static void Close( vlc_object_t * );
vlc_module_begin();
- set_shortname( _("Matroska") );
+ set_shortname( "Matroska" );
set_description( _("Matroska stream demuxer" ) );
set_capability( "demux2", 50 );
set_callbacks( Open, Close );
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."), VLC_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."), VLC_TRUE );
add_bool( "mkv-seek-percent", 0, NULL,
- N_("Seek based on percent not time"),
- N_("Seek based on percent not time"), VLC_TRUE );
+ N_("Seek based on percent not time."),
+ N_("Seek based on percent not time."), VLC_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)."), VLC_TRUE );
add_shortcut( "mka" );
add_shortcut( "mkv" );
void Reset( demux_t *p_demux );
EbmlElement *Get( void );
void Keep( void );
+ EbmlElement *UnGet( uint64 i_block_pos, uint64 i_cluster_pos );
int GetLevel( void );
{
public:
chapter_codec_cmds_c( demux_sys_t & demuxer, int codec_id = -1)
- :i_codec_id( codec_id )
+ :p_private_data(NULL)
+ ,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();
+ while ( indexe != enter_cmds.end() )
+ {
+ delete (*indexe);
+ indexe++;
+ }
+ std::vector<KaxChapterProcessData*>::iterator indexl = leave_cmds.begin();
+ while ( indexl != leave_cmds.end() )
+ {
+ delete (*indexl);
+ indexl++;
+ }
+ std::vector<KaxChapterProcessData*>::iterator indexd = during_cmds.begin();
+ while ( indexd != during_cmds.end() )
+ {
+ delete (*indexd);
+ indexd++;
+ }
+ }
void SetPrivate( const KaxChapterProcessPrivate & private_data )
{
- m_private_data = *( new KaxChapterProcessPrivate( private_data ) );
+ p_private_data = new KaxChapterProcessPrivate( private_data );
}
void AddCommand( const KaxChapterProcessCommand & command );
virtual std::string GetCodecName( bool f_for_title = false ) const { return ""; }
virtual int16 GetTitleNumber() { return -1; }
- KaxChapterProcessPrivate m_private_data;
+ KaxChapterProcessPrivate *p_private_data;
protected:
- std::vector<KaxChapterProcessData> enter_cmds;
- std::vector<KaxChapterProcessData> during_cmds;
- std::vector<KaxChapterProcessData> leave_cmds;
+ std::vector<KaxChapterProcessData*> enter_cmds;
+ std::vector<KaxChapterProcessData*> during_cmds;
+ std::vector<KaxChapterProcessData*> leave_cmds;
int i_codec_id;
demux_sys_t & sys;
// DVD command IDs
// Tests
- // wether the test has to be positive or not
- static const uint16 CMD_DVD_IF_NOT = 0x10;
// wether it's a comparison on the value or register
static const uint16 CMD_DVD_TEST_VALUE = 0x80;
- static const uint16 CMD_DVD_IF_GPREG_AND = (0 << 5);
- static const uint16 CMD_DVD_IF_GPREG_EQUAL = (1 << 5);
- static const uint16 CMD_DVD_IF_GPREG_SUP_EQUAL = (2 << 5);
- static const uint16 CMD_DVD_IF_GPREG_INF = (3 << 5);
+ static const uint16 CMD_DVD_IF_GPREG_AND = (1 << 4);
+ static const uint16 CMD_DVD_IF_GPREG_EQUAL = (2 << 4);
+ static const uint16 CMD_DVD_IF_GPREG_NOT_EQUAL = (3 << 4);
+ static const uint16 CMD_DVD_IF_GPREG_SUP_EQUAL = (4 << 4);
+ 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;
// 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 );
static bool MatchVTSNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
+ static bool MatchVTSMNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
static bool MatchTitleNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
static bool MatchPgcType ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
static bool MatchPgcNumber ( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size );
class chapter_translation_c
{
public:
- KaxChapterTranslateID translated;
+ chapter_translation_c()
+ :p_translated(NULL)
+ {}
+
+ ~chapter_translation_c()
+ {
+ delete p_translated;
+ }
+
+ KaxChapterTranslateID *p_translated;
unsigned int codec_id;
std::vector<uint64_t> editions;
};
int64_t RefreshChapters( bool b_ordered, int64_t i_prev_user_time );
int PublishChapters( input_title_t & title, int & i_user_chapters, int i_level = 0 );
- chapter_item_c * FindTimecode( mtime_t i_timecode );
+ 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 Enter( bool b_do_subchapters );
bool Leave( bool b_do_subchapters );
- bool EnterAndLeave( chapter_item_c *p_item );
+ bool EnterAndLeave( chapter_item_c *p_item, bool b_enter = true );
};
class chapter_edition_c : public chapter_item_c
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;
};
,i_chapters_position(-1)
,i_tags_position(-1)
,cluster(NULL)
+ ,i_block_pos(0)
+ ,i_cluster_pos(0)
,i_start_pos(0)
+ ,p_segment_uid(NULL)
+ ,p_prev_segment_uid(NULL)
+ ,p_next_segment_uid(NULL)
,b_cues(VLC_FALSE)
,i_index(0)
,i_index_max(1024)
,ep(NULL)
,b_preloaded(false)
{
- index = (mkv_index_t*)malloc( sizeof( mkv_index_t ) * i_index_max );
+ p_indexes = (mkv_index_t*)malloc( sizeof( mkv_index_t ) * i_index_max );
}
virtual ~matroska_segment_c()
{
free( tracks[i_track]->fmt.psz_description );
}
- if( tracks[i_track]->psz_codec )
+/* 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];
}
{
free( psz_date_utc );
}
- if ( index )
- free( index );
+ if ( p_indexes )
+ free( p_indexes );
delete ep;
+ delete p_segment_uid;
+ delete p_prev_segment_uid;
+ delete p_next_segment_uid;
std::vector<chapter_edition_c*>::iterator index = stored_editions.begin();
while ( index != stored_editions.end() )
delete (*index);
index++;
}
+ std::vector<chapter_translation_c*>::iterator indext = translations.begin();
+ while ( indext != translations.end() )
+ {
+ delete (*indext);
+ indext++;
+ }
}
KaxSegment *segment;
int64_t i_tags_position;
KaxCluster *cluster;
+ uint64 i_block_pos;
+ uint64 i_cluster_pos;
int64_t i_start_pos;
- KaxSegmentUID segment_uid;
- KaxPrevUID prev_segment_uid;
- KaxNextUID next_segment_uid;
+ KaxSegmentUID *p_segment_uid;
+ KaxPrevUID *p_prev_segment_uid;
+ KaxNextUID *p_next_segment_uid;
vlc_bool_t b_cues;
int i_index;
int i_index_max;
- mkv_index_t *index;
+ mkv_index_t *p_indexes;
/* info */
char *psz_muxing_application;
std::vector<chapter_edition_c*> stored_editions;
int i_default_edition;
- std::vector<chapter_translation_c> translations;
+ std::vector<chapter_translation_c*> translations;
std::vector<KaxSegmentFamily> families;
demux_sys_t & sys;
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 );
+ int BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration );
bool Select( mtime_t i_start_time );
void UnSelect( );
{
linked_segments.push_back( p_segment );
- AppendUID( p_segment->segment_uid );
- AppendUID( p_segment->prev_segment_uid );
- AppendUID( p_segment->next_segment_uid );
+ AppendUID( p_segment->p_segment_uid );
+ AppendUID( p_segment->p_prev_segment_uid );
+ AppendUID( p_segment->p_next_segment_uid );
}
void Sort();
int i_current_edition;
chapter_item_c *psz_current_chapter;
- void AppendUID( const EbmlBinary & UID );
+ void AppendUID( const EbmlBinary * UID );
};
class matroska_stream_c
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)
demux_t & demuxer;
mtime_t i_pts;
+ mtime_t i_last_dts;
mtime_t i_start_pts;
mtime_t i_chapter_time;
vlc_meta_t *meta;
- std::vector<input_title_t> titles; // matroska editions
+ std::vector<input_title_t*> titles; // matroska editions
size_t i_current_title;
std::vector<matroska_stream_c*> streams;
void PreloadLinked( matroska_segment_c *p_segment );
bool PreparePlayback( virtual_segment_c *p_new_segment );
matroska_stream_c *AnalyseAllSegmentsFound( EbmlStream *p_estream );
+ void JumpTo( virtual_segment_c & p_segment, chapter_item_c * p_chapter );
void StartUiThread();
void StopUiThread();
for( size_t i = 0; i < p_sys->titles.size(); i++ )
{
- (*ppp_title)[i] = vlc_input_title_Duplicate( &p_sys->titles[i] );
+ (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] );
}
return VLC_SUCCESS;
i_idx = (int)va_arg( args, int );
if( i_idx < p_sys->used_segments.size() )
{
- p_sys->PreparePlayback( p_sys->used_segments[i_idx] );
+ p_sys->JumpTo( *p_sys->used_segments[i_idx], NULL );
return VLC_SUCCESS;
}
return VLC_EGENERIC;
i_skp = (int)va_arg( args, int );
// TODO change the way it works with the << & >> buttons on the UI (+1/-1 instead of a number)
- if( p_sys->titles.size() && i_skp < p_sys->titles[p_sys->i_current_title].i_seekpoint)
+ if( p_sys->titles.size() && i_skp < p_sys->titles[p_sys->i_current_title]->i_seekpoint)
{
- Seek( p_demux, (int64_t)p_sys->titles[p_sys->i_current_title].seekpoint[i_skp]->i_time_offset, -1, NULL);
+ Seek( p_demux, (int64_t)p_sys->titles[p_sys->i_current_title]->seekpoint[i_skp]->i_time_offset, -1, NULL);
p_demux->info.i_seekpoint |= INPUT_UPDATE_SEEKPOINT;
p_demux->info.i_seekpoint = i_skp;
return VLC_SUCCESS;
}
}
-int matroska_segment_c::BlockGet( KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration )
+int matroska_segment_c::BlockGet( KaxBlock * & pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration )
{
- *pp_block = NULL;
- *pi_ref1 = -1;
- *pi_ref2 = -1;
+ pp_block = NULL;
+ *pi_ref1 = 0;
+ *pi_ref2 = 0;
for( ;; )
{
el = ep->Get();
i_level = ep->GetLevel();
- if( el == NULL && *pp_block != NULL )
+ if( el == NULL && pp_block != NULL )
{
/* update the index */
-#define idx index[i_index - 1]
+#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 == -1 ? VLC_TRUE : VLC_FALSE;
+ idx.i_time = (*pp_block).GlobalTimecode() / (mtime_t)1000;
+ idx.b_key = *pi_ref1 == 0 ? VLC_TRUE : VLC_FALSE;
}
#undef idx
return VLC_SUCCESS;
if( MKV_IS_ID( el, KaxCluster ) )
{
cluster = (KaxCluster*)el;
+ i_cluster_pos = cluster->GetElementPosition();
/* add it to the index */
if( i_index == 0 ||
- ( i_index > 0 && index[i_index - 1].i_position < (int64_t)cluster->GetElementPosition() ) )
+ ( i_index > 0 && p_indexes[i_index - 1].i_position < (int64_t)cluster->GetElementPosition() ) )
{
IndexAppendCluster( cluster );
}
}
else if( MKV_IS_ID( el, KaxBlockGroup ) )
{
+ i_block_pos = el->GetElementPosition();
ep->Down();
}
break;
case 3:
if( MKV_IS_ID( el, KaxBlock ) )
{
- *pp_block = (KaxBlock*)el;
+ pp_block = (KaxBlock*)el;
- (*pp_block)->ReadData( es.I_O() );
- (*pp_block)->SetParent( *cluster );
+ pp_block->ReadData( es.I_O() );
+ pp_block->SetParent( *cluster );
ep->Keep();
}
KaxReferenceBlock &ref = *(KaxReferenceBlock*)el;
ref.ReadData( es.I_O() );
- if( *pi_ref1 == -1 )
+ if( *pi_ref1 == 0 )
{
- *pi_ref1 = int64( ref );
+ *pi_ref1 = int64( ref ) * cluster->GlobalTimecodeScale();
}
else
{
- *pi_ref2 = int64( ref );
+ *pi_ref2 = int64( ref ) * cluster->GlobalTimecodeScale();
}
}
else if( MKV_IS_ID( el, KaxClusterSilentTrackNumber ) )
msg_Err( p_demux, "invalid track number=%d", block->TrackNum() );
return;
}
- if( tk->p_es == NULL )
+ if( tk->fmt.i_cat != NAV_ES && tk->p_es == NULL )
{
msg_Err( p_demux, "unknown track number=%d", block->TrackNum() );
return;
}
- if( i_pts < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES )
+ if( i_pts + i_duration < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES )
{
return; /* discard audio packets that shouldn't be rendered */
}
- if ( tk->fmt.i_cat != SPU_ES || strcmp( tk->psz_codec, "B_VOBBTN" ) )
+ if ( tk->fmt.i_cat != NAV_ES )
{
es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
}
#endif
+ if ( tk->fmt.i_cat == NAV_ES )
+ {
+ // TODO handle the start/stop times of this packet
+ if ( p_sys->b_ui_hooked )
+ {
+ vlc_mutex_lock( &p_sys->p_ev->lock );
+ memcpy( &p_sys->pci_packet, &p_block->p_buffer[1], sizeof(pci_t) );
+ p_sys->SwapButtons();
+ p_sys->b_pci_packet_set = true;
+ vlc_mutex_unlock( &p_sys->p_ev->lock );
+ block_Release( p_block );
+ }
+ return;
+ }
// TODO implement correct timestamping when B frames are used
+#if 0
if( tk->fmt.i_cat != VIDEO_ES )
{
p_block->i_dts = p_block->i_pts = i_pts;
}
else
{
- p_block->i_dts = i_pts;
- p_block->i_pts = 0;
+ p_block->i_pts = i_pts;
+ p_block->i_dts = p_sys->i_pts;
}
-
- if ( tk->fmt.i_cat == SPU_ES )
+#else
+ p_block->i_pts = i_pts;
+ p_block->i_dts = p_sys->i_last_dts;
+#endif
+msg_Dbg( p_demux, "block i_dts: "I64Fd" / i_pts: "I64Fd, p_block->i_dts, p_block->i_pts);
+ if( strcmp( tk->psz_codec, "S_VOBSUB" ) )
{
- if ( !strcmp( tk->psz_codec, "B_VOBBTN" ) )
- {
- // TODO handle the start/stop times of this packet
- if ( p_sys->b_ui_hooked )
- {
- vlc_mutex_lock( &p_sys->p_ev->lock );
- memcpy( &p_sys->pci_packet, &p_block->p_buffer[1], sizeof(pci_t) );
- p_sys->SwapButtons();
- p_sys->b_pci_packet_set = true;
- vlc_mutex_unlock( &p_sys->p_ev->lock );
- block_Release( p_block );
- }
- return;
- }
-
- else if ( strcmp( tk->psz_codec, "S_VOBSUB" ) )
- {
- p_block->i_length = i_duration * 1000;
- }
+ p_block->i_length = i_duration * 1000;
}
es_out_Send( p_demux->out, tk->p_es, p_block );
delete p_l0;
// find all segments in this file
- p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFL);
+ p_l0 = p_estream->FindNextID(KaxSegment::ClassInfos, 0xFFFFFFFFFLL);
if (p_l0 == NULL)
{
return NULL;
if ( !b_keep_segment )
break; // this segment is already known
opened_segments.push_back( p_segment1 );
- p_segment1->segment_uid = *( new KaxSegmentUID(*p_uid) );
+ delete p_segment1->p_segment_uid;
+ p_segment1->p_segment_uid = new KaxSegmentUID(*p_uid);
}
else if( MKV_IS_ID( l, KaxPrevUID ) )
{
- p_segment1->prev_segment_uid = *( new KaxPrevUID( *static_cast<KaxPrevUID*>(l) ) );
+ p_segment1->p_prev_segment_uid = new KaxPrevUID( *static_cast<KaxPrevUID*>(l) );
}
else if( MKV_IS_ID( l, KaxNextUID ) )
{
- p_segment1->next_segment_uid = *( new KaxNextUID( *static_cast<KaxNextUID*>(l) ) );
+ p_segment1->p_next_segment_uid = new KaxNextUID( *static_cast<KaxNextUID*>(l) );
}
else if( MKV_IS_ID( l, KaxSegmentFamily ) )
{
else if( !strcmp( tracks[i_track]->psz_codec, "V_QUICKTIME" ) )
{
MP4_Box_t *p_box = (MP4_Box_t*)malloc( sizeof( MP4_Box_t ) );
-#ifdef VSLHC
- stream_t *p_mp4_stream = stream_MemoryNew( VLC_OBJECT(&sys.demuxer),
- tracks[i_track]->p_extra_data,
- tracks[i_track]->i_extra_data );
-#else
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 );
-#endif
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;
tracks[i_track]->fmt.p_extra = malloc( tracks[i_track]->fmt.i_extra );
memcpy( tracks[i_track]->fmt.p_extra, p_box->data.p_sample_vide->p_qt_image_description, tracks[i_track]->fmt.i_extra );
MP4_FreeBox_sample_vide( p_box );
-#ifdef VSLHC
- stream_MemoryDelete( p_mp4_stream, VLC_TRUE );
-#else
stream_Delete( p_mp4_stream );
-#endif
}
else if( !strcmp( tracks[i_track]->psz_codec, "A_MS/ACM" ) )
{
}
else if( !strcmp( tracks[i_track]->psz_codec, "B_VOBBTN" ) )
{
- tracks[i_track]->fmt.i_codec = VLC_FOURCC( 's','p','u',' ' );
+ tracks[i_track]->fmt.i_cat = NAV_ES;
+ continue;
}
else
{
{
demux_sys_t & sys = *demux.p_sys;
chapter_item_c *psz_curr_chapter;
+ bool b_has_seeked = false;
/* update current chapter/seekpoint */
if ( p_editions->size() )
{
/* 1st, we need to know in which chapter we are */
- psz_curr_chapter = (*p_editions)[i_current_edition]->FindTimecode( sys.i_pts );
+ psz_curr_chapter = (*p_editions)[i_current_edition]->FindTimecode( sys.i_pts, psz_current_chapter );
/* we have moved to a new chapter */
if (psz_curr_chapter != NULL && psz_current_chapter != psz_curr_chapter)
if ( (*p_editions)[i_current_edition]->b_ordered )
{
// Leave/Enter up to the link point
- if ( !psz_curr_chapter->EnterAndLeave( psz_current_chapter ) )
+ b_has_seeked = psz_curr_chapter->EnterAndLeave( psz_current_chapter );
+ if ( !b_has_seeked )
{
- // only seek if necessary
+ // only physically seek if necessary
if ( psz_current_chapter == NULL || (psz_current_chapter->i_end_time != psz_curr_chapter->i_start_time) )
Seek( demux, sys.i_pts, 0, psz_curr_chapter );
- psz_current_chapter = psz_curr_chapter;
}
}
- else if ( psz_curr_chapter->i_seekpoint_num > 0 )
- {
- demux.info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT;
- demux.info.i_title = sys.i_current_title = i_sys_title;
- demux.info.i_seekpoint = psz_curr_chapter->i_seekpoint_num - 1;
- psz_current_chapter = psz_curr_chapter;
- }
- else
+
+ if ( !b_has_seeked )
{
psz_current_chapter = psz_curr_chapter;
+ if ( psz_curr_chapter->i_seekpoint_num > 0 )
+ {
+ demux.info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT;
+ demux.info.i_title = sys.i_current_title = i_sys_title;
+ demux.info.i_seekpoint = psz_curr_chapter->i_seekpoint_num - 1;
+ }
}
return true;
// out of the scope of the data described by chapters, leave the edition
if ( (*p_editions)[i_current_edition]->b_ordered && psz_current_chapter != NULL )
{
- if ( !(*p_editions)[i_current_edition]->EnterAndLeave( psz_current_chapter ) )
+ if ( !(*p_editions)[i_current_edition]->EnterAndLeave( psz_current_chapter, false ) )
psz_current_chapter = NULL;
else
return true;
std::string dvd_chapter_codec_c::GetCodecName( bool f_for_title ) const
{
std::string result;
- if ( m_private_data.GetSize() >= 3)
+ if ( p_private_data->GetSize() >= 3)
{
- const binary* p_data = m_private_data.GetBuffer();
+ const binary* p_data = p_private_data->GetBuffer();
/* if ( p_data[0] == MATROSKA_DVD_LEVEL_TT )
{
uint16_t i_title = (p_data[1] << 8) + p_data[2];
int16 dvd_chapter_codec_c::GetTitleNumber()
{
- if ( m_private_data.GetSize() >= 3)
+ if ( p_private_data->GetSize() >= 3)
{
- const binary* p_data = m_private_data.GetBuffer();
+ const binary* p_data = p_private_data->GetBuffer();
if ( p_data[0] == MATROSKA_DVD_LEVEL_SS )
{
return int16( (p_data[2] << 8) + p_data[3] );
msg_Dbg( p_demux, "inacurate way of seeking" );
for( i_index = 0; i_index < p_segment->i_index; i_index++ )
{
- if( p_segment->index[i_index].i_position >= i_pos)
+ if( p_segment->p_indexes[i_index].i_position >= i_pos)
{
break;
}
i_index--;
}
- i_date = p_segment->index[i_index].i_time;
+ i_date = p_segment->p_indexes[i_index].i_time;
#if 0
- if( p_segment->index[i_index].i_position < i_pos )
+ if( p_segment->p_indexes[i_index].i_position < i_pos )
{
EbmlElement *el;
int i_block_count = 0;
int i_return = 0;
- KaxBlock *block;
- int64_t i_block_duration;
- int64_t i_block_ref1;
- int64_t i_block_ref2;
-
for( ;; )
{
if ( p_sys->demuxer.b_die )
continue;
}
+ KaxBlock *block;
+ int64_t i_block_duration = 0;
+ int64_t i_block_ref1;
+ int64_t i_block_ref2;
- if( p_segment->BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
+ if( p_segment->BlockGet( block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
{
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_pts = p_chap->i_user_end_time;
+ p_sys->i_last_dts = 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;
break;
}
- msg_Warn( p_demux, "cannot get block EOF?" );
+ else
+ {
+ 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 */
+ if ( !p_vsegment->SelectNext() )
+ // no more segments in this stream
+ break;
+ p_segment = p_vsegment->Segment();
+ if ( !p_segment->Select( 0 ) )
+ {
+ msg_Err( p_demux, "Failed to select new segment" );
+ break;
+ }
+
+ continue;
+ }
+ }
+
+ 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;
+ else
+ p_sys->i_last_dts = i_dts;
+
+ p_sys->i_pts = i_pts;
+
+ 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;
+ 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 */
- if ( !p_vsegment->SelectNext() )
- // no more segments in this stream
- break;
p_segment = p_vsegment->Segment();
if ( !p_segment->Select( 0 ) )
{
msg_Err( p_demux, "Failed to select new segment" );
break;
}
-
continue;
}
- 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 );
- }
-
- BlockDecode( p_demux, block, p_sys->i_pts, i_block_duration );
+ BlockDecode( p_demux, block, i_pts, i_block_duration );
delete block;
i_block_count++;
}
}
+EbmlElement* EbmlParser::UnGet( uint64 i_block_pos, uint64 i_cluster_pos )
+{
+ if ( mi_user_level > mi_level )
+ {
+ while ( mi_user_level != mi_level )
+ {
+ delete m_el[mi_user_level];
+ m_el[mi_user_level] = NULL;
+ mi_user_level--;
+ }
+ }
+ m_got = NULL;
+ mb_keep = VLC_FALSE;
+ if ( m_el[1]->GetElementPosition() == i_cluster_pos )
+ {
+ m_es->I_O().setFilePointer( i_block_pos, seek_beginning );
+ return (EbmlMaster*) m_el[1];
+ }
+ else
+ {
+ // seek to the previous Cluster
+ m_es->I_O().setFilePointer( i_cluster_pos, seek_beginning );
+ mi_level--;
+ mi_user_level--;
+ delete m_el[mi_level];
+ m_el[mi_level] = NULL;
+ return NULL;
+ }
+}
+
void EbmlParser::Up( void )
{
if( mi_user_level == mi_level )
mb_keep = VLC_FALSE;
}
- m_el[mi_level] = m_es->FindNextElement( m_el[mi_level - 1]->Generic().Context, i_ulev, 0xFFFFFFFFL, mb_dummy, 1 );
+ m_el[mi_level] = m_es->FindNextElement( m_el[mi_level - 1]->Generic().Context, i_ulev, 0xFFFFFFFFL, mb_dummy != 0, 1 );
// mi_remain_size[mi_level] = m_el[mi_level]->GetSize();
if( i_ulev > 0 )
{
{
if( MKV_IS_ID( el, KaxCuePoint ) )
{
-#define idx index[i_index]
+#define idx p_indexes[i_index]
idx.i_track = -1;
idx.i_block_number= -1;
if( i_index >= i_index_max )
{
i_index_max += 1024;
- index = (mkv_index_t*)realloc( index, sizeof( mkv_index_t ) * i_index_max );
+ p_indexes = (mkv_index_t*)realloc( p_indexes, sizeof( mkv_index_t ) * i_index_max );
}
#undef idx
}
msg_Dbg( &sys.demuxer, "| | | + Track Video" );
tk->f_fps = 0.0;
+ tk->fmt.video.i_frame_rate_base = (unsigned int)(tk->i_default_duration / 1000);
+ tk->fmt.video.i_frame_rate = 1000000;
+
for( j = 0; j < tkv->ListSize(); j++ )
{
EbmlElement *l = (*tkv)[j];
if( MKV_IS_ID( l, KaxSegmentUID ) )
{
- segment_uid = *(new KaxSegmentUID(*static_cast<KaxSegmentUID*>(l)));
+ p_segment_uid = new KaxSegmentUID(*static_cast<KaxSegmentUID*>(l));
- msg_Dbg( &sys.demuxer, "| | + UID=%d", *(uint32*)segment_uid.GetBuffer() );
+ msg_Dbg( &sys.demuxer, "| | + UID=%d", *(uint32*)p_segment_uid->GetBuffer() );
}
else if( MKV_IS_ID( l, KaxPrevUID ) )
{
- prev_segment_uid = *(new KaxPrevUID(*static_cast<KaxPrevUID*>(l)));
+ p_prev_segment_uid = new KaxPrevUID(*static_cast<KaxPrevUID*>(l));
- msg_Dbg( &sys.demuxer, "| | + PrevUID=%d", *(uint32*)prev_segment_uid.GetBuffer() );
+ msg_Dbg( &sys.demuxer, "| | + PrevUID=%d", *(uint32*)p_prev_segment_uid->GetBuffer() );
}
else if( MKV_IS_ID( l, KaxNextUID ) )
{
- next_segment_uid = *(new KaxNextUID(*static_cast<KaxNextUID*>(l)));
+ p_next_segment_uid = new KaxNextUID(*static_cast<KaxNextUID*>(l));
- msg_Dbg( &sys.demuxer, "| | + NextUID=%d", *(uint32*)next_segment_uid.GetBuffer() );
+ msg_Dbg( &sys.demuxer, "| | + NextUID=%d", *(uint32*)p_next_segment_uid->GetBuffer() );
}
else if( MKV_IS_ID( l, KaxTimecodeScale ) )
{
else if( MKV_IS_ID( l, KaxChapterTranslate ) )
{
KaxChapterTranslate *p_trans = static_cast<KaxChapterTranslate*>( l );
- chapter_translation_c translated;
+ chapter_translation_c *p_translate = new chapter_translation_c();
p_trans->Read( es, p_trans->Generic().Context, i_upper_level, el, true );
for( j = 0; j < p_trans->ListSize(); j++ )
if( MKV_IS_ID( l, KaxChapterTranslateEditionUID ) )
{
- translated.editions.push_back( uint64( *static_cast<KaxChapterTranslateEditionUID*>( l ) ) );
+ p_translate->editions.push_back( uint64( *static_cast<KaxChapterTranslateEditionUID*>( l ) ) );
}
else if( MKV_IS_ID( l, KaxChapterTranslateCodec ) )
{
- translated.codec_id = uint32( *static_cast<KaxChapterTranslateCodec*>( l ) );
+ p_translate->codec_id = uint32( *static_cast<KaxChapterTranslateCodec*>( l ) );
}
else if( MKV_IS_ID( l, KaxChapterTranslateID ) )
{
- translated.translated = *( new KaxChapterTranslateID( *static_cast<KaxChapterTranslateID*>( l ) ) );
+ p_translate->p_translated = new KaxChapterTranslateID( *static_cast<KaxChapterTranslateID*>( l ) );
}
}
- translations.push_back( translated );
+ translations.push_back( p_translate );
}
#endif
else
stored_editions[i]->RefreshChapters( );
}
- if ( stored_editions[i_default_edition]->b_ordered )
+ 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);
void matroska_segment_c::IndexAppendCluster( KaxCluster *cluster )
{
-#define idx index[i_index]
+#define idx p_indexes[i_index]
idx.i_track = -1;
idx.i_block_number= -1;
idx.i_position = cluster->GetElementPosition();
if( i_index >= i_index_max )
{
i_index_max += 1024;
- index = (mkv_index_t*)realloc( index, sizeof( mkv_index_t ) * i_index_max );
+ p_indexes = (mkv_index_t*)realloc( p_indexes, sizeof( mkv_index_t ) * i_index_max );
}
#undef idx
}
return i_result;
}
-chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode )
+chapter_item_c * chapter_edition_c::FindTimecode( mtime_t i_timecode, const chapter_item_c * p_current )
+{
+ if ( !b_ordered )
+ p_current = NULL;
+ bool b_found_current = false;
+ return chapter_item_c::FindTimecode( i_timecode, p_current, b_found_current );
+}
+
+chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode, const chapter_item_c * p_current, bool & b_found )
{
chapter_item_c *psz_result = NULL;
+ if ( p_current == this )
+ b_found = true;
+
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();
- while ( index != sub_chapters.end() && psz_result == NULL )
+ while ( index != sub_chapters.end() && ((p_current == NULL && psz_result == NULL) || (p_current != NULL && (!b_found || psz_result == NULL))))
{
- psz_result = (*index)->FindTimecode( i_user_timecode );
+ psz_result = (*index)->FindTimecode( i_user_timecode, p_current, b_found );
index++;
}
p_title->psz_name = strdup( sz_name.c_str() );
}
- titles.push_back( *p_title );
+ titles.push_back( p_title );
}
}
{
for ( size_t i=0; i< used_segments.size(); i++ )
{
- if ( used_segments[i]->FindUID( segment.segment_uid ) )
+ if ( used_segments[i]->FindUID( *segment.p_segment_uid ) )
return true;
}
return false;
return true;
}
+void demux_sys_t::JumpTo( virtual_segment_c & vsegment, chapter_item_c * p_chapter )
+{
+ // if the segment is not part of the current segment, select the new one
+ if ( &vsegment != p_current_segment )
+ {
+ PreparePlayback( &vsegment );
+ }
+
+ if ( p_chapter != NULL )
+ {
+ if ( !p_chapter->Enter( true ) )
+ {
+ // jump to the location in the found segment
+ 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->segment_uid);
- if ( *p_itema == p_item_b->prev_segment_uid )
+ EbmlBinary * p_itema = (EbmlBinary *)(p_item_a->p_segment_uid);
+ if ( *p_itema == *p_item_b->p_prev_segment_uid )
return true;
- p_itema = (EbmlBinary *)(&p_item_a->next_segment_uid);
- if ( *p_itema == p_item_b->segment_uid )
+ p_itema = (EbmlBinary *)(&p_item_a->p_next_segment_uid);
+ if ( *p_itema == *p_item_b->p_segment_uid )
return true;
- if ( *p_itema == p_item_b->prev_segment_uid )
+ if ( *p_itema == *p_item_b->p_prev_segment_uid )
return true;
return false;
cluster = (KaxCluster*)el;
- i_start_pos = cluster->GetElementPosition();
+ i_cluster_pos = i_start_pos = cluster->GetElementPosition();
ParseCluster( );
ep->Down();
{
for (size_t i=0; i<opened_segments.size(); i++)
{
- if ( opened_segments[i]->segment_uid == uid )
+ if ( *opened_segments[i]->p_segment_uid == uid )
return opened_segments[i];
}
return NULL;
// check if it's not already in here
for ( i=0; i<linked_segments.size(); i++ )
{
- if ( p_segment->segment_uid == linked_segments[i]->segment_uid )
+ if ( *p_segment->p_segment_uid == *linked_segments[i]->p_segment_uid )
return 0;
}
// find possible mates
for ( i=0; i<linked_uids.size(); i++ )
{
- if ( p_segment->segment_uid == linked_uids[i]
- || p_segment->prev_segment_uid == linked_uids[i]
- || p_segment->next_segment_uid == linked_uids[i] )
+ if ( (p_segment->p_segment_uid != NULL && *p_segment->p_segment_uid == linked_uids[i])
+ || (p_segment->p_prev_segment_uid != NULL && *p_segment->p_prev_segment_uid == linked_uids[i])
+ || (p_segment->p_next_segment_uid !=NULL && *p_segment->p_next_segment_uid == linked_uids[i]) )
{
linked_segments.push_back( p_segment );
- AppendUID( p_segment->prev_segment_uid );
- AppendUID( p_segment->next_segment_uid );
+ AppendUID( p_segment->p_prev_segment_uid );
+ AppendUID( p_segment->p_next_segment_uid );
return 1;
}
}
}
-void virtual_segment_c::AppendUID( const EbmlBinary & UID )
+void virtual_segment_c::AppendUID( const EbmlBinary * p_UID )
{
- if ( UID.GetBuffer() == NULL )
+ if ( p_UID == NULL )
+ return;
+ if ( p_UID->GetBuffer() == NULL )
return;
for (size_t i=0; i<linked_uids.size(); i++)
{
- if ( UID == linked_uids[i] )
+ if ( *p_UID == linked_uids[i] )
return;
}
- linked_uids.push_back( *(KaxSegmentUID*)(&UID) );
+ linked_uids.push_back( *(KaxSegmentUID*)(p_UID) );
}
void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset )
for( ; i_idx < i_index; i_idx++ )
{
- if( index[i_idx].i_time + i_time_offset > i_date )
+ if( p_indexes[i_idx].i_time + i_time_offset > i_date )
{
break;
}
i_idx--;
}
- i_seek_position = index[i_idx].i_position;
- i_seek_time = index[i_idx].i_time;
+ i_seek_position = p_indexes[i_idx].i_position;
+ i_seek_time = p_indexes[i_idx].i_time;
}
msg_Dbg( &sys.demuxer, "seek got "I64Fd" (%d%%)",
while( i_track_skipping > 0 )
{
- if( BlockGet( &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
+ if( BlockGet( block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
{
msg_Warn( &sys.demuxer, "cannot get block EOF?" );
return;
}
+ ep->Down();
for( i_track = 0; i_track < tracks.size(); i_track++ )
{
}
}
- sys.i_pts = sys.i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000;
+ sys.i_last_dts = sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
if( i_track < tracks.size() )
{
- if( sys.i_pts >= sys.i_start_pts )
+ if( sys.i_pts >= sys.i_start_pts )
{
- BlockDecode( &sys.demuxer, block, sys.i_pts, 0 );
+ cluster = static_cast<KaxCluster*>(ep->UnGet( i_block_pos, i_cluster_pos ));
i_track_skipping = 0;
}
else if( tracks[i_track]->fmt.i_cat == VIDEO_ES )
{
- if( i_block_ref1 == -1 && tracks[i_track]->b_search_keyframe )
+ if( i_block_ref1 == 0 && tracks[i_track]->b_search_keyframe )
{
tracks[i_track]->b_search_keyframe = VLC_FALSE;
i_track_skipping--;
if ( Edition() && Edition()->b_ordered )
{
/* 1st, we need to know in which chapter we are */
- psz_chapter = (*p_editions)[i_current_edition]->FindTimecode( i_date );
+ psz_chapter = (*p_editions)[i_current_edition]->FindTimecode( i_date, psz_current_chapter );
}
}
switch ( codec_time )
{
case 0:
- during_cmds.push_back( *p_data );
+ during_cmds.push_back( p_data );
break;
case 1:
- enter_cmds.push_back( *p_data );
+ enter_cmds.push_back( p_data );
break;
case 2:
- leave_cmds.push_back( *p_data );
+ leave_cmds.push_back( p_data );
break;
default:
delete p_data;
return f_result;
}
-bool chapter_item_c::EnterAndLeave( chapter_item_c *p_item )
+bool chapter_item_c::EnterAndLeave( chapter_item_c *p_item, bool b_final_enter )
{
chapter_item_c *p_common_parent = p_item;
} while ( 1 );
}
- return Enter( true );
+ if ( b_final_enter )
+ return Enter( true );
+ else
+ return false;
}
bool dvd_chapter_codec_c::Enter()
{
bool f_result = false;
- std::vector<KaxChapterProcessData>::iterator index = enter_cmds.begin();
+ std::vector<KaxChapterProcessData*>::iterator index = enter_cmds.begin();
while ( index != enter_cmds.end() )
{
- if ( (*index).GetSize() )
+ if ( (*index)->GetSize() )
{
- binary *p_data = (*index).GetBuffer();
+ 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" );
bool dvd_chapter_codec_c::Leave()
{
bool f_result = false;
- std::vector<KaxChapterProcessData>::iterator index = leave_cmds.begin();
+ std::vector<KaxChapterProcessData*>::iterator index = leave_cmds.begin();
while ( index != leave_cmds.end() )
{
- if ( (*index).GetSize() )
+ if ( (*index)->GetSize() )
{
- binary *p_data = (*index).GetBuffer();
+ 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" );
// handle register tests if there are some
if ( (i_command & 0xF0) != 0 )
{
- bool b_test_positive = (i_command & CMD_DVD_IF_NOT) == 0;
+ bool b_test_positive = true;//(i_command & CMD_DVD_IF_NOT) == 0;
bool b_test_value = (i_command & CMD_DVD_TEST_VALUE) != 0;
uint8 i_test = i_command & 0x70;
uint16 i_value;
+ // see http://dvd.sourceforge.net/dvdinfo/vmi.html
+ uint8 i_cr1;
+ uint16 i_cr2;
+ switch ( i_command >> 12 )
+ {
+ default:
+ i_cr1 = p_command[3];
+ i_cr2 = (p_command[4] << 8) + p_command[5];
+ break;
+ case 3:
+ case 4:
+ case 5:
+ i_cr1 = p_command[6];
+ i_cr2 = p_command[7];
+ b_test_value = false;
+ break;
+ case 6:
+ case 7:
+ if ( ((p_command[1] >> 4) & 0x7) == 0)
+ {
+ i_cr1 = p_command[2];
+ i_cr2 = (p_command[6] << 8) + p_command[7];
+ }
+ else
+ {
+ i_cr1 = p_command[2];
+ i_cr2 = (p_command[6] << 8) + p_command[7];
+ }
+ break;
+ }
+
if ( b_test_value )
- i_value = ( p_command[4] << 8 ) + p_command[5];
+ i_value = i_cr2;
else
- i_value = GetPRM( p_command[7] );
+ i_value = GetPRM( i_cr2 );
switch ( i_test )
{
case CMD_DVD_IF_GPREG_EQUAL:
// if equals
- msg_Dbg( &sys.demuxer, "IF %s EQUALS %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
- if (!( GetPRM( p_command[3] ) == i_value ))
+ msg_Dbg( &sys.demuxer, "IF %s EQUALS %s", GetRegTypeName( false, i_cr1 ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) == i_value ))
{
- b_test_positive = !b_test_positive;
+ b_test_positive = false;
+ }
+ break;
+ case CMD_DVD_IF_GPREG_NOT_EQUAL:
+ // if not equals
+ msg_Dbg( &sys.demuxer, "IF %s NOT EQUALS %s", GetRegTypeName( false, i_cr1 ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) != i_value ))
+ {
+ b_test_positive = false;
}
break;
case CMD_DVD_IF_GPREG_INF:
// if inferior
msg_Dbg( &sys.demuxer, "IF %s < %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
- if (!( GetPRM( p_command[3] ) < i_value ))
+ if (!( GetPRM( i_cr1 ) < i_value ))
+ {
+ b_test_positive = false;
+ }
+ break;
+ case CMD_DVD_IF_GPREG_INF_EQUAL:
+ // if inferior or equal
+ msg_Dbg( &sys.demuxer, "IF %s < %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) <= i_value ))
{
- b_test_positive = !b_test_positive;
+ b_test_positive = false;
}
break;
case CMD_DVD_IF_GPREG_AND:
// if logical and
msg_Dbg( &sys.demuxer, "IF %s & %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
- if (!( GetPRM( p_command[3] ) & i_value ))
+ if (!( GetPRM( i_cr1 ) & i_value ))
{
- b_test_positive = !b_test_positive;
+ b_test_positive = false;
+ }
+ break;
+ case CMD_DVD_IF_GPREG_SUP:
+ // if superior
+ msg_Dbg( &sys.demuxer, "IF %s >= %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
+ if (!( GetPRM( i_cr1 ) > i_value ))
+ {
+ b_test_positive = false;
}
break;
case CMD_DVD_IF_GPREG_SUP_EQUAL:
// if superior or equal
msg_Dbg( &sys.demuxer, "IF %s >= %s", GetRegTypeName( false, p_command[3] ).c_str(), GetRegTypeName( b_test_value, i_value ).c_str() );
- if (!( GetPRM( p_command[3] ) >= i_value ))
+ if (!( GetPRM( i_cr1 ) >= i_value ))
{
- b_test_positive = !b_test_positive;
+ b_test_positive = false;
}
break;
}
// find in the ChapProcessPrivate matching this Title level
p_chapter = sys.BrowseCodecPrivate( 1, MatchTitleNumber, &i_title, sizeof(i_title), p_segment );
- if ( p_chapter != NULL )
+ if ( p_segment != NULL )
{
- // if the segment is not part of the current segment, select the new one
- if ( p_segment != sys.p_current_segment )
- {
- sys.PreparePlayback( p_segment );
- }
-
- // jump to the location in the found segment
- p_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, NULL );
- p_chapter->Enter( true );
-
+ sys.JumpTo( *p_segment, p_chapter );
f_result = true;
}
}
case CMD_DVD_CALLSS_VTSM1:
{
- msg_Dbg( &sys.demuxer, "CallSS VTSM" );
+ msg_Dbg( &sys.demuxer, "CallSS" );
+ binary p_type;
switch( (p_command[6] & 0xC0) >> 6 ) {
case 0:
- switch ( p_command[5] )
+ p_type = p_command[5] & 0x0F;
+ switch ( p_type )
{
case 0x00:
- msg_Dbg( &sys.demuxer, "CallSS PGC (rsm_cell %x)", p_command[5]);
+ msg_Dbg( &sys.demuxer, "CallSS PGC (rsm_cell %x)", p_command[4]);
break;
- case 0x82:
- msg_Dbg( &sys.demuxer, "CallSS Title Entry (rsm_cell %x)", p_command[5]);
+ case 0x02:
+ msg_Dbg( &sys.demuxer, "CallSS Title Entry (rsm_cell %x)", p_command[4]);
break;
- case 0x83:
- msg_Dbg( &sys.demuxer, "CallSS Root Menu (rsm_cell %x)", p_command[5]);
+ case 0x03:
+ msg_Dbg( &sys.demuxer, "CallSS Root Menu (rsm_cell %x)", p_command[4]);
break;
- case 0x84:
- msg_Dbg( &sys.demuxer, "CallSS Subpicture Menu (rsm_cell %x)", p_command[5]);
+ case 0x04:
+ msg_Dbg( &sys.demuxer, "CallSS Subpicture Menu (rsm_cell %x)", p_command[4]);
break;
- case 0x85:
- msg_Dbg( &sys.demuxer, "CallSS Audio Menu (rsm_cell %x)", p_command[5]);
+ case 0x05:
+ msg_Dbg( &sys.demuxer, "CallSS Audio Menu (rsm_cell %x)", p_command[4]);
break;
- case 0x86:
- msg_Dbg( &sys.demuxer, "CallSS Angle Menu (rsm_cell %x)", p_command[5]);
+ case 0x06:
+ msg_Dbg( &sys.demuxer, "CallSS Angle Menu (rsm_cell %x)", p_command[4]);
break;
- case 0x87:
- msg_Dbg( &sys.demuxer, "CallSS Chapter Menu (rsm_cell %x)", p_command[5]);
+ case 0x07:
+ msg_Dbg( &sys.demuxer, "CallSS Chapter Menu (rsm_cell %x)", p_command[4]);
break;
default:
- msg_Dbg( &sys.demuxer, "CallSS <unknown> (rsm_cell %x)", p_command[5]);
+ msg_Dbg( &sys.demuxer, "CallSS <unknown> (rsm_cell %x)", p_command[4]);
break;
}
- p_chapter = sys.BrowseCodecPrivate( 1, MatchPgcType, &p_command[5], 1, p_segment );
- if ( p_chapter != NULL )
+ p_chapter = sys.BrowseCodecPrivate( 1, MatchPgcType, &p_type, 1, p_segment );
+ if ( p_segment != NULL )
{
- // if the segment is not part of the current segment, select the new one
- if ( p_segment != sys.p_current_segment )
- {
- sys.PreparePlayback( p_segment );
- }
-
- p_chapter->Enter( true );
-
- // jump to the location in the found segment
- p_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter );
+ sys.JumpTo( *p_segment, p_chapter );
f_result = true;
}
break;
case 1:
- msg_Dbg( &sys.demuxer, "CallSS VMGM (menu %d, rsm_cell %x)", p_command[6] & 0x0F, p_command[5]);
+ msg_Dbg( &sys.demuxer, "CallSS VMGM (menu %d, rsm_cell %x)", p_command[5] & 0x0F, p_command[4]);
+ break;
+ case 2:
+ msg_Dbg( &sys.demuxer, "CallSS VTSM (menu %d, rsm_cell %x)", p_command[5] & 0x0F, p_command[4]);
+ break;
+ case 3:
+ msg_Dbg( &sys.demuxer, "CallSS VMGM (pgc %d, rsm_cell %x)", (p_command[2] << 8) + p_command[3], p_command[4]);
+ break;
+ }
+ break;
+ }
+ case CMD_DVD_JUMP_SS:
+ {
+ msg_Dbg( &sys.demuxer, "JumpSS");
+ binary p_type;
+ switch( (p_command[5] & 0xC0) >> 6 ) {
+ case 0:
+ msg_Dbg( &sys.demuxer, "JumpSS FP");
+ break;
+ case 1:
+ p_type = p_command[5] & 0x0F;
+ switch ( p_type )
+ {
+ case 0x02:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Title Entry");
+ break;
+ case 0x03:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Root Menu");
+ break;
+ case 0x04:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Subpicture Menu");
+ break;
+ case 0x05:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Audio Menu");
+ break;
+ case 0x06:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Angle Menu");
+ break;
+ case 0x07:
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM Chapter Menu");
+ break;
+ default:
+ msg_Dbg( &sys.demuxer, "JumpSS <unknown>");
+ break;
+ }
+ // find the VMG
+ p_chapter = sys.BrowseCodecPrivate( 1, MatchIsVMG, NULL, 0, p_segment );
+ if ( p_segment != NULL )
+ {
+ p_chapter = p_segment->BrowseCodecPrivate( 1, MatchPgcType, &p_type, 1 );
+ if ( p_chapter != NULL )
+ {
+ sys.JumpTo( *p_segment, p_chapter );
+ f_result = true;
+ }
+ }
break;
case 2:
- msg_Dbg( &sys.demuxer, "CallSS VTSM (menu %d, rsm_cell %x)", p_command[6] & 0x0F, p_command[5]);
+ p_type = p_command[5] & 0x0F;
+ switch ( p_type )
+ {
+ case 0x02:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Title Entry", p_command[4], p_command[3]);
+ break;
+ case 0x03:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Root Menu", p_command[4], p_command[3]);
+ break;
+ case 0x04:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Subpicture Menu", p_command[4], p_command[3]);
+ break;
+ case 0x05:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Audio Menu", p_command[4], p_command[3]);
+ break;
+ case 0x06:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Angle Menu", p_command[4], p_command[3]);
+ break;
+ case 0x07:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) Chapter Menu", p_command[4], p_command[3]);
+ break;
+ default:
+ msg_Dbg( &sys.demuxer, "JumpSS VTSM (vts %d, ttn %d) <unknown>", p_command[4], p_command[3]);
+ break;
+ }
+
+ p_chapter = sys.BrowseCodecPrivate( 1, MatchVTSMNumber, &p_command[4], 1, p_segment );
+
+ if ( p_segment != NULL && p_chapter != NULL )
+ {
+ // find the title in the VTS
+ p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchTitleNumber, &p_command[3], 1 );
+ if ( p_chapter != NULL )
+ {
+ // find the specified menu in the VTSM
+ p_chapter = p_segment->BrowseCodecPrivate( 1, MatchPgcType, &p_type, 1 );
+ if ( p_chapter != NULL )
+ {
+ sys.JumpTo( *p_segment, p_chapter );
+ f_result = true;
+ }
+ }
+ else
+ msg_Dbg( &sys.demuxer, "Title (%d) does not exist in this VTS", p_command[3] );
+ }
+ else
+ msg_Dbg( &sys.demuxer, "DVD Domain VTS (%d) not found", p_command[4] );
break;
case 3:
- msg_Dbg( &sys.demuxer, "CallSS VMGM (pgc %d, rsm_cell %x)", (p_command[3] << 8) + p_command[4], p_command[5]);
+ msg_Dbg( &sys.demuxer, "JumpSS VMGM (pgc %d)", (p_command[2] << 8) + p_command[3]);
break;
}
break;
{
p_chapter = sys.BrowseCodecPrivate( 1, MatchVTSNumber, &i_curr_title, sizeof(i_curr_title), p_segment );
- if ( p_chapter != NULL )
+ if ( p_segment != NULL && p_chapter != NULL )
{
// find the title in the VTS
p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchTitleNumber, &i_title, sizeof(i_title) );
p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchChapterNumber, &i_ptt, sizeof(i_ptt) );
if ( p_chapter != NULL )
{
- // if the segment is not part of the current segment, select the new one
- if ( p_segment != sys.p_current_segment )
- {
- sys.PreparePlayback( p_segment );
- }
-
- p_chapter->Enter( true );
-
- // jump to the location in the found segment
- p_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter );
+ sys.JumpTo( *p_segment, p_chapter );
f_result = true;
}
}
p_chapter = sys.p_current_segment->BrowseCodecPrivate( 1, MatchPgcNumber, &i_pgcn, 2 );
if ( p_chapter != NULL )
{
- p_chapter->Enter( true );
-
- // jump to the location in the found segment
- sys.p_current_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter );
+ if ( !p_chapter->Enter( true ) )
+ // jump to the location in the found segment
+ sys.p_current_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter );
+
f_result = true;
}
break;
p_chapter = p_chapter->BrowseCodecPrivate( 1, MatchCellNumber, &i_cn, 1 );
if ( p_chapter != NULL )
{
- p_chapter->Enter( true );
-
- // jump to the location in the found segment
- sys.p_current_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter );
+ if ( !p_chapter->Enter( true ) )
+ // jump to the location in the found segment
+ sys.p_current_segment->Seek( sys.demuxer, p_chapter->i_user_start_time, -1, p_chapter );
+
f_result = true;
}
break;
// TODO
break;
}
+ case CMD_DVD_SET_HL_BTNN1:
+ {
+ msg_Dbg( &sys.demuxer, "SetHL_BTN (%d)", p_command[4] );
+ SetSPRM( 0x88, p_command[4] );
+ break;
+ }
default:
{
msg_Dbg( &sys.demuxer, "unsupported command : %02X %02X %02X %02X %02X %02X %02X %02X"
bool dvd_command_interpretor_c::MatchIsDomain( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
{
- return ( data.m_private_data.GetBuffer()[0] == MATROSKA_DVD_LEVEL_SS );
+ return ( data.p_private_data != NULL && data.p_private_data->GetBuffer()[0] == MATROSKA_DVD_LEVEL_SS );
+}
+
+bool dvd_command_interpretor_c::MatchIsVMG( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ if ( data.p_private_data == NULL || data.p_private_data->GetSize() < 2 )
+ return false;
+
+ return ( data.p_private_data->GetBuffer()[0] == MATROSKA_DVD_LEVEL_SS && data.p_private_data->GetBuffer()[1] == 0xC0);
}
bool dvd_command_interpretor_c::MatchVTSNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
{
- if ( i_cookie_size != 2 || data.m_private_data.GetSize() < 4 )
+ if ( i_cookie_size != 2 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 )
return false;
- if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_SS || data.m_private_data.GetBuffer()[1] != 0x80 )
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_SS || data.p_private_data->GetBuffer()[1] != 0x80 )
return false;
- uint16 i_gtitle = (data.m_private_data.GetBuffer()[2] << 8 ) + data.m_private_data.GetBuffer()[3];
+ uint16 i_gtitle = (data.p_private_data->GetBuffer()[2] << 8 ) + data.p_private_data->GetBuffer()[3];
uint16 i_title = *(uint16*)p_cookie;
return (i_gtitle == i_title);
}
+bool dvd_command_interpretor_c::MatchVTSMNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
+{
+ 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;
+
+ uint8 i_gtitle = data.p_private_data->GetBuffer()[3];
+ uint8 i_title = *(uint8*)p_cookie;
+
+ return (i_gtitle == i_title);
+}
+
bool dvd_command_interpretor_c::MatchTitleNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
{
- if ( i_cookie_size != 1 || data.m_private_data.GetSize() < 4 )
+ if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 4 )
return false;
- if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_TT )
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_TT )
return false;
- uint16 i_gtitle = (data.m_private_data.GetBuffer()[1] << 8 ) + data.m_private_data.GetBuffer()[2];
+ uint16 i_gtitle = (data.p_private_data->GetBuffer()[1] << 8 ) + data.p_private_data->GetBuffer()[2];
uint8 i_title = *(uint8*)p_cookie;
return (i_gtitle == i_title);
bool dvd_command_interpretor_c::MatchPgcType( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
{
- if ( i_cookie_size != 1 || data.m_private_data.GetSize() < 8 )
+ if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 8 )
return false;
- if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC )
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC )
return false;
- uint8 i_pgc_type = data.m_private_data.GetBuffer()[3];
+ uint8 i_pgc_type = data.p_private_data->GetBuffer()[3] & 0x0F;
uint8 i_pgc = *(uint8*)p_cookie;
return (i_pgc_type == i_pgc);
bool dvd_command_interpretor_c::MatchPgcNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
{
- if ( i_cookie_size != 2 || data.m_private_data.GetSize() < 8 )
+ if ( i_cookie_size != 2 || data.p_private_data == NULL || data.p_private_data->GetSize() < 8 )
return false;
- if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC )
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PGC )
return false;
uint16 *i_pgc_n = (uint16 *)p_cookie;
- uint16 i_pgc_num = (data.m_private_data.GetBuffer()[1] << 8) + data.m_private_data.GetBuffer()[2];
+ uint16 i_pgc_num = (data.p_private_data->GetBuffer()[1] << 8) + data.p_private_data->GetBuffer()[2];
return (i_pgc_num == *i_pgc_n);
}
bool dvd_command_interpretor_c::MatchChapterNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
{
- if ( i_cookie_size != 1 || data.m_private_data.GetSize() < 2 )
+ if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 2 )
return false;
- if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_PTT )
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_PTT )
return false;
- uint8 i_chapter = data.m_private_data.GetBuffer()[1];
+ uint8 i_chapter = data.p_private_data->GetBuffer()[1];
uint8 i_ptt = *(uint8*)p_cookie;
return (i_chapter == i_ptt);
bool dvd_command_interpretor_c::MatchCellNumber( const chapter_codec_cmds_c &data, const void *p_cookie, size_t i_cookie_size )
{
- if ( i_cookie_size != 1 || data.m_private_data.GetSize() < 5 )
+ if ( i_cookie_size != 1 || data.p_private_data == NULL || data.p_private_data->GetSize() < 5 )
return false;
- if ( data.m_private_data.GetBuffer()[0] != MATROSKA_DVD_LEVEL_CN )
+ if ( data.p_private_data->GetBuffer()[0] != MATROSKA_DVD_LEVEL_CN )
return false;
uint8 *i_cell_n = (uint8 *)p_cookie;
- uint8 i_cell_num = data.m_private_data.GetBuffer()[3];
+ uint8 i_cell_num = data.p_private_data->GetBuffer()[3];
return (i_cell_num == *i_cell_n);
}
bool matroska_script_codec_c::Enter()
{
bool f_result = false;
- std::vector<KaxChapterProcessData>::iterator index = enter_cmds.begin();
+ std::vector<KaxChapterProcessData*>::iterator index = enter_cmds.begin();
while ( index != enter_cmds.end() )
{
- if ( (*index).GetSize() )
+ if ( (*index)->GetSize() )
{
msg_Dbg( &sys.demuxer, "Matroska Script enter command" );
- f_result |= interpretor.Interpret( (*index).GetBuffer(), (*index).GetSize() );
+ f_result |= interpretor.Interpret( (*index)->GetBuffer(), (*index)->GetSize() );
}
index++;
}
bool matroska_script_codec_c::Leave()
{
bool f_result = false;
- std::vector<KaxChapterProcessData>::iterator index = leave_cmds.begin();
+ std::vector<KaxChapterProcessData*>::iterator index = leave_cmds.begin();
while ( index != leave_cmds.end() )
{
- if ( (*index).GetSize() )
+ if ( (*index)->GetSize() )
{
msg_Dbg( &sys.demuxer, "Matroska Script leave command" );
- f_result |= interpretor.Interpret( (*index).GetBuffer(), (*index).GetSize() );
+ f_result |= interpretor.Interpret( (*index)->GetBuffer(), (*index)->GetSize() );
}
index++;
}