Commit Graph

359 Commits

Author SHA1 Message Date
Moritz Bunkus
09fbbec05a Only handle RealMedia tracks whose MIME type is known. Gets rid of all the extra tracks in multirate files. 2004-02-27 10:31:55 +00:00
Moritz Bunkus
29ef49e660 Better popular languages. 2004-02-23 16:04:30 +00:00
Moritz Bunkus
a1edacd843 Bumped the version number to 0.8.5. 2004-02-22 11:14:43 +00:00
Moritz Bunkus
de6e647012 Allocate space for the extra_data because it's freed later. 2004-02-21 18:55:42 +00:00
Moritz Bunkus
e976802eb1 Convert the track name and title from Matroska files to the local charset instead of displaying UTF-8. 2004-02-21 18:16:25 +00:00
Moritz Bunkus
161d3ebaa7 Fix parameter order for the wxFileDialog class. Otherwise the default directory will not be set. 2004-02-21 17:12:00 +00:00
Moritz Bunkus
2445314056 Added a function for adjustin the chapter timecodes. 2004-02-16 08:53:12 +00:00
Moritz Bunkus
1cdaf2610d Reset the number of cue elements so that UpdateSize() will not be called on it accidentally if splitting is active. 2004-02-15 20:01:36 +00:00
Moritz Bunkus
adfba59fef Splitting by time was broken: beginning with the second file splitting occured after each key frame. 2004-02-14 09:32:23 +00:00
Moritz Bunkus
a22eb8680d Updates. 2004-02-12 22:30:52 +00:00
Moritz Bunkus
23576c563e Bumped version number to 0.8.4. 2004-02-11 08:13:24 +00:00
Moritz Bunkus
670d896647 Scale the duration to ns precision when reading Matroska files. 2004-02-11 08:12:09 +00:00
Moritz Bunkus
be24eadfce Bumped the version numbers. 2004-02-09 21:47:42 +00:00
Moritz Bunkus
392e15c261 Also convert the TITLE comment. 2004-02-08 22:48:19 +00:00
Moritz Bunkus
79badd76e2 Keep chapters and language tags intact when reading OGM files. 2004-02-08 18:27:42 +00:00
Moritz Bunkus
3c0cb8b1d3 Made "--global-tags" apply to the complete file. 2004-02-08 11:35:20 +00:00
Moritz Bunkus
5d16fb4d2c Use ns precision durations in VobSubs. 2004-02-07 13:26:35 +00:00
Moritz Bunkus
31b867012f Calculate proper durations for subs from OGM. 2004-02-01 10:07:04 +00:00
Moritz Bunkus
cd119820fa Made "do not link files" the default. 2004-01-31 14:55:26 +00:00
Moritz Bunkus
276e89adf8 Added support for AAC-in-OGM. 2004-01-31 14:03:20 +00:00
Moritz Bunkus
1d01ec4599 Do not automatically discard big VobSub packets anymore. 2004-01-31 10:47:36 +00:00
Moritz Bunkus
0f9cd0b2a7 Also mark packets as being freeable when P frames are encountered but use the frame they reference for freeing. Allows for better handling of sections with few/no key frames. 2004-01-31 09:08:28 +00:00
Moritz Bunkus
c26dda5b04 Replaced the two-pass splitting with a one-pass splitting procedure. 2004-01-30 20:40:38 +00:00
Moritz Bunkus
675d1103ab Do not delete the file object twice. 2004-01-25 18:00:21 +00:00
Moritz Bunkus
4f9d2e681b Updates. 2004-01-24 18:27:27 +00:00
Moritz Bunkus
4d3b90a3ee Allocate space for the extra data after the RealMedia headers - otherwise the pointers would be invalid. Removed the "set number of samples per packet" function from the AAC packetizer as AAC is still always 1024 samples/packet. 2004-01-23 19:15:12 +00:00
Moritz Bunkus
1b34be6948 Switched the complete timecode handling from ms precision to ns precision. 2004-01-22 22:36:05 +00:00
Moritz Bunkus
679456b40e Fixed a couple of memleaks. 2004-01-22 12:55:21 +00:00
Moritz Bunkus
57044fdb73 Added some extensions for RealMedia files to mmg. 2004-01-21 18:45:06 +00:00
Moritz Bunkus
71bc99214a Get the AAC values from the AAC config data stored in the RealMedia headers. 2004-01-21 15:39:44 +00:00
Moritz Bunkus
c33663bb2f Added the release message. 2004-01-20 21:18:19 +00:00
Moritz Bunkus
93423ca6f0 Proper handling of PCM data: always start / end packets on sample boundaries. 2004-01-19 22:02:58 +00:00
Moritz Bunkus
bb9be6b325 Do not read more data than can fit into the buffer. 2004-01-17 19:57:40 +00:00
Moritz Bunkus
6b5bfa9345 Allow the user to un-set track names and the file title when remuxing Matroska files. 2004-01-17 17:20:20 +00:00
Moritz Bunkus
e13def97df Always render the track headers fully including default values. Set the track language to "eng" if none was given. 2004-01-17 13:41:50 +00:00
Moritz Bunkus
c66255d3d3 Accept 0ms relative references as backward references as well - otherwise they are lost completely. 2004-01-16 23:41:19 +00:00
Moritz Bunkus
e140906ba0 Automatically set the attachment's MIME type according to the file extension. 2004-01-15 19:18:17 +00:00
Moritz Bunkus
0f7ead76a0 AAC from RM: Extract the number of samples per AAC packet from the timecode difference between the first two RealMedia packets for a track. 2004-01-15 12:51:41 +00:00
Moritz Bunkus
68bd57649c Added support for AAC in RM. 2004-01-14 23:34:06 +00:00
Moritz Bunkus
b9e0534066 Write cues for audio only files for each track as well (only one entry every two seconds). 2004-01-14 19:42:57 +00:00
Moritz Bunkus
6368102c5e Properly handle the default track flags, even when reading Matroska files. 2004-01-12 21:34:08 +00:00
Moritz Bunkus
967bd1090a Added a note about the new runtime archive. 2004-01-12 20:02:13 +00:00
Moritz Bunkus
28574b6fb7 Added the two new chapter flags "hidden" and "enabled". Coded partially by Steve Lhomme. 2004-01-11 18:07:55 +00:00
Moritz Bunkus
3f40d48b31 Added the second timecode format: one timecode per line. 2004-01-11 17:40:33 +00:00
Moritz Bunkus
2b47ee4872 Re-added libtool. Introduced the #defines FMT_TIMECODE and ARG_TIMECODE for easier formatted timecode output. Discard SPU packets that don't belong to the current stream. 2004-01-09 21:33:56 +00:00
Moritz Bunkus
d65cb2c77b Added the "Released" note. 2004-01-05 23:54:24 +00:00
Moritz Bunkus
7b01208b2e Wrong member variable initialization resulting in spontaneous segfaults on Windows. 2004-01-05 21:21:52 +00:00
Moritz Bunkus
52e8e98a08 The "extended size" field for an atom is situated directly after the type, not after the size field. 2004-01-03 16:52:34 +00:00
Moritz Bunkus
905b53dc14 Check if hcodec_id is set before using it. Occurs with e.g. RealVideo. 2004-01-02 21:49:58 +00:00
Moritz Bunkus
d530a16ef4 Added new release note. 2004-01-01 13:35:47 +00:00
Moritz Bunkus
8da93ca51c Fixed the overwriting of elements in existing Matroska files: the segment header size is not 5 anymore (was changed to 8 some time ago). It is now derived from the existing segment header, and OverwriteHead() is called for actually changing the segment size. 2003-12-29 22:37:57 +00:00
Moritz Bunkus
cbe9caae25 Print an error message and don't abort when a malformed XML file should be loaded. 2003-12-29 21:33:13 +00:00
Moritz Bunkus
2760de38de Added support for the new simple tagging system. 2003-12-29 18:44:23 +00:00
Moritz Bunkus
632a6f861d Also assume SBR if the sampling frequency is < 44100 even if only the 2 byte identifier is used. 2003-12-23 12:11:59 +00:00
Moritz Bunkus
4bf8041122 Unfinished array of track types let mkvextract access wrong memory regions when extracting FLAC files. 2003-12-22 21:58:32 +00:00
Moritz Bunkus
132e344d6c If the track name or language was present in the output of "mkvmerge --identify-verbose" but empty then mmg would access a non-existent array entry. 2003-12-17 19:16:22 +00:00
Moritz Bunkus
6aa9387d0e Automatically select the first track when a file has been selected. Automatically focus the track name input box on track selection. 2003-12-15 17:35:02 +00:00
Moritz Bunkus
38b8f36755 Automatically focus the chpater name input box on chapter entry selection. 2003-12-15 16:57:36 +00:00
Moritz Bunkus
8e457e2362 Escape the chapter names when writing to XML files. 2003-12-15 13:15:49 +00:00
Moritz Bunkus
5725357039 Wrong CodecID for MP2 tracks for the second and all following files when splitting files. 2003-12-12 14:21:27 +00:00
Moritz Bunkus
16b4b144ab Bumped version number to 0.7.9. 2003-12-11 18:30:19 +00:00
Moritz Bunkus
e5d2a5ac48 Updates 2003-12-05 17:23:46 +00:00
Moritz Bunkus
c7387a85f0 Set the thread priority to "below normal" on Windows. 2003-12-05 16:43:54 +00:00
Moritz Bunkus
d955b13aee Removed the Ctrl-v and Ctrl-c accelerators. Added an option for creating an option file. 2003-12-05 14:51:56 +00:00
Moritz Bunkus
29266640b6 Changed from direct command line to option file usage. 2003-12-05 14:42:09 +00:00
Moritz Bunkus
5075aa7ebc Use negative track IDs for mkvmerge -i and Ogg files. Allow negative track IDs in --track-order for the same reason. 2003-12-05 12:04:54 +00:00
Moritz Bunkus
9c62c7e177 Added "up" and "down" buttons for the tracks, too. 2003-12-04 19:34:20 +00:00
Moritz Bunkus
1e1ebf4944 Added a "set output file" menu option which does the same as the "browse" button. 2003-12-04 19:09:08 +00:00
Moritz Bunkus
ce93bc12d7 Added the "--track-order" option allowing the user to modify the order in which tracks are created in the output file. 2003-12-04 18:56:52 +00:00
Moritz Bunkus
b2d9833f2b Upon loading settings some settings were not loaded correctly (strings were not allocated). Some settings were not saved either. 2003-12-03 21:42:20 +00:00
Moritz Bunkus
079a9c4c15 In header mode (for raw AAC files), the AAC packetizer would not work at all. 2003-12-03 17:25:54 +00:00
Moritz Bunkus
d1ba86b423 Avoid deadlocks in the SPU parser for bad packets. 2003-12-03 15:52:54 +00:00
Moritz Bunkus
8019b99aef Added buttons for moving input files up and down in mmg. 2003-12-03 11:26:00 +00:00
Moritz Bunkus
d0883848c0 Updated version number to 0.7.8 2003-12-02 22:18:34 +00:00
Moritz Bunkus
0dd0745ccc Added the "set values" button for easy mass application of language and country codes. 2003-12-02 22:09:05 +00:00
Moritz Bunkus
43a02b6e02 Changed the options "--fourcc" and "--aspect-ratio": they now need a track ID. Added a new option, "--display-dimensions", which can be used as an alternative to "--aspect-ratio". Fixed a small rounding error resulting in weird display dimensions like 640x479. 2003-12-01 17:02:03 +00:00
Moritz Bunkus
aef1ed6cb0 Updates 2003-11-29 20:14:20 +00:00
Moritz Bunkus
7a9cf9c005 Missing quotes for the timecode file name. 2003-11-23 12:45:54 +00:00
Moritz Bunkus
192f379111 Rewrote the SPU parsing code. Should not abort anymore. 2003-11-18 18:00:58 +00:00
Moritz Bunkus
e9ff16769d Bumped version number to 0.7.7. 2003-11-16 20:23:59 +00:00
Moritz Bunkus
2121a4e89d Added support for extracting FLAC tracks to raw FLAC and OggFLAC files. 2003-11-16 18:54:57 +00:00
Moritz Bunkus
bb21c0215c Added support for reading raw FLAC files. 2003-11-16 18:22:40 +00:00
Moritz Bunkus
81549f058c Added support for FLAC (reading only from Ogm, Matroska). 2003-11-16 12:40:33 +00:00
Moritz Bunkus
8e91f4b5fe Added the input field for the cue-to-chapter-name format. Fixed some minor bugs which resulted from having added the new "advanced" tab. 2003-11-15 18:20:40 +00:00
Moritz Bunkus
89b68ad397 Reworked the audio synchronization code which was not working for Matroska source files. 2003-11-15 15:29:40 +00:00
Moritz Bunkus
85a949f016 Enlarged the space reserved for the first seek head. Implemented file sanitizing when a SIGINT is received on *NIX. 2003-11-13 20:01:38 +00:00
Moritz Bunkus
a9f99b43b0 Updates 2003-11-12 22:57:48 +00:00
Moritz Bunkus
f4a47aac2d Improved MP3 layer detection which is being done in the packetizer instead of all the readers. 2003-11-12 20:16:01 +00:00
Moritz Bunkus
29701f459e Improved the file type detection for MP3 and AC3 a bit. 2003-11-12 18:24:27 +00:00
Moritz Bunkus
fbaa0b7d2e Made mmg accept mkvmerge return codes of 0 and 1 when using mkvmerge -i so that warnings will not prohibit mmg from accepting that file. 2003-11-12 11:19:41 +00:00
Moritz Bunkus
1dc08ad127 Added CUE sheet parsing for chapters. 2003-11-10 22:16:29 +00:00
Moritz Bunkus
c9a5be1ab2 Added support for --sync for VobSub tracks. 2003-11-09 10:45:40 +00:00
Moritz Bunkus
e4f8c589eb Updates 2003-11-08 10:26:51 +00:00
Moritz Bunkus
b0d5be64cc Replaced leading spaces with tabs. 2003-11-05 20:17:05 +00:00
Moritz Bunkus
8d6d165980 Fixed a division by 0 if a VobSub track only contains one entry. 2003-11-05 19:51:15 +00:00
Moritz Bunkus
f1d3ef21ae Boosted the version number to 0.7.5. 2003-11-05 18:32:37 +00:00
Moritz Bunkus
a9155887c6 Reset the "default track" flag for all tracks of a type when "default track" is enabled for a track. 2003-11-05 15:15:08 +00:00
Moritz Bunkus
d588f91709 Discard the MPEG program stream and only keep the SPU packets. 2003-10-29 15:58:45 +00:00
Moritz Bunkus
cfe3500959 Ignore empty or "erase only" subtitle packets read from OGM and Matroska files. 2003-10-28 20:20:54 +00:00
Moritz Bunkus
915dd64bdb Added the ability to read timecodes from text files which override the timecodes mkvmerge calculates normally. 2003-10-27 21:21:50 +00:00
Moritz Bunkus
e199b01d2c Automatically add missing/defaulted mandatory elements to the XML output when extracting chapters. 2003-10-26 17:49:29 +00:00
Moritz Bunkus
08d8f0c55b Changed to use libmatroska's new lacing code. 2003-10-24 22:21:13 +00:00
Moritz Bunkus
a861168b51 The VobSub .idx parser was mis-calculating the subtitle entry frame sizes. 2003-10-23 21:00:45 +00:00
Moritz Bunkus
d3ad280b2a The Vorbis packetizer was miscalculating the number of samples to add/remove when using audio sync. 2003-10-23 19:25:31 +00:00
Moritz Bunkus
9d44de68f2 Added a new menu entry, "File -> new", which will clear all muxing settings. 2003-10-21 22:56:58 +00:00
Moritz Bunkus
2ea041bfba Added support for VobSub subtitles including their compression options. Made the input boxes for file names (tags and chapters) editable so that their contents can be deleted. 2003-10-21 22:36:46 +00:00
Moritz Bunkus
c2240e6500 Adjusted the content encoding handling to the final specs. 2003-10-21 22:01:31 +00:00
Moritz Bunkus
aa042167fa Implemented generic support for frame compression (mostly useful for VobSub subtitles but could also be used for others) and the complete framework for handling content encodings in the Matroska reader. 2003-10-19 19:06:40 +00:00
Moritz Bunkus
2f8a292f57 Dump unknown elements recursively. 2003-10-18 11:34:16 +00:00
Moritz Bunkus
c5fb0b9088 Made the SRT reader more tolerant regarding empty lines. 2003-10-15 16:49:06 +00:00
Moritz Bunkus
c507a3dcf1 Updates 2003-10-14 14:14:24 +00:00
Moritz Bunkus
6ea95f46f9 Correct calculation for cluster timecodes even when --dont-link is in use. 2003-10-14 13:43:22 +00:00
Moritz Bunkus
af66b02552 Implemented some speedups, especially during the 1st pass of splitting. 2003-10-14 13:16:22 +00:00
Moritz Bunkus
4745dbff08 Fixed SBR AAC extraction. 2003-10-12 16:19:51 +00:00
Moritz Bunkus
9a87e12840 Fixed the "abort" button under Windows. 2003-10-11 11:26:45 +00:00
Moritz Bunkus
81fbd51042 Fixed the wrong translation of track selections into command line options. 2003-10-05 22:41:32 +00:00
Moritz Bunkus
b2c912c85f Update 2003-10-03 09:33:31 +00:00
Moritz Bunkus
615586954f Changed the lacing strategy again. New defaults are NOT to write duration elements for all blocks, NOT to use time slices and to USE lacing for most audio tracks. All these options can be toggled by the user with the new/modified options --disable-lacing, --enable-durations and --enable-timeslices. 2003-10-01 19:06:07 +00:00
Moritz Bunkus
0b02af818d mkvmerge will copy the attachments from Matroska source files. Can be disabled with the --no-attachments option. 2003-09-29 19:26:26 +00:00
Moritz Bunkus
d373f308ae Bumped version number to 0.7.1 2003-09-28 17:24:31 +00:00
Moritz Bunkus
2436193cca XML chapters were not parsed correctly. 2003-09-26 10:25:16 +00:00
Moritz Bunkus
c4146cc00a Rewrote the complete MP3 handling. ID3 tags and all MPEG audio files should be handled correctly now. 2003-09-24 16:40:20 +00:00
Moritz Bunkus
900d51e938 Updates 2003-09-23 18:29:46 +00:00
Moritz Bunkus
47b4dec50d Attachment names were not stripped of their path components on Windows. 2003-09-19 14:26:04 +00:00
Moritz Bunkus
7496acf43e Updates 2003-09-19 12:59:27 +00:00
Moritz Bunkus
aaa66e9e9e Added a lot of data validity checks. 2003-09-17 11:56:16 +00:00
Moritz Bunkus
e448470a5d Added -mwindows to the mmg linking process which gets rid of the command line box on Windows. 2003-09-16 22:05:55 +00:00
Moritz Bunkus
e615dbced9 Moved the aspect ratio and FourCC input fields from the global tab to the input tab where they belong. 2003-09-16 21:14:39 +00:00
Moritz Bunkus
b3b283ee1f Bugfix: RealVideo was not read correctly from Matroska files. New feature: RealAudio can be read from Matroska files. 2003-09-16 19:05:36 +00:00
Moritz Bunkus
53417a48bb Some small bugfixes related to subtitle handling. 2003-09-16 17:34:14 +00:00
Moritz Bunkus
5812cb615e Update 2003-09-15 22:07:06 +00:00
Moritz Bunkus
e5cb5a2731 Add an UTF-8 BOM to extracted SSA/ASS and SRT subtitle files. Print warnings for missing durations for text subtitle tracks. 2003-09-15 22:03:06 +00:00
Moritz Bunkus
464cbac16c Added the muxing dialog, command line generation, muxing process control. 2003-09-14 20:04:48 +00:00
Moritz Bunkus
e48c6bc73a Added an option for setting the track name. Track names and the segment title are kept when reading a Matroska file. 2003-09-12 19:37:51 +00:00
Moritz Bunkus
fd577e3ca2 The Matroska reader has been simplified by using Read(). The Matroska reader keeps chapters unless overridden on the command line. 2003-09-12 09:16:54 +00:00
Moritz Bunkus
3fcd47dc6a Implemented the VobSub reader and packetizer. Implemented three compression algos which are selectable via the (undocumented) command line option --compression. 2003-09-11 19:43:32 +00:00
Moritz Bunkus
c508151f1b Bumped version number to 0.6.9. 2003-09-09 20:26:54 +00:00
Moritz Bunkus
462e287f33 DisplayWidth and DisplayHeight are kept intact when reading a Matroska file, but they can be overridden with --aspect-ratio. 2003-09-08 13:20:02 +00:00
Moritz Bunkus
32956f97e9 Wrote documentation, XML examples and the DTD for the XML chapter files. 2003-08-30 15:03:04 +00:00
Moritz Bunkus
b3a175ae64 Rewrote mkvinfo to use libebml's Read() function instead of manually reading each and every element. 2003-08-30 13:50:00 +00:00
Moritz Bunkus
56af76730f Some validation for the start and end times. Support for splitting chapters. 2003-08-30 10:29:09 +00:00
Moritz Bunkus
06bc68fc53 Some updates. 2003-08-29 07:39:14 +00:00
Moritz Bunkus
6202ecb776 On Windows the 'isspace()' function used to trim leading and trailing white spaces from tags considered some parts of valid UTF-8 character sequences to be white spaces as well. Fixed by replacing 'isspace()' with 'isblank()'. 2003-08-28 17:21:23 +00:00
Moritz Bunkus
2d74dde71b Support for chosing the charset and language used in simple chapter files. Suggestion by Liisachan. 2003-08-28 09:10:45 +00:00
Moritz Bunkus
30831506f4 Rewrote the UTF-8 conversion routines. They should now handle U+8000 characters correctly. 2003-08-28 08:33:30 +00:00
Moritz Bunkus
06c3bcdb98 For RV40 the actual dimensions were also used for the aspect ratio/display dimensions. This has been fixed: the actual dimensions are used for PixelWidth/PixelHeight, the dimensions stored in the RM container are used for the aspect ratio/DisplayWidth & DisplayHeight. Reported by Karl Lillevold. 2003-08-28 07:16:24 +00:00
Moritz Bunkus
f0e2866239 Released v0.6.4 2003-08-27 18:21:21 +00:00
Moritz Bunkus
c8ceb5dd87 Support for re-creating dropped frames when extracting video to an AVI. Works only well if the frame durations in the source file are multiples of the frame rate, of course. 2003-08-27 17:44:33 +00:00
Moritz Bunkus
1339014349 The MP3 packetizer did not start at 0 with its timecodes. It does now. 2003-08-27 16:52:25 +00:00
Moritz Bunkus
ffcb1c7cfb Proper support for dropped frames when reading AVIs. 2003-08-27 16:27:33 +00:00