X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmkv.cpp;h=6a42e2000200a66ab5b280552992f43ad73c0af5;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=7a8ec5b9a8a636d30d54b2aa9705cf8a96e4ecf9;hpb=c89097c0f996e931f3cfc033042f688c5bf33980;p=vlc diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index 7a8ec5b9a8..6a42e20002 100644 --- a/modules/demux/mkv.cpp +++ b/modules/demux/mkv.cpp @@ -19,13 +19,12 @@ * * 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() */ #include @@ -33,11 +32,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 +61,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" @@ -84,6 +86,12 @@ #include "ebml/StdIOCallback.h" +#if LIBMATROSKA_VERSION < 0x000706 +START_LIBMATROSKA_NAMESPACE +extern const EbmlSemanticContext MATROSKA_DLL_API KaxMatroska_Context; +END_LIBMATROSKA_NAMESPACE +#endif + #include "vlc_keys.h" extern "C" { @@ -93,14 +101,17 @@ extern "C" { # include #endif -#define MATROSKA_COMPRESSION_NONE 0 -#define MATROSKA_COMPRESSION_ZLIB 1 +#define MATROSKA_COMPRESSION_NONE -1 +#define MATROSKA_COMPRESSION_ZLIB 0 +#define MATROSKA_COMPRESSION_BLIB 1 +#define MATROSKA_COMPRESSION_LZOX 2 +#define MATROSKA_COMPRESSION_HEADER 3 #define MKVD_TIMECODESCALE 1000000 //////////////////////////////////////////////////////////////////////////////////////////////////////////////// #undef ATTRIBUTE_PACKED -#undef PRAGMA_PACK_BEGIN +#undef PRAGMA_PACK_BEGIN #undef PRAGMA_PACK_END #if defined(__GNUC__) @@ -140,7 +151,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; @@ -149,7 +160,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; @@ -158,7 +169,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; @@ -170,7 +181,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; @@ -179,7 +190,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; @@ -188,7 +199,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; @@ -209,7 +220,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 */ @@ -230,8 +241,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 @@ -264,7 +275,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) */ @@ -272,19 +283,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 @@ -337,7 +348,7 @@ typedef struct { } ATTRIBUTE_PACKED btni_t; /** - * Highlight Information + * Highlight Information */ typedef struct { hl_gi_t hl_gi; @@ -396,6 +407,10 @@ vlc_module_begin(); N_("Chapter codecs"), N_("Use chapter codecs found in the segment."), VLC_TRUE ); + add_bool( "mkv-preload-local-dir", 1, NULL, + N_("Preload Directory"), + N_("Preload matroska files from the same family in the same directory (not good for broken files)."), VLC_TRUE ); + add_bool( "mkv-seek-percent", 0, NULL, N_("Seek based on percent not time"), N_("Seek based on percent not time."), VLC_TRUE ); @@ -464,7 +479,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 ) @@ -473,17 +488,17 @@ 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 ] = '+'; psz_foo2[ 4 * i_level + 1 ] = ' '; strcpy( &psz_foo2[ 4 * i_level + 2 ], psz_format ); - __msg_GenericVa( VLC_OBJECT(&demuxer), VLC_MSG_DBG, "mkv", psz_foo2, args ); + __msg_GenericVa( VLC_OBJECT(&demuxer), MSG_QUEUE_NORMAL, VLC_MSG_DBG, "mkv", psz_foo2, args ); free( psz_foo2 ); va_end( args ); } - + /***************************************************************************** * Stream managment *****************************************************************************/ @@ -556,6 +571,8 @@ static vlc_fourcc_t __GetFOURCC( uint8_t *p ) *****************************************************************************/ typedef struct { +// ~mkv_track_t(); + vlc_bool_t b_default; vlc_bool_t b_enabled; unsigned int i_number; @@ -567,12 +584,16 @@ typedef struct uint64_t i_default_duration; float f_timecodescale; + mtime_t i_last_dts; /* video */ es_format_t fmt; float f_fps; es_out_id_t *p_es; + /* audio */ + unsigned int i_original_rate; + vlc_bool_t b_inited; /* data to be send first */ int i_data_init; @@ -583,13 +604,14 @@ 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; + int i_compression_type; + KaxContentCompSettings *p_compression_data; } mkv_track_t; @@ -622,8 +644,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(); @@ -652,7 +674,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; } @@ -686,9 +708,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 ) @@ -720,7 +742,7 @@ public: } return false; } - + bool SetGPRM( size_t index, uint16 value ) { if ( index >= 0 && index < 16 ) @@ -777,7 +799,7 @@ protected: uint16 p_PRMs[256]; demux_sys_t & sys; - + // DVD command IDs // Tests @@ -790,7 +812,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; @@ -819,7 +841,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 ); @@ -853,10 +875,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; }; @@ -876,7 +898,7 @@ public: bool Leave(); protected: - matroska_script_interpretor_c interpretor; + matroska_script_interpretor_c interpretor; }; class chapter_translation_c @@ -932,14 +954,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; @@ -950,7 +972,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 ) @@ -969,12 +991,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; }; @@ -1017,21 +1039,18 @@ public: { for( size_t i_track = 0; i_track < tracks.size(); i_track++ ) { - if( tracks[i_track]->fmt.psz_description ) + if ( tracks[i_track]->p_compression_data ) { - free( tracks[i_track]->fmt.psz_description ); + delete tracks[i_track]->p_compression_data; } + es_format_Clean( &tracks[i_track]->fmt ); + if( tracks[i_track]->p_extra_data ) + free( tracks[i_track]->p_extra_data ); if( tracks[i_track]->psz_codec ) - { free( tracks[i_track]->psz_codec ); - } - if( tracks[i_track]->fmt.psz_language ) - { - free( tracks[i_track]->fmt.psz_language ); - } delete tracks[i_track]; } - + if( psz_writing_application ) { free( psz_writing_application ); @@ -1056,6 +1075,7 @@ public: free( p_indexes ); delete ep; + delete segment; delete p_segment_uid; delete p_prev_segment_uid; delete p_next_segment_uid; @@ -1072,6 +1092,12 @@ public: delete (*indext); indext++; } + std::vector::iterator indexf = families.begin(); + while ( indexf != families.end() ) + { + delete (*indexf); + indexf++; + } } KaxSegment *segment; @@ -1119,8 +1145,8 @@ public: int i_default_edition; std::vector translations; - std::vector families; - + std::vector families; + demux_sys_t & sys; EbmlParser *ep; bool b_preloaded; @@ -1128,6 +1154,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 ); @@ -1139,7 +1166,11 @@ public: void LoadTags( ); void InformationCreate( ); void Seek( mtime_t i_date, mtime_t i_time_offset ); - int BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ); +#if LIBMATROSKA_VERSION >= 0x000800 + int BlockGet( KaxBlock * &, KaxSimpleBlock * &, int64_t *, int64_t *, int64_t *); +#else + int BlockGet( KaxBlock * &, int64_t *, int64_t *, int64_t *); +#endif bool Select( mtime_t i_start_time ); void UnSelect( ); @@ -1212,9 +1243,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 ); @@ -1268,13 +1299,31 @@ 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: demux_sys_t( demux_t & demux ) :demuxer(demux) ,i_pts(0) - ,i_last_dts(0) ,i_start_pts(0) ,i_chapter_time(0) ,meta(NULL) @@ -1300,6 +1349,13 @@ 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; @@ -1327,17 +1383,17 @@ 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 ); void PreloadFamily( const matroska_segment_c & of_segment ); void PreloadLinked( matroska_segment_c *p_segment ); bool PreparePlayback( virtual_segment_c *p_new_segment ); - matroska_stream_c *AnalyseAllSegmentsFound( EbmlStream *p_estream, bool b_initial = false ); + matroska_stream_c *AnalyseAllSegmentsFound( demux_t *p_demux, EbmlStream *p_estream, bool b_initial = false ); void JumpTo( virtual_segment_c & p_segment, chapter_item_c * p_chapter ); void StartUiThread(); @@ -1387,8 +1443,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; @@ -1415,7 +1471,7 @@ static int Open( vlc_object_t * p_this ) return VLC_EGENERIC; } - p_stream = p_sys->AnalyseAllSegmentsFound( p_io_stream, true ); + p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_io_stream, true ); if( p_stream == NULL ) { msg_Err( p_demux, "cannot find KaxSegment" ); @@ -1440,81 +1496,107 @@ static int Open( vlc_object_t * p_this ) p_stream->p_in->setFilePointer( p_segment->cluster->GetElementPosition() ); } - /* get the files from the same dir from the same family (based on p_demux->psz_path) */ - if (p_demux->psz_path[0] != '\0' && !strcmp(p_demux->psz_access, "")) + if (config_GetInt( p_demux, "mkv-preload-local-dir" )) { - // assume it's a regular file - // get the directory path - s_path = p_demux->psz_path; - if (s_path.at(s_path.length() - 1) == DIRECTORY_SEPARATOR) + /* get the files from the same dir from the same family (based on p_demux->psz_path) */ + if (p_demux->psz_path[0] != '\0' && !strcmp(p_demux->psz_access, "")) { - s_path = s_path.substr(0,s_path.length()-1); - } - else - { - if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0) + // assume it's a regular file + // get the directory path + s_path = p_demux->psz_path; + if (s_path.at(s_path.length() - 1) == DIRECTORY_SEPARATOR) { - s_path = s_path.substr(0,s_path.find_last_of(DIRECTORY_SEPARATOR)); + s_path = s_path.substr(0,s_path.length()-1); + } + else + { + 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))) + if (p_src_dir != NULL) { - if (strlen(p_file_item->d_name) > 4) + char *psz_file; + while ((psz_file = utf8_readdir(p_src_dir)) != NULL) { - s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name; + if (strlen(psz_file) > 4) + { + s_filename = s_path + DIRECTORY_SEPARATOR + psz_file; - if (!s_filename.compare(p_demux->psz_path)) - continue; // don't reuse the original opened 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) || - !s_filename.compare("mka", 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") || - !s_filename.compare(s_filename.length() - 3, 3, "mka")) + 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 ) { - 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); + // test wether this file belongs to our family + 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); - p_stream = p_sys->AnalyseAllSegmentsFound( p_estream ); + p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_estream ); - if ( p_stream == NULL ) - { - msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() ); - delete p_estream; - delete p_file_io; + if ( p_stream == NULL ) + { + msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() ); + delete p_estream; + delete p_file_io; + } + else + { + p_stream->p_in = p_file_io; + p_stream->p_es = p_estream; + p_sys->streams.push_back( p_stream ); + } } else { - p_stream->p_in = p_file_io; - p_stream->p_es = p_estream; - p_sys->streams.push_back( p_stream ); + if( p_file_stream ) { + stream_Delete( p_file_stream ); + } + msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() ); } } - else - { - msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() ); - } } + free (psz_file); } + closedir( p_src_dir ); } - closedir( p_src_dir ); } + + p_sys->PreloadFamily( *p_segment ); } - p_sys->PreloadFamily( *p_segment ); p_sys->PreloadLinked( p_segment ); + if ( !p_sys->PreparePlayback( NULL ) ) { msg_Err( p_demux, "cannot use the segment" ); @@ -1522,7 +1604,7 @@ static int Open( vlc_object_t * p_this ) } p_sys->StartUiThread(); - + return VLC_SUCCESS; error: @@ -1552,13 +1634,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: @@ -1634,39 +1739,54 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } } +#if LIBMATROSKA_VERSION >= 0x000800 +int matroska_segment_c::BlockGet( KaxBlock * & pp_block, KaxSimpleBlock * & pp_simpleblock, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ) +#else int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration ) +#endif { +#if LIBMATROSKA_VERSION >= 0x000800 + pp_simpleblock = NULL; +#endif pp_block = NULL; *pi_ref1 = 0; *pi_ref2 = 0; for( ;; ) { - EbmlElement *el; + EbmlElement *el = NULL; int i_level; if ( ep == NULL ) return VLC_EGENERIC; - el = ep->Get(); - i_level = ep->GetLevel(); - - if( el == NULL && pp_block != NULL ) +#if LIBMATROSKA_VERSION >= 0x000800 + if( pp_simpleblock != NULL || ((el = ep->Get()) == NULL && pp_block != NULL) ) +#else + if( (el = ep->Get()) == NULL && pp_block != NULL ) +#endif { /* update the index */ #define idx p_indexes[i_index - 1] if( i_index > 0 && idx.i_time == -1 ) { - idx.i_time = (*pp_block).GlobalTimecode() / (mtime_t)1000; +#if LIBMATROSKA_VERSION >= 0x000800 + if ( pp_simpleblock != NULL ) + idx.i_time = pp_simpleblock->GlobalTimecode() / (mtime_t)1000; + else +#endif + idx.i_time = (*pp_block).GlobalTimecode() / (mtime_t)1000; idx.b_key = *pi_ref1 == 0 ? VLC_TRUE : VLC_FALSE; } #undef idx return VLC_SUCCESS; } + i_level = ep->GetLevel(); + if( el == NULL ) { - if( ep->GetLevel() > 1 ) + if( i_level > 1 ) { ep->Up(); continue; @@ -1726,6 +1846,15 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64 i_block_pos = el->GetElementPosition(); ep->Down(); } +#if LIBMATROSKA_VERSION >= 0x000800 + else if( MKV_IS_ID( el, KaxSimpleBlock ) ) + { + pp_simpleblock = (KaxSimpleBlock*)el; + + pp_simpleblock->ReadData( es.I_O() ); + pp_simpleblock->SetParent( *cluster ); + } +#endif break; case 3: if( MKV_IS_ID( el, KaxBlock ) ) @@ -1753,7 +1882,7 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64 { *pi_ref1 = int64( ref ) * cluster->GlobalTimecodeScale(); } - else + else if( *pi_ref2 == 0 ) { *pi_ref2 = int64( ref ) * cluster->GlobalTimecodeScale(); } @@ -1780,17 +1909,22 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64 } } -static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, int i_mem) +static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, int i_mem, size_t offset) { block_t *p_block; - if( !(p_block = block_New( p_demux, i_mem ) ) ) return NULL; - memcpy( p_block->p_buffer, p_mem, i_mem ); + if( !(p_block = block_New( p_demux, i_mem + offset ) ) ) return NULL; + memcpy( p_block->p_buffer + offset, p_mem, i_mem ); //p_block->i_rate = p_input->stream.control.i_rate; return p_block; } +#if LIBMATROSKA_VERSION >= 0x000800 +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, - mtime_t i_duration ) + mtime_t i_duration, bool f_mandatory ) +#endif { demux_sys_t *p_sys = p_demux->p_sys; matroska_segment_c *p_segment = p_sys->p_current_segment->Segment(); @@ -1802,7 +1936,12 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, #define tk p_segment->tracks[i_track] for( i_track = 0; i_track < p_segment->tracks.size(); i_track++ ) { +#if LIBMATROSKA_VERSION >= 0x000800 + if( (block != NULL && tk->i_number == block->TrackNum()) || + (simpleblock != NULL && tk->i_number == simpleblock->TrackNum())) +#else if( tk->i_number == block->TrackNum() ) +#endif { break; } @@ -1810,12 +1949,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 ) @@ -1841,18 +1980,37 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, block_t *p_init; msg_Dbg( p_demux, "sending header (%d bytes)", tk->i_data_init ); - p_init = MemToBlock( p_demux, tk->p_data_init, tk->i_data_init ); + p_init = MemToBlock( p_demux, tk->p_data_init, tk->i_data_init, 0 ); if( p_init ) es_out_Send( p_demux->out, tk->p_es, p_init ); } tk->b_inited = VLC_TRUE; +#if LIBMATROSKA_VERSION >= 0x000800 + for( i = 0; + (block != NULL && i < block->NumberFrames()) || (simpleblock != NULL && i < simpleblock->NumberFrames()); + i++ ) +#else for( i = 0; i < block->NumberFrames(); i++ ) +#endif { block_t *p_block; - DataBuffer &data = block->GetBuffer(i); + DataBuffer *data; +#if LIBMATROSKA_VERSION >= 0x000800 + if ( simpleblock != NULL ) + { + data = &simpleblock->GetBuffer(i); + // condition when the DTS is correct (keyframe or B frame == NOT P frame) + f_mandatory = simpleblock->IsDiscardable() || simpleblock->IsKeyframe(); + } + else +#endif + data = &block->GetBuffer(i); - p_block = MemToBlock( p_demux, data.Buffer(), data.Size() ); + if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER && tk->p_compression_data != NULL ) + p_block = MemToBlock( p_demux, data->Buffer(), data->Size(), tk->p_compression_data->GetSize() ); + else + p_block = MemToBlock( p_demux, data->Buffer(), data->Size(), 0 ); if( p_block == NULL ) { @@ -1860,11 +2018,16 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, } #if defined(HAVE_ZLIB_H) - if( tk->i_compression_type ) + if( tk->i_compression_type == MATROSKA_COMPRESSION_ZLIB ) { p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block ); } + else #endif + if( tk->i_compression_type == MATROSKA_COMPRESSION_HEADER ) + { + memcpy( p_block->p_buffer, tk->p_compression_data->GetBuffer(), tk->p_compression_data->GetSize() ); + } if ( tk->fmt.i_cat == NAV_ES ) { @@ -1889,14 +2052,21 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, { if( !strcmp( tk->psz_codec, "V_MS/VFW/FOURCC" ) ) { + // in VFW we have no idea about B frames p_block->i_pts = 0; + p_block->i_dts = i_pts; } else { p_block->i_pts = 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 + (mtime_t)(tk->i_default_duration >> 10)); + p_sys->i_pts = p_block->i_dts; } - p_block->i_dts = p_sys->i_pts; } + tk->i_last_dts = p_block->i_dts; #if 0 msg_Dbg( p_demux, "block i_dts: "I64Fd" / i_pts: "I64Fd, p_block->i_dts, p_block->i_pts); @@ -1915,7 +2085,7 @@ msg_Dbg( p_demux, "block i_dts: "I64Fd" / i_pts: "I64Fd, p_block->i_dts, p_block #undef tk } -matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream, bool b_initial ) +matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlStream *p_estream, bool b_initial ) { int i_upper_lvl = 0; size_t i; @@ -1926,11 +2096,38 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream, p_l0 = p_estream->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFL); if (p_l0 == NULL) { + msg_Err( p_demux, "No EBML header found" ); + return NULL; + } + + // verify we can read this Segment, we only support Matroska version 1 for now + p_l0->Read(*p_estream, EbmlHead::ClassInfos.Context, i_upper_lvl, p_l0, true); + + EDocType doc_type = GetChild(*static_cast(p_l0)); + if (std::string(doc_type) != "matroska") + { + msg_Err( p_demux, "Not a Matroska file : DocType = %s ", std::string(doc_type).c_str()); return NULL; } - p_l0->SkipData(*p_estream, KaxMatroska_Context); + + EDocTypeReadVersion doc_read_version = GetChild(*static_cast(p_l0)); +#if LIBMATROSKA_VERSION >= 0x000800 + if (uint64(doc_read_version) > 2) + { + msg_Err( p_demux, "This matroska file is needs version "I64Fd" and this VLC only supports version 1 & 2", uint64(doc_read_version)); + return NULL; + } +#else + if (uint64(doc_read_version) != 1) + { + msg_Err( p_demux, "This matroska file is needs version "I64Fd" and this VLC only supports version 1", uint64(doc_read_version)); + return NULL; + } +#endif + delete p_l0; + // find all segments in this file p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFFLL); if (p_l0 == NULL) @@ -1985,7 +2182,7 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream, else if( MKV_IS_ID( l, KaxSegmentFamily ) ) { KaxSegmentFamily *p_fam = new KaxSegmentFamily( *static_cast(l) ); - p_segment1->families.push_back( *p_fam ); + p_segment1->families.push_back( p_fam ); } } break; @@ -1997,7 +2194,10 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream, p_stream1->segments.push_back( p_segment1 ); } else + { + p_segment1->segment = NULL; delete p_segment1; + } } if (p_l0->IsFiniteSize() ) { @@ -2062,23 +2262,93 @@ 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_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" ) ) { @@ -2187,7 +2457,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) else if( !strncmp( tracks[i_track]->psz_codec, "A_AAC/MPEG2/", strlen( "A_AAC/MPEG2/" ) ) || !strncmp( tracks[i_track]->psz_codec, "A_AAC/MPEG4/", strlen( "A_AAC/MPEG4/" ) ) ) { - int i_profile, i_srate; + int i_profile, i_srate, sbr = 0; static unsigned int i_sample_rates[] = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, @@ -2209,6 +2479,11 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) { i_profile = 2; } + else if( !strcmp( &tracks[i_track]->psz_codec[12], "LC/SBR" ) ) + { + i_profile = 1; + sbr = 1; + } else { i_profile = 3; @@ -2216,17 +2491,49 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) for( i_srate = 0; i_srate < 13; i_srate++ ) { - if( i_sample_rates[i_srate] == tracks[i_track]->fmt.audio.i_rate ) + if( i_sample_rates[i_srate] == tracks[i_track]->i_original_rate ) { break; } } msg_Dbg( &sys.demuxer, "profile=%d srate=%d", i_profile, i_srate ); - tracks[i_track]->fmt.i_extra = 2; + tracks[i_track]->fmt.i_extra = sbr ? 5 : 2; tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->fmt.i_extra ); ((uint8_t*)tracks[i_track]->fmt.p_extra)[0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1); ((uint8_t*)tracks[i_track]->fmt.p_extra)[1] = ((i_srate & 0x1) << 7) | (tracks[i_track]->fmt.audio.i_channels << 3); + if (sbr != 0) + { + int syncExtensionType = 0x2B7; + int iDSRI; + for (iDSRI=0; iDSRI<13; iDSRI++) + if( i_sample_rates[iDSRI] == tracks[i_track]->fmt.audio.i_rate ) + break; + ((uint8_t*)tracks[i_track]->fmt.p_extra)[2] = (syncExtensionType >> 3) & 0xFF; + ((uint8_t*)tracks[i_track]->fmt.p_extra)[3] = ((syncExtensionType & 0x7) << 5) | 5; + ((uint8_t*)tracks[i_track]->fmt.p_extra)[4] = ((1 & 0x1) << 7) | (iDSRI << 3); + } + } + else if( !strcmp( tracks[i_track]->psz_codec, "A_AAC" ) ) + { + tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); + 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_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" ) || @@ -2242,23 +2549,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" ) || @@ -2266,6 +2572,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" ) ) { @@ -2276,7 +2588,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 ) @@ -2307,9 +2619,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 ); @@ -2352,8 +2676,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 ); @@ -2381,7 +2704,10 @@ int demux_sys_t::EventMouse( vlc_object_t *p_this, char const *psz_var, event_thread_t *p_ev = (event_thread_t *) p_data; vlc_mutex_lock( &p_ev->lock ); if( psz_var[6] == 'c' ) + { p_ev->b_clicked = VLC_TRUE; + msg_Dbg( p_this, "Event Mouse: clicked"); + } else if( psz_var[6] == 'm' ) p_ev->b_moved = VLC_TRUE; vlc_mutex_unlock( &p_ev->lock ); @@ -2396,6 +2722,7 @@ int demux_sys_t::EventKey( vlc_object_t *p_this, char const *psz_var, vlc_mutex_lock( &p_ev->lock ); p_ev->b_key = VLC_TRUE; vlc_mutex_unlock( &p_ev->lock ); + msg_Dbg( p_this, "Event Key"); return VLC_SUCCESS; } @@ -2411,7 +2738,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 ) @@ -2429,14 +2756,16 @@ 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"); + vlc_mutex_lock( &p_ev->lock ); 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 ) @@ -2543,7 +2872,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]; @@ -2581,18 +2910,20 @@ int demux_sys_t::EventThread( vlc_object_t *p_this ) int32_t best,dist,d; int32_t mx,my,dx,dy; + msg_Dbg( p_ev->p_demux, "Handle Mouse Event: Mouse clicked x(%d)*y(%d)", (unsigned)valx.i_int, (unsigned)valy.i_int); + b_activated = VLC_TRUE; // 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; @@ -2709,7 +3040,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 ); @@ -2827,7 +3158,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; @@ -2856,9 +3187,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 @@ -2885,9 +3216,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 @@ -2898,7 +3229,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(); @@ -2909,7 +3240,7 @@ chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id, return p_result; index2++; } - + return p_result; } @@ -3147,14 +3478,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 */ @@ -3172,7 +3503,13 @@ static int Demux( demux_t *p_demux) int64_t i_block_ref1; int64_t i_block_ref2; +#if LIBMATROSKA_VERSION >= 0x000800 + KaxSimpleBlock *simpleblock; + + if( p_segment->BlockGet( block, simpleblock, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) +#else if( p_segment->BlockGet( block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) +#endif { if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered ) { @@ -3184,7 +3521,7 @@ static int Demux( demux_t *p_demux) if ( p_chap->i_user_start_time == p_chap->i_user_start_time ) p_vsegment->SelectNext(); */ - p_sys->i_last_dts = p_sys->i_pts = p_chap->i_user_end_time; + p_sys->i_pts = p_chap->i_user_end_time; p_sys->i_pts++; // trick to avoid staying on segments with no duration and no content i_return = 1; @@ -3196,7 +3533,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 */ @@ -3214,43 +3551,35 @@ static int Demux( demux_t *p_demux) } } - mtime_t i_pts, i_dts; - - mtime_t i_time = block->GlobalTimecode(); - if ( i_block_ref1 != 0 ) - i_time += min( 0, i_block_ref1 ); - if ( i_block_ref2 != 0 ) - i_time += min( 0, i_block_ref2 ); - - i_pts = (p_sys->i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; - i_dts = (p_sys->i_chapter_time + i_time) / (mtime_t) 1000; - - if ( i_dts != i_pts && p_sys->i_last_dts >= i_dts ) - p_sys->i_last_dts += 200; +#if LIBMATROSKA_VERSION >= 0x000800 + if ( simpleblock != NULL ) + p_sys->i_pts = (p_sys->i_chapter_time + simpleblock->GlobalTimecode()) / (mtime_t) 1000; else - p_sys->i_last_dts = i_dts; - - p_sys->i_pts = i_pts; +#endif + p_sys->i_pts = (p_sys->i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; if( p_sys->i_pts >= p_sys->i_start_pts ) { es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts ); - } - if( i_pts >= p_sys->i_start_pts ) if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) ) { i_return = 1; + delete block; 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() ) + { + delete block; break; + } p_segment->UnSelect( ); - + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); /* switch to the next segment */ @@ -3258,12 +3587,18 @@ static int Demux( demux_t *p_demux) if ( !p_segment->Select( 0 ) ) { msg_Err( p_demux, "Failed to select new segment" ); + delete block; break; } + delete block; continue; } - BlockDecode( p_demux, block, i_pts, i_block_duration ); +#if LIBMATROSKA_VERSION >= 0x000800 + BlockDecode( p_demux, block, simpleblock, p_sys->i_pts, i_block_duration, i_block_ref1 >= 0 || i_block_ref2 > 0 ); +#else + BlockDecode( p_demux, block, p_sys->i_pts, i_block_duration, i_block_ref1 >= 0 || i_block_ref2 > 0 ); +#endif delete block; i_block_count++; @@ -3846,13 +4181,13 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { size_t i, j, k, n; + bool bSupported = true; mkv_track_t *tk; msg_Dbg( &sys.demuxer, "| | + Track Entry" ); tk = new mkv_track_t(); - tracks.push_back( tk ); /* Init the track */ memset( tk, 0, sizeof( mkv_track_t ) ); @@ -3879,8 +4214,9 @@ 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; for( i = 0; i < m->ListSize(); i++ ) { @@ -3901,7 +4237,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) ) @@ -3988,6 +4324,8 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxTrackLanguage &lang = *(KaxTrackLanguage*)l; + if ( tk->fmt.psz_language != NULL ) + free( tk->fmt.psz_language ); tk->fmt.psz_language = strdup( string( lang ).c_str() ); msg_Dbg( &sys.demuxer, "| | | + Track Language=`%s'", tk->fmt.psz_language ); @@ -4022,6 +4360,11 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { EbmlMaster *cencs = static_cast(l); MkvTree( sys.demuxer, 3, "Content Encodings" ); + if ( cencs->ListSize() > 1 ) + { + msg_Err( &sys.demuxer, "Multiple Compression method not supported" ); + bSupported = false; + } for( j = 0; j < cencs->ListSize(); j++ ) { EbmlElement *l2 = (*cencs)[j]; @@ -4058,31 +4401,35 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxContentCompAlgo &compalg = *(KaxContentCompAlgo*)l4; MkvTree( sys.demuxer, 6, "Compression Algorithm: %i", uint32(compalg) ); - if( uint32( compalg ) == 0 ) + tk->i_compression_type = uint32( compalg ); + if ( ( tk->i_compression_type != MATROSKA_COMPRESSION_ZLIB ) && + ( tk->i_compression_type != MATROSKA_COMPRESSION_HEADER ) ) { - tk->i_compression_type = MATROSKA_COMPRESSION_ZLIB; + msg_Err( &sys.demuxer, "Track Compression method %d not supported", tk->i_compression_type ); + bSupported = false; } } + else if( MKV_IS_ID( l4, KaxContentCompSettings ) ) + { + tk->p_compression_data = new KaxContentCompSettings( *(KaxContentCompSettings*)l4 ); + } else { MkvTree( sys.demuxer, 6, "Unknown (%s)", typeid(*l4).name() ); } } } - 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 ) // { @@ -4121,13 +4468,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; - + tk->fmt.video.i_frame_rate = 1000000; + for( j = 0; j < tkv->ListSize(); j++ ) { EbmlElement *l = (*tkv)[j]; @@ -4148,30 +4497,58 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)l; - tk->fmt.video.i_width = uint16( vwidth ); + tk->fmt.video.i_width += uint16( vwidth ); msg_Dbg( &sys.demuxer, "| | | | + width=%d", uint16( vwidth ) ); } else if( MKV_IS_ID( l, KaxVideoPixelHeight ) ) { KaxVideoPixelWidth &vheight = *(KaxVideoPixelWidth*)l; - tk->fmt.video.i_height = uint16( vheight ); + tk->fmt.video.i_height += uint16( vheight ); msg_Dbg( &sys.demuxer, "| | | | + height=%d", uint16( vheight ) ); } else if( MKV_IS_ID( l, KaxVideoDisplayWidth ) ) { 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; + + 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; + + 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; + + 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; + + i_crop_left = uint16( cropval ); + msg_Dbg( &sys.demuxer, "| | | | + crop pixel left=%d", uint16( cropval ) ); + } else if( MKV_IS_ID( l, KaxVideoFrameRate ) ) { KaxVideoFrameRate &vfps = *(KaxVideoFrameRate*)l; @@ -4179,13 +4556,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; @@ -4196,15 +4574,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 ) ) { @@ -4221,9 +4610,16 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) { KaxAudioSamplingFreq &afreq = *(KaxAudioSamplingFreq*)l; - tk->fmt.audio.i_rate = (int)float( afreq ); + tk->i_original_rate = tk->fmt.audio.i_rate = (int)float( afreq ); msg_Dbg( &sys.demuxer, "| | | | + afreq=%d", tk->fmt.audio.i_rate ); } + else if( MKV_IS_ID( l, KaxAudioOutputSamplingFreq ) ) + { + KaxAudioOutputSamplingFreq &afreq = *(KaxAudioOutputSamplingFreq*)l; + + tk->fmt.audio.i_rate = (int)float( afreq ); + msg_Dbg( &sys.demuxer, "| | | | + aoutfreq=%d", tk->fmt.audio.i_rate ); + } else if( MKV_IS_ID( l, KaxAudioChannels ) ) { KaxAudioChannels &achan = *(KaxAudioChannels*)l; @@ -4250,6 +4646,16 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) typeid(*l).name() ); } } + + if ( bSupported ) + { + tracks.push_back( tk ); + } + else + { + msg_Err( &sys.demuxer, "Track Entry %d not supported", tk->i_number ); + delete tk; + } } /***************************************************************************** @@ -4303,19 +4709,22 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) if( MKV_IS_ID( l, KaxSegmentUID ) ) { - p_segment_uid = new KaxSegmentUID(*static_cast(l)); + if ( p_segment_uid == NULL ) + p_segment_uid = new KaxSegmentUID(*static_cast(l)); msg_Dbg( &sys.demuxer, "| | + UID=%d", *(uint32*)p_segment_uid->GetBuffer() ); } else if( MKV_IS_ID( l, KaxPrevUID ) ) { - p_prev_segment_uid = new KaxPrevUID(*static_cast(l)); + if ( p_prev_segment_uid == NULL ) + p_prev_segment_uid = new KaxPrevUID(*static_cast(l)); msg_Dbg( &sys.demuxer, "| | + PrevUID=%d", *(uint32*)p_prev_segment_uid->GetBuffer() ); } else if( MKV_IS_ID( l, KaxNextUID ) ) { - p_next_segment_uid = new KaxNextUID(*static_cast(l)); + if ( p_next_segment_uid == NULL ) + p_next_segment_uid = new KaxNextUID(*static_cast(l)); msg_Dbg( &sys.demuxer, "| | + NextUID=%d", *(uint32*)p_next_segment_uid->GetBuffer() ); } @@ -4376,11 +4785,11 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) { KaxSegmentFamily *uid = static_cast(l); - families.push_back(*uid); + families.push_back( new KaxSegmentFamily(*uid) ); 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; @@ -4493,10 +4902,12 @@ void matroska_segment_c::ParseChapterAtom( int i_level, KaxChapterAtom *ca, chap for (k = 0; k < i_level; k++) chapters.psz_name += '+'; chapters.psz_name += ' '; - chapters.psz_name += ToUTF8( UTFstring( name ) ); + char *psz_tmp_utf8 = ToUTF8( UTFstring( name ) ); + chapters.psz_name += psz_tmp_utf8; chapters.b_user_display = true; - msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", ToUTF8(UTFstring(name)) ); + msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", psz_tmp_utf8 ); + free( psz_tmp_utf8 ); } else if( MKV_IS_ID( l, KaxChapterLanguage ) ) { @@ -4565,6 +4976,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: *****************************************************************************/ @@ -4585,7 +5038,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" ); @@ -4629,7 +5082,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 */ @@ -4671,61 +5124,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 ) { @@ -4771,7 +5200,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() ) @@ -4819,14 +5248,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; } @@ -4845,8 +5274,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(); @@ -4855,7 +5284,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; } @@ -4895,7 +5324,7 @@ bool matroska_segment_c::PreloadFamily( const matroska_segment_c & of_segment ) { for (size_t j=0; jpsz_name == NULL ) { - sz_name = N_("Segment "); + sz_name = N_("Segment"); char psz_str[6]; - sprintf( psz_str, "%d", (int)i ); + sprintf( psz_str, " %d", (int)i ); sz_name += psz_str; p_title->psz_name = strdup( sz_name.c_str() ); } @@ -5043,23 +5472,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; @@ -5083,6 +5520,11 @@ bool matroska_segment_c::Preload( ) else if( MKV_IS_ID( el, KaxTracks ) ) { ParseTracks( static_cast( el ) ); + if ( tracks.size() == 0 ) + { + msg_Err( &sys.demuxer, "No tracks supported" ); + return false; + } } else if( MKV_IS_ID( el, KaxSeekHead ) ) { @@ -5107,7 +5549,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 ) ) { @@ -5139,10 +5582,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; @@ -5191,7 +5634,9 @@ 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 == *linked_segments[i]->p_segment_uid ) + 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; } @@ -5262,6 +5707,9 @@ void virtual_segment_c::AppendUID( const EbmlBinary * p_UID ) void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) { KaxBlock *block; +#if LIBMATROSKA_VERSION >= 0x000800 + KaxSimpleBlock *simpleblock; +#endif int i_track_skipping; int64_t i_block_duration; int64_t i_block_ref1; @@ -5319,7 +5767,11 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) while( i_track_skipping > 0 ) { +#if LIBMATROSKA_VERSION >= 0x000800 + if( BlockGet( block, simpleblock, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) +#else if( BlockGet( block, &i_block_ref1, &i_block_ref2, &i_block_duration ) ) +#endif { msg_Warn( &sys.demuxer, "cannot get block EOF?" ); @@ -5329,13 +5781,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_last_dts = 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() ) { @@ -5353,9 +5815,13 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) } if( !tracks[i_track]->b_search_keyframe ) { - BlockDecode( &sys.demuxer, block, sys.i_pts, 0 ); +#if LIBMATROSKA_VERSION >= 0x000800 + BlockDecode( &sys.demuxer, block, simpleblock, sys.i_pts, 0, i_block_ref1 >= 0 || i_block_ref2 > 0 ); +#else + BlockDecode( &sys.demuxer, block, sys.i_pts, 0, i_block_ref1 >= 0 || i_block_ref2 > 0 ); +#endif } - } + } } delete block; @@ -5703,10 +6169,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: @@ -5936,7 +6402,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; @@ -5944,7 +6410,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 ) @@ -5960,7 +6426,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 ); @@ -6022,7 +6488,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; @@ -6036,7 +6502,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; @@ -6050,7 +6516,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; @@ -6064,7 +6530,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; @@ -6078,7 +6544,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; @@ -6092,7 +6558,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; @@ -6106,7 +6572,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; @@ -6148,7 +6614,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 ) {