/*****************************************************************************
* mkv.cpp : matroska demuxer
*****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
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" );
private:
stream_t *s;
vlc_bool_t mb_eof;
+ vlc_bool_t b_owner;
public:
- vlc_stream_io_callback( stream_t * );
+ vlc_stream_io_callback( stream_t *, vlc_bool_t );
+
+ virtual ~vlc_stream_io_callback()
+ {
+ if( b_owner )
+ stream_Delete( s );
+ }
virtual uint32 read ( void *p_buffer, size_t i_size);
virtual void setFilePointer ( int64_t i_offset, seek_mode mode = seek_beginning );
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;
input_thread_t *p_input;
pci_t pci_packet;
bool b_pci_packet_set;
- uint8_t alpha[4];
+ uint8_t palette[4][4];
vlc_mutex_t lock_demuxer;
/* event */
#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId )
-static char *UTF8ToStr ( const UTFstring &u );
+static inline char * ToUTF8( const UTFstring &u )
+{
+ return strdup( u.GetUTF8().c_str() );
+}
/*****************************************************************************
* Open: initializes matroska demux structures
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = new demux_sys_t( *p_demux );
- p_io_callback = new vlc_stream_io_callback( p_demux->s );
+ p_io_callback = new vlc_stream_io_callback( p_demux->s, VLC_FALSE );
p_io_stream = new EbmlStream( *p_io_callback );
if( p_io_stream == NULL )
!s_filename.compare(s_filename.length() - 3, 3, "mka"))
#endif
{
- // test wether this file belongs to the our family
- StdIOCallback *p_file_io = new StdIOCallback(s_filename.c_str(), MODE_READ);
- EbmlStream *p_estream = new EbmlStream(*p_file_io);
-
- p_stream = p_sys->AnalyseAllSegmentsFound( p_estream );
- if ( p_stream == NULL )
+ // 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 )
{
- msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() );
- delete p_estream;
- delete p_file_io;
+ vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, VLC_TRUE );
+ EbmlStream *p_estream = new EbmlStream(*p_file_io);
+
+ p_stream = p_sys->AnalyseAllSegmentsFound( p_estream );
+
+ if ( p_stream == NULL )
+ {
+ msg_Dbg( p_demux, "the file '%s' will not be used", s_filename.c_str() );
+ delete p_estream;
+ delete p_file_io;
+ }
+ else
+ {
+ p_stream->p_in = p_file_io;
+ p_stream->p_es = p_estream;
+ p_sys->streams.push_back( p_stream );
+ }
}
else
{
- p_stream->p_in = p_file_io;
- p_stream->p_es = p_estream;
- p_sys->streams.push_back( p_stream );
+ msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() );
}
}
}
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;
+ *pi_ref1 = 0;
+ *pi_ref2 = 0;
for( ;; )
{
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.b_key = *pi_ref1 == 0 ? VLC_TRUE : VLC_FALSE;
}
#undef idx
return VLC_SUCCESS;
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, "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 */
}
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;
}
+#else
+ p_block->i_pts = i_pts;
+ p_block->i_dts = p_sys->i_last_dts;
+#endif
+#if 0
+msg_Dbg( p_demux, "block i_dts: "I64Fd" / i_pts: "I64Fd, p_block->i_dts, p_block->i_pts);
+#endif
if( strcmp( tk->psz_codec, "S_VOBSUB" ) )
{
p_block->i_length = i_duration * 1000;
}
+ if( !strcmp( tk->psz_codec, "V_MS/VFW/FOURCC" ) )
+ {
+ p_block->i_pts = 0;
+ }
es_out_Send( p_demux->out, tk->p_es, p_block );
size_t i_track;
/* add all es */
- msg_Dbg( &sys.demuxer, "found %d es", tracks.size() );
+ msg_Dbg( &sys.demuxer, "found %d es", (int)tracks.size() );
sys.b_pci_packet_set = false;
for( i_track = 0; i_track < tracks.size(); i_track++ )
{
if( tracks[i_track]->fmt.i_cat == UNKNOWN_ES )
{
- msg_Warn( &sys.demuxer, "invalid track[%d, n=%d]", i_track, tracks[i_track]->i_number );
+ msg_Warn( &sys.demuxer, "invalid track[%d, n=%d]", (int)i_track, tracks[i_track]->i_number );
tracks[i_track]->p_es = NULL;
continue;
}
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]", i_track, tracks[i_track]->i_number );
+ 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]", i_track, tracks[i_track]->i_number );
+ 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" ) )
var_Create( p_input, "x-end", VLC_VAR_INTEGER );
var_Create( p_input, "y-end", VLC_VAR_INTEGER );
var_Create( p_input, "color", VLC_VAR_ADDRESS );
- var_Create( p_input, "menu-contrast", VLC_VAR_ADDRESS );
+ var_Create( p_input, "menu-palette", VLC_VAR_ADDRESS );
var_Create( p_input, "highlight", VLC_VAR_BOOL );
var_Create( p_input, "highlight-mutex", VLC_VAR_MUTEX );
var_Destroy( p_input, "y-start" );
var_Destroy( p_input, "y-end" );
var_Destroy( p_input, "color" );
- var_Destroy( p_input, "menu-contrast" );
+ var_Destroy( p_input, "menu-palette" );
+
+ vlc_object_release( p_input );
msg_Dbg( &demuxer, "Stopping the UI Hook" );
}
{
btni_t *button_ptr = &(pci->hli.btnit[button-1]);
- if((valx.i_int >= button_ptr->x_start) && (valx.i_int <= button_ptr->x_end) &&
- (valy.i_int >= button_ptr->y_start) && (valy.i_int <= button_ptr->y_end))
+ 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))
{
mx = (button_ptr->x_start + button_ptr->x_end)/2;
my = (button_ptr->y_start + button_ptr->y_end)/2;
} else {
i_palette = 0;
}
- p_sys->alpha[0] = i_palette & 0x0f;
- p_sys->alpha[1] = (i_palette>>4) & 0x0f;
- p_sys->alpha[2] = (i_palette>>8) & 0x0f;
- p_sys->alpha[3] = (i_palette>>12)& 0x0f;
+
+ for( int i = 0; i < 4; i++ )
+ {
+ uint32_t i_yuv = 0xFF;//p_sys->clut[(hl.palette>>(16+i*4))&0x0f];
+ uint8_t i_alpha = (i_palette>>(i*4))&0x0f;
+ i_alpha = i_alpha == 0xf ? 0xff : i_alpha << 4;
+
+ p_sys->palette[i][0] = (i_yuv >> 16) & 0xff;
+ p_sys->palette[i][1] = (i_yuv >> 0) & 0xff;
+ p_sys->palette[i][2] = (i_yuv >> 8) & 0xff;
+ p_sys->palette[i][3] = i_alpha;
+ }
vlc_mutex_lock( p_mutex );
val.i_int = button_ptr.x_start; var_Set( p_sys->p_input, "x-start", val );
val.i_int = button_ptr.y_start; var_Set( p_sys->p_input, "y-start", val );
val.i_int = button_ptr.y_end; var_Set( p_sys->p_input, "y-end", val );
- val.p_address = (void *)p_sys->alpha;
- var_Set( p_sys->p_input, "menu-contrast", val );
+ val.p_address = (void *)p_sys->palette;
+ var_Set( p_sys->p_input, "menu-palette", val );
val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val );
vlc_mutex_unlock( p_mutex );
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;
}
}
- p_sys->i_pts = p_sys->i_chapter_time + block->GlobalTimecode() / (mtime_t) 1000;
+ 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( p_sys->i_pts >= p_sys->i_start_pts )
+ if( i_pts >= p_sys->i_start_pts )
if ( p_vsegment->UpdateCurrentToChapter( *p_demux ) )
{
i_return = 1;
continue;
}
- 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++;
/*****************************************************************************
* Stream managment
*****************************************************************************/
-vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_ )
+vlc_stream_io_callback::vlc_stream_io_callback( stream_t *s_, vlc_bool_t b_owner_ )
{
s = s_;
+ b_owner = b_owner_;
mb_eof = VLC_FALSE;
}
}
uint64 vlc_stream_io_callback::getFilePointer( void )
{
+ if ( s == NULL )
+ return 0;
return stream_Tell( s );
}
void vlc_stream_io_callback::close( void )
{
KaxTrackName &tname = *(KaxTrackName*)l;
- tk->fmt.psz_description = UTF8ToStr( UTFstring( tname ) );
+ tk->fmt.psz_description = ToUTF8( UTFstring( tname ) );
msg_Dbg( &sys.demuxer, "| | | + Track Name=%s", tk->fmt.psz_description );
}
else if( MKV_IS_ID( l, KaxTrackLanguage ) )
{
KaxCodecName &cname = *(KaxCodecName*)l;
- tk->psz_codec_name = UTF8ToStr( UTFstring( cname ) );
+ tk->psz_codec_name = ToUTF8( UTFstring( cname ) );
msg_Dbg( &sys.demuxer, "| | | + Track Codec Name=%s", tk->psz_codec_name );
}
else if( MKV_IS_ID( l, KaxContentEncodings ) )
// {
// KaxCodecSettings &cset = *(KaxCodecSettings*)l;
-// tk->psz_codec_settings = UTF8ToStr( UTFstring( cset ) );
+// tk->psz_codec_settings = ToUTF8( UTFstring( cset ) );
// msg_Dbg( &sys.demuxer, "| | | + Track Codec Settings=%s", tk->psz_codec_settings );
// }
// else if( EbmlId( *l ) == KaxCodecInfoURL::ClassInfos.GlobalId )
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 ( 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( tk->f_fps )
- {
- tk->fmt.video.i_frame_rate = (unsigned int)(tk->f_fps * 1001);
- tk->fmt.video.i_frame_rate_base = 1001;
- }
}
else if( MKV_IS_ID( l, KaxTrackAudio ) )
{
{
KaxMuxingApp &mapp = *(KaxMuxingApp*)l;
- psz_muxing_application = UTF8ToStr( UTFstring( mapp ) );
+ psz_muxing_application = ToUTF8( UTFstring( mapp ) );
msg_Dbg( &sys.demuxer, "| | + Muxing Application=%s",
psz_muxing_application );
{
KaxWritingApp &wapp = *(KaxWritingApp*)l;
- psz_writing_application = UTF8ToStr( UTFstring( wapp ) );
+ psz_writing_application = ToUTF8( UTFstring( wapp ) );
msg_Dbg( &sys.demuxer, "| | + Writing Application=%s",
psz_writing_application );
{
KaxSegmentFilename &sfn = *(KaxSegmentFilename*)l;
- psz_segment_filename = UTF8ToStr( UTFstring( sfn ) );
+ psz_segment_filename = ToUTF8( UTFstring( sfn ) );
msg_Dbg( &sys.demuxer, "| | + Segment Filename=%s",
psz_segment_filename );
{
KaxTitle &title = *(KaxTitle*)l;
- psz_title = UTF8ToStr( UTFstring( title ) );
+ psz_title = ToUTF8( UTFstring( title ) );
msg_Dbg( &sys.demuxer, "| | + Title=%s", psz_title );
}
for (k = 0; k < i_level; k++)
chapters.psz_name += '+';
chapters.psz_name += ' ';
- chapters.psz_name += UTF8ToStr( UTFstring( name ) );
+ chapters.psz_name += ToUTF8( UTFstring( name ) );
chapters.b_user_display = true;
- msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", UTF8ToStr(UTFstring(name)) );
+ msg_Dbg( &sys.demuxer, "| | | | | + ChapterString '%s'", ToUTF8(UTFstring(name)) );
}
else if( MKV_IS_ID( l, KaxChapterLanguage ) )
{
#undef idx
}
-static char * UTF8ToStr( const UTFstring &u )
-{
- int i_src;
- const wchar_t *src;
- char *dst, *p;
-
- i_src = u.length();
- src = u.c_str();
-
- p = dst = (char*)malloc( i_src + 1);
- while( i_src > 0 )
- {
- if( *src < 255 )
- {
- *p++ = (char)*src;
- }
- else
- {
- *p++ = '?';
- }
- src++;
- i_src--;
- }
- *p++= '\0';
-
- return dst;
-}
-
void chapter_edition_c::RefreshChapters( )
{
chapter_item_c::RefreshChapters( b_ordered, -1 );
{
sz_name = N_("Segment ");
char psz_str[6];
- sprintf( psz_str, "%d", i );
+ sprintf( psz_str, "%d", (int)i );
sz_name += psz_str;
p_title->psz_name = strdup( sz_name.c_str() );
}
bool matroska_segment_c::CompareSegmentUIDs( const matroska_segment_c * p_item_a, const matroska_segment_c * p_item_b )
{
+ if ( p_item_a == NULL || p_item_b == NULL )
+ return false;
+
EbmlBinary * p_itema = (EbmlBinary *)(p_item_a->p_segment_uid);
- if ( *p_itema == *p_item_b->p_prev_segment_uid )
+ if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid )
return true;
p_itema = (EbmlBinary *)(&p_item_a->p_next_segment_uid);
- if ( *p_itema == *p_item_b->p_segment_uid )
+ if ( p_item_b->p_segment_uid != NULL && *p_itema == *p_item_b->p_segment_uid )
return true;
- if ( *p_itema == *p_item_b->p_prev_segment_uid )
+ if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid )
return true;
return false;
}
}
- 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() )
{
}
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--;