Skip to content

V
vlc
Commit a4cc7556 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

MKV: parse segment cleanup 

Notably: do the difference between Unknown and Unsupported Elements so the bug reports are cleaner
do comment deprecated stuff
parent 6fac9321
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 54 deletions
modules/demux/mkv/matroska_segment.cpp
View file @ a4cc7556
...@@ -478,6 +478,8 @@ bool matroska_segment_c::Preload( ) ...@@ -478,6 +478,8 @@ bool matroska_segment_c::Preload( )
;//LoadTags( static_cast<KaxTags*>( el ) ); ;//LoadTags( static_cast<KaxTags*>( el ) );
i_tags_position = (int64_t) es.I_O().getFilePointer(); i_tags_position = (int64_t) es.I_O().getFilePointer();
} }
else if( MKV_IS_ID( el, EbmlVoid ) )
msg_Dbg( &sys.demuxer, "| + Void" );
else else
msg_Dbg( &sys.demuxer, "| + Preload Unknown (%s)", typeid(*el).name() ); msg_Dbg( &sys.demuxer, "| + Preload Unknown (%s)", typeid(*el).name() );
} }
......
modules/demux/mkv/matroska_segment_parse.cpp
View file @ a4cc7556
...@@ -248,34 +248,39 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) ...@@ -248,34 +248,39 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
msg_Dbg( &sys.demuxer, "| | | + Track Type=%s", psz_type ); msg_Dbg( &sys.demuxer, "| | | + Track Type=%s", psz_type );
} }
// else if( EbmlId( *l ) == KaxTrackFlagEnabled::ClassInfos.GlobalId ) else if( MKV_IS_ID( l, KaxTrackFlagEnabled ) ) // UNUSED
// { {
// KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)l; KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)l;
// tk->b_enabled = uint32( fenb ); // tk->b_enabled = uint32( fenb );
// msg_Dbg( &sys.demuxer, "| | | + Track Enabled=%u", msg_Dbg( &sys.demuxer, "| | | + Track Enabled=%u", uint32( fenb ) );
// uint32( fenb ) ); }
// }
else if( MKV_IS_ID( l, KaxTrackFlagDefault ) ) else if( MKV_IS_ID( l, KaxTrackFlagDefault ) )
{ {
KaxTrackFlagDefault &fdef = *(KaxTrackFlagDefault*)l; KaxTrackFlagDefault &fdef = *(KaxTrackFlagDefault*)l;
tk->b_default = uint32( fdef ); tk->b_default = uint32( fdef );
msg_Dbg( &sys.demuxer, "| | | + Track Default=%u", uint32( fdef ) ); msg_Dbg( &sys.demuxer, "| | | + Track Default=%u", uint32( fdef ) );
}
else if( MKV_IS_ID( l, KaxTrackFlagForced ) ) // UNUSED
{
KaxTrackFlagForced &ffor = *(KaxTrackFlagForced*)l;
msg_Dbg( &sys.demuxer, "| | | + Track Forced=%u", uint32( ffor ) );
} }
else if( MKV_IS_ID( l, KaxTrackFlagLacing ) ) else if( MKV_IS_ID( l, KaxTrackFlagLacing ) ) // UNUSED
{ {
KaxTrackFlagLacing &lac = *(KaxTrackFlagLacing*)l; KaxTrackFlagLacing &lac = *(KaxTrackFlagLacing*)l;
msg_Dbg( &sys.demuxer, "| | | + Track Lacing=%d", uint32( lac ) ); msg_Dbg( &sys.demuxer, "| | | + Track Lacing=%d", uint32( lac ) );
} }
else if( MKV_IS_ID( l, KaxTrackMinCache ) ) else if( MKV_IS_ID( l, KaxTrackMinCache ) ) // UNUSED
{ {
KaxTrackMinCache &cmin = *(KaxTrackMinCache*)l; KaxTrackMinCache &cmin = *(KaxTrackMinCache*)l;
msg_Dbg( &sys.demuxer, "| | | + Track MinCache=%d", uint32( cmin ) ); msg_Dbg( &sys.demuxer, "| | | + Track MinCache=%d", uint32( cmin ) );
} }
else if( MKV_IS_ID( l, KaxTrackMaxCache ) ) else if( MKV_IS_ID( l, KaxTrackMaxCache ) ) // UNUSED
{ {
KaxTrackMaxCache &cmax = *(KaxTrackMaxCache*)l; KaxTrackMaxCache &cmax = *(KaxTrackMaxCache*)l;
...@@ -295,6 +300,12 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) ...@@ -295,6 +300,12 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
tk->f_timecodescale = float( ttcs ); tk->f_timecodescale = float( ttcs );
msg_Dbg( &sys.demuxer, "| | | + Track TimeCodeScale=%f", tk->f_timecodescale ); msg_Dbg( &sys.demuxer, "| | | + Track TimeCodeScale=%f", tk->f_timecodescale );
} }
else if( MKV_IS_ID( l, KaxMaxBlockAdditionID ) ) // UNUSED
{
KaxMaxBlockAdditionID &mbl = *(KaxMaxBlockAdditionID*)l;
msg_Dbg( &sys.demuxer, "| | | + Track Max BlockAdditionID=%d", uint32( mbl ) );
}
else if( MKV_IS_ID( l, KaxTrackName ) ) else if( MKV_IS_ID( l, KaxTrackName ) )
{ {
KaxTrackName &tname = *(KaxTrackName*)l; KaxTrackName &tname = *(KaxTrackName*)l;
...@@ -337,6 +348,19 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) ...@@ -337,6 +348,19 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
tk->psz_codec_name = ToUTF8( UTFstring( cname ) ); tk->psz_codec_name = ToUTF8( UTFstring( cname ) );
msg_Dbg( &sys.demuxer, "| | | + Track Codec Name=%s", tk->psz_codec_name ); msg_Dbg( &sys.demuxer, "| | | + Track Codec Name=%s", tk->psz_codec_name );
} }
//AttachmentLink
else if( MKV_IS_ID( l, KaxCodecDecodeAll ) ) // UNUSED
{
KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)l;
msg_Dbg( &sys.demuxer, "| | | + Track Codec Decode All=%u", uint8( cdall ) );
}
else if( MKV_IS_ID( l, KaxTrackOverlay ) ) // UNUSED
{
KaxTrackOverlay &tovr = *(KaxTrackOverlay*)l;
msg_Dbg( &sys.demuxer, "| | | + Track Overlay=%u", uint32( tovr ) );
}
else if( MKV_IS_ID( l, KaxContentEncodings ) ) else if( MKV_IS_ID( l, KaxContentEncodings ) )
{ {
EbmlMaster *cencs = static_cast<EbmlMaster*>(l); EbmlMaster *cencs = static_cast<EbmlMaster*>(l);
...@@ -400,6 +424,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) ...@@ -400,6 +424,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
} }
} }
} }
// ContentEncryption Unsupported
else else
{ {
MkvTree( sys.demuxer, 5, "Unknown (%s)", typeid(*l3).name() ); MkvTree( sys.demuxer, 5, "Unknown (%s)", typeid(*l3).name() );
...@@ -412,38 +437,26 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) ...@@ -412,38 +437,26 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
} }
} }
} }
// else if( EbmlId( *l ) == KaxCodecSettings::ClassInfos.GlobalId ) // else if( EbmlId( *l ) == KaxCodecSettings::ClassInfos.GlobalId ) DEPRECATED by matroska
// { // {
// KaxCodecSettings &cset = *(KaxCodecSettings*)l; // KaxCodecSettings &cset = *(KaxCodecSettings*)l;
// tk->psz_codec_settings = ToUTF8( UTFstring( cset ) ); // tk->psz_codec_settings = ToUTF8( UTFstring( cset ) );
// msg_Dbg( &sys.demuxer, "| | | + Track Codec Settings=%s", tk->psz_codec_settings ); // msg_Dbg( &sys.demuxer, "| | | + Track Codec Settings=%s", tk->psz_codec_settings );
// } // }
// else if( EbmlId( *l ) == KaxCodecInfoURL::ClassInfos.GlobalId ) // else if( EbmlId( *l ) == KaxCodecInfoURL::ClassInfos.GlobalId ) DEPRECATED by matroska
// { // {
// KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)l; // KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)l;
// tk->psz_codec_info_url = strdup( string( ciurl ).c_str() ); // tk->psz_codec_info_url = strdup( string( ciurl ).c_str() );
// msg_Dbg( &sys.demuxer, "| | | + Track Codec Info URL=%s", tk->psz_codec_info_url ); // msg_Dbg( &sys.demuxer, "| | | + Track Codec Info URL=%s", tk->psz_codec_info_url );
// } // }
// else if( EbmlId( *l ) == KaxCodecDownloadURL::ClassInfos.GlobalId ) // else if( EbmlId( *l ) == KaxCodecDownloadURL::ClassInfos.GlobalId ) DEPRECATED by matroska
// { // {
// KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)l; // KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)l;
// tk->psz_codec_download_url = strdup( string( cdurl ).c_str() ); // tk->psz_codec_download_url = strdup( string( cdurl ).c_str() );
// msg_Dbg( &sys.demuxer, "| | | + Track Codec Info URL=%s", tk->psz_codec_download_url ); // msg_Dbg( &sys.demuxer, "| | | + Track Codec Info URL=%s", tk->psz_codec_download_url );
// }
// else if( EbmlId( *l ) == KaxCodecDecodeAll::ClassInfos.GlobalId )
// {
// KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)l;
// msg_Dbg( &sys.demuxer, "| | | + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) );
// }
// else if( EbmlId( *l ) == KaxTrackOverlay::ClassInfos.GlobalId )
// {
// KaxTrackOverlay &tovr = *(KaxTrackOverlay*)l;
// msg_Dbg( &sys.demuxer, "| | | + Track Overlay=%u <== UNUSED", uint32( tovr ) );
// } // }
else if( MKV_IS_ID( l, KaxTrackVideo ) ) else if( MKV_IS_ID( l, KaxTrackVideo ) )
{ {
...@@ -461,20 +474,19 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) ...@@ -461,20 +474,19 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
for( j = 0; j < tkv->ListSize(); j++ ) for( j = 0; j < tkv->ListSize(); j++ )
{ {
EbmlElement *l = (*tkv)[j]; EbmlElement *l = (*tkv)[j];
// if( EbmlId( *el4 ) == KaxVideoFlagInterlaced::ClassInfos.GlobalId ) if( MKV_IS_ID( l, KaxVideoFlagInterlaced ) ) // UNUSED
// { {
// KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)el4; KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)l;
// msg_Dbg( &sys.demuxer, "| | | | + Track Video Interlaced=%u", uint8( fint ) ); msg_Dbg( &sys.demuxer, "| | | | + Track Video Interlaced=%u", uint8( fint ) );
// } }
// else if( EbmlId( *el4 ) == KaxVideoStereoMode::ClassInfos.GlobalId ) else if( MKV_IS_ID( l, KaxVideoStereoMode ) ) // UNUSED
// { {
// KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)el4; KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)l;
// msg_Dbg( &sys.demuxer, "| | | | + Track Video Stereo Mode=%u", uint8( stereo ) ); msg_Dbg( &sys.demuxer, "| | | | + Track Video Stereo Mode=%u", uint8( stereo ) );
// } }
// else else if( MKV_IS_ID( l, KaxVideoPixelWidth ) )
if( MKV_IS_ID( l, KaxVideoPixelWidth ) )
{ {
KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)l; KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)l;
...@@ -530,14 +542,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) ...@@ -530,14 +542,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
i_crop_left = uint16( cropval ); i_crop_left = uint16( cropval );
msg_Dbg( &sys.demuxer, "| | | | + crop pixel left=%d", uint16( cropval ) ); msg_Dbg( &sys.demuxer, "| | | | + crop pixel left=%d", uint16( cropval ) );
} }
else if( MKV_IS_ID( l, KaxVideoFrameRate ) ) else if( MKV_IS_ID( l, KaxVideoDisplayUnit ) )
{
KaxVideoFrameRate &vfps = *(KaxVideoFrameRate*)l;
tk->f_fps = float( vfps );
msg_Dbg( &sys.demuxer, " | | | + fps=%f", float( vfps ) );
}
else if( EbmlId( *l ) == KaxVideoDisplayUnit::ClassInfos.GlobalId )
{ {
KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l; KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l;
...@@ -545,13 +550,21 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) ...@@ -545,13 +550,21 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m )
msg_Dbg( &sys.demuxer, "| | | | + Track Video Display Unit=%s", msg_Dbg( &sys.demuxer, "| | | | + Track Video Display Unit=%s",
uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) ); uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) );
} }
// else if( EbmlId( *l ) == KaxVideoAspectRatio::ClassInfos.GlobalId ) else if( MKV_IS_ID( l, KaxVideoAspectRatio ) ) // UNUSED
// { {
// KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)l; KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)l;
// msg_Dbg( &sys.demuxer, " | | | + Track Video Aspect Ratio Type=%u", uint8( ratio ) ); msg_Dbg( &sys.demuxer, " | | | + Track Video Aspect Ratio Type=%u", uint8( ratio ) );
// } }
// else if( EbmlId( *l ) == KaxVideoGamma::ClassInfos.GlobalId ) // ColourSpace UNUSED
else if( MKV_IS_ID( l, KaxVideoFrameRate ) )
{
KaxVideoFrameRate &vfps = *(KaxVideoFrameRate*)l;
tk->f_fps = float( vfps );
msg_Dbg( &sys.demuxer, " | | | + fps=%f", float( vfps ) );
}
// else if( EbmlId( *l ) == KaxVideoGamma::ClassInfos.GlobalId ) //DEPRECATED by Matroska
// { // {
// KaxVideoGamma &gamma = *(KaxVideoGamma*)l; // KaxVideoGamma &gamma = *(KaxVideoGamma*)l;
...@@ -1015,9 +1028,8 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters ) ...@@ -1015,9 +1028,8 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters )
chapter_edition_c *p_edition = new chapter_edition_c(); chapter_edition_c *p_edition = new chapter_edition_c();
EbmlMaster *E = static_cast<EbmlMaster *>(l ); EbmlMaster *E = static_cast<EbmlMaster *>(l );
size_t j;
msg_Dbg( &sys.demuxer, "| | + EditionEntry" ); msg_Dbg( &sys.demuxer, "| | + EditionEntry" );
for( j = 0; j < E->ListSize(); j++ ) for( size_t j = 0; j < E->ListSize(); j++ )
{ {
EbmlElement *l = (*E)[j]; EbmlElement *l = (*E)[j];
...@@ -1040,6 +1052,10 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters ) ...@@ -1040,6 +1052,10 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters )
if (uint8(*static_cast<KaxEditionFlagDefault *>( l )) != 0) if (uint8(*static_cast<KaxEditionFlagDefault *>( l )) != 0)
i_default_edition = stored_editions.size(); i_default_edition = stored_editions.size();
} }
else if( MKV_IS_ID( l, KaxEditionFlagHidden ) )
{
// FIXME to implement
}
else else
{ {
msg_Dbg( &sys.demuxer, "| | | + Unknown (%s)", typeid(*l).name() ); msg_Dbg( &sys.demuxer, "| | | + Unknown (%s)", typeid(*l).name() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment