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

MPEG TS: parse PMT registration descriptor and get codec from it

Browse Source
This commit is contained in:
Moritz Bunkus 2014-12-16 15:04:37 +01:00
parent b826c89a31
commit 14e5ef96c8
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/input/r_mpeg_ts.cpp
View File

@ -460,6 +460,36 @@ mpeg_ts_track_c::parse_srt_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_de
return true; return true;
} }
bool
mpeg_ts_track_c::parse_registration_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor,
mpeg_ts_pmt_pid_info_t const &pmt_pid_info) {
if (pmt_pid_info.stream_type != ISO_13818_PES_PRIVATE)
return false;
if (pmt_descriptor.length < 4)
return false;
auto fourcc = fourcc_c{reinterpret_cast<unsigned char const *>(&pmt_descriptor + 1)};
auto reg_codec = codec_c::look_up(fourcc.str());
mxdebug_if(reader.m_debug_pat_pmt, boost::format("mpeg_ts:parse_pmt: Registration descriptor with FourCC: %1% codec: %2%\n") % fourcc % reg_codec);
if (!reg_codec.valid())
return false;
switch (reg_codec.get_track_type()) {
case track_audio: type = ES_AUDIO_TYPE; break;
case track_video: type = ES_VIDEO_TYPE; break;
case track_subtitle: type = ES_SUBT_TYPE; break;
default:
return false;
}
codec = reg_codec;
return true;
}
bool bool
mpeg_ts_track_c::parse_vobsub_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor, mpeg_ts_track_c::parse_vobsub_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor,
mpeg_ts_pmt_pid_info_t const &pmt_pid_info) { mpeg_ts_pmt_pid_info_t const &pmt_pid_info) {
@ -911,6 +941,9 @@ mpeg_ts_reader_c::parse_pmt(unsigned char *pmt) {
missing_tag = false; missing_tag = false;
switch (pmt_descriptor->tag) { switch (pmt_descriptor->tag) {
case 0x05: // registration descriptor
track->parse_registration_pmt_descriptor(*pmt_descriptor, *pmt_pid_info);
break;
case 0x0a: // ISO 639 language descriptor case 0x0a: // ISO 639 language descriptor
track->parse_iso639_language_from(pmt_descriptor + 1); track->parse_iso639_language_from(pmt_descriptor + 1);
break; break;

1
src/input/r_mpeg_ts.h
View File

@ -359,6 +359,7 @@ public:
bool parse_ac3_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor, mpeg_ts_pmt_pid_info_t const &pmt_pid_info); bool parse_ac3_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor, mpeg_ts_pmt_pid_info_t const &pmt_pid_info);
bool parse_dts_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor, mpeg_ts_pmt_pid_info_t const &pmt_pid_info); bool parse_dts_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor, mpeg_ts_pmt_pid_info_t const &pmt_pid_info);
bool parse_registration_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor, mpeg_ts_pmt_pid_info_t const &pmt_pid_info);
bool parse_srt_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor, mpeg_ts_pmt_pid_info_t const &pmt_pid_info); bool parse_srt_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor, mpeg_ts_pmt_pid_info_t const &pmt_pid_info);
bool parse_vobsub_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor, mpeg_ts_pmt_pid_info_t const &pmt_pid_info); bool parse_vobsub_pmt_descriptor(mpeg_ts_pmt_descriptor_t const &pmt_descriptor, mpeg_ts_pmt_pid_info_t const &pmt_pid_info);