*
* 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>
# include <time.h> /* time() */
#endif
-#include <vlc/input.h>
-#include <codecs.h> /* BITMAPINFOHEADER, WAVEFORMATEX */
+#include <vlc_codecs.h> /* BITMAPINFOHEADER, WAVEFORMATEX */
#include "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"
////////////////////////////////////////////////////////////////////////////////////////////////////////////////
#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;
/**
* 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), MSG_QUEUE_NORMAL, VLC_MSG_DBG, "mkv", psz_foo2, args );
free( psz_foo2 );
va_end( args );
}
-
+
/*****************************************************************************
* Stream managment
*****************************************************************************/
*****************************************************************************/
typedef struct
{
+// ~mkv_track_t();
+
vlc_bool_t b_default;
vlc_bool_t b_enabled;
unsigned int i_number;
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;
vlc_bool_t b_silent;
/* informative */
- char *psz_codec_name;
- char *psz_codec_settings;
- char *psz_codec_info_url;
- char *psz_codec_download_url;
-
+ const char *psz_codec_name;
+ const char *psz_codec_settings;
+ const char *psz_codec_info_url;
+ const char *psz_codec_download_url;
+
/* encryption/compression */
int i_compression_type;
KaxContentCompSettings *p_compression_data;
,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;
static bool CompareTimecode( const chapter_item_c * itemA, const chapter_item_c * itemB )
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;
};
{
delete tracks[i_track]->p_compression_data;
}
- if( tracks[i_track]->fmt.psz_description )
- {
- free( tracks[i_track]->fmt.psz_description );
- }
+ 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 );
std::vector<chapter_translation_c*> translations;
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 );
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 );
} 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:
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 );
}
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 );
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;
}
else
{
- if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0)
+ if (s_path.find_last_of(DIRECTORY_SEPARATOR) > 0)
{
s_path = s_path.substr(0,s_path.find_last_of(DIRECTORY_SEPARATOR));
}
}
- struct dirent *p_file_item;
- DIR *p_src_dir = opendir(s_path.c_str());
+ DIR *p_src_dir = utf8_opendir(s_path.c_str());
if (p_src_dir != NULL)
{
- while ((p_file_item = (dirent *) readdir(p_src_dir)))
+ char *psz_file;
+ while ((psz_file = utf8_readdir(p_src_dir)) != NULL)
{
- if (strlen(p_file_item->d_name) > 4)
+ if (strlen(psz_file) > 4)
{
- s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name;
+ s_filename = s_path + DIRECTORY_SEPARATOR + psz_file;
#ifdef WIN32
if (!strcasecmp(s_filename.c_str(), p_demux->psz_path))
#else
if (!s_filename.compare(p_demux->psz_path))
#endif
+ {
+ free (psz_file);
continue; // don't reuse the original opened file
+ }
#if defined(__GNUC__) && (__GNUC__ < 3)
- if (!s_filename.compare("mkv", s_filename.length() - 3, 3) ||
+ if (!s_filename.compare("mkv", s_filename.length() - 3, 3) ||
!s_filename.compare("mka", s_filename.length() - 3, 3))
#else
- if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
+ if (!s_filename.compare(s_filename.length() - 3, 3, "mkv") ||
!s_filename.compare(s_filename.length() - 3, 3, "mka"))
#endif
{
// test wether this file belongs to our family
- stream_t *p_file_stream = stream_UrlNew( p_demux, s_filename.c_str());
- if ( p_file_stream != NULL )
+ const uint8_t *p_peek;
+ bool file_ok = false;
+ stream_t *p_file_stream = stream_UrlNew(
+ p_demux,
+ s_filename.c_str());
+ /* peek the begining */
+ if( p_file_stream &&
+ stream_Peek( p_file_stream, &p_peek, 4 ) >= 4
+ && p_peek[0] == 0x1a && p_peek[1] == 0x45 &&
+ p_peek[2] == 0xdf && p_peek[3] == 0xa3 ) file_ok = true;
+
+ if ( file_ok )
{
vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, VLC_TRUE );
EbmlStream *p_estream = new EbmlStream(*p_file_io);
}
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 );
}
}
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:
}
#if LIBMATROSKA_VERSION >= 0x000800
-static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock,
+static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock,
mtime_t i_pts, mtime_t i_duration, bool f_mandatory )
#else
static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts,
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 LIBMATROSKA_VERSION >= 0x000800
- for( i = 0;
+ for( i = 0;
(block != NULL && i < block->NumberFrames()) || (simpleblock != NULL && i < simpleblock->NumberFrames());
i++ )
#else
if ( f_mandatory )
p_block->i_dts = p_block->i_pts;
else
- p_block->i_dts = min( i_pts, tk->i_last_dts + (tk->i_default_duration >> 10));
+ p_block->i_dts = min( i_pts, tk->i_last_dts + (mtime_t)(tk->i_default_duration >> 10));
p_sys->i_pts = p_block->i_dts;
}
}
p_stream1->segments.push_back( p_segment1 );
}
else
+ {
+ p_segment1->segment = NULL;
delete p_segment1;
+ }
}
if (p_l0->IsFiniteSize() )
{
{
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" ) )
{
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" ) )
- {
- /* 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" ) ||
{
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 )
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 );
{
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 );
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 )
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");
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 )
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];
// 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;
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 );
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;
}
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 */
{
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 */
break;
}
}
-
+
if ( p_vsegment->Edition() && p_vsegment->Edition()->b_ordered && p_vsegment->CurrentChapter() == NULL )
{
/* nothing left to read in this ordered edition */
break;
}
p_segment->UnSelect( );
-
+
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
/* switch to the next segment */
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;
}
else if( MKV_IS_ID( l, KaxTrackType ) )
{
- char *psz_type;
+ const char *psz_type;
KaxTrackType &ttype = *(KaxTrackType*)l;
switch( uint8(ttype) )
KaxContentCompAlgo &compalg = *(KaxContentCompAlgo*)l4;
MkvTree( sys.demuxer, 6, "Compression Algorithm: %i", uint32(compalg) );
tk->i_compression_type = uint32( compalg );
- if ( ( tk->i_compression_type != MATROSKA_COMPRESSION_ZLIB ) &&
+ if ( ( tk->i_compression_type != MATROSKA_COMPRESSION_ZLIB ) &&
( tk->i_compression_type != MATROSKA_COMPRESSION_HEADER ) )
{
msg_Err( &sys.demuxer, "Track Compression method %d not supported", tk->i_compression_type );
}
}
}
-
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;
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;
}
}
+/*****************************************************************************
+ * 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 */
*****************************************************************************/
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 )
{
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() )
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;
}
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_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;
}
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 ( linked_segments[i]->p_segment_uid != NULL
+ if ( linked_segments[i]->p_segment_uid != NULL
&& p_segment->p_segment_uid != NULL
&& *p_segment->p_segment_uid == *linked_segments[i]->p_segment_uid )
return 0;
for( i_track = 0; i_track < tracks.size(); i_track++ )
{
+#if LIBMATROSKA_VERSION >= 0x000800
+ if( (simpleblock && tracks[i_track]->i_number == simpleblock->TrackNum()) ||
+ (block && tracks[i_track]->i_number == block->TrackNum()) )
+#else
if( tracks[i_track]->i_number == block->TrackNum() )
+#endif
{
break;
}
}
- sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
+#if LIBMATROSKA_VERSION >= 0x000800
+ if( simpleblock )
+ sys.i_pts = (sys.i_chapter_time + simpleblock->GlobalTimecode()) / (mtime_t) 1000;
+ else
+#endif
+ sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
if( i_track < tracks.size() )
{
BlockDecode( &sys.demuxer, block, sys.i_pts, 0, i_block_ref1 >= 0 || i_block_ref2 > 0 );
#endif
}
- }
+ }
}
delete block;
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 )
{
projects / vlc / blobdiff