Moritz Bunkus
8139108c0f
Improved the control over which tags get copied from a source file to the output file
...
The old option --no-tags" was replaced with the new options
"--no-global-tags" which causes global tags not to be copied and
"--no-track-tags" which causes track specific tags to not be
copied. The new option "--track-tags" can be used to select tracks for
which tags will be copied. The default is still to copy all existing
tags.
2009-05-31 21:08:12 +02:00
Moritz Bunkus
7d31271f59
Include global and track specific tags in the identification output.
2009-05-31 14:24:22 +02:00
Moritz Bunkus
816ff6f8ac
Added test cases for MPEG-2 video handling, sequence header extraction etc.
2009-05-31 13:29:15 +02:00
Moritz Bunkus
260f876ab2
Intentional change due to 9de93e4c32 and 25817e32c0.
2009-05-30 18:40:24 +02:00
Moritz Bunkus
be31e7925e
Include the number of chapters in a file in the identification output.
2009-05-29 11:31:12 +02:00
Moritz Bunkus
c68f41b435
Intentional change due to 8a072ba704
2009-05-10 18:59:08 +02:00
Moritz Bunkus
e820f7e390
Intentional updates due to c1f2d2d.
2009-04-25 12:32:23 +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
201c40e7b6
Added support for the "forced track" flag in mkvmerge. Fix for bug 128.
2009-04-11 14:04:51 +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
2dec64c9e9
Added support for reading the track language form QuickTime/MP4 files.
2009-04-05 15:20:53 +02:00
Moritz Bunkus
62796a0962
Intentional update.
2009-04-05 14:54:11 +02:00
Moritz Bunkus
e2b5251a98
Added a test for the --attachments option
2009-02-28 19:17:33 +01:00
Moritz Bunkus
d3d5b880b6
Added an way for keeping temp files
2009-02-28 19:17:17 +01:00
Moritz Bunkus
988ea9cc58
Added support for copying attachments selectively
...
Attachments are now included in the output of --identify. They
can be selected just like the other track types. The option used
for them is -m / --attachments and disabled with -M / --no-attachments.
2009-02-16 20:06:10 +01:00
Moritz Bunkus
005fbb9550
Intentional update due to revision 4031.
2008-12-17 22:00:05 +00:00
Moritz Bunkus
95f1ba2c7f
Forgot to add the test case for Theora pixel aspect ratio handling.
2008-12-09 19:22:41 +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
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
de1af373bd
Intentional update
2008-11-04 14:00:16 +00:00
Moritz Bunkus
6ce6d1698d
Intentional update (switched my test platform from 32bit to a 64bit Linux which sometimes has some subtle differences in float storage).
2008-11-01 10:52:13 +00:00
Moritz Bunkus
9246f1f845
Intentional update.
2008-10-05 09:38:43 +00:00
Moritz Bunkus
cf80ea72d5
New test for iconv Hebrew handling.
2008-10-04 19:38:07 +00:00
Moritz Bunkus
b5b15511f0
Intentional change due to the fix in revision 3917.
2008-09-20 18:03:11 +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
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
70865df821
Intentional update due to revision 3843.
2008-08-24 18:06:36 +00:00
Moritz Bunkus
da09f5af46
Intentional changes caused by revision 3831.
2008-08-20 19:06:19 +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
75c5d1b25d
Change in the hash due to the zlib stream handling fix in revision 3802.
2008-08-18 20:38:57 +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
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
8ed313f2d3
Added support for skipping ID3 tags in AC3 files.
2008-03-09 17:37:42 +00:00
Moritz Bunkus
a1962191ee
Added a test for DTS-HD.
2008-03-09 16:08:02 +00:00
Moritz Bunkus
4905caf963
Added support for AAC files with ID3 tags.
2008-03-09 16:02:08 +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
ba82a4ae4f
Added a test case for AC3-in-MOV and tracks with constant sample size > 1.
2008-02-29 09:39:37 +00:00
Moritz Bunkus
516daee57b
Force a packetizer flush at the end of DTS and AC3 files.
2008-02-27 15:32:22 +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
b25973076b
File identification code unified. Fix for the wrong track type in r_ogm.cpp ("subtitle" instead of "subtitles").
2008-02-26 19:08:38 +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
84867e220b
Intentional update after bugfix to OGM text subs handler.
2008-02-22 16:43:48 +00:00
Moritz Bunkus
ccd91ab84f
Rewrite of the OGM reader code.
2008-02-19 16:29:34 +00:00
Moritz Bunkus
6271265fb5
Added a test for MS_COMP type video from OGM files.
2007-12-23 10:22:49 +00:00
Moritz Bunkus
ab33e25049
Calculate the minimum and maximum cluster timecodes correctly. Only the cluster timecodes have changed for the reference test files however, as the relative block timecodes can be negative.
2007-10-17 21:12:57 +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
c61b3b3582
Added a test for AVC/h.264 streams with changing SPS/PPS.
2007-08-15 19:35:32 +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
49a2aca3c9
More shell/Ruby compatibility fixes
2007-07-04 14:40:52 +00:00
Moritz Bunkus
d2b010988c
More shell compatibility fixes
2007-07-04 14:35:32 +00:00
Moritz Bunkus
b3d9434177
Compatibility fix.
2007-07-04 14:30:33 +00:00
Moritz Bunkus
9596719c41
Intentional change in mkvmerge's identification output in rev 3534.
2007-06-27 13:44:38 +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
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
5937790c70
Portability fix for non-bash-shells.
2007-02-20 09:20:38 +00:00
Moritz Bunkus
ef79aae98c
Added two test files for raw h.264 muxing.
2007-02-08 10:15:48 +00:00
Moritz Bunkus
3debdee6f9
Added two regression tests for DTS files.
2007-02-06 16:50:46 +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
0f5dc7bff4
Intentional update for r3370.
2006-11-13 23:16:42 +00:00
Moritz Bunkus
69fec72247
Do not create temp files.
2006-11-13 22:47:13 +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
8083266e1d
Added support for the "stereo mode" flag for video tracks.
2006-11-07 15:11:49 +00:00
Moritz Bunkus
34e69ec891
Recoded the timecode and duration calculation for Quicktime/MP4 files. Improves handling of files with negative timecodes.
2006-11-06 13:18:15 +00:00
Moritz Bunkus
28869f3c79
Added a test case for AAC LC profile misdetection as being SBR.
2006-11-03 16:42:51 +00:00
Moritz Bunkus
9afdaa86ef
Updates.
2006-11-03 15:42:16 +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
3f37f52686
Added a test for SRT subs with short timecodes.
2006-09-26 09:27:28 +00:00
Moritz Bunkus
20665325e3
Reverse of r3324.
2006-09-25 15:45:24 +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
717037ecfe
Added another test file for Ogg/Theora.
2006-04-28 09:12:32 +00:00
Moritz Bunkus
d0691ee747
Added a test case for Ogg/Theora muxing.
2006-04-28 08:51:26 +00:00
Moritz Bunkus
5c2a7ca412
Quicktime/MP4 reader: Added support for version 1 media headers ("mdhd" atom) with 64bit fields. Fixed the duration of the last packet passed downstream.
2006-02-27 12:17:18 +00:00
Moritz Bunkus
06de6e03b8
Linked against different libOgg, therefore a checksum mismatch.
2006-02-27 12:07:15 +00:00
Moritz Bunkus
d2c6e836c0
Added a test for mkvmerge's --identify-verbose output.
2005-12-09 23:10:00 +00:00
Moritz Bunkus
be157d9fd3
MP4 files may contain other atoms than "avcC" in the video track headers; so look for "avcC" and don't rely on it being the first one. Added limited support for edit lists in MP4/QuickTime files.
2005-11-18 18:18:10 +00:00
Moritz Bunkus
a54cce80c3
Made the old AAC codec IDs the default again and renamed the hack to enable the new one.
2005-11-12 18:11:49 +00:00
Moritz Bunkus
0591a72ca1
Intended update due to the A_AAC change.
2005-10-23 16:52:17 +00:00
Moritz Bunkus
a3b0ee0816
Built against libmatroska 0.8.0. The mandatory elements have been changed. Intended update of results.txt.
2005-10-19 15:12:57 +00:00
Moritz Bunkus
8b41e3f949
Write codec extradata to the AVI if it is present which it is for e.g. HuffYuv. Fixes bug 157.
2005-10-04 17:49:36 +00:00
Moritz Bunkus
dc1f002065
Rewrote the reading function of the AVI reader to be much cleaner. It also allows one frame AVIs to be processed correctly. Fixes bug 156.
2005-10-04 17:30:09 +00:00
Moritz Bunkus
eebddbda7f
Changed how frames are referenced in h.264/AVC video. References are kept intact when reading from Matroska. If no references are provided then the previous frame is referenced for non-I frames. Should fix bug 154.
2005-09-30 18:12:38 +00:00
Moritz Bunkus
d338c5dd12
Also fix the BITMAPINFOHEADER with the new pixel dimenions after getting them from the bitstream. Added a test case for this feature.
2005-09-19 07:49:22 +00:00
Moritz Bunkus
b1e6f2bd55
Intended change due to commits 3088:3090.
2005-09-18 10:57:55 +00:00
Moritz Bunkus
e14bcb1b24
Updated the results for AVC muxing: the AR info is removed from the bitstream.
2005-09-06 09:49:50 +00:00
Moritz Bunkus
0f82880d15
Doh!
2005-09-03 12:08:10 +00:00
Moritz Bunkus
3cdfb8b3fe
Only try to delete a file that actually exists.
2005-09-03 12:03:31 +00:00
Moritz Bunkus
c83f555557
Forgot to run the new test once more before the last commit.
2005-08-25 18:55:21 +00:00
Moritz Bunkus
23b476d8a1
Convert embedded fonts and pictures in SSA and ASS files into Matroska attachments. Keep other sections and non-"Dialogue:" lines from the "[Events]" section in the CodecPrivate in order to keep as much from the original file as possible. Renamed the member variables of the buffer_t structure in the process.
2005-08-24 11:18:24 +00:00
Moritz Bunkus
837a4bf7bb
Simplified adding attachments both from the command line and from input files. A new function, add_attachment(), takes a flat attchment_t structure as its argument. Only render_attachment() deals with the relevant libmatroska classes while other readers do not have to anymore. The change in test/results.txt is intended.
2005-08-15 20:47:56 +00:00
Moritz Bunkus
15f47f2741
Reworked the packet queueing if timecode files are involved. First, do not queue anything if no timecode file has been specified and don't create a factory in that case either. Second, queue only as many frames as are needed. This depends on the track type and codec used. Subtitle tracks do not need any queueing. Neither do most audio tracks with the exception of RealAudio. Most normal B frame video codecs like MPEG-4 part 2, MPEG-1/-2, RealVideo etc only need short queueing while AVC and all unknown video codecs should be fully queued.
2005-08-06 11:52:14 +00:00
Moritz Bunkus
6c0425c922
Moved the application of the timecode factory to the packet's timecodes from get_packet() to add_packet2(). It is also called after flush(). It assigns as many packets as possible regarding the possible presence of B frames. If it is a subtitle track or if the packetizer has been flushed then all remaining packets are applied. Removed the timecode_factory_c::peek_next() function.
2005-08-02 19:26:57 +00:00
Moritz Bunkus
25d6ccee1a
Added a regression test for the segfault fixed in r2996.
2005-07-28 06:35:04 +00:00
Moritz Bunkus
871d1b744b
Timecode file handling for B frames. Patch by Steve Lhomme (see AUTHORS). Does not work yet as far as I can tell.
2005-07-25 15:58:07 +00:00
Moritz Bunkus
3e0da0ff84
AVC frames are referenced differently. Updated the test results.
2005-07-19 19:52:15 +00:00
Moritz Bunkus
447db3e04a
VobSub extraction has been purposefully changed by commit 2915.
2005-05-20 14:24:15 +00:00
Moritz Bunkus
00c0cb47cb
The default value for "MaxBlockAdditions" has been changed from 1 to 0 in order to match the specs.
2005-05-05 14:58:14 +00:00
Moritz Bunkus
95f5ae4b59
Updated the results due to commit 2876.
2005-04-07 17:11:38 +00:00
Moritz Bunkus
223e1a2613
Added a test for the chapter handling during splitting (see commit 2869 and Anthill bug 122).
2005-04-06 14:52:15 +00:00
Moritz Bunkus
3a2fb8538a
Added a test for a formerly mis-detected AC3 file.
2005-03-15 08:30:03 +00:00
Moritz Bunkus
b6f574ab55
Updated status
2005-03-14 13:14:34 +00:00
Moritz Bunkus
a5f837fb44
Concatenating + splitting at the same time is now possible. Track entries are only created once and not for each new file.
2005-03-06 14:28:26 +00:00
Moritz Bunkus
b76004ecd3
Replaced all exception() classes with error_c() classes. Added support for reading SegmentUID, NextSegmentUID and PreviousSegmentUID from a --segmentinfo XML file. Added a test for such a XML file.
2005-02-11 23:29:39 +00:00
Moritz Bunkus
579270a9b8
Added a test for VobSub extraction.
2005-02-11 22:20:18 +00:00
Moritz Bunkus
e3b2d4ecc5
Renamed a couple of variables ("tracks" -> "tspecs"). Fixed CUE sheet extraction in "tracks" mode. Added a test for the two CUE sheet extraction modes.
2005-02-10 20:20:47 +00:00
Moritz Bunkus
0bbba45e19
Changed the behaviour of --link-to-next and --link-to-previous to match the man page. Now both parameters can be used whether or not --split is used as well.
2005-02-02 15:16:45 +00:00
Moritz Bunkus
1c493df414
Easier removal of temporary files for test classes. Added a new exception for handling inside the test classes themselves so that they do not have to use RuntimeError which is used extensively by the Test class itself.
2005-02-02 15:15:17 +00:00
Moritz Bunkus
d458c26ff6
Added two test cases for WavPack with and without correction data.
2005-02-01 08:45:03 +00:00
Moritz Bunkus
d54a597c8c
Added test cases for AVC in MP4 with pixel aspect ratio, both with and without B frames.
2005-01-25 21:47:19 +00:00
Moritz Bunkus
485dfbbb03
Commit 2726 changed the duration for files whose first packet does not start at 0. Updated the test results accordingly.
2005-01-19 13:08:41 +00:00
Moritz Bunkus
1cb2d837b1
Account for automatic handling of TrackMinCache.
2005-01-16 10:12:03 +00:00
Moritz Bunkus
96ba68b2e9
Only delete a file if it actually exists.
2005-01-11 08:18:34 +00:00
Moritz Bunkus
597f587b60
Account for recent changes in the chapter specs.
2005-01-05 22:34:20 +00:00
Moritz Bunkus
8e8d875f24
New checksums because of the new mandatory element "MaxBlockAdditionID".
2004-12-20 18:09:54 +00:00
Moritz Bunkus
21d4f10d47
New chapter handling due to file concatenation.
2004-11-22 09:54:49 +00:00
Moritz Bunkus
855bc2bd09
Big API change from "char *" to "string".
2004-11-21 22:26:09 +00:00
Moritz Bunkus
e4c0a53e6f
Account for the new Forced flag.
2004-11-18 21:19:36 +00:00
Moritz Bunkus
bbced0c45c
Updates for the new timecode adjustment policy for splitting.
2004-11-13 18:59:19 +00:00
Moritz Bunkus
92eb6cad48
Imlpemented appending chapters.
2004-11-13 17:49:50 +00:00
Moritz Bunkus
03184bb462
Changed the chapter handling to a per-reader basis. This will allow for chapter concatenation when concatenating files. This also means that chapters cannot be written before the output file is closed. Reserving enough space at the beginning is therefore necessary.
2004-11-13 12:59:02 +00:00
Moritz Bunkus
ef188b301f
Test result update
2004-11-12 12:04:32 +00:00
Moritz Bunkus
d088d6de07
The OGM reader uses a memory file as temporary storage for the chapters and not a file on disc.
2004-11-12 11:39:32 +00:00
Moritz Bunkus
57fa9f31bd
Merged 2383
2004-10-24 18:01:19 +00:00
Moritz Bunkus
71edb3d50f
Merged 2367
2004-10-16 21:49:17 +00:00
Moritz Bunkus
cbd9c7bf01
Always regenerate Vorbis timecodes. This is necessary because Vorbis is laced, and when reading it from Matroska the timestamps might come out wrong if the output has different lacing, e.g. when splitting is active.
2004-10-16 13:46:34 +00:00
Moritz Bunkus
d5ca84ac0d
Moved the external timecode stuff into their own classes. Enabled proper durations for tracks with external timecodes.
2004-10-09 14:28:58 +00:00
Moritz Bunkus
263dfa4409
Merged 2329
2004-10-09 10:30:23 +00:00
Moritz Bunkus
76cd8b468a
Segment duration is 32bit for files with video.
2004-10-03 10:04:55 +00:00
Moritz Bunkus
f920e0650f
Merged 2263:2265
2004-10-03 10:01:24 +00:00
Moritz Bunkus
84e25ea39f
Merged 2239
2004-09-29 09:41:22 +00:00
Moritz Bunkus
6a569bacc3
Merged 2237
2004-09-29 09:35:27 +00:00
Moritz Bunkus
dbfe27157b
Merged 2235
2004-09-28 18:29:34 +00:00
Moritz Bunkus
cde2eab9b1
Merged 2227
2004-09-28 12:31:25 +00:00
Moritz Bunkus
c10da282d5
Merged 2225
2004-09-28 12:22:06 +00:00
Moritz Bunkus
77bff649f6
Merged 2223
2004-09-28 12:12:49 +00:00
Moritz Bunkus
057fd9ccdf
Merged 2221
2004-09-28 10:48:07 +00:00
Moritz Bunkus
a2e6cad821
Merged 2215
2004-09-27 12:51:18 +00:00
Moritz Bunkus
c48e1167e8
Merged 2201 and 2205
2004-09-25 20:26:38 +00:00
Moritz Bunkus
fccd0ff6c2
Merged 2201:2203
2004-09-25 20:14:35 +00:00
Moritz Bunkus
2c754d52e8
Merged 2193:2195
2004-09-24 10:02:19 +00:00
Moritz Bunkus
51dc226606
Merged 2188
2004-09-20 17:25:37 +00:00
Moritz Bunkus
59a7e3b19a
Merged 2184
2004-09-20 17:09:29 +00:00
Moritz Bunkus
b457faa963
Merged 2178
2004-09-17 16:52:19 +00:00
Moritz Bunkus
40c8a2d537
New test for MP2 in MP4.
2004-08-30 22:20:02 +00:00
Moritz Bunkus
c2ca90280e
New paths for the test files.
2004-08-30 22:17:55 +00:00
Moritz Bunkus
ef5fbcc943
Merged 2112:2115
2004-08-30 21:27:45 +00:00
Moritz Bunkus
d538eca68b
Forgot to run the test twice.
2004-08-28 14:33:02 +00:00
Moritz Bunkus
9e793ffcdb
Leftovers from the previous merge.
2004-08-28 14:25:23 +00:00
Moritz Bunkus
f78d588bd4
Merged 2059 2060:2066 2069:2075
2004-08-28 14:14:38 +00:00
