Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only handle RealMedia tracks whose MIME type is known. Gets rid of all the extra tracks in multirate files.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-02-27 10:31:55 +00:00
parent 29ef49e660
commit 09fbbec05a
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-02-27 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: Some RealMedia files contain several tracks
for multirate stuff which are now ignored. Only tracks with known
MIME types (audio/x-pn-realaudio and video/x-pn-realvideo) are
used.
2004-02-23 Moritz Bunkus <moritz@bunkus.org>
* mmg: Added a list of 'popular' languages on top of all language

30
src/input/r_real.cpp
View File

@ -209,6 +209,7 @@ real_reader_c::parse_headers() {
real_video_props_t *rvp;
real_audio_v4_props_t *ra4p;
real_audio_v5_props_t *ra5p;
bool mime_type_ok;
try {
io->skip(4); // object_id = ".RIF"
@ -283,13 +284,18 @@ real_reader_c::parse_headers() {
} else if (object_id == FOURCC('M', 'D', 'P', 'R')) {
id = io->read_uint16_be();
io->skip(4); // max_bit_rate
io->skip(4); // avg_bit_rate
io->skip(4); // max_packet_size
io->skip(4); // avg_packet_size
mxverb(2, "real_reader MDPR: id %u\n", id);
mxverb(2, "real_reader MDPR: max_bit_rate %u\n", io->read_uint32_be());
mxverb(2, "real_reader MDPR: avg_bit_rate %u\n", io->read_uint32_be());
mxverb(2, "real_reader MDPR: max_packet_size %u\n",
io->read_uint32_be());
mxverb(2, "real_reader MDPR: avg_packet_size %u\n",
io->read_uint32_be());
start_time = io->read_uint32_be();
preroll = io->read_uint32_be();
io->skip(4); // duration
mxverb(2, "real_reader MDPR: start_time %u\nreal_reader MDPR: "
"preroll %u\nreal_reader MDPR: duration %u\n", start_time,
preroll, io->read_uint32_be());
size = io->read_uint8(); // stream_name_size
if (size > 0) {
@ -297,24 +303,28 @@ real_reader_c::parse_headers() {
memset(buffer, 0, size + 1);
if (io->read(buffer, size) != size)
throw exception();
if (verbose > 1)
mxinfo("stream_name: '%s'\n", buffer);
mxverb(2, "real_reader MDPR stream_name: '%s'\n", buffer);
safefree(buffer);
}
mime_type_ok = false;
size = io->read_uint8(); // mime_type_size
if (size > 0) {
buffer = (char *)safemalloc(size + 1);
memset(buffer, 0, size + 1);
if (io->read(buffer, size) != size)
throw exception();
if (verbose > 1)
mxinfo("mime_type: '%s'\n", buffer);
mxverb(2, "real_reader MDPR mime_type: '%s'\n", buffer);
if (!strcmp(buffer, "audio/x-pn-realaudio") ||
!strcmp(buffer, "video/x-pn-realvideo"))
mime_type_ok = true;
safefree(buffer);
}
size = io->read_uint32_be(); // type_specific_size
if (size > 0) {
if (!mime_type_ok)
io->skip(size);
else if (size > 0) {
buffer = (char *)safemalloc(size);
if (io->read(buffer, size) != size)
throw exception();