Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-13 13:41:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,195 Commits 1 Branch 241 Tags 367 MiB
0da133b7cf
Commit Graph

1027 Commits

Author SHA1 Message Date
Moritz Bunkus
accc1d28c8 Do not overwrite the duration for some track types. 
Subtitle and button tracks must preserve their duration even
if an external timecode file is used. Otherwise each subtitle
frame's duration is set to the difference between the next
frame's timecode and the current frame's timecode.

Fix for bug 286.
 2009-04-15 16:40:07 +02:00
Moritz Bunkus
402a679f5c Removed the option "always use simple blocks" from the preferences dialog. 2009-04-15 13:10:25 +02:00
Moritz Bunkus
a938f662d1 Updates 2009-04-14 20:36:02 +02:00
Moritz Bunkus
c573ecea0e Set the version number, added the release message, set the release codename. 2009-04-14 19:51:32 +02:00
Moritz Bunkus
1e3c269f66 Enabled the use of SimpleBlock elements by default. 
The old hack "use_simpleblock" has been renamed to "no_simpleblock"
which will prohibit the use of SimpleBlock elements.
 2009-04-13 16:30:52 +02:00
Moritz Bunkus
f8fbb07ff3 Added support for the "forced track" flag in mmg. 2009-04-11 15:37:24 +02:00
Moritz Bunkus
201c40e7b6 Added support for the "forced track" flag in mkvmerge. Fix for bug 128. 2009-04-11 14:04:51 +02:00
Moritz Bunkus
dee548cbb3 Updates 2009-04-11 11:01:16 +02:00
Moritz Bunkus
c9981c75e5 Changed the behaviour of removing the aspect ratio information from h.264 bitstreams to keeping it. 
The new option "--engage remove_bitstream_ar_info" restores the previous behaviour.
 2009-04-08 16:47:10 +02:00
Moritz Bunkus
fff0804b59 Fixed aspect ratio handling for AVC/h.264 video. 
1. The list of predefined aspect ratios has been extended by three entries (sync with ffmpeg).
2. mkvmerge only tries to read free aspect ratio information if the aspect ratio type indicates it by being 0xff.
 2009-04-08 11:50:41 +02:00
Moritz Bunkus
71090a649d Added support for opening files in the header editor by dragging & dropping a file onto its window. 2009-04-05 18:27:43 +02:00
Moritz Bunkus
2dec64c9e9 Added support for reading the track language form QuickTime/MP4 files. 2009-04-05 15:20:53 +02:00
Moritz Bunkus
6de167dd9a Updates 2009-04-05 14:08:31 +02:00
Moritz Bunkus
71c4926f5e Added support for MLP audio. 2009-03-30 16:45:18 +02:00
Moritz Bunkus
03fbe9dfd0 Unescape the letter "c" to a colon. 2009-03-30 10:11:06 +02:00
Moritz Bunkus
854efa5f2b Updates. 2009-03-29 18:02:55 +02:00
Moritz Bunkus
ceebc5be3f Make a copy of the value returned by gettext(). Otherwise a following call will overwrite the previous result. 2009-03-25 23:35:07 +01:00
Moritz Bunkus
b3523a3e3d mkvmerge is run with translations, so mmg has to look for translated strings in its output. 2009-03-25 23:28:56 +01:00
Moritz Bunkus
43f7edc3ae Fix timecode formatting in the job queue. 
Also always use wxGetUTCTime() instead of time(NULL) or wxGetLocalTime()
in order to get proper timestamps.

Fix for bug 362.
 2009-03-25 17:37:32 +01:00
Moritz Bunkus
5496f2b773 Only return fully-read timestamps. 
If the bit_cursor_c throws an exception in the middle of
reading the timestamp then the "timestamp" variable used
to return the timestamp must not have been modified yet.

Fix for bug 337.
 2009-03-24 23:09:01 +01:00
Moritz Bunkus
1320636f91 Bumped the version number to 2.6.0, set the release code name, added the release message to the ChangeLog. 2009-03-24 11:51:37 +01:00
Moritz Bunkus
114dfd2bd0 Removed message about wxWidgets 2.8. 
Due to the removal of wxTreebook wxWidgets 2.8 is not needed anymore.
 2009-03-23 14:13:38 +01:00
Moritz Bunkus
e381505950 Fixes for compilation with mingw/other wxWidgets version. 2009-03-22 00:37:01 +01:00
Moritz Bunkus
0003a1b523 Added documentation for the header editor. 2009-03-22 00:09:11 +01:00
Moritz Bunkus
ca158fde4a Convert simple chapter output to the current output charset instead of always converting to UTF-8. 
This allows the user to change the charset with --output-charset.
Before chapters were not converted at all resulting in UTF-8 output
on every system, and --output-charset had no effect on it.

This does not affect the output of XML style chapter files.

Fix for bug 359.
 2009-03-21 11:36:19 +01:00
Moritz Bunkus
f63200363b Store QuickTime audio codecs with CodecID "A_QUICKTIME". 
QuickTime audio tracks will be stored with the CodecID "A_QUICKTIME".
The CodecPrivate element contains the full "STSD" element from the QuickTime file
(just like V_QUICKTIME). This method is used for all audio tracks which
don't have a well-defined storage spec for Matroska (e.g. AAC, AC3,
MP2/3 are still stored as A_AC3, A_AAC etc). Hopefully a fix for bugs 354 and 357.
 2009-03-18 22:57:26 +01:00
Moritz Bunkus
0263e8a2d9 Include the "size" field in the CodecPrivate element for QuickTime tracks. 
Fix for bug 355.
 2009-03-18 21:05:38 +01:00
Moritz Bunkus
ac2db254ab Added a Japanese translation by Hiroki Taniura. 2009-03-18 20:20:55 +01:00
Moritz Bunkus
1b73f480e8 Fix for little endian PCM tracks in MOV files 
Fix for bug 356.
 2009-03-17 12:27:57 +01:00
Moritz Bunkus
3d425dfc6f Properly initialize the console locale 
Otherwise conversion will fail on non-UTF-8 locales,
e.g. on German or Japanese Windows.
 2009-03-15 15:30:20 +01:00
Moritz Bunkus
02b7082846 Updates 2009-03-15 15:08:05 +01:00
Moritz Bunkus
84f70308cd Added a configure check for checking if wxWidgets was compiled with Unicode support. 2009-03-15 15:05:28 +01:00
Moritz Bunkus
cc039f6e1f Update to the ChangeLog. 2009-03-14 14:41:34 +01:00
Moritz Bunkus
f5209cf52d Close the console that is started with mkvinfo in GUI mode on Windows 2009-03-08 14:25:46 +01:00
Moritz Bunkus
4983829ad8 Recode EbmlUnicodeStrings to UTF-8 encoded C strings 
mkvinfo expects strings to be encoded in UTF-8 when they're displayed. Fix for bug 353.
 2009-03-08 14:03:01 +01:00
Moritz Bunkus
c48917c747 Released v2.5.3. 2009-03-07 11:31:57 +01:00
Moritz Bunkus
4836220b6e Allow locales for which mkvtoolnix does not contain a translation 
For locales for which mkvtoolnix does not contain a translation
(e.g. fr_FR, en_AU etc) mkvtoolnix should not abort with an
error message. mmg must not chose such a locale as the parameter
for --ui-language. Fix for bug 338.
 2009-03-01 18:13:32 +01:00
Moritz Bunkus
bc3716dcf6 ChangeLog update 2009-03-01 16:15:44 +01:00
Moritz Bunkus
0db67d7425 Increase the attachment ID even if the attachment itself is skipped 
Otherwise none of the following attachments are copied,
even if they were requested with --attachments. Fix for
bug 346.
 2009-02-28 18:29:12 +01:00
Moritz Bunkus
5523f59962 Release 2.5.2. 
Added the release message to the ChangeLog; set the version number;
set the release code name.
 2009-02-28 15:11:55 +01:00
Moritz Bunkus
36892b6364 Do not ask the user during silent installs 
Do not pop up windows asking the user stuff if the installer
is run in silent mode (with the "/S" switch). Fix for bug 345.
 2009-02-28 15:07:52 +01:00
Moritz Bunkus
694fe14916 Added buttons for enabling/disabling all attached files 2009-02-28 14:56:58 +01:00
Moritz Bunkus
bdf46f05e5 Clear the list of attached files 
The action "remove all files" must also clear the list of attached files.
The action "File" -> "New" must clear the internal list of attached files
as well as the GUI component.
 2009-02-28 13:37:34 +01:00
Moritz Bunkus
4cc69c777e Made the mkvinfo GUI translatable 
Made the GUI translatable and added a German translation for it.
 2009-02-26 01:13:31 +01:00
Moritz Bunkus
e8fbf923ba Preparations for the translation of mkvinfo 2009-02-25 23:31:15 +01:00
Moritz Bunkus
9cfe9298d9 Use wxBitmapComboBoxes instead of wxComboBoxes on Linux with wxWidgets 2.8.0 and newer 
On Linux wxWidgets 2.8.0 and newer uses the GTK combo boxes which suck. A lot.
Therefore mmg uses wxBitmapComboBoxes for wxWidgets >= 2.8.0 on Linux and normal
wxComboBoxes in all other cases. wxBitmapComboBoxes are still drawn by wxWidgets
itself (just like wxComboBoxes before 2.8.0) and offer much better functionality.
Fix for bug 339.
 2009-02-25 22:40:12 +01:00
Moritz Bunkus
0e13f24db6 Update to the ChangeLog 
Added fix for bug 340.
 2009-02-25 19:20:11 +01:00
Moritz Bunkus
bb39519a7e Various fixes for compilation with wxWidgets 2.9. 2009-02-25 18:35:07 +01:00
Moritz Bunkus
57d853188e Release v2.5.1 
Added the release message, set the release code name and the version number.
 2009-02-22 14:59:55 +01:00
Moritz Bunkus
681fc96e94 Released v2.5.0. 
Bumped the version number, added the release message, set the
release codename.
 2009-02-21 19:06:46 +01:00
Moritz Bunkus
0e40ad966e Removed superfluous format specifier 
The string contained four format specifies but only three arguments.
Possibly a fix for bugs 335 and 336.
 2009-02-21 16:07:57 +01:00
Moritz Bunkus
ae6ed71a00 An update to the ChangeLog. 2009-02-19 00:09:47 +01:00
Moritz Bunkus
e473cf5733 Added support for selectively copying attached files in mmg 
Added controls on the "attachments" page so that the user can
select which existing attached files he wants copied into the
output file. Removed the checkbox for "no attachments" from the
"input" page.
 2009-02-19 00:07:32 +01:00
Moritz Bunkus
1244d00df9 Fixed AAC detection 
AAC data which does not start on the first byte was not detected
properly. The reason is that the AAC scanning code did not take
the start offset into account. Also the AAC reader class treated
the offset to the first header being != 0 as an error.
 2009-02-06 10:24:46 +01:00
Moritz Bunkus
f86b13a873 Test for NULL. 
The chapter editor does not assign an item data element to the root
element. Therefore the function should check if said item data element
is NULL before using it causing a crash otherwise.
 2009-01-19 13:53:05 +01:00
Moritz Bunkus
b816b838a4 mkvextract: do not output timecodes in scientific notation 
Huge timecodes were output in scientific notation because floating
point numbers were used. Now mkvextract creates the decimal and fractional
parts of the output itself so that the scientific notation will not be used.
 2009-01-18 20:42:40 +01:00
Moritz Bunkus
e5d156a07c Releasemessage and version number for 2.4.2 2009-01-17 22:07:31 +01:00
Moritz Bunkus
06fa821050 Fix timecodes in appended subtitle files 
If subtitle files are appended to separate video files
(e.g. two AVI and two SRT files) then the subtitle timecodes of
the second and all following subtitle files were based on the last
timecode in the first subtitle file instead of the last timecode in
the first video file. Fix for bug 325.

This bug was introduced in c68a6dfc27
 2009-01-15 22:59:17 +01:00
Moritz Bunkus
a228089347 Initialized unused variables 
The member variables display_width and display_height have to
be initialized. Otherwise it's up to the compiler which is bad :)
Fix for bug 329.
 2009-01-15 19:06:26 +01:00
Moritz Bunkus
949f9ed387 Implemented libmagic based automatich MIME type detection for Windows. 2009-01-08 20:33:19 +00:00
Moritz Bunkus
0d38943c63 Copy attachments from Matroska input files into each output file, not just the first one. Partial fix for bug 324. 2009-01-03 18:20:33 +00:00
Moritz Bunkus
b63d2959d4 Decreased the time needed for parsing the headers and pre-calculating the tables. 2008-12-21 17:07:33 +00:00
Moritz Bunkus
7227888f22 Use Boost based regular expressions for the simple chapter parser and extended it to handle more than 100 chapters. Fix for bug 320. 2008-12-17 18:00:44 +00:00
Moritz Bunkus
5cb339a3cf Update the command line prior to saving it or creating an option file. 2008-12-17 07:26:39 +00:00
Moritz Bunkus
3a6a29c1d5 Revision 3884 removed the variable i from the loop end condition causing segfaults if "--engage native_mpeg4" is used together with MPEG-4 part 2 video. Fix for bug 318. 2008-12-13 22:14:16 +00:00
Moritz Bunkus
54990f47d3 Updates. 2008-12-08 10:13:07 +00:00
Moritz Bunkus
479e6fef94 Added support for handling the pixel aspect ratio in Theora video tracks. 2008-12-05 16:59:10 +00:00
Moritz Bunkus
ddd11a12b4 Set the release codename, the new version and the release message in the ChangeLog. 2008-12-04 20:13:51 +00:00
Moritz Bunkus
7373881957 Updates 2008-12-04 20:02:20 +00:00
Moritz Bunkus
986a7b9827 Calculate with samples and not bytes. That way the int64_t calculation will not overflow as quickly. Otherwise timecodes will be negative, packets will be dropped and PCM tracks are cut off after approximately 8 GB. 2008-12-03 11:54:54 +00:00
Moritz Bunkus
ba35e5bfcd Allow timecodes in SRT files to be formatted not as strictly as before: there may be spaces between colons and digits, and numbers do not have to be exactly two or three digits long. 2008-12-02 14:17:03 +00:00
Moritz Bunkus
d3c8c34fcb Process window events much more often during muxing. 2008-11-28 12:13:24 +00:00
Moritz Bunkus
2c47b7b286 Sync with the official ISO 639-2 standard ( http://www.loc.gov/standards/iso639-2/php/code_list.php ). 2008-11-28 10:40:51 +00:00
Moritz Bunkus
dda1a15cbf Updates 2008-11-04 18:38:13 +00:00
Moritz Bunkus
c68a6dfc27 Introduced another way of calculating the timecodes when appending files and made this one the default. The old way is still useable via "--append-mode track-based" but results in wrong timecodes most of the time. 2008-11-03 15:23:44 +00:00
Moritz Bunkus
0cc32e30cb Added support for reading SRT and SSA/ASS subtitles from AVI files. Fix for bug 64. 2008-11-03 14:08:13 +00:00
Moritz Bunkus
a31e1975af Updates 2008-11-01 14:13:07 +00:00
Moritz Bunkus
9d58941ffa Handle SRT files with missing spaces around the arrow in the timecode lines. 2008-10-29 15:47:25 +00:00
Moritz Bunkus
31e3bd4d7f Recoded from ISO-8859-15 to UTF-8. 2008-10-14 13:12:54 +00:00
Moritz Bunkus
a9244648c7 Output hex as numbers, not characters. 2008-10-13 19:02:48 +00:00
Moritz Bunkus
d6cd6fff27 Added the release message, set the release codename, bumped the version number to 2.4.0. 2008-10-11 17:17:00 +00:00
Moritz Bunkus
2b1dfa06a5 Updates 2008-10-11 08:46:22 +00:00
Moritz Bunkus
c8dbbc3bbe More updates 2008-10-06 20:00:51 +00:00
Moritz Bunkus
ef2f32f39c Updates. 2008-10-06 19:54:49 +00:00
Moritz Bunkus
c1cf76b631 Do not add the same language twice or more to the "language" drop down boxes. 2008-10-04 22:16:55 +00:00
Moritz Bunkus
e66f028515 Call iconv with NULL as the source so that the internal shift registers are written to the output string as well. This is neccessary for some languages, e.g. Hebrew. Fix for bug 302. 2008-10-04 19:31:05 +00:00
Moritz Bunkus
a3a365ef49 Use the timecodes provided by the MPEG PS stream for the VC1 video packets. 2008-09-25 09:54:29 +00:00
Moritz Bunkus
5b8c29cd25 Updates 2008-09-25 09:53:31 +00:00
Moritz Bunkus
c2e680ba3f Added support for SimpleBlocks for timecode extraction mode. 2008-09-22 17:22:37 +00:00
Moritz Bunkus
1f9efc5959 Fixed reading AC3 files bigger than 2 GB. 2008-09-21 15:17:42 +00:00
Moritz Bunkus
c864440f17 Added support for Dirac video tracks. 2008-09-21 14:31:14 +00:00
Moritz Bunkus
650986eb30 Both AVC and MPEG-1/-2 video tracks use the same packet ID in MPEG program streams. The detection for them should not rely on the very first packet encountered being the start of an AVC NALU/MPEG video packet. The detection has been changed to search through enough bytes until several required start codes are found for either type. 2008-09-20 17:53:50 +00:00
Moritz Bunkus
4c97668948 The DTS header finding function requires that enough data is available to determine whether or not it is DTS-HD. This means that the MPEG PS reader has to read enough MPEG PS packets for the DTS header finder to work with. 2008-09-20 15:18:26 +00:00
Moritz Bunkus
2d49a444a5 Added the extensions "evo", "evob" and "vob" to mmg's "add file" dialog. 2008-09-19 20:52:27 +00:00
Moritz Bunkus
cd64533695 Added support for reading VC1 video tracks from MPEG program streams (EVOBs). 2008-09-18 12:13:30 +00:00
Moritz Bunkus
1fe0e40ab0 Added support for 7.1 EAC3 files. 2008-09-17 07:49:39 +00:00
Moritz Bunkus
09ccdefada Revision 3831 (the change to the "--delay" and "--sync" options) caused mkvmerge to no longer respect the delay caused by garbage at the beginning of MP3 and AC3 audio tracks in AVI files. The timecodes of such tracks are now delayed appropriately again. Fix for bug 300. 2008-09-13 16:55:10 +00:00
Moritz Bunkus
524cee0ddc Ignore unknown stream types in Ogg files (the function "demuxing_requested()" doesn't like being called with unknown track types). Fix for bug 299. 2008-09-12 18:16:33 +00:00
Moritz Bunkus
2e02c96599 Added support for extracting Theora video tracks into Ogg files. Fix for bug 298. 2008-09-12 17:04:11 +00:00
Moritz Bunkus
8a4cd7fc44 Theora is fixed for Ogg and Matroska files. 2008-09-12 16:09:07 +00:00
Moritz Bunkus
8897672a70 Fixed the frame type (key or non-key frame) detection for Theora tracks in Ogg files. 2008-09-12 11:01:09 +00:00
Moritz Bunkus
24045e8859 Updates 2008-09-08 15:43:39 +00:00
Moritz Bunkus
79d97f4729 Bumped the version number to 2.3.0, set the release name and added the release message. 2008-09-07 12:49:59 +00:00
Moritz Bunkus
5b437cf369 Improved the timecode calculation for MP3 tracks. If the source file contains the same timecode for consecutive packets then mkvmerge will extrapolate timecodes for all but the first packets in the sequence. Fix for bug 165. 2008-09-06 14:50:38 +00:00
Moritz Bunkus
3713fd72e4 Honor the timecode offsets in MPEG program streams (VOB files). This fixes audio/video desynchronization. Fix for bug 295. 2008-09-03 16:18:50 +00:00
Moritz Bunkus
f1f4b5567f Switched from the PCRE regex library to Boost's one. 2008-08-30 12:45:54 +00:00
Moritz Bunkus
a004bdb233 DTS-in-WAV handling (14 to 16 bit expansion) was flawed. Fix for bug 288. 2008-08-23 14:49:28 +00:00
Moritz Bunkus
d3de460b82 Added support for Vorbis in AVI (format tag 0x566f). Fix for bug 271. 2008-08-23 14:33:37 +00:00
Moritz Bunkus
9fa04c501f Added support for PCM tracks with floating point numbers (CodecID A_PCM/FLOAT/IEEE). Patch by Aurelien Jacobs (see AUTHORS). 2008-08-23 12:02:10 +00:00
Moritz Bunkus
7545fbd50e The fix to the timecode handling for AVC tracks in MP4 files from 2008-04-16 caused certain other MP4 files to not be read correctly. The video tracks were found, but no frames were read. Fix for bug 294. 2008-08-21 10:45:34 +00:00
Moritz Bunkus
04f35dc84a Added support for Ogg Kate subtitles. Patch by ogg.k.ogg.k@googlemail.com. 2008-08-21 10:12:31 +00:00
Moritz Bunkus
3fb8a8863d Removed the "--delay" option. Changed the "--sync d,l/p" option: audio samples are not added. Instead only the timecodes are adjusted. The default for "p" has been changed from 1000 to 1 if it is left out. The "--sync" option works for all track types. Therefore mmg activates the "delay" and "stretch by" inputs no matter what track type is selected. 2008-08-20 19:04:10 +00:00
Moritz Bunkus
3cf5067d9c mmg outputs a more informative error message for known but unsupported input file types (e.g. ASF, FLV, MPEG TS) instead of the cryptic "file identification failed". 2008-08-19 14:52:12 +00:00
Moritz Bunkus
0de4e02cc4 Do not read more bytes from the SUB file for a single SPU packet than indicated by the IDX file, even if the PES length field says otherwise. Partial fix for bug 245. 2008-08-19 13:53:20 +00:00
Moritz Bunkus
aabcccffd5 The BZIP2 API usage was wrong. Patch by Aurelien Jacobs. 2008-05-16 12:06:21 +00:00
Moritz Bunkus
d98bcbd84d Improved support for WAV files bigger than 4 GB which only contain a single DATA chunk and a wrong length field for this DATA chunk (e.g. eac3to creates such files). 2008-05-15 17:06:37 +00:00
Moritz Bunkus
642912edd0 Revision 3741 deactivated a check which should avoid huge memory consumption for files with dis-continuous streams. This caused bug 281. 2008-05-14 08:54:39 +00:00
Moritz Bunkus
315fd92266 Detect ASF/WMV input files and output a proper error message instead of detecting other stream types like AVC ES. Fix for bug 280. 2008-04-22 09:50:45 +00:00
Moritz Bunkus
4dd522775b Fix for an assertion for OGM files with embedded chapters. Fix for bug 279. 2008-04-20 19:11:13 +00:00
Moritz Bunkus
eba8ab675c Updates 2008-04-20 18:54:17 +00:00
Moritz Bunkus
da6bedc367 Fixed wrong timecodes for MP4 files that contain video tracks with B frames and edit lists. Fix for bug 277. Patch by Damiano Galassi (see AUTHORS). 2008-04-16 15:39:29 +00:00
Moritz Bunkus
0984dacfee Do not strip leading spaces from SRT subtitle entries. 2008-04-14 21:33:34 +00:00
Moritz Bunkus
e67323c979 Tuned the file type detection for MPEG ES streams. Fix for bug 265. 2008-04-14 21:15:11 +00:00
Moritz Bunkus
740cd6a9c1 Fixed support for UNC paths on Windows. Handle the host and share name parts of UNC paths correctly when checking if a directory needs to be created for the output file. Fix for bug 275. 2008-04-03 16:21:16 +00:00
Moritz Bunkus
8ed313f2d3 Added support for skipping ID3 tags in AC3 files. 2008-03-09 17:37:42 +00:00
Moritz Bunkus
4905caf963 Added support for AAC files with ID3 tags. 2008-03-09 16:02:08 +00:00
Moritz Bunkus
37a6c2e864 Added support for DTS-HD (master audio/high resolution). Cosmetics for dts_common.cpp. 2008-03-09 15:38:53 +00:00
Moritz Bunkus
b88b0ebf8a Updated the version number, set the new release nick name and included the release message in ChangeLog. 2008-03-04 07:35:53 +00:00
Moritz Bunkus
7161cb1862 Small updates for ChangeLog. 2008-03-03 16:58:17 +00:00
Moritz Bunkus
5b9eeb097b Added support for AC3-in-WAV in ACM mode. Added test cases for AC3-in-WAV in both ACM and IEC 61937 mode. Refactored r_wav.cpp & r_wav.h to match my desired coding style. 2008-02-29 14:28:35 +00:00
Moritz Bunkus
a396d20e94 Added support for reading AC3 from QuickTime/MP4 files. Fix for bug 254. 2008-02-28 18:18:27 +00:00
Moritz Bunkus
44d53cc76a Added support for handling AC3-in-WAV. 2008-02-27 14:49:42 +00:00
Moritz Bunkus
ded5cc873e Rewrite of the WAV reader. Fixed the handling of "fmt" chunks of unexpected length. Added support for handling WAV files with multiple data chunks. 2008-02-27 14:09:19 +00:00
Moritz Bunkus
8f12504a2b Added support for AAC-in-AVI with CodecID 0x706d as created by mencoder. Fix for bug 266. 2008-02-23 16:51:06 +00:00
Moritz Bunkus
52f2415c02 Update 2008-02-20 14:48:41 +00:00
Moritz Bunkus
1fbb6a8fda Rewrote the timecode application mechanism to be a lot faster, especially with full queues. Also always set the previous cluster timecode. This seems to get rid of at least some of the assertions thrown by libmatroska about the local timecode being to small/large to fit into a int16, and it also seems to get rid of some of mkvmerge's error messages about the packet queue not being empty. 2007-12-31 16:51:37 +00:00
Moritz Bunkus
466244606c Updates. 2007-12-22 09:37:32 +00:00
Moritz Bunkus
3bd17e6e13 Accept other Theora header versions than 3.2.0 as long as the major version is 3 and the minor 2. Fix for bug 262. 2007-10-11 14:33:40 +00:00
Moritz Bunkus
ad7be8fceb If resyncing after the "this is not a start code" case then re-do the start code checks. Another fix for bug 259. 2007-09-02 17:15:54 +00:00
Moritz Bunkus
33971bd6a6 Try to resync to the next MPEG start code in case of error. Fix for bug 259. 2007-09-02 16:35:46 +00:00
Moritz Bunkus
cd855e965e Output SVQ1 video tracks as V_MS/VFW/FOURCC and not as V_QUICKTIME. Fix for bug 257. 2007-08-31 11:51:08 +00:00
Moritz Bunkus
4a8dcc0468 Avoid a segfault if max_idx has been set before. Fix for bug 256. 2007-08-30 19:02:00 +00:00
Moritz Bunkus
e00a819078 SRT files that contain coordinates in the timecode line are supported. The coordinates are discarded automatically (as S_TEXT/SRT doesn't support them), and a warning is shown. 2007-08-19 18:35:51 +00:00
Moritz Bunkus
120ca3389a Bumped the version number to 2.1.0; set the release code name; added the release message to the ChangeLog. 2007-08-19 09:24:10 +00:00
Moritz Bunkus
1151078f02 Added support for reading MP2 audio tracks from OGM files. Patch by Mihail Zenkov <mihail.zenkov@gmail.com>. 2007-08-16 16:30:05 +00:00
Moritz Bunkus
596d3a2681 Added support for extracting Dolby Digital Plus (EAC3) tracks. 2007-08-15 19:43:36 +00:00
Moritz Bunkus
e88bb1aee5 Don't remove SPS and PPS NALUs from AVC/h.264 streams. 2007-08-15 17:59:22 +00:00
Moritz Bunkus
42a1924934 Fixed SSA/ASS detection for files produced by Aegis Sub which does not include a line with "[script info]" in the file. 2007-07-19 11:20:45 +00:00
Moritz Bunkus
3e26b1be51 Added another option how mmg choses the directory if automatic output filename creation is on. Implements all suggestions as listed in bug 248. Renamed all occurences of "settings" to "options" if they apply to the "options" dialog but left the "settings" alone where the word applies to the muxing settings. 2007-07-07 17:21:36 +00:00
Moritz Bunkus
dc016d3148 Moved the complete 'settings' tab to its own dialog accessible via the 'Settings' option in the 'File' menu. 2007-07-05 14:40:51 +00:00
Moritz Bunkus
1f03ae2875 Spelling. 2007-07-01 08:03:09 +00:00
Moritz Bunkus
9c325d1be4 Added a buton 'remove all' which removes all input files and tracks leaving all other options as they are. Fix for bug 248. 2007-06-30 17:21:07 +00:00
Moritz Bunkus
cc7bab3e08 mmg: Added an option for setting the default output directory if the automatic setting of the output file name is turned on. Fix for bug 248. 2007-06-30 16:54:17 +00:00
Moritz Bunkus
f2e71cbbd4 Updates 2007-06-30 15:33:07 +00:00
Moritz Bunkus
858536a516 When mmg is called with an argument then check the file name extension first. If it is 'mmg' then try to load the file as a settings file (as before). Otherwise try adding the file. 2007-06-30 10:08:45 +00:00
Moritz Bunkus
e5fb1c3690 The OGM reader now uses the AVC/h.264 video packetizer for AVC/h.264 tracks so that the aspect ratio can be extracted from it. The OGM reader uses the OGM's timestamps for video tracks. Before it would just use the current frame number multiplied by the FPS. 2007-06-27 13:51:21 +00:00
Moritz Bunkus
1cf47a12f2 Fixed a couple of memory leaks. 2007-06-25 10:39:26 +00:00
Moritz Bunkus
89d0e2ea60 Added better checks if two tracks can be appended to the passthrough packetizer so that tracks that are otherwise not known to mkvmerge can still be appended (e.g. V_VC1). Fix for bug 244. 2007-06-24 08:16:04 +00:00
Moritz Bunkus
84e31e9f6c mmg: Enable the NALU size length combobox for all AVC tracks. 2007-06-23 16:05:01 +00:00
Moritz Bunkus
3544fdc94f mkvmerge: Honor 'no' for the default track even if the track is read from a Matroska file in which it had 'yes' set for its default track flag. 2007-06-23 14:56:28 +00:00
Moritz Bunkus
d657fd2f07 mkvextract: Added support for the 'header removal' compression scheme. Hopefully fixed support for all compression schemes for all extractors. 2007-06-23 09:16:13 +00:00
Moritz Bunkus
2e24df8c07 Implemented code that can change the NALU size length for non-ES streams, too (e.g. coming from MP4 or Matroska files). 2007-06-22 08:44:39 +00:00
Moritz Bunkus
a42d6e05ab Added support for RealAudio v3 in RealMedia files. Patch by Aurelian Jacobs. Fix for bug 246. 2007-06-19 20:15:26 +00:00
Moritz Bunkus
e22a676e3c Moved the command line to a separate dialog and reduced the main window's height. 2007-06-11 08:38:46 +00:00
Moritz Bunkus
4c6ae4bbf1 Sync to mplayer's program stream handling code. Should fix the issues with various (E)AC3 tracks either having 3 bytes cut off from the beginning or them having 3 bytes to many which have to be skipped resulting in a flood of warning messages. 2007-04-30 14:46:06 +00:00
Moritz Bunkus
8ba834b720 AVC/h.264: Signal "key frame" if a recovery point has been found (a SEI NALU of type 6). Is necessary for streams without IDR slices. 2007-04-26 08:32:49 +00:00
Moritz Bunkus
4c84e14b9e Allow negative timecodes in "delay:" lines in VobSub subtitles. Fix for bug 241. 2007-04-19 07:50:15 +00:00
Moritz Bunkus
6bbfae08fc Improved the file type detection code for MPEG transport streams. If such a file is detected then an error message is output. 2007-04-18 17:20:18 +00:00
Moritz Bunkus
1fc84c8b31 Do not skip the first three bytes for normal AC3 tracks in MPEG program streams. 2007-03-23 11:53:18 +00:00
Moritz Bunkus
f3a01efbe4 When splitting video and linking is not active then don't use the first I frame\s timecode as the offset for the next file but the highest timecode + duration written to the previous file. Reason: For AVC/h.264 the timecode of the following P frames may be smaller than the first I frame's timecode. 2007-03-22 09:06:14 +00:00
Moritz Bunkus
4070ad45ee Allow "." as the decimal separator in SRT files as well as ",". 2007-03-16 07:28:40 +00:00
Moritz Bunkus
1ca3824964 Updates 2007-03-12 15:09:58 +00:00
Moritz Bunkus
083b23e8a6 Sort the tracks in MPEG PS files first by their category (video, audio, subs) and then by their stream IDs. 2007-03-08 15:52:59 +00:00
Moritz Bunkus
4051b80e44 The MPEG PS reader will now buffer data up to a specific size for some track types before sending it to the packetizer. This is especially important for the MPEG-1/2 and h.264 packetizers which parse each packet once it is received. For MPEG PS files each packet is usually very small ( < 2048 bytes) resulting in a lot of data being parsed multiple times by the packetizers because they did not have full frames to work with. Result is a major speed-up. 2007-03-08 15:17:08 +00:00
Moritz Bunkus
4a6674e730 If a packet header cannot be parsed then try skipping this packet. Additionally try to resync to the next start code in the case of errors. 2007-03-05 12:45:06 +00:00
Moritz Bunkus
989ac0aad8 Added support for handling AVC/h.264 tracks in MPEG program streams. 2007-03-05 10:08:49 +00:00
Moritz Bunkus
87b7a111ef Added support for EAC3 tracks in MPEG program streams. 2007-03-02 15:06:32 +00:00
Moritz Bunkus
95238e68a8 Added support for EAC3/DD+ (Dolby Digital Plus) files and tracks (raw EAC3 files or inside Matroska with CodecID A_EAC3). 2007-03-02 11:17:25 +00:00
Moritz Bunkus
c09590f2ac Added the release message. 2007-02-21 10:30:55 +00:00
Moritz Bunkus
9a522c9a2f Reintroduced the 'allow_avc_in_vfw_mode' hack due to user requests. 2007-02-19 08:52:27 +00:00
Moritz Bunkus
131ef6ae8d Fixed suppoert for DTS-in-WAV files which are encoded with 14 bits per word. 2007-02-06 15:52:01 +00:00
Moritz Bunkus
0c834be27e Added support for DTS files which use only 14 out of every 16 bits and which are not stored inside a WAV file. 2007-02-03 15:22:16 +00:00
Moritz Bunkus
309a1c52df Changed the default for the "NALU size length" to "4" and added a warning if "3" is used. 2007-01-30 20:02:53 +00:00
Moritz Bunkus
46fb91d1fa Skip "wide" atoms during file type detection. 2007-01-30 12:34:10 +00:00
Moritz Bunkus
d6aa8fc874 Base the decision whether or not to enable the NALU size length drop down box on mkvmerge's "uses_avc_es_packetizer" identification flag. 2007-01-30 09:24:59 +00:00
Moritz Bunkus
3484733c9b Extended the option "--default-track" so that it can be forced to "off" allowing the user to create a file for which no track has its "default" flag set. Fix for bug #224. 2007-01-28 21:57:32 +00:00
Moritz Bunkus
fe54ad47d2 Wrong value! 2007-01-17 09:42:54 +00:00
Moritz Bunkus
1efc33227b Updates. 2007-01-16 20:04:47 +00:00
Moritz Bunkus
14c4757d8e Pass the correct track_info_c instance down to the new packetizer. Otherwise the track ID etc will be wrong. 2007-01-16 15:22:19 +00:00
Moritz Bunkus
e5c3c940dc Added support for using CodecState for signaling changes to CodecPrivate. It is used for MPEG-1/-2 video if it is turned on with "--engage use_codec_state". 2007-01-15 19:02:18 +00:00
Moritz Bunkus
46838f2a41 Changed the version to 2.0.0 and the version code name. 2007-01-13 18:08:21 +00:00
Moritz Bunkus
f663136c1a Added another tab for each track in which the user can add arbitrary track options. 2007-01-12 16:02:16 +00:00
Moritz Bunkus
a07f407c89 mkvextract will now also print which container format it uses for each track. 2007-01-12 14:44:59 +00:00
Moritz Bunkus
a40b9d364f Added support for the extraction of MPEG-1/-2 video tracks into MPEG-1/2 program streams. 2007-01-12 13:59:30 +00:00
Moritz Bunkus
c05ccc267b Flush the MPEG-1/2 parser during the probe so that files with a single frame are detected correctly. 2007-01-11 23:09:53 +00:00
Moritz Bunkus
a3edc83512 MPEG-1/2 video: The sequence and GOP headers are not removed from the bitstream anymore. This should fix the blockiness if the sequence headers change mid-stream. The sequence header is also not stored in the codec private anymore. Fix for Bugzilla bug #167. 2007-01-11 19:01:55 +00:00
Moritz Bunkus
b075212e1b Updates 2007-01-09 16:58:08 +00:00
Moritz Bunkus
68b7511e46 Improved the detection of AVC/h.264 ES streams with garbage at the beginning. 2007-01-08 20:36:27 +00:00
Moritz Bunkus
f2c1e71bc9 Updates 2007-01-08 11:55:02 +00:00
Moritz Bunkus
ac032acc5d Updates. 2007-01-07 22:56:15 +00:00
Moritz Bunkus
f3762a8399 Do not remove the h.264 AR bitstream information in the ES parser. The AVCC the ES parser returns must still contain it, otherwise the AR extraction will not work from the packetizer. 2007-01-07 21:36:05 +00:00
Moritz Bunkus
5dabe48bc8 Skip all the frames up to the first key frame. 2007-01-07 16:38:28 +00:00
Moritz Bunkus
89ec7e5f3c Updates 2007-01-05 11:17:47 +00:00
Moritz Bunkus
63fcc8c0b6 Fixed the decision if a NALU belongs to a previous frame or starts a new one. 2007-01-05 07:46:41 +00:00
Moritz Bunkus
ea3730fdf1 Added an input for the new "NALU size length" parameter. 2007-01-04 15:11:53 +00:00
Moritz Bunkus
99e07e1cc2 The NALU size length can be overridden for AVC/h.264 elementary streams. It defaults to 2 which might not be enough for larger frames/slices. 2007-01-04 08:07:17 +00:00
Moritz Bunkus
25df94521b Support for AVC/h.264 elementary streams with short markers (0x00 0x00 0x01 instead of 0x00 0x00 0x00 0x01). 2007-01-03 20:39:04 +00:00
Moritz Bunkus
2ceab2cbc0 Removed the "allow_avc_in_fvw_mode" hack. 2007-01-03 10:23:22 +00:00
Moritz Bunkus
44edf05bb6 Added "x264" to the list of recognized FourCCs for AVC/h.264 video in AVI and Matroska files. 2007-01-03 10:22:43 +00:00
Moritz Bunkus
8955ef9388 Added support for proper muxing of AVC/h.264 tracks in Matroska files that were stored in the MS compatibility mode (CodecID V_MS/VFW/FOURCC instead of V_MPEG4/ISO/AVC). 2007-01-03 08:40:26 +00:00
Moritz Bunkus
8edcd9c63b Do not save the address of objects directly stored in a vector. Invalid memory accesses might be the result. 2007-01-03 08:38:20 +00:00
Moritz Bunkus
a218df8bba Added support for proper muxing of AVC/h.264 tracks in AVI files. 2007-01-02 12:17:12 +00:00
Moritz Bunkus
616be8e6a6 Added support for reading AVC/h.264 elementary streams. 2007-01-01 14:28:27 +00:00
Moritz Bunkus
a21cead679 Updates 2006-12-30 19:47:00 +00:00
Moritz Bunkus
7b2ccb5e34 If the "use_simpleblock" hack is engaged then check if the current packet requires writing a duration to the file. In such cases always use a normal BlockGroup because SimpleBlocks do not support durations. Fix for Bugzilla #215. 2006-12-29 07:27:53 +00:00
Moritz Bunkus
54b22a6ff7 Some RealAudio tracks might not have the key frame flags set at all. 2006-12-28 14:11:19 +00:00
Moritz Bunkus
820e957e7e Get the currently selected file and track from the actual controls and do not rely on wxWidgets to always work one way. Fixes a segfault occuring after removing a file for which a track was still selected. 2006-12-27 13:18:26 +00:00
Moritz Bunkus
da2ab40904 Update 2006-12-27 13:16:00 +00:00
Moritz Bunkus
6740661040 Bumped the version number to 1.8.1 and updated the release code name. 2006-11-25 08:11:31 +00:00
Moritz Bunkus
db17b2995d Allow for some track properties to be changed even if the track is being appended. This is especially important for things that modify the input characteristics like the subtitle charset. Fix for Anthill bug 216. 2006-11-24 16:57:23 +00:00
Moritz Bunkus
671193fdb7 Allow the user to tell configure which wx-config executable to use. 2006-11-19 19:33:18 +00:00
Moritz Bunkus
19b8d4e0e7 Use the GetValue() call on a ComboBox for retrieving the current value. GetSelection() seems to be working differently with 2.6.x than before. 2006-11-14 22:32:20 +00:00
Moritz Bunkus
86c16fccf0 AAC SBR detection and output in verbose indentification mode. mmg will set the checkbox automatically if mkvmerge reports it. 2006-11-13 23:14:35 +00:00
Moritz Bunkus
315f9c8cc8 If the CTTS atom is missing/empty then do not try to access the frame offset table. 2006-11-12 16:13:20 +00:00
Moritz Bunkus
f84a88952e --attach-file: Test if the file can be read before trying to guess its MIME type because libmagic segfaults if it does not. 2006-11-12 13:30:11 +00:00
Moritz Bunkus
f792d7fb66 Clear the start and end hooks when parsing XML chapters. Prior calls to write_xml_chapters() setup end hooks which were otherwise called by the reading function resulting in crashes. 2006-11-12 10:31:53 +00:00
Moritz Bunkus
dd190b98b0 Made the "set the delay input field from the file name" feature disengageable. 2006-11-11 18:16:18 +00:00
Moritz Bunkus
9c9482af71 Changed the CodecID for AAC to "A_AAC". The old hack "new_aac_codecid" was renamed to "old_aac_codecid" which re-enables the old CodecIDs for AAC. 2006-11-10 18:23:51 +00:00
Moritz Bunkus
a97134b3a0 Updated the version number and set the release codename. 2006-11-10 07:57:14 +00:00
Moritz Bunkus
4233a71155 Reworked the "input tab" and split track options into two sub-pages. Also added an input for the "stereo mode" parameter for video tracks. 2006-11-08 15:20:02 +00:00
Moritz Bunkus
8083266e1d Added support for the "stereo mode" flag for video tracks. 2006-11-07 15:11:49 +00:00
Moritz Bunkus
a46213fa58 Adjust all timecodes if some are negative. 2006-11-03 19:32:50 +00:00
Moritz Bunkus
8bf48f6424 The AAC config data size is not a sufficient test for SBR. The profile must be 5 as well. 2006-11-03 16:20:12 +00:00
Moritz Bunkus
32475ced6a Updates 2006-10-26 07:27:16 +00:00
Moritz Bunkus
770ba0b9f3 Fixed random number generation on Windows. On 9x/ME UuidCreate returns the same value in UUID.Data4 on each call meaning that the numbers generated are always the same, too. In such cases srand() and rand() is used instead of UuidCreate. The loop for the "UuidCreate failed" case was broken as well. 2006-09-29 14:45:28 +00:00
Moritz Bunkus
528890fe47 SSA/ASS subs: Allow for empty lines and comments at the start of the file before the "[script info]" line. 2006-09-26 10:01:46 +00:00
Moritz Bunkus
197c83d061 Implemented a slightly less strict check for SRT timecodes (e.g. only one digit after the comma). 2006-09-25 15:39:13 +00:00
Moritz Bunkus
fd45113c89 Handle stream comments in OGM files in identification mode, too. 2006-07-19 08:21:16 +00:00
Moritz Bunkus
edd8022be4 Accept the same formats for the "stretch" input box that mkvmerge accepts for "--sync". 2006-06-16 11:45:00 +00:00
Moritz Bunkus
3e89d7cc44 PCM audio data with 4 bits per Sample caused mkvmerge to allocate all available memory. Patch by Robert Millan (rmh 4t aybabtu d0t com). 2006-06-16 08:51:49 +00:00
Moritz Bunkus
8382aa428a Mixed up tool tips on the "settings" tab. 2006-06-15 13:43:17 +00:00
Moritz Bunkus
83ae9edb83 Moved some @...@ style variables from configure.in to Makefile.in where they belong (very recent autoconf versions were choking on those). Fixes Anthill bug #197. 2006-06-02 14:31:16 +00:00
Moritz Bunkus
e2f9a52f2d Added an option for always using simple blocks. 2006-06-01 12:09:35 +00:00
Moritz Bunkus
5951b12149 Pre-set the "delay" input field for audio tracks if the file name contains something like "DELAY XX" where XX is a number. 2006-06-01 11:52:49 +00:00
Moritz Bunkus
03d4746044 Start the open file dialog in the last directory from which files have been added, even if drag&drop is used. 2006-05-24 14:43:20 +00:00
Moritz Bunkus
d5a45df3a2 Do not create empty files. 2006-05-23 15:32:26 +00:00
Moritz Bunkus
4ab660d09a Included the release message. 2006-04-28 18:54:02 +00:00
Moritz Bunkus
98edcb10ce Added support for MIME type detection via libmagic (patch by Robert Millan with heavy modifications by myself). See also Anthill bug #194. 2006-04-28 11:33:27 +00:00
Moritz Bunkus
94134761e5 Fixed the detection of Theora header packets in Ogg files. 2006-04-28 08:48:49 +00:00
Moritz Bunkus
161b831628 WavPack: "long" is 64bits long on 64 bit systems, but the fields in the WavPack headers are only 32 bits long. 2006-04-03 15:51:00 +00:00