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

295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Bryant
3ad21c7643 issue fix, we must use Bash for the upload script 2019-12-14 14:35:01 +00:00
Dan
c6192bbf28
Merge pull request #76 from justdan96/enhancement-nightly-build 
Enhancement nightly build
 2019-12-14 14:06:00 +00:00
Dan Bryant
9e0215ad87 fix another typo in the Mac Docker script 2019-12-14 14:04:47 +00:00
Dan Bryant
65883d86bf fix issue with the Mac zip file in the nightly upload script 2019-12-14 13:59:52 +00:00
Dan
f7c8988b1f
Merge pull request #75 from justdan96/enhancement-nightly-build 
Enhancement nightly build
 2019-12-14 13:31:01 +00:00
Dan Bryant
c48cce889b improve output on upload script 2019-12-14 12:23:39 +00:00
Dan Bryant
8c2fa59aa9 add GitHub flow file and fix typo in upload script 2019-12-14 12:20:06 +00:00
Dan Bryant
5a9d4e9999 update docker build scripts and add new script to upload nightly versions to bintray 2019-12-14 12:16:18 +00:00
Daniel Kamil Kozar
b236ee26a9
Use standard-width types in convertUTF.h 
convertUTF.h typedefed the UTF32 type as unsigned long, which is really 64-bit
wide on LP64 platforms. Since there is a number of casts, mostly around
utf8Converter.cpp, which assume that UTF32 is 32 bits and no more, this caused
some of the pointers to point outside of their respective arrays due to pointer
arithmetic adding an offset of 8 instead of 4.

This naturally never occured on Windows, because it uses 32 bits for longs, and
the problematic code was never actually really hit because sizeof(wchar_t) on
Windows is 2, which means that the code which needed to cast to UTF32 was never
executed.

Fixes #69.
 2019-12-11 20:44:20 +01:00
Dan
007daed92a
Merge pull request #72 from justdan96/enhancement-add-gui-docker-scripts 
add 32-bit Windows build script
 2019-12-11 12:50:34 +00:00
Dan Bryant
75df69b67c add 32-bit Windows build script 2019-12-11 12:48:40 +00:00
Dan
b1362e8baf
Merge pull request #71 from justdan96/enhancement-add-gui-docker-scripts 
add new script files for tsMuxerGUI builds in Docker
 2019-12-11 11:28:40 +00:00
Dan Bryant
e575bc0f80 Merge branch 'xavery-consistent-override' 2019-12-10 22:43:48 +00:00
Dan Bryant
aaecc7c1d6 Merging pull request #67 2019-12-10 22:42:23 +00:00
Dan Bryant
1117c3b63b add new script files for tsMuxerGUI builds in Docker 2019-12-10 21:54:54 +00:00
Dan
d9ac5f8bdc
Merge pull request #66 from xavery/fixes-and-cleanups 
Fixes and cleanups
 2019-12-10 21:51:10 +00:00
Dan
6c75b43606
Merge pull request #64 from xavery/use-qt5-connect-syntax 
Replace the old QObject::connect syntax with the new one supported since Qt5
 2019-12-10 21:37:49 +00:00
Dan
b56b26dcc9
Merge pull request #65 from xavery/tsmuxer-binary-name-fix 
Make the GUI look for the main binary under "tsmuxer" and "tsMuxeR"
 2019-12-10 21:37:12 +00:00
Dan
f13d1b582f
Merge pull request #68 from justdan96/enhancement-osx-gui-build 
enhance the OSX script for tsMuxerGUI to properly create the app bundle
 2019-12-08 21:35:14 +00:00
Daniel Bryant
22d2ba0d0e enhance the OSX script for tsMuxerGUI to properly create the app bundle 2019-12-08 21:18:56 +00:00
Daniel Kamil Kozar
a654b465a5
Remove setting custom platform defines from main CMakeLists.txt 2019-12-08 16:58:59 +01:00
Daniel Kamil Kozar
6bc34a6e54
Replace custom platform defines with standard ones 2019-12-08 16:31:56 +01:00
Daniel Kamil Kozar
8cab740da9
Remove unused source and header files 2019-12-08 16:19:59 +01:00
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