*
* 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 <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
+/* config.h may include inttypes.h, so make sure we define that option
+ * early enough. */
+#define __STDC_FORMAT_MACROS 1
+#define __STDC_CONSTANT_MACROS 1
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <inttypes.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#ifdef HAVE_TIME_H
# include <time.h> /* time() */
#endif
-#include <vlc/input.h>
-#include <codecs.h> /* BITMAPINFOHEADER, WAVEFORMATEX */
-#include "iso_lang.h"
+#include <vlc_codecs.h> /* BITMAPINFOHEADER, WAVEFORMATEX */
+#include <vlc_iso_lang.h>
#include "vlc_meta.h"
+#include <vlc_charset.h>
+#include <vlc_input.h>
+#include <vlc_demux.h>
#include <iostream>
#include <cassert>
#include "ebml/StdIOCallback.h"
#include "matroska/KaxAttachments.h"
+#include "matroska/KaxAttached.h"
#include "matroska/KaxBlock.h"
#include "matroska/KaxBlockData.h"
#include "matroska/KaxChapters.h"
#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" {
# include <zlib.h>
#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__)
#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;
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;
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;
#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;
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;
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;
#define COMMAND_DATA_SIZE 8
/**
- * PCI General Information
+ * PCI General Information
*/
typedef struct {
uint32_t nv_pck_lbn; /**< sector address of this nav pack */
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
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) */
} 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
} ATTRIBUTE_PACKED btni_t;
/**
- * Highlight Information
+ * Highlight Information
*/
typedef struct {
hl_gi_t hl_gi;
vlc_module_begin();
set_shortname( "Matroska" );
- set_description( _("Matroska stream demuxer" ) );
- set_capability( "demux2", 50 );
+ set_description( N_("Matroska stream demuxer" ) );
+ set_capability( "demux", 50 );
set_callbacks( Open, Close );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
add_bool( "mkv-use-ordered-chapters", 1, NULL,
N_("Ordered chapters"),
- N_("Play ordered chapters as specified in the segment."), VLC_TRUE );
+ N_("Play ordered chapters as specified in the segment."), true );
add_bool( "mkv-use-chapter-codec", 1, NULL,
N_("Chapter codecs"),
- N_("Use chapter codecs found in the segment."), VLC_TRUE );
+ N_("Use chapter codecs found in the segment."), 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)."), true );
add_bool( "mkv-seek-percent", 0, NULL,
- N_("Seek based on percent not time."),
- N_("Seek based on percent not time."), VLC_TRUE );
+ N_("Seek based on percent not time"),
+ N_("Seek based on percent not time."), true );
add_bool( "mkv-use-dummy", 0, NULL,
N_("Dummy Elements"),
- N_("Read and discard unknown EBML elements (not good for broken files)."), VLC_TRUE );
+ N_("Read and discard unknown EBML elements (not good for broken files)."), true );
add_shortcut( "mka" );
add_shortcut( "mkv" );
/**
* 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 )
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),VLC_MSG_DBG, "mkv", psz_foo2, args );
free( psz_foo2 );
va_end( args );
}
-
+
/*****************************************************************************
* Stream managment
*****************************************************************************/
{
private:
stream_t *s;
- vlc_bool_t mb_eof;
- vlc_bool_t b_owner;
+ bool mb_eof;
+ bool b_owner;
public:
- vlc_stream_io_callback( stream_t *, vlc_bool_t );
+ vlc_stream_io_callback( stream_t *, bool );
virtual ~vlc_stream_io_callback()
{
EbmlElement *m_got;
int mi_user_level;
- vlc_bool_t mb_keep;
- vlc_bool_t mb_dummy;
+ bool mb_keep;
+ bool mb_dummy;
};
*****************************************************************************/
typedef struct
{
- vlc_bool_t b_default;
- vlc_bool_t b_enabled;
+// ~mkv_track_t();
+
+ bool b_default;
+ bool b_enabled;
unsigned int i_number;
int i_extra_data;
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;
- vlc_bool_t b_inited;
+ /* audio */
+ unsigned int i_original_rate;
+
+ bool b_inited;
/* data to be send first */
int i_data_init;
uint8_t *p_data_init;
/* hack : it's for seek */
- vlc_bool_t b_search_keyframe;
- vlc_bool_t b_silent;
+ bool b_search_keyframe;
+ bool 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;
int64_t i_position;
int64_t i_time;
- vlc_bool_t b_key;
+ bool b_key;
} mkv_index_t;
class demux_sys_t;
,i_codec_id( codec_id )
,sys( demuxer )
{}
-
- virtual ~chapter_codec_cmds_c()
+
+ virtual ~chapter_codec_cmds_c()
{
delete p_private_data;
std::vector<KaxChapterProcessData*>::iterator indexe = enter_cmds.begin();
}
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; }
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 )
}
return false;
}
-
+
bool SetGPRM( size_t index, uint16 value )
{
if ( index >= 0 && index < 16 )
uint16 p_PRMs[256];
demux_sys_t & sys;
-
+
// DVD command IDs
// Tests
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;
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 );
{}
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;
};
bool Leave();
protected:
- matroska_script_interpretor_c interpretor;
+ matroska_script_interpretor_c interpretor;
};
class chapter_translation_c
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<chapter_item_c*> sub_chapters;
std::string psz_name;
chapter_item_c *psz_parent;
bool b_is_leaving;
-
+
std::vector<chapter_codec_cmds_c*> codecs;
- bool operator<( const chapter_item_c & item ) const
+ static bool CompareTimecode( const chapter_item_c * itemA, const chapter_item_c * itemB )
{
- return ( i_user_start_time < item.i_user_start_time || (i_user_start_time == item.i_user_start_time && i_user_end_time < item.i_user_end_time) );
+ return ( itemA->i_user_start_time < itemB->i_user_start_time || (itemA->i_user_start_time == itemB->i_user_start_time && itemA->i_user_end_time < itemB->i_user_end_time) );
}
bool Enter( bool b_do_subchapters );
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;
};
,p_segment_uid(NULL)
,p_prev_segment_uid(NULL)
,p_next_segment_uid(NULL)
- ,b_cues(VLC_FALSE)
+ ,b_cues(false)
,i_index(0)
,i_index_max(1024)
,psz_muxing_application(NULL)
{
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;
}
-/* 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 );
- }*/
+ es_format_Clean( &tracks[i_track]->fmt );
+ free( tracks[i_track]->p_extra_data );
+ free( tracks[i_track]->psz_codec );
delete tracks[i_track];
}
-
- if( psz_writing_application )
- {
- free( psz_writing_application );
- }
- if( psz_muxing_application )
- {
- free( psz_muxing_application );
- }
- if( psz_segment_filename )
- {
- free( psz_segment_filename );
- }
- if( psz_title )
- {
- free( psz_title );
- }
- if( psz_date_utc )
- {
- free( psz_date_utc );
- }
- if ( p_indexes )
- free( p_indexes );
+
+ free( psz_writing_application );
+ free( psz_muxing_application );
+ free( psz_segment_filename );
+ free( psz_title );
+ free( psz_date_utc );
+ free( p_indexes );
delete ep;
+ delete segment;
delete p_segment_uid;
delete p_prev_segment_uid;
delete p_next_segment_uid;
delete (*indext);
indext++;
}
+ std::vector<KaxSegmentFamily*>::iterator indexf = families.begin();
+ while ( indexf != families.end() )
+ {
+ delete (*indexf);
+ indexf++;
+ }
}
KaxSegment *segment;
KaxPrevUID *p_prev_segment_uid;
KaxNextUID *p_next_segment_uid;
- vlc_bool_t b_cues;
+ bool b_cues;
int i_index;
int i_index_max;
mkv_index_t *p_indexes;
int i_default_edition;
std::vector<chapter_translation_c*> translations;
- std::vector<KaxSegmentFamily> families;
-
+ std::vector<KaxSegmentFamily*> families;
+
demux_sys_t & sys;
EbmlParser *ep;
bool b_preloaded;
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 );
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( );
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 );
demux_t *p_demux;
vlc_mutex_t lock;
- vlc_bool_t b_moved;
- vlc_bool_t b_clicked;
- vlc_bool_t b_key;
+ bool b_moved;
+ bool b_clicked;
+ int i_key_action;
} event_thread_t;
+
+class attachment_c
+{
+public:
+ attachment_c()
+ :p_data(NULL)
+ ,i_size(0)
+ {}
+ virtual ~attachment_c()
+ {
+ 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)
,b_pci_packet_set(false)
,p_ev(NULL)
{
- vlc_mutex_init( &demuxer, &lock_demuxer );
+ vlc_mutex_init( &lock_demuxer );
}
virtual ~demux_sys_t()
delete opened_segments[i];
for ( i=0; i<used_segments.size(); i++ )
delete used_segments[i];
+ for ( i=0; i<stored_attachments.size(); i++ )
+ delete stored_attachments[i];
+ if( meta ) vlc_meta_Delete( meta );
+
+ while( titles.size() )
+ { vlc_input_title_Delete( titles.back() ); titles.pop_back();}
+
vlc_mutex_destroy( &lock_demuxer );
}
demux_t & demuxer;
mtime_t i_pts;
- mtime_t i_last_dts;
mtime_t i_start_pts;
mtime_t i_chapter_time;
size_t i_current_title;
std::vector<matroska_stream_c*> streams;
+ std::vector<attachment_c*> stored_attachments;
std::vector<matroska_segment_c*> opened_segments;
std::vector<virtual_segment_c*> used_segments;
virtual_segment_c *p_current_segment;
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 );
+ 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();
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;
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = new demux_sys_t( *p_demux );
- p_io_callback = new vlc_stream_io_callback( p_demux->s, VLC_FALSE );
+ p_io_callback = new vlc_stream_io_callback( p_demux->s, false );
p_io_stream = new EbmlStream( *p_io_callback );
if( p_io_stream == NULL )
return VLC_EGENERIC;
}
- p_stream = p_sys->AnalyseAllSegmentsFound( p_io_stream );
+ p_stream = p_sys->AnalyseAllSegmentsFound( p_demux, p_io_stream, true );
if( p_stream == NULL )
{
msg_Err( p_demux, "cannot find KaxSegment" );
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)
- {
- s_path = s_path.substr(0,s_path.length()-1);
- }
- else
+ /* 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 (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 (!s_filename.compare(p_demux->psz_path))
- continue; // don't reuse the original opened file
+ if (strlen(psz_file) > 4)
+ {
+ s_filename = s_path + DIRECTORY_SEPARATOR + psz_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))
+#ifdef WIN32
+ if (!strcasecmp(s_filename.c_str(), p_demux->psz_path))
#else
- if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
- !s_filename.compare(s_filename.length() - 3, 3, "mka"))
+ if (!s_filename.compare(p_demux->psz_path))
#endif
- {
- // test wether this file belongs to our family
- vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( stream_UrlNew( p_demux, s_filename.c_str()), VLC_TRUE );
- EbmlStream *p_estream = new EbmlStream(*p_file_io);
-
- p_stream = p_sys->AnalyseAllSegmentsFound( 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;
+ free (psz_file);
+ continue; // don't reuse the original opened file
}
- else
+
+#if defined(__GNUC__) && (__GNUC__ < 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"))
+#endif
{
- p_stream->p_in = p_file_io;
- p_stream->p_es = p_estream;
- p_sys->streams.push_back( p_stream );
+ // 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, true );
+ EbmlStream *p_estream = new EbmlStream(*p_file_io);
+
+ 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;
+ }
+ else
+ {
+ p_stream->p_in = p_file_io;
+ p_stream->p_es = p_estream;
+ p_sys->streams.push_back( p_stream );
+ }
+ }
+ 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 );
}
- 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" );
}
p_sys->StartUiThread();
-
+
return VLC_SUCCESS;
error:
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:
return VLC_SUCCESS;
case DEMUX_GET_TITLE_INFO:
- if( p_sys->titles.size() )
+ if( p_sys->titles.size() > 1 || ( p_sys->titles.size() == 1 && p_sys->titles[0]->i_seekpoint > 0 ) )
{
input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
int *pi_int = (int*)va_arg( args, int* );
{
(*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] );
}
-
return VLC_SUCCESS;
}
return VLC_EGENERIC;
}
}
+#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;
- idx.b_key = *pi_ref1 == 0 ? VLC_TRUE : VLC_FALSE;
+#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 ? true : false;
}
#undef idx
return VLC_SUCCESS;
}
+ i_level = ep->GetLevel();
+
if( el == NULL )
{
- if( ep->GetLevel() > 1 )
+ if( i_level > 1 )
{
ep->Up();
continue;
// reset silent tracks
for (size_t i=0; i<tracks.size(); i++)
{
- tracks[i]->b_silent = VLC_FALSE;
+ tracks[i]->b_silent = false;
}
ep->Down();
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 ) )
{
*pi_ref1 = int64( ref ) * cluster->GlobalTimecodeScale();
}
- else
+ else if( *pi_ref2 == 0 )
{
*pi_ref2 = int64( ref ) * cluster->GlobalTimecodeScale();
}
{
if ( tracks[i]->i_number == uint32(track_num))
{
- tracks[i]->b_silent = VLC_TRUE;
+ tracks[i]->b_silent = true;
break;
}
}
}
}
-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();
size_t i_track;
unsigned int i;
- vlc_bool_t b;
+ bool b;
#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;
}
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 )
if( !b )
{
- tk->b_inited = VLC_FALSE;
+ tk->b_inited = false;
return;
}
}
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;
+ tk->b_inited = 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 )
{
}
#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 )
{
}
return;
}
- // TODO implement correct timestamping when B frames are used
-#if 0
+ // correct timestamping when B frames are used
if( tk->fmt.i_cat != VIDEO_ES )
{
p_block->i_dts = p_block->i_pts = i_pts;
}
else
{
- p_block->i_pts = i_pts;
- p_block->i_dts = p_sys->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;
+ }
}
-#else
- p_block->i_pts = i_pts;
- p_block->i_dts = p_sys->i_last_dts;
-#endif
+ 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);
+msg_Dbg( p_demux, "block i_dts: %"PRId64" / i_pts: %"PRId64, p_block->i_dts, p_block->i_pts);
#endif
if( strcmp( tk->psz_codec, "S_VOBSUB" ) )
{
#undef tk
}
-matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( EbmlStream *p_estream )
+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;
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<EDocType>(*static_cast<EbmlHead*>(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;
+ }
+
+ EDocTypeReadVersion doc_read_version = GetChild<EDocTypeReadVersion>(*static_cast<EbmlHead*>(p_l0));
+#if LIBMATROSKA_VERSION >= 0x000800
+ if (uint64(doc_read_version) > 2)
+ {
+ msg_Err( p_demux, "This matroska file is needs version %"PRId64" 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 %"PRId64" and this VLC only supports version 1", uint64(doc_read_version));
return NULL;
}
- p_l0->SkipData(*p_estream, EbmlHead_Context);
+#endif
+
delete p_l0;
+
// find all segments in this file
p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFFLL);
if (p_l0 == NULL)
{
EbmlParser *ep;
matroska_segment_c *p_segment1 = new matroska_segment_c( *this, *p_estream );
- b_keep_segment = false;
+ b_keep_segment = b_initial;
ep = new EbmlParser(p_estream, p_l0, &demuxer );
p_segment1->ep = ep;
else if( MKV_IS_ID( l, KaxSegmentFamily ) )
{
KaxSegmentFamily *p_fam = new KaxSegmentFamily( *static_cast<KaxSegmentFamily*>(l) );
- p_segment1->families.push_back( *p_fam );
+ p_segment1->families.push_back( p_fam );
}
}
break;
p_stream1->segments.push_back( p_segment1 );
}
else
+ {
+ p_segment1->segment = NULL;
delete p_segment1;
+ }
}
-
- p_l0->SkipData(*p_estream, EbmlHead_Context);
- p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL);
+ if (p_l0->IsFiniteSize() )
+ {
+ p_l0->SkipData(*p_estream, KaxMatroska_Context);
+ p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL);
+ }
+ else
+ p_l0 = p_l0->SkipData(*p_estream, KaxSegment_Context);
}
if ( !b_keep_stream )
{
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' );
- tracks[i_track]->fmt.b_packetized = VLC_FALSE;
+ /* 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" ) )
{
stream_t *p_mp4_stream = stream_MemoryNew( VLC_OBJECT(&sys.demuxer),
tracks[i_track]->p_extra_data,
tracks[i_track]->i_extra_data,
- VLC_FALSE );
+ false );
MP4_ReadBoxCommon( p_mp4_stream, p_box );
MP4_ReadBox_sample_vide( p_mp4_stream, p_box );
tracks[i_track]->fmt.i_codec = p_box->i_type;
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,
{
i_profile = 2;
}
+ else if( !strcmp( &tracks[i_track]->psz_codec[12], "LC/SBR" ) )
+ {
+ i_profile = 1;
+ sbr = 1;
+ }
else
{
i_profile = 3;
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" ) ||
}
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" ) )
+ /* disabled due to the potential "S_KATE" namespace issue */
+ else if( !strcmp( tracks[i_track]->psz_codec, "S_KATE" ) )
{
- /* 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' );
+ int i, i_offset = 1, *i_size, i_extra, num_headers, size_so_far;
+ uint8_t *p_extra;
+
+ tracks[i_track]->fmt.i_codec = VLC_FOURCC( 'k', 'a', 't', 'e' );
+ tracks[i_track]->fmt.subs.psz_encoding = strdup( "UTF-8" );
+
+ /* Recover the number of headers to expect */
+ num_headers = tracks[i_track]->p_extra_data[0]+1;
+ msg_Dbg( &sys.demuxer, "kate in mkv detected: %d headers in %u bytes",
+ num_headers, tracks[i_track]->i_extra_data);
+
+ /* this won't overflow the stack as is can allocate only 1020 bytes max */
+ i_size = (int*)alloca(num_headers*sizeof(int));
+
+ /* Split the headers */
+ size_so_far = 0;
+ for( i = 0; i < num_headers-1; i++ )
+ {
+ i_size[i] = 0;
+ while( i_offset < tracks[i_track]->i_extra_data )
+ {
+ i_size[i] += tracks[i_track]->p_extra_data[i_offset];
+ if( tracks[i_track]->p_extra_data[i_offset++] != 0xff ) break;
+ }
+ msg_Dbg( &sys.demuxer, "kate header %d is %d bytes", i, i_size[i]);
+ size_so_far += i_size[i];
+ }
+ i_size[num_headers-1] = tracks[i_track]->i_extra_data - (size_so_far+i_offset);
+ msg_Dbg( &sys.demuxer, "kate last header (%d) is %d bytes", num_headers-1, i_size[num_headers-1]);
+
+ tracks[i_track]->fmt.i_extra = 1 + num_headers * 2 + size_so_far + i_size[num_headers-1];
+ tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->fmt.i_extra );
+
+ p_extra = (uint8_t *)tracks[i_track]->fmt.p_extra;
+ i_extra = 0;
+ *(p_extra++) = num_headers;
+ ++i_extra;
+ for( i = 0; i < num_headers; i++ )
+ {
+ *(p_extra++) = i_size[i] >> 8;
+ *(p_extra++) = i_size[i] & 0xFF;
+ memcpy( p_extra, tracks[i_track]->p_extra_data + i_offset + i_extra-1,
+ i_size[i] );
+ p_extra += i_size[i];
+ i_extra += i_size[i];
+ }
}
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" ) ||
{
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" ) )
{
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 )
}
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 )
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 );
/* Now create our event thread catcher */
p_ev = (event_thread_t *) vlc_object_create( &demuxer, sizeof( event_thread_t ) );
p_ev->p_demux = &demuxer;
- p_ev->b_die = VLC_FALSE;
- vlc_mutex_init( p_ev, &p_ev->lock );
+ p_ev->b_die = false;
+ vlc_mutex_init( &p_ev->lock );
vlc_thread_create( p_ev, "mkv event thread handler", EventThread,
- VLC_THREAD_PRIORITY_LOW, VLC_FALSE );
+ VLC_THREAD_PRIORITY_LOW, false );
}
}
{
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 );
+ vlc_object_release( p_ev );
p_ev = NULL;
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;
+ {
+ p_ev->b_clicked = true;
+ msg_Dbg( p_this, "Event Mouse: clicked");
+ }
else if( psz_var[6] == 'm' )
- p_ev->b_moved = VLC_TRUE;
+ p_ev->b_moved = true;
vlc_mutex_unlock( &p_ev->lock );
return VLC_SUCCESS;
}
-int demux_sys_t::EventKey( vlc_object_t *p_this, char const *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+int demux_sys_t::EventKey( vlc_object_t *p_this, char const *,
+ vlc_value_t, vlc_value_t newval, void *p_data )
{
event_thread_t *p_ev = (event_thread_t *) p_data;
vlc_mutex_lock( &p_ev->lock );
- p_ev->b_key = VLC_TRUE;
+ p_ev->i_key_action = newval.i_int;
vlc_mutex_unlock( &p_ev->lock );
+ msg_Dbg( p_this, "Event Key");
return VLC_SUCCESS;
}
demux_sys_t *p_sys = p_ev->p_demux->p_sys;
vlc_object_t *p_vout = NULL;
- p_ev->b_moved = VLC_FALSE;
- p_ev->b_clicked = VLC_FALSE;
- p_ev->b_key = VLC_FALSE;
+ p_ev->b_moved = false;
+ p_ev->b_clicked = false;
+ p_ev->i_key_action = 0;
/* catch all key event */
- var_AddCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev );
+ var_AddCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev );
/* main loop */
- while( !p_ev->b_die )
+ while( vlc_object_alive (p_ev) )
{
if ( !p_sys->b_pci_packet_set )
{
continue;
}
- vlc_bool_t b_activated = VLC_FALSE;
+ bool b_activated = false;
/* KEY part */
- if( p_ev->b_key )
+ if( p_ev->i_key_action )
{
- vlc_value_t valk;
- struct vlc_t::hotkey *p_hotkeys = p_ev->p_vlc->p_hotkeys;
- int i, i_action = -1;
+ int i;
+
+ 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 );
- for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
- {
- if( p_hotkeys[i].i_key == valk.i_int )
- {
- i_action = p_hotkeys[i].i_action;
- }
- }
-
uint16 i_curr_button = p_sys->dvd_interpretor.GetSPRM( 0x88 );
- switch( i_action )
+ switch( p_ev->i_key_action )
{
case ACTIONID_NAV_LEFT:
if ( i_curr_button > 0 && i_curr_button <= pci->hli.hl_gi.btn_ns )
}
break;
case ACTIONID_NAV_ACTIVATE:
- b_activated = VLC_TRUE;
-
+ b_activated = 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];
default:
break;
}
- p_ev->b_key = VLC_FALSE;
+ p_ev->i_key_action = 0;
vlc_mutex_unlock( &p_ev->lock );
}
int32_t best,dist,d;
int32_t mx,my,dx,dy;
- b_activated = VLC_TRUE;
+ 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 = 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;
val.p_address = (void *)p_sys->palette;
var_Set( p_sys->p_input, "menu-palette", val );
- val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val );
+ val.b_bool = true; var_Set( p_sys->p_input, "highlight", val );
vlc_mutex_unlock( p_mutex );
}
}
// dvdnav_mouse_select( NULL, pci, valx.i_int, valy.i_int );
}
- p_ev->b_moved = VLC_FALSE;
- p_ev->b_clicked = VLC_FALSE;
+ p_ev->b_moved = false;
+ p_ev->b_clicked = false;
vlc_mutex_unlock( &p_ev->lock );
}
/* VOUT part */
- if( p_vout && p_vout->b_die )
+ if( p_vout && !vlc_object_alive (p_vout) )
{
var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev );
var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev );
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-action", EventKey, p_ev );
vlc_mutex_destroy( &p_ev->lock );
p_segment = linked_segments[i];
// FIXME assume we have the same editions in all segments
for (j=0; j<p_segment->stored_editions.size(); j++)
+ {
+ if( j >= p_editions->size() ) /* Protect against broken files (?) */
+ break;
(*p_editions)[j]->Append( *p_segment->stored_editions[j] );
+ }
}
}
Seek( demux, sys.i_pts, 0, psz_curr_chapter );
}
}
-
+
if ( !b_has_seeked )
{
psz_current_chapter = psz_curr_chapter;
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
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
return this;
index++;
}
-
+
// sub-chapters
chapter_item_c *p_result = NULL;
std::vector<chapter_item_c*>::const_iterator index2 = sub_chapters.begin();
return p_result;
index2++;
}
-
+
return p_result;
}
int i_index;
- msg_Dbg( p_demux, "seek request to "I64Fd" (%f%%)", i_date, f_percent );
+ msg_Dbg( p_demux, "seek request to %"PRId64" (%f%%)", i_date, f_percent );
if( i_date < 0 && f_percent < 0 )
{
msg_Warn( p_demux, "cannot seek nowhere !" );
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 */
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 )
{
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;
{
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 */
}
}
- 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 */
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++;
/*****************************************************************************
* Stream managment
*****************************************************************************/
-vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_, vlc_bool_t b_owner_ )
+vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_, bool b_owner_ )
{
s = s_;
b_owner = b_owner_;
- mb_eof = VLC_FALSE;
+ mb_eof = false;
}
uint32 vlc_stream_io_callback::read( void *p_buffer, size_t i_size )
if( i_pos < 0 || i_pos >= stream_Size( s ) )
{
- mb_eof = VLC_TRUE;
+ mb_eof = true;
return;
}
- mb_eof = VLC_FALSE;
+ mb_eof = false;
if( stream_Seek( s, i_pos ) )
{
- mb_eof = VLC_TRUE;
+ mb_eof = true;
}
return;
}
}
uint64 vlc_stream_io_callback::getFilePointer( void )
{
+ if ( s == NULL )
+ return 0;
return stream_Tell( s );
}
void vlc_stream_io_callback::close( void )
}
mi_level = 1;
mi_user_level = 1;
- mb_keep = VLC_FALSE;
+ mb_keep = false;
mb_dummy = config_GetInt( p_demux, "mkv-use-dummy" );
}
{
delete m_el[i];
}
- mb_keep = VLC_FALSE;
+ mb_keep = false;
}
}
}
}
m_got = NULL;
- mb_keep = VLC_FALSE;
+ mb_keep = false;
if ( m_el[1]->GetElementPosition() == i_cluster_pos )
{
m_es->I_O().setFilePointer( i_block_pos, seek_beginning );
void EbmlParser::Keep( void )
{
- mb_keep = VLC_TRUE;
+ mb_keep = true;
}
int EbmlParser::GetLevel( void )
{
delete m_el[mi_level];
}
- mb_keep = VLC_FALSE;
+ mb_keep = false;
}
m_el[mi_level] = m_es->FindNextElement( m_el[mi_level - 1]->Generic().Context, i_ulev, 0xFFFFFFFFL, mb_dummy != 0, 1 );
// IndexAppendCluster( cluster );
}
- vlc_bool_t b_seekable;
+ bool b_seekable;
stream_Control( sys.demuxer.s, STREAM_CAN_FASTSEEK, &b_seekable );
if( !b_seekable )
idx.i_block_number= -1;
idx.i_position = -1;
idx.i_time = 0;
- idx.b_key = VLC_TRUE;
+ idx.b_key = true;
ep->Down();
while( ( el = ep->Get() ) != NULL )
ep->Up();
#if 0
- msg_Dbg( &sys.demuxer, " * added time="I64Fd" pos="I64Fd
+ msg_Dbg( &sys.demuxer, " * added time=%"PRId64" pos=%"PRId64
" track=%d bnum=%d", idx.i_time, idx.i_position,
idx.i_track, idx.i_block_number );
#endif
delete ep;
delete cues;
- b_cues = VLC_TRUE;
+ b_cues = true;
msg_Dbg( &sys.demuxer, "loading cues done." );
es.I_O().setFilePointer( i_sav_position, seek_beginning );
{
if( id == KaxCues::ClassInfos.GlobalId )
{
- msg_Dbg( &sys.demuxer, "| | | = cues at "I64Fd, i_pos );
+ msg_Dbg( &sys.demuxer, "| | | = cues at %"PRId64, i_pos );
i_cues_position = segment->GetGlobalPosition( i_pos );
}
else if( id == KaxChapters::ClassInfos.GlobalId )
{
- msg_Dbg( &sys.demuxer, "| | | = chapters at "I64Fd, i_pos );
+ msg_Dbg( &sys.demuxer, "| | | = chapters at %"PRId64, i_pos );
i_chapters_position = segment->GetGlobalPosition( i_pos );
}
else if( id == KaxTags::ClassInfos.GlobalId )
{
- msg_Dbg( &sys.demuxer, "| | | = tags at "I64Fd, i_pos );
+ msg_Dbg( &sys.demuxer, "| | | = tags at %"PRId64, i_pos );
i_tags_position = segment->GetGlobalPosition( i_pos );
}
}
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 ) );
tk->fmt.psz_language = strdup("English");
tk->fmt.psz_description = NULL;
- tk->b_default = VLC_TRUE;
- tk->b_enabled = VLC_TRUE;
- tk->b_silent = VLC_FALSE;
+ tk->b_default = true;
+ tk->b_enabled = true;
+ tk->b_silent = false;
tk->i_number = tracks.size() - 1;
tk->i_extra_data = 0;
tk->p_extra_data = NULL;
tk->i_default_duration = 0;
tk->f_timecodescale = 1.0;
- tk->b_inited = VLC_FALSE;
+ tk->b_inited = false;
tk->i_data_init = 0;
tk->p_data_init = NULL;
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++ )
{
}
else if( MKV_IS_ID( l, KaxTrackType ) )
{
- char *psz_type;
+ const char *psz_type;
KaxTrackType &ttype = *(KaxTrackType*)l;
switch( uint8(ttype) )
KaxTrackDefaultDuration &defd = *(KaxTrackDefaultDuration*)l;
tk->i_default_duration = uint64(defd);
- msg_Dbg( &sys.demuxer, "| | | + Track Default Duration="I64Fd, uint64(defd) );
+ msg_Dbg( &sys.demuxer, "| | | + Track Default Duration=%"PRId64, uint64(defd) );
}
else if( MKV_IS_ID( l, KaxTrackTimecodeScale ) )
{
{
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 );
tk->p_extra_data = (uint8_t*)malloc( tk->i_extra_data );
memcpy( tk->p_extra_data, cpriv.GetBuffer(), tk->i_extra_data );
}
- msg_Dbg( &sys.demuxer, "| | | + Track CodecPrivate size="I64Fd, cpriv.GetSize() );
+ msg_Dbg( &sys.demuxer, "| | | + Track CodecPrivate size=%"PRId64, cpriv.GetSize() );
}
else if( MKV_IS_ID( l, KaxCodecName ) )
{
{
EbmlMaster *cencs = static_cast<EbmlMaster*>(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];
{
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 )
// {
{
EbmlMaster *tkv = static_cast<EbmlMaster*>(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];
{
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;
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;
// {
// 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 ) )
{
{
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;
typeid(*l).name() );
}
}
+
+ if ( bSupported )
+ {
+ tracks.push_back( tk );
+ }
+ else
+ {
+ msg_Err( &sys.demuxer, "Track Entry %d not supported", tk->i_number );
+ delete tk;
+ }
}
/*****************************************************************************
if( MKV_IS_ID( l, KaxSegmentUID ) )
{
- p_segment_uid = new KaxSegmentUID(*static_cast<KaxSegmentUID*>(l));
+ if ( p_segment_uid == NULL )
+ p_segment_uid = new KaxSegmentUID(*static_cast<KaxSegmentUID*>(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<KaxPrevUID*>(l));
+ if ( p_prev_segment_uid == NULL )
+ p_prev_segment_uid = new KaxPrevUID(*static_cast<KaxPrevUID*>(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<KaxNextUID*>(l));
+ if ( p_next_segment_uid == NULL )
+ p_next_segment_uid = new KaxNextUID(*static_cast<KaxNextUID*>(l));
msg_Dbg( &sys.demuxer, "| | + NextUID=%d", *(uint32*)p_next_segment_uid->GetBuffer() );
}
i_timescale = uint64(tcs);
- msg_Dbg( &sys.demuxer, "| | + TimecodeScale="I64Fd,
+ msg_Dbg( &sys.demuxer, "| | + TimecodeScale=%"PRId64,
i_timescale );
}
else if( MKV_IS_ID( l, KaxDuration ) )
i_duration = mtime_t( double( dur ) );
- msg_Dbg( &sys.demuxer, "| | + Duration="I64Fd,
+ msg_Dbg( &sys.demuxer, "| | + Duration=%"PRId64,
i_duration );
}
else if( MKV_IS_ID( l, KaxMuxingApp ) )
{
KaxSegmentFamily *uid = static_cast<KaxSegmentFamily*>(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;
else if( MKV_IS_ID( l, KaxChapterTimeStart ) )
{
KaxChapterTimeStart &start =*(KaxChapterTimeStart*)l;
- chapters.i_start_time = uint64( start ) / I64C(1000);
+ chapters.i_start_time = uint64( start ) / INT64_C(1000);
msg_Dbg( &sys.demuxer, "| | | | + ChapterTimeStart: %lld", chapters.i_start_time );
}
else if( MKV_IS_ID( l, KaxChapterTimeEnd ) )
{
KaxChapterTimeEnd &end =*(KaxChapterTimeEnd*)l;
- chapters.i_end_time = uint64( end ) / I64C(1000);
+ chapters.i_end_time = uint64( end ) / INT64_C(1000);
msg_Dbg( &sys.demuxer, "| | | | + ChapterTimeEnd: %lld", chapters.i_end_time );
}
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 ) )
{
}
}
+/*****************************************************************************
+ * 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<KaxAttached>( *attachments );
+
+ while( attachedFile && ( attachedFile->GetSize() > 0 ) )
+ {
+ std::string psz_mime_type = GetChild<KaxMimeType>( *attachedFile );
+ KaxFileName &file_name = GetChild<KaxFileName>( *attachedFile );
+ KaxFileData &img_data = GetChild<KaxFileData>( *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<KaxAttached>( *attachments, *attachedFile );
+ }
+}
+
/*****************************************************************************
* ParseChapters:
*****************************************************************************/
if( MKV_IS_ID( l, KaxEditionEntry ) )
{
chapter_edition_c *p_edition = new chapter_edition_c();
-
+
EbmlMaster *E = static_cast<EbmlMaster *>(l );
size_t j;
msg_Dbg( &sys.demuxer, "| | + EditionEntry" );
{
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 */
- i_dur = stored_editions[i_default_edition]->Duration() / I64C(1000);
+ i_dur = stored_editions[i_default_edition]->Duration() / INT64_C(1000);
if (i_dur > 0)
i_duration = i_dur;
}
*****************************************************************************/
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 )
{
- vlc_bool_t b_seekable;
+ bool b_seekable;
stream_Control( sys.demuxer.s, STREAM_CAN_FASTSEEK, &b_seekable );
if( b_seekable )
/*****************************************************************************
- * Divers
+ * Misc
*****************************************************************************/
void matroska_segment_c::IndexAppendCluster( KaxCluster *cluster )
idx.i_block_number= -1;
idx.i_position = cluster->GetElementPosition();
idx.i_time = -1;
- idx.b_key = VLC_TRUE;
+ idx.b_key = true;
i_index++;
if( i_index >= i_index_max )
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<chapter_item_c*>::iterator index = sub_chapters.begin();
while ( index != sub_chapters.end() )
}
else
{
- std::sort( sub_chapters.begin(), sub_chapters.end() );
+ if ( sub_chapters.begin() != sub_chapters.end() )
+ std::sort( sub_chapters.begin(), sub_chapters.end(), chapter_item_c::CompareTimecode );
i_user_start_time = i_start_time;
if ( i_end_time != -1 )
i_user_end_time = i_end_time;
mtime_t chapter_edition_c::Duration() const
{
mtime_t i_result = 0;
-
+
if ( sub_chapters.size() )
{
std::vector<chapter_item_c*>::const_iterator index = sub_chapters.end();
index--;
i_result = (*index)->i_user_end_time;
}
-
+
return i_result;
}
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<chapter_item_c*>::iterator index = sub_chapters.begin();
psz_result = (*index)->FindTimecode( i_user_timecode, p_current, b_found );
index++;
}
-
+
if ( psz_result == NULL )
psz_result = this;
}
{
for (size_t j=0; j<of_segment.families.size(); j++)
{
- if ( families[i] == of_segment.families[j] )
+ if ( *(families[i]) == *(of_segment.families[j]) )
return Preload( );
}
}
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
// create a name if there is none
if ( p_title->psz_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() );
}
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_itema = (EbmlBinary *)(p_item_a->p_segment_uid);
- if ( *p_itema == *p_item_b->p_prev_segment_uid )
+ EbmlBinary *p_tmp;
+
+ if ( p_item_a == NULL || p_item_b == NULL )
+ return false;
+
+ 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_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_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;
else if( MKV_IS_ID( el, KaxTracks ) )
{
ParseTracks( static_cast<KaxTracks*>( el ) );
+ if ( tracks.size() == 0 )
+ {
+ msg_Err( &sys.demuxer, "No tracks supported" );
+ return false;
+ }
}
else if( MKV_IS_ID( el, KaxSeekHead ) )
{
}
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<KaxAttachments*>( el ) );
}
else if( MKV_IS_ID( el, KaxChapters ) )
{
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;
// check if it's not already in here
for ( i=0; i<linked_segments.size(); i++ )
{
- if ( *p_segment->p_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;
}
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;
i_seek_time = p_indexes[i_idx].i_time;
}
- msg_Dbg( &sys.demuxer, "seek got "I64Fd" (%d%%)",
+ msg_Dbg( &sys.demuxer, "seek got %"PRId64" (%d%%)",
i_seek_time, (int)( 100 * i_seek_position / stream_Size( sys.demuxer.s ) ) );
es.I_O().setFilePointer( i_seek_position, seek_beginning );
{
if( tracks[i_track]->fmt.i_cat == VIDEO_ES )
{
- tracks[i_track]->b_search_keyframe = VLC_TRUE;
+ tracks[i_track]->b_search_keyframe = true;
i_track_skipping++;
}
es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, tracks[i_track]->p_es, i_date );
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?" );
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() )
{
{
if( i_block_ref1 == 0 && tracks[i_track]->b_search_keyframe )
{
- tracks[i_track]->b_search_keyframe = VLC_FALSE;
+ tracks[i_track]->b_search_keyframe = false;
i_track_skipping--;
}
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;
binary *p_data = (*index)->GetBuffer();
size_t i_size = *p_data++;
// avoid reading too much from the buffer
- i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 );
+ i_size = __MIN( i_size, ((*index)->GetSize() - 1) >> 3 );
for ( ; i_size > 0; i_size--, p_data += 8 )
{
msg_Dbg( &sys.demuxer, "Matroska DVD enter command" );
binary *p_data = (*index)->GetBuffer();
size_t i_size = *p_data++;
// avoid reading too much from the buffer
- i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 );
+ i_size = __MIN( i_size, ((*index)->GetSize() - 1) >> 3 );
for ( ; i_size > 0; i_size--, p_data += 8 )
{
msg_Dbg( &sys.demuxer, "Matroska DVD leave command" );
if ( i_size != 8 )
return false;
- virtual_segment_c *p_segment;
- chapter_item_c *p_chapter;
+ virtual_segment_c *p_segment = NULL;
+ chapter_item_c *p_chapter = NULL;
bool f_result = false;
uint16 i_command = ( p_command[0] << 8 ) + p_command[1];
if ( !b_test_positive )
return false;
}
-
+
// strip the test command
i_command &= 0xFF0F;
-
+
switch ( i_command )
{
case CMD_DVD_NOP:
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;
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 )
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 );
{
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;
{
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;
{
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;
{
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;
{
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;
{
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;
{
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;
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 )
{
chapter_item_c *p_chapter = sys.FindChapter( i_chapter_uid, p_segment );
if ( p_chapter == NULL )
- msg_Dbg( &sys.demuxer, "Chapter "I64Fd" not found", i_chapter_uid);
+ msg_Dbg( &sys.demuxer, "Chapter %"PRId64" not found", i_chapter_uid);
else
{
if ( !p_chapter->EnterAndLeave( sys.p_current_segment->CurrentChapter() ) )