Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-17 23:44:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RealMedia reader: use codec_c for common codec names

Browse Source
This commit is contained in:
Moritz Bunkus 2013-12-29 20:47:22 +01:00
parent aae2fa4c07
commit a991ba90d0
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/input/r_real.cpp
View File

@ -16,6 +16,7 @@
#include <matroska/KaxTrackVideo.h>
#include "common/bit_cursor.h"
#include "common/codec.h"
#include "common/ebml.h"
#include "common/endian.h"
#include "common/error.h"
@ -587,18 +588,10 @@ real_reader_c::identify() {
size_t i;
for (i = 0; i < demuxers.size(); i++) {
real_demuxer_cptr demuxer = demuxers[i];
auto demuxer = demuxers[i];
auto type = RMFF_TRACK_TYPE_AUDIO == demuxer->track->type ? ID_RESULT_TRACK_AUDIO : ID_RESULT_TRACK_VIDEO;
std::string type, codec;
if (!strcasecmp(demuxer->fourcc, "raac") || !strcasecmp(demuxer->fourcc, "racp")) {
type = ID_RESULT_TRACK_AUDIO;
codec = "AAC";
} else {
type = RMFF_TRACK_TYPE_AUDIO == demuxer->track->type ? ID_RESULT_TRACK_AUDIO : ID_RESULT_TRACK_VIDEO;
codec = demuxer->fourcc;
}
id_result_track(demuxer->track->id, type, codec);
id_result_track(demuxer->track->id, type, codec_c::get_name(demuxer->fourcc, demuxer->fourcc));
}
}

2
tests/results.txt
View File

@ -63,7 +63,7 @@ T_213mp4_broken_pixel_dimensions:2e3bfee9ea899238fa0d9d96ba66945c:passed:2005091
T_214one_frame_avi:036fdbdc91ce3c061aa04eb8910ff1e7:passed:20051004-192755:0.039489971
T_215X_codec_extradata_avi:324b8054fd47e9a3f7fb2b20687d8897-3fabc505fdd377c05ce4557b1bc13545:passed:20051004-194707:0.052219855
T_216mp4_editlists:e67a7baf1427ff34b1bed9bbcc4264ac:passed:20051118-191453:0.106975045
T_217file_identification:580b3da6e30ba3417ad5be64027336b7-85a2a482ec7a7c5ecaa99abef9af3a40-35716c7153dd07f863053da834ca99c5-03dd46e98c889ebf764955b996a6a740-b51f69615d6a4b970784b4ffcef95dc7-2f43b435a9811390aefb63e1ad308339-d745c32579925ea9e9ada600b58ae1cb-b82c40794db84b4f4d3060eea310161f-e95c1a1bceaa96a7f8960fcf3f804f7c-e157987587f672611229abf548f89852-ae9797fdc1f6e17dea7e92f48ee32b47-41d1a270454f005a0183019cfb189c56-ef8adc91fe129e7c68b8ccd065a761b0-d743d7d07d80d7e037bfb1f2be33f88c-fbd358ed87fca9961ad06893eaeb6d23-6a556928c705520619b9b8f05a97a019-7d6bd09ee09914a95802edb589842c7d-b5f010d5f85c30c40a17622aa9fdc86d-90cc7bdfc3b3b8965a29ef3f999b450a-b1e60bf1ba3650ba009b7cadacc6f3c8-1c208a69643bae7d277615a6696c7d6e-2c6d22cf6ca8ce6f739d986de38ba6bc:passed:20051209-180815:1.882517588
T_217file_identification:580b3da6e30ba3417ad5be64027336b7-85a2a482ec7a7c5ecaa99abef9af3a40-35716c7153dd07f863053da834ca99c5-03dd46e98c889ebf764955b996a6a740-b51f69615d6a4b970784b4ffcef95dc7-2f43b435a9811390aefb63e1ad308339-d745c32579925ea9e9ada600b58ae1cb-b82c40794db84b4f4d3060eea310161f-7a8bdfa57236ece682686b06a5441ea0-dd3cfae1d5343abf584d3025793b44ad-ae9797fdc1f6e17dea7e92f48ee32b47-41d1a270454f005a0183019cfb189c56-ef8adc91fe129e7c68b8ccd065a761b0-d743d7d07d80d7e037bfb1f2be33f88c-fbd358ed87fca9961ad06893eaeb6d23-6a556928c705520619b9b8f05a97a019-7d6bd09ee09914a95802edb589842c7d-b5f010d5f85c30c40a17622aa9fdc86d-90cc7bdfc3b3b8965a29ef3f999b450a-b1e60bf1ba3650ba009b7cadacc6f3c8-1c208a69643bae7d277615a6696c7d6e-2c6d22cf6ca8ce6f739d986de38ba6bc:passed:20051209-180815:1.882517588
T_218theora:80ae79ba3c9141fd3cd8a6effb3558f5-fdb3b8ea8431e0861e4bed5942c8279e:passed:20060428-105054:0.392912102
T_219srt_short_timecodes:86076d76ad6370a6cc52368143afc671:passed:20060926-112658:0.117747192
T_220ass_with_comments_at_start:9711ab190be4e0f223cde362a7ce8c15:passed:20060926-120101:0.382410266