X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmkv.cpp;h=65ed0fb85b915a90094c0a28a99c0d8ba8af1c92;hb=0621dd1e676fdd60461059b04aad11207bb39b5a;hp=93bd3cf402f5e39ea237140e76a382a4be26cd93;hpb=4df46145296978b8254783b07a20b5bb0da28f01;p=vlc diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index 93bd3cf402..65ed0fb85b 100644 --- a/modules/demux/mkv.cpp +++ b/modules/demux/mkv.cpp @@ -19,13 +19,16 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include @@ -33,11 +36,13 @@ # include /* time() */ #endif -#include -#include /* BITMAPINFOHEADER, WAVEFORMATEX */ +#include /* BITMAPINFOHEADER, WAVEFORMATEX */ #include "iso_lang.h" #include "vlc_meta.h" +#include +#include +#include #include #include @@ -60,6 +65,7 @@ #include "ebml/StdIOCallback.h" #include "matroska/KaxAttachments.h" +#include "matroska/KaxAttached.h" #include "matroska/KaxBlock.h" #include "matroska/KaxBlockData.h" #include "matroska/KaxChapters.h" @@ -109,7 +115,7 @@ extern "C" { //////////////////////////////////////////////////////////////////////////////////////////////////////////////// #undef ATTRIBUTE_PACKED -#undef PRAGMA_PACK_BEGIN +#undef PRAGMA_PACK_BEGIN #undef PRAGMA_PACK_END #if defined(__GNUC__) @@ -149,7 +155,7 @@ typedef struct { #ifdef WORDS_BIGENDIAN unsigned char zero : 7; /* 25-31 */ unsigned char video_pres_mode_change : 1; /* 24 */ - + unsigned char karaoke_audio_pres_mode_change : 1; /* 23 */ unsigned char angle_change : 1; unsigned char subpic_stream_change : 1; @@ -158,7 +164,7 @@ typedef struct { unsigned char still_off : 1; unsigned char button_select_or_activate : 1; unsigned char resume : 1; /* 16 */ - + unsigned char chapter_menu_call : 1; /* 15 */ unsigned char angle_menu_call : 1; unsigned char audio_menu_call : 1; @@ -167,7 +173,7 @@ typedef struct { unsigned char title_menu_call : 1; unsigned char backward_scan : 1; unsigned char forward_scan : 1; /* 8 */ - + unsigned char next_pg_search : 1; /* 7 */ unsigned char prev_or_top_pg_search : 1; unsigned char time_or_chapter_search : 1; @@ -179,7 +185,7 @@ typedef struct { #else unsigned char video_pres_mode_change : 1; /* 24 */ unsigned char zero : 7; /* 25-31 */ - + unsigned char resume : 1; /* 16 */ unsigned char button_select_or_activate : 1; unsigned char still_off : 1; @@ -188,7 +194,7 @@ typedef struct { unsigned char subpic_stream_change : 1; unsigned char angle_change : 1; unsigned char karaoke_audio_pres_mode_change : 1; /* 23 */ - + unsigned char forward_scan : 1; /* 8 */ unsigned char backward_scan : 1; unsigned char title_menu_call : 1; @@ -197,7 +203,7 @@ typedef struct { unsigned char audio_menu_call : 1; unsigned char angle_menu_call : 1; unsigned char chapter_menu_call : 1; /* 15 */ - + unsigned char title_or_time_play : 1; /* 0 */ unsigned char chapter_search_or_play : 1; unsigned char title_play : 1; @@ -218,7 +224,7 @@ typedef struct { #define COMMAND_DATA_SIZE 8 /** - * PCI General Information + * PCI General Information */ typedef struct { uint32_t nv_pck_lbn; /**< sector address of this nav pack */ @@ -239,8 +245,8 @@ typedef struct { uint32_t nsml_agl_dsta[9]; /**< address of destination vobu in AGL_C#n */ } ATTRIBUTE_PACKED nsml_agli_t; -/** - * Highlight General Information +/** + * Highlight General Information * * For btngrX_dsp_ty the bits have the following meaning: * 000b: normal 4/3 only buttons @@ -273,7 +279,7 @@ typedef struct { unsigned char zero3 : 1; #endif uint8_t btn_ofn; /**< button offset number range 0-255 */ - uint8_t btn_ns; /**< number of valid buttons <= 36/18/12 (low 6 bits) */ + uint8_t btn_ns; /**< number of valid buttons <= 36/18/12 (low 6 bits) */ uint8_t nsl_btn_ns; /**< number of buttons selectable by U_BTNNi (low 6 bits) nsl_btn_ns <= btn_ns */ uint8_t zero5; /**< reserved */ uint8_t fosl_btnn; /**< forcedly selected button (low 6 bits) */ @@ -281,19 +287,19 @@ typedef struct { } ATTRIBUTE_PACKED hl_gi_t; -/** - * Button Color Information Table +/** + * Button Color Information Table * Each entry beeing a 32bit word that contains the color indexs and alpha * values to use. They are all represented by 4 bit number and stored * like this [Ci3, Ci2, Ci1, Ci0, A3, A2, A1, A0]. The actual palette * that the indexes reference is in the PGC. - * @TODO split the uint32_t into a struct + * \todo split the uint32_t into a struct */ typedef struct { uint32_t btn_coli[3][2]; /**< [button color number-1][select:0/action:1] */ } ATTRIBUTE_PACKED btn_colit_t; -/** +/** * Button Information * * NOTE: I've had to change the structure from the disk layout to get @@ -346,7 +352,7 @@ typedef struct { } ATTRIBUTE_PACKED btni_t; /** - * Highlight Information + * Highlight Information */ typedef struct { hl_gi_t hl_gi; @@ -477,7 +483,7 @@ block_t *block_zlib_decompress( vlc_object_t *p_this, block_t *p_in_block ) { /** * Helper function to print the mkv parse tree */ -static void MkvTree( demux_t & demuxer, int i_level, char *psz_format, ... ) +static void MkvTree( demux_t & demuxer, int i_level, const char *psz_format, ... ) { va_list args; if( i_level > 9 ) @@ -486,7 +492,7 @@ static void MkvTree( demux_t & demuxer, int i_level, char *psz_format, ... ) return; } va_start( args, psz_format ); - static char *psz_foo = "| | | | | | | | | |"; + static const char psz_foo[] = "| | | | | | | | | |"; char *psz_foo2 = (char*)malloc( ( i_level * 4 + 3 + strlen( psz_format ) ) * sizeof(char) ); strncpy( psz_foo2, psz_foo, 4 * i_level ); psz_foo2[ 4 * i_level ] = '+'; @@ -496,7 +502,7 @@ static void MkvTree( demux_t & demuxer, int i_level, char *psz_format, ... ) free( psz_foo2 ); va_end( args ); } - + /***************************************************************************** * Stream managment *****************************************************************************/ @@ -602,11 +608,11 @@ typedef struct vlc_bool_t b_silent; /* informative */ - char *psz_codec_name; - char *psz_codec_settings; - char *psz_codec_info_url; - char *psz_codec_download_url; - + const char *psz_codec_name; + const char *psz_codec_settings; + const char *psz_codec_info_url; + const char *psz_codec_download_url; + /* encryption/compression */ int i_compression_type; KaxContentCompSettings *p_compression_data; @@ -642,8 +648,8 @@ public: ,i_codec_id( codec_id ) ,sys( demuxer ) {} - - virtual ~chapter_codec_cmds_c() + + virtual ~chapter_codec_cmds_c() { delete p_private_data; std::vector::iterator indexe = enter_cmds.begin(); @@ -672,7 +678,7 @@ public: } void AddCommand( const KaxChapterProcessCommand & command ); - + /// \return wether the codec has seeked in the files or not virtual bool Enter() { return false; } virtual bool Leave() { return false; } @@ -706,9 +712,9 @@ public: p_PRMs[ 0x80 + 16 ] = 0xFFFFu; p_PRMs[ 0x80 + 18 ] = 0xFFFFu; } - + bool Interpret( const binary * p_command, size_t i_size = 8 ); - + uint16 GetPRM( size_t index ) const { if ( index < 256 ) @@ -740,7 +746,7 @@ public: } return false; } - + bool SetGPRM( size_t index, uint16 value ) { if ( index >= 0 && index < 16 ) @@ -797,7 +803,7 @@ protected: uint16 p_PRMs[256]; demux_sys_t & sys; - + // DVD command IDs // Tests @@ -810,7 +816,7 @@ protected: static const uint16 CMD_DVD_IF_GPREG_SUP = (5 << 4); static const uint16 CMD_DVD_IF_GPREG_INF_EQUAL = (6 << 4); static const uint16 CMD_DVD_IF_GPREG_INF = (7 << 4); - + static const uint16 CMD_DVD_NOP = 0x0000; static const uint16 CMD_DVD_GOTO_LINE = 0x0001; static const uint16 CMD_DVD_BREAK = 0x0002; @@ -839,7 +845,7 @@ protected: static const uint16 CMD_DVD_MULT_GPREG = 0x7500; static const uint16 CMD_DVD_GPREG_DIV_VALUE = 0x7600; static const uint16 CMD_DVD_GPREG_AND_VALUE = 0x7900; - + // callbacks when browsing inside CodecPrivate static bool MatchIsDomain ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); static bool MatchIsVMG ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ); @@ -873,10 +879,10 @@ public: {} bool Interpret( const binary * p_command, size_t i_size ); - + // DVD command IDs static const std::string CMD_MS_GOTO_AND_PLAY; - + protected: demux_sys_t & sys; }; @@ -896,7 +902,7 @@ public: bool Leave(); protected: - matroska_script_interpretor_c interpretor; + matroska_script_interpretor_c interpretor; }; class chapter_translation_c @@ -952,14 +958,14 @@ public: virtual chapter_item_c * FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current, bool & b_found ); void Append( const chapter_item_c & edition ); chapter_item_c * FindChapter( int64_t i_find_uid ); - virtual chapter_item_c *BrowseCodecPrivate( unsigned int codec_id, - bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), - const void *p_cookie, + virtual chapter_item_c *BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, size_t i_cookie_size ); std::string GetCodecName( bool f_for_title = false ) const; bool ParentOf( const chapter_item_c & item ) const; int16 GetTitleNumber( ) const; - + int64_t i_start_time, i_end_time; int64_t i_user_start_time, i_user_end_time; /* the time in the stream when an edition is ordered */ std::vector sub_chapters; @@ -970,7 +976,7 @@ public: std::string psz_name; chapter_item_c *psz_parent; bool b_is_leaving; - + std::vector codecs; static bool CompareTimecode( const chapter_item_c * itemA, const chapter_item_c * itemB ) @@ -989,12 +995,12 @@ public: chapter_edition_c() :b_ordered(false) {} - + void RefreshChapters( ); mtime_t Duration() const; std::string GetMainName() const; chapter_item_c * FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current ); - + bool b_ordered; }; @@ -1144,7 +1150,7 @@ public: std::vector translations; std::vector families; - + demux_sys_t & sys; EbmlParser *ep; bool b_preloaded; @@ -1152,6 +1158,7 @@ public: bool Preload( ); bool PreloadFamily( const matroska_segment_c & segment ); void ParseInfo( KaxInfo *info ); + void ParseAttachments( KaxAttachments *attachments ); void ParseChapters( KaxChapters *chapters ); void ParseSeekHead( KaxSeekHead *seekhead ); void ParseTracks( KaxTracks *tracks ); @@ -1240,9 +1247,9 @@ public: bool UpdateCurrentToChapter( demux_t & demux ); void PrepareChapters( ); - chapter_item_c *BrowseCodecPrivate( unsigned int codec_id, - bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), - const void *p_cookie, + chapter_item_c *BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, size_t i_cookie_size ); chapter_item_c *FindChapter( int64_t i_find_uid ); @@ -1296,6 +1303,25 @@ typedef struct } event_thread_t; + +class attachment_c +{ +public: + attachment_c() + :p_data(NULL) + ,i_size(0) + {} + virtual ~attachment_c() + { + if( p_data ) free( p_data ); + } + + std::string psz_file_name; + std::string psz_mime_type; + void *p_data; + int i_size; +}; + class demux_sys_t { public: @@ -1327,6 +1353,8 @@ public: delete opened_segments[i]; for ( i=0; i streams; + std::vector stored_attachments; std::vector opened_segments; std::vector used_segments; virtual_segment_c *p_current_segment; @@ -1358,10 +1387,10 @@ public: float f_duration; matroska_segment_c *FindSegment( const EbmlBinary & uid ) const; - chapter_item_c *BrowseCodecPrivate( unsigned int codec_id, - bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), - const void *p_cookie, - size_t i_cookie_size, + chapter_item_c *BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, + size_t i_cookie_size, virtual_segment_c * & p_segment_found ); chapter_item_c *FindChapter( int64_t i_find_uid, virtual_segment_c * & p_segment_found ); @@ -1418,8 +1447,8 @@ static int Open( vlc_object_t * p_this ) demux_sys_t *p_sys; matroska_stream_c *p_stream; matroska_segment_c *p_segment; - uint8_t *p_peek; - std::string s_path, s_filename; + const uint8_t *p_peek; + std::string s_path, s_filename; vlc_stream_io_callback *p_io_callback; EbmlStream *p_io_stream; @@ -1485,41 +1514,54 @@ static int Open( vlc_object_t * p_this ) } else { - if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0) + if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0) { s_path = s_path.substr(0,s_path.find_last_of(DIRECTORY_SEPARATOR)); } } - struct dirent *p_file_item; - DIR *p_src_dir = opendir(s_path.c_str()); + DIR *p_src_dir = utf8_opendir(s_path.c_str()); if (p_src_dir != NULL) { - while ((p_file_item = (dirent *) readdir(p_src_dir))) + char *psz_file; + while ((psz_file = utf8_readdir(p_src_dir)) != NULL) { - if (strlen(p_file_item->d_name) > 4) + if (strlen(psz_file) > 4) { - s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name; + s_filename = s_path + DIRECTORY_SEPARATOR + psz_file; #ifdef WIN32 if (!strcasecmp(s_filename.c_str(), p_demux->psz_path)) #else if (!s_filename.compare(p_demux->psz_path)) #endif + { + free (psz_file); continue; // don't reuse the original opened file + } #if defined(__GNUC__) && (__GNUC__ < 3) - if (!s_filename.compare("mkv", s_filename.length() - 3, 3) || + if (!s_filename.compare("mkv", s_filename.length() - 3, 3) || !s_filename.compare("mka", s_filename.length() - 3, 3)) #else - if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") || + if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") || !s_filename.compare(s_filename.length() - 3, 3, "mka")) #endif { // test wether this file belongs to our family - stream_t *p_file_stream = stream_UrlNew( p_demux, s_filename.c_str()); - if ( p_file_stream != NULL ) + const uint8_t *p_peek; + bool file_ok = false; + stream_t *p_file_stream = stream_UrlNew( + p_demux, + s_filename.c_str()); + /* peek the begining */ + if( p_file_stream && + stream_Peek( p_file_stream, &p_peek, 4 ) >= 4 + && p_peek[0] == 0x1a && p_peek[1] == 0x45 && + p_peek[2] == 0xdf && p_peek[3] == 0xa3 ) file_ok = true; + + if ( file_ok ) { vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, VLC_TRUE ); EbmlStream *p_estream = new EbmlStream(*p_file_io); @@ -1541,10 +1583,14 @@ static int Open( vlc_object_t * p_this ) } else { + if( p_file_stream ) { + stream_Delete( p_file_stream ); + } msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() ); } } } + free (psz_file); } closedir( p_src_dir ); } @@ -1562,7 +1608,7 @@ static int Open( vlc_object_t * p_this ) } p_sys->StartUiThread(); - + return VLC_SUCCESS; error: @@ -1592,13 +1638,36 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) int i_skp; size_t i_idx; - vlc_meta_t **pp_meta; + vlc_meta_t *p_meta; + input_attachment_t ***ppp_attach; + int *pi_int; + int i; switch( i_query ) { + case DEMUX_GET_ATTACHMENTS: + ppp_attach = (input_attachment_t***)va_arg( args, input_attachment_t*** ); + pi_int = (int*)va_arg( args, int * ); + + if( p_sys->stored_attachments.size() <= 0 ) + return VLC_EGENERIC; + + *pi_int = p_sys->stored_attachments.size(); + *ppp_attach = (input_attachment_t**)malloc( sizeof(input_attachment_t**) * + p_sys->stored_attachments.size() ); + if( !(*ppp_attach) ) + return VLC_ENOMEM; + for( i = 0; i < p_sys->stored_attachments.size(); i++ ) + { + attachment_c *a = p_sys->stored_attachments[i]; + (*ppp_attach)[i] = vlc_input_attachment_New( a->psz_file_name.c_str(), a->psz_mime_type.c_str(), NULL, + a->p_data, a->i_size ); + } + return VLC_SUCCESS; + case DEMUX_GET_META: - pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** ); - *pp_meta = vlc_meta_Duplicate( p_sys->meta ); + p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* ); + vlc_meta_Merge( p_meta, p_sys->meta ); return VLC_SUCCESS; case DEMUX_GET_LENGTH: @@ -1854,7 +1923,7 @@ static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, int i_mem, size_t } #if LIBMATROSKA_VERSION >= 0x000800 -static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock, +static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock, mtime_t i_pts, mtime_t i_duration, bool f_mandatory ) #else static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, @@ -1884,12 +1953,12 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, if( i_track >= p_segment->tracks.size() ) { - msg_Err( p_demux, "invalid track number=%d", block->TrackNum() ); + msg_Err( p_demux, "invalid track number" ); return; } if( tk->fmt.i_cat != NAV_ES && tk->p_es == NULL ) { - msg_Err( p_demux, "unknown track number=%d", block->TrackNum() ); + msg_Err( p_demux, "unknown track number" ); return; } if( i_pts + i_duration < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES ) @@ -1922,7 +1991,7 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, #if LIBMATROSKA_VERSION >= 0x000800 - for( i = 0; + for( i = 0; (block != NULL && i < block->NumberFrames()) || (simpleblock != NULL && i < simpleblock->NumberFrames()); i++ ) #else @@ -1997,7 +2066,7 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, if ( f_mandatory ) p_block->i_dts = p_block->i_pts; else - p_block->i_dts = min( i_pts, tk->i_last_dts + (tk->i_default_duration >> 10)); + p_block->i_dts = min( i_pts, tk->i_last_dts + (mtime_t)(tk->i_default_duration >> 10)); p_sys->i_pts = p_block->i_dts; } } @@ -2129,7 +2198,10 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS p_stream1->segments.push_back( p_segment1 ); } else + { + p_segment1->segment = NULL; delete p_segment1; + } } if (p_l0->IsFiniteSize() ) { @@ -2194,23 +2266,104 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' ); } + else if( !strncmp( tracks[i_track]->psz_codec, "V_THEORA", 8 ) ) + { + uint8_t *p_data = tracks[i_track]->p_extra_data; + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 't', 'h', 'e', 'o' ); + if( tracks[i_track]->i_extra_data >= 4 ) { + if( p_data[0] == 2 ) { + int i = 1; + int i_size1 = 0, i_size2 = 0; + p_data++; + /* read size of first header packet */ + while( *p_data == 0xFF && + i < tracks[i_track]->i_extra_data ) + { + i_size1 += *p_data; + p_data++; + i++; + } + i_size1 += *p_data; + p_data++; + i++; + msg_Dbg( &sys.demuxer, "first theora header size %d", i_size1 ); + /* read size of second header packet */ + while( *p_data == 0xFF && + i < tracks[i_track]->i_extra_data ) + { + i_size2 += *p_data; + p_data++; + i++; + } + i_size2 += *p_data; + p_data++; + i++; + int i_size3 = tracks[i_track]->i_extra_data - i - i_size1 + - i_size2; + msg_Dbg( &sys.demuxer, "second theora header size %d", i_size2 ); + msg_Dbg( &sys.demuxer, "third theora header size %d", i_size3 ); + tracks[i_track]->fmt.i_extra = i_size1 + i_size2 + i_size3 + + 6; + if( i_size1 > 0 && i_size2 > 0 && i_size3 > 0 ) { + tracks[i_track]->fmt.p_extra = + malloc( tracks[i_track]->fmt.i_extra ); + uint8_t *p_out = (uint8_t*)tracks[i_track]->fmt.p_extra; + *p_out++ = (i_size1>>8) & 0xFF; + *p_out++ = i_size1 & 0xFF; + memcpy( p_out, p_data, i_size1 ); + p_data += i_size1; + p_out += i_size1; + + *p_out++ = (i_size2>>8) & 0xFF; + *p_out++ = i_size2 & 0xFF; + memcpy( p_out, p_data, i_size2 ); + p_data += i_size2; + p_out += i_size2; + + *p_out++ = (i_size3>>8) & 0xFF; + *p_out++ = i_size3 & 0xFF; + memcpy( p_out, p_data, i_size3 ); + p_data += i_size3; + p_out += i_size3; + } + else + { + msg_Err( &sys.demuxer, "inconsistant theora extradata" ); + } + } + else { + msg_Err( &sys.demuxer, "Wrong number of ogg packets with theora headers (%d)", p_data[0] + 1 ); + } + } + } + else if( !strncmp( tracks[i_track]->psz_codec, "V_REAL/RV", 9 ) ) + { + if( !strcmp( tracks[i_track]->psz_codec, "V_REAL/RV10" ) ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'R', 'V', '1', '0' ); + else if( !strcmp( tracks[i_track]->psz_codec, "V_REAL/RV20" ) ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'R', 'V', '2', '0' ); + else if( !strcmp( tracks[i_track]->psz_codec, "V_REAL/RV30" ) ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'R', 'V', '3', '0' ); + else if( !strcmp( tracks[i_track]->psz_codec, "V_REAL/RV40" ) ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'R', 'V', '4', '0' ); + } else if( !strncmp( tracks[i_track]->psz_codec, "V_MPEG4", 7 ) ) { if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG4/MS/V3" ) ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' ); } - else if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG4/ISO/AVC" ) ) + else if( !strncmp( tracks[i_track]->psz_codec, "V_MPEG4/ISO", 11 ) ) { - tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', 'v', 'c', '1' ); + /* A MPEG 4 codec, SP, ASP, AP or AVC */ + if( !strcmp( tracks[i_track]->psz_codec, "V_MPEG4/ISO/AVC" ) ) + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'a', 'v', 'c', '1' ); + else + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); memcpy( tracks[i_track]->fmt.p_extra,tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); } - else - { - tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); - } } else if( !strcmp( tracks[i_track]->psz_codec, "V_QUICKTIME" ) ) { @@ -2383,6 +2536,20 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); } + else if( !strcmp( tracks[i_track]->psz_codec, "A_WAVPACK4" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'W', 'V', 'P', 'K' ); + tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); + memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); + } + else if( !strcmp( tracks[i_track]->psz_codec, "A_TTA1" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'T', 'T', 'A', '1' ); + tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); + memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); + } else if( !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/BIG" ) || !strcmp( tracks[i_track]->psz_codec, "A_PCM/INT/LIT" ) || !strcmp( tracks[i_track]->psz_codec, "A_PCM/FLOAT/IEEE" ) ) @@ -2397,23 +2564,22 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) } tracks[i_track]->fmt.audio.i_blockalign = ( tracks[i_track]->fmt.audio.i_bitspersample + 7 ) / 8 * tracks[i_track]->fmt.audio.i_channels; } - else if( !strcmp( tracks[i_track]->psz_codec, "A_TTA1" ) ) - { - /* FIXME: support this codec */ - msg_Err( &sys.demuxer, "TTA not supported yet[%d, n=%d]", (int)i_track, tracks[i_track]->i_number ); - tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); - } - else if( !strcmp( tracks[i_track]->psz_codec, "A_WAVPACK4" ) ) - { - /* FIXME: support this codec */ - msg_Err( &sys.demuxer, "Wavpack not supported yet[%d, n=%d]", (int)i_track, tracks[i_track]->i_number ); - tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); - } else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/UTF8" ) ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" ); } + else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/USF" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 's', 'f', ' ' ); + tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" ); + if( tracks[i_track]->i_extra_data ) + { + tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); + memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); + } + } else if( !strcmp( tracks[i_track]->psz_codec, "S_TEXT/SSA" ) || !strcmp( tracks[i_track]->psz_codec, "S_TEXT/ASS" ) || !strcmp( tracks[i_track]->psz_codec, "S_SSA" ) || @@ -2421,6 +2587,12 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) { tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's', 's', 'a', ' ' ); tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" ); + if( tracks[i_track]->i_extra_data ) + { + tracks[i_track]->fmt.i_extra = tracks[i_track]->i_extra_data; + tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->i_extra_data ); + memcpy( tracks[i_track]->fmt.p_extra, tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data ); + } } else if( !strcmp( tracks[i_track]->psz_codec, "S_VOBSUB" ) ) { @@ -2431,7 +2603,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) char *p_buf = (char *)malloc( tracks[i_track]->i_extra_data + 1); memcpy( p_buf, tracks[i_track]->p_extra_data , tracks[i_track]->i_extra_data ); p_buf[tracks[i_track]->i_extra_data] = '\0'; - + p_start = strstr( p_buf, "size:" ); if( sscanf( p_start, "size: %dx%d", &tracks[i_track]->fmt.subs.spu.i_original_frame_width, &tracks[i_track]->fmt.subs.spu.i_original_frame_height ) == 2 ) @@ -2452,7 +2624,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) } else { - msg_Err( &sys.demuxer, "unknow codec id=`%s'", tracks[i_track]->psz_codec ); + msg_Err( &sys.demuxer, "unknown codec id=`%s'", tracks[i_track]->psz_codec ); tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' ); } if( tracks[i_track]->b_default ) @@ -2462,9 +2634,21 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) tracks[i_track]->p_es = es_out_Add( sys.demuxer.out, &tracks[i_track]->fmt ); + /* Turn on a subtitles track if it has been flagged as default - + * but only do this if no subtitles track has already been engaged, + * either by an earlier 'default track' (??) or by default + * language choice behaviour. + */ + if( tracks[i_track]->b_default ) + { + es_out_Control( sys.demuxer.out, + ES_OUT_SET_DEFAULT, + tracks[i_track]->p_es ); + } + es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, tracks[i_track]->p_es, i_start_time ); } - + sys.i_start_pts = i_start_time; // reset the stream reading to the first cluster of the segment used es.I_O().setFilePointer( i_start_pos ); @@ -2507,8 +2691,7 @@ void demux_sys_t::StopUiThread() { if ( b_ui_hooked ) { - p_ev->b_die = VLC_TRUE; - + vlc_object_kill( p_ev ); vlc_thread_join( p_ev ); vlc_object_destroy( p_ev ); @@ -2570,7 +2753,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) p_ev->b_key = VLC_FALSE; /* catch all key event */ - var_AddCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev ); + var_AddCallback( p_ev->p_libvlc, "key-pressed", EventKey, p_ev ); /* main loop */ while( !p_ev->b_die ) @@ -2588,7 +2771,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) if( p_ev->b_key ) { vlc_value_t valk; - struct vlc_t::hotkey *p_hotkeys = p_ev->p_vlc->p_hotkeys; + struct libvlc_int_t::hotkey *p_hotkeys = p_ev->p_libvlc->p_hotkeys; int i, i_action = -1; msg_Dbg( p_ev->p_demux, "Handle Key Event"); @@ -2597,7 +2780,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) pci_t *pci = (pci_t *) &p_sys->pci_packet; - var_Get( p_ev->p_vlc, "key-pressed", &valk ); + var_Get( p_ev->p_libvlc, "key-pressed", &valk ); for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) { if( p_hotkeys[i].i_key == valk.i_int ) @@ -2704,7 +2887,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) break; case ACTIONID_NAV_ACTIVATE: b_activated = VLC_TRUE; - + if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns ) { btni_t button_ptr = pci->hli.btnit[i_curr_button-1]; @@ -2748,14 +2931,14 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) // get current button best = 0; dist = 0x08000000; /* >> than (720*720)+(567*567); */ - for(button = 1; button <= pci->hli.hl_gi.btn_ns; button++) + for(button = 1; button <= pci->hli.hl_gi.btn_ns; button++) { btni_t *button_ptr = &(pci->hli.btnit[button-1]); if(((unsigned)valx.i_int >= button_ptr->x_start) && ((unsigned)valx.i_int <= button_ptr->x_end) && ((unsigned)valy.i_int >= button_ptr->y_start) - && ((unsigned)valy.i_int <= button_ptr->y_end)) + && ((unsigned)valy.i_int <= button_ptr->y_end)) { mx = (button_ptr->x_start + button_ptr->x_end)/2; my = (button_ptr->y_start + button_ptr->y_end)/2; @@ -2872,7 +3055,7 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); vlc_object_release( p_vout ); } - var_DelCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev ); + var_DelCallback( p_ev->p_libvlc, "key-pressed", EventKey, p_ev ); vlc_mutex_destroy( &p_ev->lock ); @@ -2914,7 +3097,11 @@ void virtual_segment_c::PrepareChapters( ) p_segment = linked_segments[i]; // FIXME assume we have the same editions in all segments for (j=0; jstored_editions.size(); j++) + { + if( j >= p_editions->size() ) /* Protect against broken files (?) */ + break; (*p_editions)[j]->Append( *p_segment->stored_editions[j] ); + } } } @@ -2990,7 +3177,7 @@ bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux ) Seek( demux, sys.i_pts, 0, psz_curr_chapter ); } } - + if ( !b_has_seeked ) { psz_current_chapter = psz_curr_chapter; @@ -3019,9 +3206,9 @@ bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux ) return false; } -chapter_item_c *virtual_segment_c::BrowseCodecPrivate( unsigned int codec_id, - bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), - const void *p_cookie, +chapter_item_c *virtual_segment_c::BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, size_t i_cookie_size ) { // FIXME don't assume it is the first edition @@ -3048,9 +3235,9 @@ chapter_item_c *virtual_segment_c::FindChapter( int64_t i_find_uid ) return NULL; } -chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id, - bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), - const void *p_cookie, +chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, size_t i_cookie_size ) { // this chapter @@ -3061,7 +3248,7 @@ chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id, return this; index++; } - + // sub-chapters chapter_item_c *p_result = NULL; std::vector::const_iterator index2 = sub_chapters.begin(); @@ -3072,7 +3259,7 @@ chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id, return p_result; index2++; } - + return p_result; } @@ -3310,14 +3497,14 @@ static int Demux( demux_t *p_demux) i_return = 1; break; } - + if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL ) { /* nothing left to read in this ordered edition */ if ( !p_vsegment->SelectNext() ) break; p_segment->UnSelect( ); - + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); /* switch to the next segment */ @@ -3365,7 +3552,7 @@ static int Demux( demux_t *p_demux) { msg_Warn( p_demux, "cannot get block EOF?" ); p_segment->UnSelect( ); - + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); /* switch to the next segment */ @@ -3401,7 +3588,7 @@ static int Demux( demux_t *p_demux) break; } } - + if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL ) { /* nothing left to read in this ordered edition */ @@ -3411,7 +3598,7 @@ static int Demux( demux_t *p_demux) break; } p_segment->UnSelect( ); - + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); /* switch to the next segment */ @@ -4046,7 +4233,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) tk->psz_codec_settings = NULL; tk->psz_codec_info_url = NULL; tk->psz_codec_download_url = NULL; - + tk->i_compression_type = MATROSKA_COMPRESSION_NONE; tk->p_compression_data = NULL; @@ -4069,7 +4256,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) } else if( MKV_IS_ID( l, KaxTrackType ) ) { - char *psz_type; + const char *psz_type; KaxTrackType &ttype = *(KaxTrackType*)l; switch( uint8(ttype) ) @@ -4234,7 +4421,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) KaxContentCompAlgo &compalg = *(KaxContentCompAlgo*)l4; MkvTree( sys.demuxer, 6, "Compression Algorithm: %i", uint32(compalg) ); tk->i_compression_type = uint32( compalg ); - if ( ( tk->i_compression_type != MATROSKA_COMPRESSION_ZLIB ) && + if ( ( tk->i_compression_type != MATROSKA_COMPRESSION_ZLIB ) && ( tk->i_compression_type != MATROSKA_COMPRESSION_HEADER ) ) { msg_Err( &sys.demuxer, "Track Compression method %d not supported", tk->i_compression_type ); @@ -4251,20 +4438,17 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) } } } - else { MkvTree( sys.demuxer, 5, "Unknown (%s)", typeid(*l3).name() ); } } - } else { MkvTree( sys.demuxer, 4, "Unknown (%s)", typeid(*l2).name() ); } } - } // else if( EbmlId( *l ) == KaxCodecSettings::ClassInfos.GlobalId ) // { @@ -4303,13 +4487,15 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { EbmlMaster *tkv = static_cast(l); unsigned int j; + unsigned int i_crop_right = 0, i_crop_left = 0, i_crop_top = 0, i_crop_bottom = 0; + unsigned int i_display_unit = 0, i_display_width = 0, i_display_height = 0; msg_Dbg( &sys.demuxer, "| | | + Track Video" ); tk->f_fps = 0.0; tk->fmt.video.i_frame_rate_base = (unsigned int)(tk->i_default_duration / 1000); tk->fmt.video.i_frame_rate = 1000000; - + for( j = 0; j < tkv->ListSize(); j++ ) { EbmlElement *l = (*tkv)[j]; @@ -4344,44 +4530,42 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxVideoDisplayWidth &vwidth = *(KaxVideoDisplayWidth*)l; - tk->fmt.video.i_visible_width = uint16( vwidth ); + i_display_width = uint16( vwidth ); msg_Dbg( &sys.demuxer, "| | | | + display width=%d", uint16( vwidth ) ); } else if( MKV_IS_ID( l, KaxVideoDisplayHeight ) ) { KaxVideoDisplayWidth &vheight = *(KaxVideoDisplayWidth*)l; - tk->fmt.video.i_visible_height = uint16( vheight ); + i_display_height = uint16( vheight ); msg_Dbg( &sys.demuxer, "| | | | + display height=%d", uint16( vheight ) ); } else if( MKV_IS_ID( l, KaxVideoPixelCropBottom ) ) { KaxVideoPixelCropBottom &cropval = *(KaxVideoPixelCropBottom*)l; - tk->fmt.video.i_height -= uint16( cropval ); + i_crop_bottom = uint16( cropval ); msg_Dbg( &sys.demuxer, "| | | | + crop pixel bottom=%d", uint16( cropval ) ); } else if( MKV_IS_ID( l, KaxVideoPixelCropTop ) ) { KaxVideoPixelCropTop &cropval = *(KaxVideoPixelCropTop*)l; - tk->fmt.video.i_height -= uint16( cropval ); - tk->fmt.video.i_y_offset += uint16( cropval ); + i_crop_top = uint16( cropval ); msg_Dbg( &sys.demuxer, "| | | | + crop pixel top=%d", uint16( cropval ) ); } else if( MKV_IS_ID( l, KaxVideoPixelCropRight ) ) { KaxVideoPixelCropRight &cropval = *(KaxVideoPixelCropRight*)l; - tk->fmt.video.i_width -= uint16( cropval ); + i_crop_right = uint16( cropval ); msg_Dbg( &sys.demuxer, "| | | | + crop pixel right=%d", uint16( cropval ) ); } else if( MKV_IS_ID( l, KaxVideoPixelCropLeft ) ) { KaxVideoPixelCropLeft &cropval = *(KaxVideoPixelCropLeft*)l; - tk->fmt.video.i_width -= uint16( cropval ); - tk->fmt.video.i_x_offset += uint16( cropval ); + i_crop_left = uint16( cropval ); msg_Dbg( &sys.demuxer, "| | | | + crop pixel left=%d", uint16( cropval ) ); } else if( MKV_IS_ID( l, KaxVideoFrameRate ) ) @@ -4391,13 +4575,14 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) tk->f_fps = float( vfps ); msg_Dbg( &sys.demuxer, " | | | + fps=%f", float( vfps ) ); } -// else if( EbmlId( *l ) == KaxVideoDisplayUnit::ClassInfos.GlobalId ) -// { -// KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l; + else if( EbmlId( *l ) == KaxVideoDisplayUnit::ClassInfos.GlobalId ) + { + KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)l; -// msg_Dbg( &sys.demuxer, "| | | | + Track Video Display Unit=%s", -// uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) ); -// } + i_display_unit = uint8( vdmode ); + msg_Dbg( &sys.demuxer, "| | | | + Track Video Display Unit=%s", + uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) ); + } // else if( EbmlId( *l ) == KaxVideoAspectRatio::ClassInfos.GlobalId ) // { // KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)l; @@ -4408,15 +4593,26 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) // { // KaxVideoGamma &gamma = *(KaxVideoGamma*)l; -// msg_Dbg( &sys.demuxer, " | | | + fps=%f", float( gamma ) ); +// msg_Dbg( &sys.demuxer, " | | | + gamma=%f", float( gamma ) ); // } else { msg_Dbg( &sys.demuxer, "| | | | + Unknown (%s)", typeid(*l).name() ); } } - if ( tk->fmt.video.i_visible_height && tk->fmt.video.i_visible_width ) - tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * tk->fmt.video.i_visible_width / tk->fmt.video.i_visible_height; + if( i_display_height && i_display_width ) + tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * i_display_width / i_display_height; + if( i_crop_left || i_crop_right || i_crop_top || i_crop_bottom ) + { + tk->fmt.video.i_visible_width = tk->fmt.video.i_width; + tk->fmt.video.i_visible_height = tk->fmt.video.i_height; + tk->fmt.video.i_x_offset = i_crop_left; + tk->fmt.video.i_y_offset = i_crop_top; + tk->fmt.video.i_visible_width -= i_crop_left + i_crop_right; + tk->fmt.video.i_visible_height -= i_crop_top + i_crop_bottom; + } + /* FIXME: i_display_* allows you to not only set DAR, but also a zoom factor. + we do not support this atm */ } else if( MKV_IS_ID( l, KaxTrackAudio ) ) { @@ -4612,7 +4808,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) msg_Dbg( &sys.demuxer, "| | + family=%d", *(uint32*)uid->GetBuffer() ); } -#if defined( HAVE_GMTIME_R ) && !defined( SYS_DARWIN ) +#if defined( HAVE_GMTIME_R ) && !defined( __APPLE__ ) else if( MKV_IS_ID( l, KaxDateUTC ) ) { KaxDateUTC &date = *(KaxDateUTC*)l; @@ -4799,6 +4995,48 @@ void matroska_segment_c::ParseChapterAtom( int i_level, KaxChapterAtom *ca, chap } } +/***************************************************************************** + * ParseAttachments: + *****************************************************************************/ +void matroska_segment_c::ParseAttachments( KaxAttachments *attachments ) +{ + EbmlElement *el; + int i_upper_level = 0; + + attachments->Read( es, attachments->Generic().Context, i_upper_level, el, true ); + + KaxAttached *attachedFile = FindChild( *attachments ); + + while( attachedFile && ( attachedFile->GetSize() > 0 ) ) + { + std::string psz_mime_type = GetChild( *attachedFile ); + KaxFileName &file_name = GetChild( *attachedFile ); + KaxFileData &img_data = GetChild( *attachedFile ); + + attachment_c *new_attachment = new attachment_c(); + + if( new_attachment ) + { + new_attachment->psz_file_name = ToUTF8( UTFstring( file_name ) ); + new_attachment->psz_mime_type = psz_mime_type; + new_attachment->i_size = img_data.GetSize(); + new_attachment->p_data = malloc( img_data.GetSize() ); + + if( new_attachment->p_data ) + { + memcpy( new_attachment->p_data, img_data.GetBuffer(), img_data.GetSize() ); + sys.stored_attachments.push_back( new_attachment ); + } + else + { + delete new_attachment; + } + } + + attachedFile = &GetNextChild( *attachments, *attachedFile ); + } +} + /***************************************************************************** * ParseChapters: *****************************************************************************/ @@ -4819,7 +5057,7 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters ) if( MKV_IS_ID( l, KaxEditionEntry ) ) { chapter_edition_c *p_edition = new chapter_edition_c(); - + EbmlMaster *E = static_cast(l ); size_t j; msg_Dbg( &sys.demuxer, "| | + EditionEntry" ); @@ -4863,7 +5101,7 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters ) { stored_editions[i]->RefreshChapters( ); } - + if ( stored_editions.size() != 0 && stored_editions[i_default_edition]->b_ordered ) { /* update the duration of the segment according to the sum of all sub chapters */ @@ -4905,61 +5143,37 @@ void matroska_segment_c::ParseCluster( ) *****************************************************************************/ void matroska_segment_c::InformationCreate( ) { - size_t i_track; - sys.meta = vlc_meta_New(); if( psz_title ) { - vlc_meta_Add( sys.meta, VLC_META_TITLE, psz_title ); + vlc_meta_SetTitle( sys.meta, psz_title ); } if( psz_date_utc ) { - vlc_meta_Add( sys.meta, VLC_META_DATE, psz_date_utc ); + vlc_meta_SetDate( sys.meta, psz_date_utc ); } +#if 0 if( psz_segment_filename ) { - vlc_meta_Add( sys.meta, _("Segment filename"), psz_segment_filename ); + fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" ); } if( psz_muxing_application ) { - vlc_meta_Add( sys.meta, _("Muxing application"), psz_muxing_application ); + fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" ); } if( psz_writing_application ) { - vlc_meta_Add( sys.meta, _("Writing application"), psz_writing_application ); + fprintf( stderr, "***** WARNING: Unhandled meta - Use custom\n" ); } - for( i_track = 0; i_track < tracks.size(); i_track++ ) + for( size_t i_track = 0; i_track < tracks.size(); i_track++ ) { - mkv_track_t *tk = tracks[i_track]; - vlc_meta_t *mtk = vlc_meta_New(); - - sys.meta->track = (vlc_meta_t**)realloc( sys.meta->track, - sizeof( vlc_meta_t * ) * ( sys.meta->i_track + 1 ) ); - sys.meta->track[sys.meta->i_track++] = mtk; - - if( tk->fmt.psz_description ) - { - vlc_meta_Add( sys.meta, VLC_META_DESCRIPTION, tk->fmt.psz_description ); - } - if( tk->psz_codec_name ) - { - vlc_meta_Add( sys.meta, VLC_META_CODEC_NAME, tk->psz_codec_name ); - } - if( tk->psz_codec_settings ) - { - vlc_meta_Add( sys.meta, VLC_META_SETTING, tk->psz_codec_settings ); - } - if( tk->psz_codec_info_url ) - { - vlc_meta_Add( sys.meta, VLC_META_CODEC_DESCRIPTION, tk->psz_codec_info_url ); - } - if( tk->psz_codec_download_url ) - { - vlc_meta_Add( sys.meta, VLC_META_URL, tk->psz_codec_download_url ); - } +// mkv_track_t *tk = tracks[i_track]; +// vlc_meta_t *mtk = vlc_meta_New(); + fprintf( stderr, "***** WARNING: Unhandled child meta\n"); } +#endif if( i_tags_position >= 0 ) { @@ -5005,7 +5219,7 @@ void chapter_edition_c::RefreshChapters( ) int64_t chapter_item_c::RefreshChapters( bool b_ordered, int64_t i_prev_user_time ) { int64_t i_user_time = i_prev_user_time; - + // first the sub-chapters, and then ourself std::vector::iterator index = sub_chapters.begin(); while ( index != sub_chapters.end() ) @@ -5053,14 +5267,14 @@ int64_t chapter_item_c::RefreshChapters( bool b_ordered, int64_t i_prev_user_tim mtime_t chapter_edition_c::Duration() const { mtime_t i_result = 0; - + if ( sub_chapters.size() ) { std::vector::const_iterator index = sub_chapters.end(); index--; i_result = (*index)->i_user_end_time; } - + return i_result; } @@ -5079,8 +5293,8 @@ chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode, const cha if ( p_current == this ) b_found = true; - if ( i_user_timecode >= i_user_start_time && - ( i_user_timecode < i_user_end_time || + if ( i_user_timecode >= i_user_start_time && + ( i_user_timecode < i_user_end_time || ( i_user_start_time == i_user_end_time && i_user_timecode == i_user_end_time ))) { std::vector::iterator index = sub_chapters.begin(); @@ -5089,7 +5303,7 @@ chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode, const cha psz_result = (*index)->FindTimecode( i_user_timecode, p_current, b_found ); index++; } - + if ( psz_result == NULL ) psz_result = this; } @@ -5144,7 +5358,7 @@ void demux_sys_t::PreloadLinked( matroska_segment_c *p_segment ) virtual_segment_c *p_seg; p_current_segment = VirtualFromSegments( p_segment ); - + used_segments.push_back( p_current_segment ); // create all the other virtual segments of the family @@ -5277,23 +5491,31 @@ void demux_sys_t::JumpTo( virtual_segment_c & vsegment, chapter_item_c * p_chapt vsegment.Seek( demuxer, p_chapter->i_user_start_time, -1, p_chapter ); } } - + } bool matroska_segment_c::CompareSegmentUIDs( const matroska_segment_c * p_item_a, const matroska_segment_c * p_item_b ) { + EbmlBinary *p_tmp; + if ( p_item_a == NULL || p_item_b == NULL ) return false; - EbmlBinary * p_itema = (EbmlBinary *)(p_item_a->p_segment_uid); - if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid ) + p_tmp = (EbmlBinary *)p_item_a->p_segment_uid; + if ( p_item_b->p_prev_segment_uid != NULL + && *p_tmp == *p_item_b->p_prev_segment_uid ) return true; - p_itema = (EbmlBinary *)(&p_item_a->p_next_segment_uid); - if ( p_item_b->p_segment_uid != NULL && *p_itema == *p_item_b->p_segment_uid ) + p_tmp = (EbmlBinary *)p_item_a->p_next_segment_uid; + if ( !p_tmp ) + return false; + + if ( p_item_b->p_segment_uid != NULL + && *p_tmp == *p_item_b->p_segment_uid ) return true; - if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid ) + if ( p_item_b->p_prev_segment_uid != NULL + && *p_tmp == *p_item_b->p_prev_segment_uid ) return true; return false; @@ -5346,7 +5568,8 @@ bool matroska_segment_c::Preload( ) } else if( MKV_IS_ID( el, KaxAttachments ) ) { - msg_Dbg( &sys.demuxer, "| + Attachments FIXME (but probably never supported)" ); + msg_Dbg( &sys.demuxer, "| + Attachments" ); + ParseAttachments( static_cast( el ) ); } else if( MKV_IS_ID( el, KaxChapters ) ) { @@ -5378,10 +5601,10 @@ matroska_segment_c *demux_sys_t::FindSegment( const EbmlBinary & uid ) const return NULL; } -chapter_item_c *demux_sys_t::BrowseCodecPrivate( unsigned int codec_id, - bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), - const void *p_cookie, - size_t i_cookie_size, +chapter_item_c *demux_sys_t::BrowseCodecPrivate( unsigned int codec_id, + bool (*match)(const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size ), + const void *p_cookie, + size_t i_cookie_size, virtual_segment_c * &p_segment_found ) { chapter_item_c *p_result = NULL; @@ -5430,7 +5653,7 @@ size_t virtual_segment_c::AddSegment( matroska_segment_c *p_segment ) // check if it's not already in here for ( i=0; ip_segment_uid != NULL + if ( linked_segments[i]->p_segment_uid != NULL && p_segment->p_segment_uid != NULL && *p_segment->p_segment_uid == *linked_segments[i]->p_segment_uid ) return 0; @@ -5577,13 +5800,23 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) for( i_track = 0; i_track < tracks.size(); i_track++ ) { +#if LIBMATROSKA_VERSION >= 0x000800 + if( (simpleblock && tracks[i_track]->i_number == simpleblock->TrackNum()) || + (block && tracks[i_track]->i_number == block->TrackNum()) ) +#else if( tracks[i_track]->i_number == block->TrackNum() ) +#endif { break; } } - sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; +#if LIBMATROSKA_VERSION >= 0x000800 + if( simpleblock ) + sys.i_pts = (sys.i_chapter_time + simpleblock->GlobalTimecode()) / (mtime_t) 1000; + else +#endif + sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; if( i_track < tracks.size() ) { @@ -5607,7 +5840,7 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) BlockDecode( &sys.demuxer, block, sys.i_pts, 0, i_block_ref1 >= 0 || i_block_ref2 > 0 ); #endif } - } + } } delete block; @@ -5955,10 +6188,10 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si if ( !b_test_positive ) return false; } - + // strip the test command i_command &= 0xFF0F; - + switch ( i_command ) { case CMD_DVD_NOP: @@ -6188,7 +6421,7 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si case CMD_DVD_SET_GPRMMD: { msg_Dbg( &sys.demuxer, "Set GPRMMD [%d]=%d", (p_command[4] << 8) + p_command[5], (p_command[2] << 8) + p_command[3]); - + if ( !SetGPRM( (p_command[4] << 8) + p_command[5], (p_command[2] << 8) + p_command[3] ) ) msg_Dbg( &sys.demuxer, "Set GPRMMD failed" ); break; @@ -6196,7 +6429,7 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si case CMD_DVD_LINKPGCN: { uint16 i_pgcn = (p_command[6] << 8) + p_command[7]; - + msg_Dbg( &sys.demuxer, "Link PGCN(%d)", i_pgcn ); p_chapter = sys.p_current_segment->BrowseCodecPrivate( 1, MatchPgcNumber, &i_pgcn, 2 ); if ( p_chapter != NULL ) @@ -6212,7 +6445,7 @@ bool dvd_command_interpretor_c::Interpret( const binary * p_command, size_t i_si case CMD_DVD_LINKCN: { uint8 i_cn = p_command[7]; - + p_chapter = sys.p_current_segment->CurrentChapter(); msg_Dbg( &sys.demuxer, "LinkCN (cell %d)", i_cn ); @@ -6274,7 +6507,7 @@ bool dvd_command_interpretor_c::MatchVTSNumber( const chapter_codec_cmds_c &data { if ( i_cookie_size != 2 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 ) return false; - + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_SS || data.p_private_data->GetBuffer()[1] != 0x80 ) return false; @@ -6288,7 +6521,7 @@ bool dvd_command_interpretor_c::MatchVTSMNumber( const chapter_codec_cmds_c &dat { if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 ) return false; - + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_SS || data.p_private_data->GetBuffer()[1] != 0x40 ) return false; @@ -6302,7 +6535,7 @@ bool dvd_command_interpretor_c::MatchTitleNumber( const chapter_codec_cmds_c &da { if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 ) return false; - + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_TT ) return false; @@ -6316,7 +6549,7 @@ bool dvd_command_interpretor_c::MatchPgcType( const chapter_codec_cmds_c &data, { if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 8 ) return false; - + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC ) return false; @@ -6330,7 +6563,7 @@ bool dvd_command_interpretor_c::MatchPgcNumber( const chapter_codec_cmds_c &data { if ( i_cookie_size != 2 || data.p_private_data == NULL || data.p_private_data->GetSize() < 8 ) return false; - + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC ) return false; @@ -6344,7 +6577,7 @@ bool dvd_command_interpretor_c::MatchChapterNumber( const chapter_codec_cmds_c & { if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 2 ) return false; - + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PTT ) return false; @@ -6358,7 +6591,7 @@ bool dvd_command_interpretor_c::MatchCellNumber( const chapter_codec_cmds_c &dat { if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 5 ) return false; - + if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_CN ) return false; @@ -6400,7 +6633,7 @@ bool matroska_script_codec_c::Leave() return f_result; } -// see http://www.matroska.org/technical/specs/chapters/index.html#mscript +// see http://www.matroska.org/technical/specs/chapters/index.html#mscript // for a description of existing commands bool matroska_script_interpretor_c::Interpret( const binary * p_command, size_t i_size ) {