justdan96/tsMuxer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
222 Commits 1 Branch 0 Tags
Commit Graph

222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Kamil Kozar
5ee30737be
Make the GUI look for the main binary under "tsmuxer" and "tsMuxeR" 
The all-lowercase binary name is the one that's emitted by the current build
system, while the old one is kept for backwards compatibility.

Fixes #63
 2019-12-07 19:37:30 +01:00
Daniel Kamil Kozar
b2ac11b0b5
Replace the old QObject::connect syntax with the new one supported since Qt5 
The old syntax is essentially based on the "normalised representation" created
by the SIGNAL and SLOT macros, with potential mismatched only being caught at
runtime. The new syntax causes these errors to appear in compile time.
 2019-12-07 19:17:19 +01:00
Dan
0826eff0f7
Merge pull request #62 from jcdr428/patch-2 
Fix conflict between std::max and windows.h max
 2019-12-07 17:16:54 +00:00
jcdr428
002a52ab89
Fix conflict between std::max and windows.h max 2019-12-06 17:37:44 +02:00
Dan
b79ef4c3e4
Merge pull request #57 from jcdr428/patch-1 
UHD Fix to muxerManager.cpp
 2019-12-04 21:23:53 +00:00
jcdr428
26a15b1446
UHD Fix to muxerManager.cpp 
Patch needed due to change from "--blu-ray v3" to "--blu-ray-v3"
(same as patch for tsMuxer.cpp already merged)
 2019-12-03 00:00:50 +02:00
Dan
eacb70c003
Merge pull request #56 from justdan96/bug-std-min-conflict 
Corrected conflict beween min and std::min
 2019-12-02 19:30:01 +00:00
Daniel Bryant
d6e5eb2781 Corrected conflict beween min and std::min 2019-12-02 19:27:02 +00:00
Dan
ea3a06f740
Merge pull request #55 from justdan96/enhancement-better-readme 
add instructions for each platform
 2019-12-02 18:57:20 +00:00
Dan Bryant
0ba3122059 add instructions for each platform 2019-12-02 18:56:46 +00:00
Dan
6c8b74f95d
Merge pull request #50 from jcdr428/patch-6 
Correct UHD video format in MPLS and CLPI
 2019-12-02 14:25:32 +00:00
Dan
ea8fe8fc1c
Merge pull request #51 from jcdr428/patch-11 
Correct aac frameSize
 2019-12-02 14:19:38 +00:00
Dan
c979e91dca
Merge pull request #54 from jcdr428/patch-8 
UHD Fix to tsMuxer.cpp
 2019-12-02 14:15:03 +00:00
Dan
6f999cfb7e
Merge pull request #53 from jcdr428/patch-12 
WIN32_LEAN_AND_MEAN for Windows built
 2019-12-02 14:14:08 +00:00
jcdr428
790220b7b5
UHD Fix to tsMuxer.cpp 
Fix to take into account change of UHD option from --blu-ray v3 to blu-ray-v3
 2019-12-01 23:49:54 +02:00
jcdr428
56c39498d1
WIN32_LEAN_AND_MEAN for Windows built 2019-12-01 00:39:44 +02:00
jcdr428
651e777bbe
Correct aac frameSize 2019-11-30 18:31:28 +02:00
jcdr428
2f4f7af151
Correct UHD video format in MPLS and CLPI 
Add video_format 8 (2160p)
 2019-11-29 13:04:15 +02:00
Dan
9a3b206499
Merge pull request #49 from justdan96/enhancement-better-readme 
put the additional parameters into a table
 2019-11-28 20:39:35 +00:00
Dan Bryant
38c1867580 put the additional parameters into a table 2019-11-28 19:41:50 +00:00
Dan
3defdb81b0
Merge pull request #48 from justdan96/enhancement-better-readme 
Documentation Cleanup and Improvement
 2019-11-28 16:52:38 +00:00
Dan Bryant
fb99e1e8cd seperate out readmes, improve some sections and put some elements in tables 2019-11-28 16:45:44 +00:00
Dan
21c8967d94 Set theme jekyll-theme-slate 2019-11-28 15:49:37 +00:00
Dan
5e02e35287
Merge pull request #46 from justdan96/enhancement-uhd-bd-v3 
Handle MPLS reserved blocks and UHD Blu-Ray
 2019-11-27 19:40:31 +00:00
Daniel Bryant
eaba2aaf1a amend cmd line option for UHD Blu-Ray and add option to tsMuxerGUI 2019-11-26 16:49:50 +00:00
Daniel Bryant
aff823e45e skip reserved blocks in MPLS files 2019-11-26 15:09:32 +00:00
lonelycrane
45fbb43e40 Deal with reserved blocks in mpls to align, allow multi m2ts files listed correctly 2019-11-26 22:21:14 +08:00
Dan Bryant
622f41a610 add UHD Blu-Ray disk type, command line option, enable UHD Blu-Ray files, folders and playlists to be created and enable UHD Blu-Ray in MPLS 2019-11-26 10:31:44 +00:00
Dan
08106ada39
Merge pull request #39 from jcdr428/patch-6 
Correct EAC3 bitrate info
 2019-11-26 09:56:35 +00:00
jcdr428
2d6ad7ebc4
Correct EAC3 bitrate info 
tsMuxer shows bitrate as m_bit_rateExt (EAC3) + m_bit_rate (AC3 core).
For EAC3, m-bit_rate should first be declared to zero.
 2019-11-25 18:47:24 +02:00
Dan
aa01ba5719
Merge pull request #38 from justdan96/bug-static-segfault 
use workaround for segfaults with statically-linked builds on Linux
 2019-11-25 14:10:44 +00:00
Daniel Bryant
9c32ab12c9 use workaround for segfaults with statically-linked builds on Linux 2019-11-25 14:08:48 +00:00
Dan
ec15888829
Merge pull request #36 from justdan96/enhancement-docker-build 
check the correct directory for executables
 2019-11-25 09:18:48 +00:00
Dan Bryant
e999c0f4a4 check the correct directory for executables 2019-11-25 09:16:19 +00:00
Dan
651557f530
Merge pull request #35 from justdan96/bug-ac3-parsing 
fix a small syntax error
 2019-11-25 09:09:19 +00:00
Dan
b75bdbe114
Merge pull request #34 from justdan96/enhancement-docker-build 
Actions will now fail if a executable isn't produced
 2019-11-25 09:03:16 +00:00
Dan Bryant
f13544d34d Actions will now fail if a executable isn't produced 2019-11-25 09:00:29 +00:00
Dan Bryant
56e4860fc7 correct bug introduced from recent pull request 2019-11-25 08:56:39 +00:00
Dan Bryant
d379bed50a Merge master branch, to bring in all changes 2019-11-25 08:52:00 +00:00
Dan Bryant
97591909a3 reset before merge 2019-11-25 08:51:57 +00:00
Dan Bryant
0b54a2c312 fix up formatting of ac3Codec.cpp 2019-11-25 08:33:41 +00:00
Dan
400742ee4d
Merge pull request #31 from jcdr428/patch-4 
Parse channel number from 'esds' atom
 2019-11-24 20:01:23 +00:00
Dan
3db9c8bef5
Merge pull request #32 from jcdr428/patch-5 
Correct H265 Stream_Type
 2019-11-24 20:01:12 +00:00
Dan
cedb3be7a5
Merge pull request #30 from jcdr428/patch-3 
Correct AAC frame size parsing
 2019-11-24 20:00:59 +00:00
Dan
ca23180f2f
Merge pull request #29 from jcdr428/patch-2 
Get rid of MAX_AV_PACKET_SIZE limitation
 2019-11-24 20:00:45 +00:00
Dan
67ba8c5fff
Merge pull request #28 from jcdr428/patch-1 
Correct EAC3 sampling rate and channel parsing
 2019-11-24 20:00:27 +00:00
Dan
8e8a3acb38
Merge pull request #33 from justdan96/enhancement-github-actions 
Enhancement GitHub actions
 2019-11-24 19:59:50 +00:00
Dan Bryant
e3e358e7f1 add binaries link to Readme 2019-11-24 19:57:49 +00:00
Dan Bryant
2520a8bbf8 only build on push to master branch 2019-11-24 19:50:28 +00:00
jcdr428
651b7295d5
Correct H265 Stream_Type 
Stream-Type for H265 is 0x24 as per ITU-T H222.0.
 2019-11-24 20:17:06 +02:00