/*****************************************************************************
* mkv.cpp : matroska demuxer
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: mkv.cpp,v 1.26 2003/09/07 22:48:29 fenrir Exp $
+ * Copyright (C) 2003-2004 VideoLAN
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
#include <codecs.h> /* BITMAPINFOHEADER, WAVEFORMATEX */
#include "iso_lang.h"
+#include "vlc_meta.h"
#include <iostream>
#include <cassert>
#include <typeinfo>
-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-
/* libebml and matroska */
#include "ebml/EbmlHead.h"
#include "ebml/EbmlSubHead.h"
static void Close( vlc_object_t * );
vlc_module_begin();
- add_category_hint( N_("mkv-demuxer"), NULL, VLC_TRUE );
- add_bool( "mkv-seek-percent", 1, NULL,
- N_("Seek based on percent not time"),
- N_("Seek based on percent not time"), VLC_TRUE );
-
- set_description( _("mka/mkv stream demuxer" ) );
- set_capability( "demux", 50 );
+ set_description( _("Matroska stream demuxer" ) );
+ set_capability( "demux2", 50 );
set_callbacks( Open, Close );
+
+ add_bool( "mkv-seek-percent", 1, NULL,
+ N_("Seek based on percent not time"),
+ N_("Seek based on percent not time"), VLC_TRUE );
+
add_shortcut( "mka" );
add_shortcut( "mkv" );
vlc_module_end();
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int Demux ( input_thread_t * );
-static void Seek ( input_thread_t *, mtime_t i_date, int i_percent );
+static int Demux ( demux_t * );
+static int Control( demux_t *, int, va_list );
+static void Seek ( demux_t *, mtime_t i_date, int i_percent );
/*****************************************************************************
*****************************************************************************/
typedef struct
{
- int i_cat;
vlc_bool_t b_default;
vlc_bool_t b_enabled;
int i_number;
int i_extra_data;
uint8_t *p_extra_data;
- char *psz_language;
-
char *psz_codec;
- vlc_fourcc_t i_codec;
uint64_t i_default_duration;
float f_timecodescale;
+
/* video */
- int i_width;
- int i_height;
- int i_display_width;
- int i_display_height;
+ es_format_t fmt;
float f_fps;
-
-
- /* audio */
- int i_channels;
- int i_samplerate;
- int i_bitspersample;
-
- es_descriptor_t *p_es;
-
-
+ es_out_id_t *p_es;
vlc_bool_t b_inited;
/* data to be send first */
vlc_bool_t b_search_keyframe;
/* informative */
- char *psz_name;
char *psz_codec_name;
char *psz_codec_settings;
char *psz_codec_info_url;
struct demux_sys_t
{
- stream_t *s;
-
vlc_stream_io_callback *in;
EbmlStream *es;
EbmlParser *ep;
char *psz_segment_filename;
char *psz_title;
char *psz_date_utc;
+
+ vlc_meta_t *meta;
};
#define MKVD_TIMECODESCALE 1000000
-static void IndexAppendCluster ( input_thread_t *p_input, KaxCluster *cluster );
+static void IndexAppendCluster ( demux_t *p_demux, KaxCluster *cluster );
static char *UTF8ToStr ( const UTFstring &u );
-static void LoadCues ( input_thread_t *);
-static void InformationsCreate ( input_thread_t *p_input );
-
-static char *LanguageGetName ( const char *psz_code );
+static void LoadCues ( demux_t * );
+static void InformationsCreate ( demux_t * );
/*****************************************************************************
* Open: initializes matroska demux structures
*****************************************************************************/
static int Open( vlc_object_t * p_this )
{
- input_thread_t *p_input = (input_thread_t *)p_this;
- demux_sys_t *p_sys;
- uint8_t *p_peek;
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys;
+ uint8_t *p_peek;
- int i_track;
- vlc_bool_t b_audio_selected;
- int i_spu_channel, i_audio_channel;
+ int i_track;
- EbmlElement *el = NULL, *el1 = NULL, *el2 = NULL, *el3 = NULL, *el4 = NULL;
-
- /* Set the demux function */
- p_input->pf_demux = Demux;
- p_input->pf_demux_control = demux_vaControlDefault;
+ EbmlElement *el = NULL, *el1 = NULL, *el2 = NULL, *el3 = NULL, *el4 = NULL;
/* peek the begining */
- if( input_Peek( p_input, &p_peek, 4 ) < 4 )
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
{
- msg_Warn( p_input, "cannot peek" );
+ msg_Warn( p_demux, "cannot peek" );
return VLC_EGENERIC;
}
if( p_peek[0] != 0x1a || p_peek[1] != 0x45 ||
p_peek[2] != 0xdf || p_peek[3] != 0xa3 )
{
- msg_Warn( p_input, "matroska module discarded "
+ msg_Warn( p_demux, "matroska module discarded "
"(invalid header 0x%.2x%.2x%.2x%.2x)",
p_peek[0], p_peek[1], p_peek[2], p_peek[3] );
return VLC_EGENERIC;
}
- p_input->p_demux_data = p_sys = (demux_sys_t*)malloc(sizeof( demux_sys_t ));
- memset( p_sys, 0, sizeof( demux_sys_t ) );
+ /* Set the demux function */
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
+ p_demux->p_sys = p_sys = (demux_sys_t*)malloc(sizeof( demux_sys_t ));
- if( ( p_sys->s = stream_OpenInput( p_input ) ) == NULL )
- {
- msg_Err( p_input, "cannot create stream" );
- free( p_sys );
- return VLC_EGENERIC;
- }
- p_sys->in = new vlc_stream_io_callback( p_sys->s );
+ memset( p_sys, 0, sizeof( demux_sys_t ) );
+ p_sys->in = new vlc_stream_io_callback( p_demux->s );
p_sys->es = new EbmlStream( *p_sys->in );
p_sys->f_duration = -1;
p_sys->i_timescale = MKVD_TIMECODESCALE;
p_sys->psz_segment_filename = NULL;
p_sys->psz_title = NULL;
p_sys->psz_date_utc = NULL;;
+ p_sys->meta = NULL;
if( p_sys->es == NULL )
{
- msg_Err( p_input, "failed to create EbmlStream" );
+ msg_Err( p_demux, "failed to create EbmlStream" );
delete p_sys->in;
- stream_Release( p_sys->s );
free( p_sys );
return VLC_EGENERIC;
}
el = p_sys->es->FindNextID(EbmlHead::ClassInfos, 0xFFFFFFFFL);
if( el == NULL )
{
- msg_Err( p_input, "cannot find EbmlHead" );
+ msg_Err( p_demux, "cannot find EbmlHead" );
goto error;
}
- msg_Dbg( p_input, "EbmlHead" );
+ msg_Dbg( p_demux, "EbmlHead" );
/* skip it */
el->SkipData( *p_sys->es, el->Generic().Context );
delete el;
el = p_sys->es->FindNextID( KaxSegment::ClassInfos, 0xFFFFFFFFL);
if( el == NULL )
{
- msg_Err( p_input, "cannot find KaxSegment" );
+ msg_Err( p_demux, "cannot find KaxSegment" );
goto error;
}
- msg_Dbg( p_input, "+ Segment" );
+ msg_Dbg( p_demux, "+ Segment" );
p_sys->segment = (KaxSegment*)el;
p_sys->cluster = NULL;
{
if( EbmlId( *el1 ) == KaxInfo::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Informations" );
+ msg_Dbg( p_demux, "| + Informations" );
p_sys->ep->Down();
while( ( el2 = p_sys->ep->Get() ) != NULL )
tcs.ReadData( p_sys->es->I_O() );
p_sys->i_timescale = uint64(tcs);
- msg_Dbg( p_input, "| | + TimecodeScale="I64Fd,
+ msg_Dbg( p_demux, "| | + TimecodeScale="I64Fd,
p_sys->i_timescale );
}
else if( EbmlId( *el2 ) == KaxDuration::ClassInfos.GlobalId )
dur.ReadData( p_sys->es->I_O() );
p_sys->f_duration = float(dur);
- msg_Dbg( p_input, "| | + Duration=%f",
+ msg_Dbg( p_demux, "| | + Duration=%f",
p_sys->f_duration );
}
else if( EbmlId( *el2 ) == KaxMuxingApp::ClassInfos.GlobalId )
p_sys->psz_muxing_application = UTF8ToStr( UTFstring( mapp ) );
- msg_Dbg( p_input, "| | + Muxing Application=%s",
+ msg_Dbg( p_demux, "| | + Muxing Application=%s",
p_sys->psz_muxing_application );
}
else if( EbmlId( *el2 ) == KaxWritingApp::ClassInfos.GlobalId )
p_sys->psz_writing_application = UTF8ToStr( UTFstring( wapp ) );
- msg_Dbg( p_input, "| | + Wrinting Application=%s",
+ msg_Dbg( p_demux, "| | + Writing Application=%s",
p_sys->psz_writing_application );
}
else if( EbmlId( *el2 ) == KaxSegmentFilename::ClassInfos.GlobalId )
p_sys->psz_segment_filename = UTF8ToStr( UTFstring( sfn ) );
- msg_Dbg( p_input, "| | + Segment Filename=%s",
+ msg_Dbg( p_demux, "| | + Segment Filename=%s",
p_sys->psz_segment_filename );
}
else if( EbmlId( *el2 ) == KaxTitle::ClassInfos.GlobalId )
p_sys->psz_title = UTF8ToStr( UTFstring( title ) );
- msg_Dbg( p_input, "| | + Title=%s", p_sys->psz_title );
+ msg_Dbg( p_demux, "| | + Title=%s", p_sys->psz_title );
}
-#ifdef HAVE_GMTIME_R
+#if defined( HAVE_GMTIME_R ) && !defined( SYS_DARWIN )
else if( EbmlId( *el2 ) == KaxDateUTC::ClassInfos.GlobalId )
{
KaxDateUTC &date = *(KaxDateUTC*)el2;
{
buffer[strlen( buffer)-1]= '\0';
p_sys->psz_date_utc = strdup( buffer );
- msg_Dbg( p_input, "| | + Date=%s", p_sys->psz_date_utc );
+ msg_Dbg( p_demux, "| | + Date=%s", p_sys->psz_date_utc );
}
}
#endif
else
{
- msg_Dbg( p_input, "| | + Unknown (%s)", typeid(*el2).name() );
+ msg_Dbg( p_demux, "| | + Unknown (%s)", typeid(*el2).name() );
}
}
p_sys->ep->Up();
}
else if( EbmlId( *el1 ) == KaxTracks::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Tracks" );
+ msg_Dbg( p_demux, "| + Tracks" );
p_sys->ep->Down();
while( ( el2 = p_sys->ep->Get() ) != NULL )
{
if( EbmlId( *el2 ) == KaxTrackEntry::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| | + Track Entry" );
+ msg_Dbg( p_demux, "| | + Track Entry" );
p_sys->i_track++;
p_sys->track = (mkv_track_t*)realloc( p_sys->track, sizeof( mkv_track_t ) * (p_sys->i_track + 1 ) );
#define tk p_sys->track[p_sys->i_track - 1]
memset( &tk, 0, sizeof( mkv_track_t ) );
- tk.i_cat = UNKNOWN_ES;
+
+ es_format_Init( &tk.fmt, UNKNOWN_ES, 0 );
+ tk.fmt.psz_language = strdup("English");
+ tk.fmt.psz_description = NULL;
+
tk.b_default = VLC_TRUE;
tk.b_enabled = VLC_TRUE;
tk.i_number = p_sys->i_track - 1;
tk.i_extra_data = 0;
tk.p_extra_data = NULL;
- tk.i_codec = 0;
tk.psz_codec = NULL;
- tk.psz_language = NULL;
tk.i_default_duration = 0;
tk.f_timecodescale = 1.0;
tk.i_data_init = 0;
tk.p_data_init = NULL;
- tk.psz_name = NULL;
tk.psz_codec_name = NULL;
tk.psz_codec_settings = NULL;
tk.psz_codec_info_url = NULL;
tnum.ReadData( p_sys->es->I_O() );
tk.i_number = uint32( tnum );
- msg_Dbg( p_input, "| | | + Track Number=%u",
+ msg_Dbg( p_demux, "| | | + Track Number=%u",
uint32( tnum ) );
}
else if( EbmlId( *el3 ) == KaxTrackUID::ClassInfos.GlobalId )
KaxTrackUID &tuid = *(KaxTrackUID*)el3;
tuid.ReadData( p_sys->es->I_O() );
- msg_Dbg( p_input, "| | | + Track UID=%u",
+ msg_Dbg( p_demux, "| | | + Track UID=%u",
uint32( tuid ) );
}
else if( EbmlId( *el3 ) == KaxTrackType::ClassInfos.GlobalId )
{
case track_audio:
psz_type = "audio";
- tk.i_cat = AUDIO_ES;
+ tk.fmt.i_cat = AUDIO_ES;
break;
case track_video:
psz_type = "video";
- tk.i_cat = VIDEO_ES;
+ tk.fmt.i_cat = VIDEO_ES;
break;
case track_subtitle:
psz_type = "subtitle";
- tk.i_cat = SPU_ES;
+ tk.fmt.i_cat = SPU_ES;
break;
default:
psz_type = "unknown";
- tk.i_cat = UNKNOWN_ES;
+ tk.fmt.i_cat = UNKNOWN_ES;
break;
}
- msg_Dbg( p_input, "| | | + Track Type=%s",
+ msg_Dbg( p_demux, "| | | + Track Type=%s",
psz_type );
}
- else if( EbmlId( *el3 ) == KaxTrackFlagEnabled::ClassInfos.GlobalId )
- {
- KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)el3;
- fenb.ReadData( p_sys->es->I_O() );
-
- tk.b_enabled = uint32( fenb );
- msg_Dbg( p_input, "| | | + Track Enabled=%u",
- uint32( fenb ) );
- }
+// else if( EbmlId( *el3 ) == KaxTrackFlagEnabled::ClassInfos.GlobalId )
+// {
+// KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)el3;
+// fenb.ReadData( p_sys->es->I_O() );
+
+// tk.b_enabled = uint32( fenb );
+// msg_Dbg( p_demux, "| | | + Track Enabled=%u",
+// uint32( fenb ) );
+// }
else if( EbmlId( *el3 ) == KaxTrackFlagDefault::ClassInfos.GlobalId )
{
KaxTrackFlagDefault &fdef = *(KaxTrackFlagDefault*)el3;
fdef.ReadData( p_sys->es->I_O() );
tk.b_default = uint32( fdef );
- msg_Dbg( p_input, "| | | + Track Default=%u",
+ msg_Dbg( p_demux, "| | | + Track Default=%u",
uint32( fdef ) );
}
else if( EbmlId( *el3 ) == KaxTrackFlagLacing::ClassInfos.GlobalId )
KaxTrackFlagLacing &lac = *(KaxTrackFlagLacing*)el3;
lac.ReadData( p_sys->es->I_O() );
- msg_Dbg( p_input, "| | | + Track Lacing=%d",
+ msg_Dbg( p_demux, "| | | + Track Lacing=%d",
uint32( lac ) );
}
else if( EbmlId( *el3 ) == KaxTrackMinCache::ClassInfos.GlobalId )
KaxTrackMinCache &cmin = *(KaxTrackMinCache*)el3;
cmin.ReadData( p_sys->es->I_O() );
- msg_Dbg( p_input, "| | | + Track MinCache=%d",
+ msg_Dbg( p_demux, "| | | + Track MinCache=%d",
uint32( cmin ) );
}
else if( EbmlId( *el3 ) == KaxTrackMaxCache::ClassInfos.GlobalId )
KaxTrackMaxCache &cmax = *(KaxTrackMaxCache*)el3;
cmax.ReadData( p_sys->es->I_O() );
- msg_Dbg( p_input, "| | | + Track MaxCache=%d",
+ msg_Dbg( p_demux, "| | | + Track MaxCache=%d",
uint32( cmax ) );
}
else if( EbmlId( *el3 ) == KaxTrackDefaultDuration::ClassInfos.GlobalId )
defd.ReadData( p_sys->es->I_O() );
tk.i_default_duration = uint64(defd);
- msg_Dbg( p_input, "| | | + Track Default Duration="I64Fd, uint64(defd) );
+ msg_Dbg( p_demux, "| | | + Track Default Duration="I64Fd, uint64(defd) );
}
else if( EbmlId( *el3 ) == KaxTrackTimecodeScale::ClassInfos.GlobalId )
{
ttcs.ReadData( p_sys->es->I_O() );
tk.f_timecodescale = float( ttcs );
- msg_Dbg( p_input, "| | | + Track TimeCodeScale=%f", tk.f_timecodescale );
+ msg_Dbg( p_demux, "| | | + Track TimeCodeScale=%f", tk.f_timecodescale );
}
else if( EbmlId( *el3 ) == KaxTrackName::ClassInfos.GlobalId )
{
KaxTrackName &tname = *(KaxTrackName*)el3;
tname.ReadData( p_sys->es->I_O() );
- tk.psz_name = UTF8ToStr( UTFstring( tname ) );
- msg_Dbg( p_input, "| | | + Track Name=%s",
- tk.psz_name );
+ tk.fmt.psz_description = UTF8ToStr( UTFstring( tname ) );
+ msg_Dbg( p_demux, "| | | + Track Name=%s",
+ tk.fmt.psz_description );
}
else if( EbmlId( *el3 ) == KaxTrackLanguage::ClassInfos.GlobalId )
{
KaxTrackLanguage &lang = *(KaxTrackLanguage*)el3;
lang.ReadData( p_sys->es->I_O() );
- tk.psz_language =
- LanguageGetName( string( lang ).c_str() );
- msg_Dbg( p_input,
- "| | | + Track Language=`%s'(%s) ",
- tk.psz_language, string( lang ).c_str() );
+ tk.fmt.psz_language = strdup( string( lang ).c_str() );
+ msg_Dbg( p_demux,
+ "| | | + Track Language=`%s'",
+ tk.fmt.psz_language );
}
else if( EbmlId( *el3 ) == KaxCodecID::ClassInfos.GlobalId )
{
codecid.ReadData( p_sys->es->I_O() );
tk.psz_codec = strdup( string( codecid ).c_str() );
- msg_Dbg( p_input, "| | | + Track CodecId=%s",
+ msg_Dbg( p_demux, "| | | + Track CodecId=%s",
string( codecid ).c_str() );
}
else if( EbmlId( *el3 ) == KaxCodecPrivate::ClassInfos.GlobalId )
{
KaxCodecPrivate &cpriv = *(KaxCodecPrivate*)el3;
- cpriv.ReadData( p_sys->es->I_O() );
+ cpriv.ReadData( p_sys->es->I_O(), SCOPE_ALL_DATA );
tk.i_extra_data = cpriv.GetSize();
if( tk.i_extra_data > 0 )
tk.p_extra_data = (uint8_t*)malloc( tk.i_extra_data );
memcpy( tk.p_extra_data, cpriv.GetBuffer(), tk.i_extra_data );
}
- msg_Dbg( p_input, "| | | + Track CodecPrivate size="I64Fd, cpriv.GetSize() );
+ msg_Dbg( p_demux, "| | | + Track CodecPrivate size="I64Fd, cpriv.GetSize() );
}
else if( EbmlId( *el3 ) == KaxCodecName::ClassInfos.GlobalId )
{
cname.ReadData( p_sys->es->I_O() );
tk.psz_codec_name = UTF8ToStr( UTFstring( cname ) );
- msg_Dbg( p_input, "| | | + Track Codec Name=%s", tk.psz_codec_name );
- }
- else if( EbmlId( *el3 ) == KaxCodecSettings::ClassInfos.GlobalId )
- {
- KaxCodecSettings &cset = *(KaxCodecSettings*)el3;
- cset.ReadData( p_sys->es->I_O() );
-
- tk.psz_codec_settings = UTF8ToStr( UTFstring( cset ) );
- msg_Dbg( p_input, "| | | + Track Codec Settings=%s", tk.psz_codec_settings );
- }
- else if( EbmlId( *el3 ) == KaxCodecInfoURL::ClassInfos.GlobalId )
- {
- KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)el3;
- ciurl.ReadData( p_sys->es->I_O() );
-
- tk.psz_codec_info_url = strdup( string( ciurl ).c_str() );
- msg_Dbg( p_input, "| | | + Track Codec Info URL=%s", tk.psz_codec_info_url );
- }
- else if( EbmlId( *el3 ) == KaxCodecDownloadURL::ClassInfos.GlobalId )
- {
- KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)el3;
- cdurl.ReadData( p_sys->es->I_O() );
-
- tk.psz_codec_download_url = strdup( string( cdurl ).c_str() );
- msg_Dbg( p_input, "| | | + Track Codec Info URL=%s", tk.psz_codec_download_url );
- }
- else if( EbmlId( *el3 ) == KaxCodecDecodeAll::ClassInfos.GlobalId )
- {
- KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)el3;
- cdall.ReadData( p_sys->es->I_O() );
-
- msg_Dbg( p_input, "| | | + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) );
- }
- else if( EbmlId( *el3 ) == KaxTrackOverlay::ClassInfos.GlobalId )
- {
- KaxTrackOverlay &tovr = *(KaxTrackOverlay*)el3;
- tovr.ReadData( p_sys->es->I_O() );
-
- msg_Dbg( p_input, "| | | + Track Overlay=%u <== UNUSED", uint32( tovr ) );
+ msg_Dbg( p_demux, "| | | + Track Codec Name=%s", tk.psz_codec_name );
}
+// else if( EbmlId( *el3 ) == KaxCodecSettings::ClassInfos.GlobalId )
+// {
+// KaxCodecSettings &cset = *(KaxCodecSettings*)el3;
+// cset.ReadData( p_sys->es->I_O() );
+
+// tk.psz_codec_settings = UTF8ToStr( UTFstring( cset ) );
+// msg_Dbg( p_demux, "| | | + Track Codec Settings=%s", tk.psz_codec_settings );
+// }
+// else if( EbmlId( *el3 ) == KaxCodecInfoURL::ClassInfos.GlobalId )
+// {
+// KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)el3;
+// ciurl.ReadData( p_sys->es->I_O() );
+
+// tk.psz_codec_info_url = strdup( string( ciurl ).c_str() );
+// msg_Dbg( p_demux, "| | | + Track Codec Info URL=%s", tk.psz_codec_info_url );
+// }
+// else if( EbmlId( *el3 ) == KaxCodecDownloadURL::ClassInfos.GlobalId )
+// {
+// KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)el3;
+// cdurl.ReadData( p_sys->es->I_O() );
+
+// tk.psz_codec_download_url = strdup( string( cdurl ).c_str() );
+// msg_Dbg( p_demux, "| | | + Track Codec Info URL=%s", tk.psz_codec_download_url );
+// }
+// else if( EbmlId( *el3 ) == KaxCodecDecodeAll::ClassInfos.GlobalId )
+// {
+// KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)el3;
+// cdall.ReadData( p_sys->es->I_O() );
+
+// msg_Dbg( p_demux, "| | | + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) );
+// }
+// else if( EbmlId( *el3 ) == KaxTrackOverlay::ClassInfos.GlobalId )
+// {
+// KaxTrackOverlay &tovr = *(KaxTrackOverlay*)el3;
+// tovr.ReadData( p_sys->es->I_O() );
+
+// msg_Dbg( p_demux, "| | | + Track Overlay=%u <== UNUSED", uint32( tovr ) );
+// }
else if( EbmlId( *el3 ) == KaxTrackVideo::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| | | + Track Video" );
- tk.i_width = 0;
- tk.i_height = 0;
- tk.i_display_width = 0;
- tk.i_display_height = 0;
+ msg_Dbg( p_demux, "| | | + Track Video" );
tk.f_fps = 0.0;
p_sys->ep->Down();
while( ( el4 = p_sys->ep->Get() ) != NULL )
{
- if( EbmlId( *el4 ) == KaxVideoFlagInterlaced::ClassInfos.GlobalId )
- {
- KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)el4;
- fint.ReadData( p_sys->es->I_O() );
-
- msg_Dbg( p_input, "| | | | + Track Video Interlaced=%u", uint8( fint ) );
- }
- else if( EbmlId( *el4 ) == KaxVideoStereoMode::ClassInfos.GlobalId )
- {
- KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)el4;
- stereo.ReadData( p_sys->es->I_O() );
-
- msg_Dbg( p_input, "| | | | + Track Video Stereo Mode=%u", uint8( stereo ) );
- }
- else if( EbmlId( *el4 ) == KaxVideoPixelWidth::ClassInfos.GlobalId )
+// if( EbmlId( *el4 ) == KaxVideoFlagInterlaced::ClassInfos.GlobalId )
+// {
+// KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)el4;
+// fint.ReadData( p_sys->es->I_O() );
+
+// msg_Dbg( p_demux, "| | | | + Track Video Interlaced=%u", uint8( fint ) );
+// }
+// else if( EbmlId( *el4 ) == KaxVideoStereoMode::ClassInfos.GlobalId )
+// {
+// KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)el4;
+// stereo.ReadData( p_sys->es->I_O() );
+
+// msg_Dbg( p_demux, "| | | | + Track Video Stereo Mode=%u", uint8( stereo ) );
+// }
+// else
+ if( EbmlId( *el4 ) == KaxVideoPixelWidth::ClassInfos.GlobalId )
{
KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)el4;
vwidth.ReadData( p_sys->es->I_O() );
- tk.i_width = uint16( vwidth );
- msg_Dbg( p_input, "| | | | + width=%d", uint16( vwidth ) );
+ tk.fmt.video.i_width = uint16( vwidth );
+ msg_Dbg( p_demux, "| | | | + width=%d", uint16( vwidth ) );
}
else if( EbmlId( *el4 ) == KaxVideoPixelHeight::ClassInfos.GlobalId )
{
KaxVideoPixelWidth &vheight = *(KaxVideoPixelWidth*)el4;
vheight.ReadData( p_sys->es->I_O() );
- tk.i_height = uint16( vheight );
- msg_Dbg( p_input, "| | | | + height=%d", uint16( vheight ) );
+ tk.fmt.video.i_height = uint16( vheight );
+ msg_Dbg( p_demux, "| | | | + height=%d", uint16( vheight ) );
}
else if( EbmlId( *el4 ) == KaxVideoDisplayWidth::ClassInfos.GlobalId )
{
KaxVideoDisplayWidth &vwidth = *(KaxVideoDisplayWidth*)el4;
vwidth.ReadData( p_sys->es->I_O() );
- tk.i_display_width = uint16( vwidth );
- msg_Dbg( p_input, "| | | | + display width=%d", uint16( vwidth ) );
+ tk.fmt.video.i_visible_width = uint16( vwidth );
+ msg_Dbg( p_demux, "| | | | + display width=%d", uint16( vwidth ) );
}
else if( EbmlId( *el4 ) == KaxVideoDisplayHeight::ClassInfos.GlobalId )
{
KaxVideoDisplayWidth &vheight = *(KaxVideoDisplayWidth*)el4;
vheight.ReadData( p_sys->es->I_O() );
- tk.i_display_height = uint16( vheight );
- msg_Dbg( p_input, "| | | | + display height=%d", uint16( vheight ) );
+ tk.fmt.video.i_visible_height = uint16( vheight );
+ msg_Dbg( p_demux, "| | | | + display height=%d", uint16( vheight ) );
}
else if( EbmlId( *el4 ) == KaxVideoFrameRate::ClassInfos.GlobalId )
{
vfps.ReadData( p_sys->es->I_O() );
tk.f_fps = float( vfps );
- msg_Dbg( p_input, " | | | + fps=%f", float( vfps ) );
- }
- else if( EbmlId( *el4 ) == KaxVideoDisplayUnit::ClassInfos.GlobalId )
- {
- KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)el4;
- vdmode.ReadData( p_sys->es->I_O() );
-
- msg_Dbg( p_input, "| | | | + Track Video Display Unit=%s",
- uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) );
- }
- else if( EbmlId( *el4 ) == KaxVideoAspectRatio::ClassInfos.GlobalId )
- {
- KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)el4;
- ratio.ReadData( p_sys->es->I_O() );
-
- msg_Dbg( p_input, " | | | + Track Video Aspect Ratio Type=%u", uint8( ratio ) );
- }
- else if( EbmlId( *el4 ) == KaxVideoGamma::ClassInfos.GlobalId )
- {
- KaxVideoGamma &gamma = *(KaxVideoGamma*)el4;
- gamma.ReadData( p_sys->es->I_O() );
-
- msg_Dbg( p_input, " | | | + fps=%f", float( gamma ) );
+ msg_Dbg( p_demux, " | | | + fps=%f", float( vfps ) );
}
+// else if( EbmlId( *el4 ) == KaxVideoDisplayUnit::ClassInfos.GlobalId )
+// {
+// KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)el4;
+// vdmode.ReadData( p_sys->es->I_O() );
+
+// msg_Dbg( p_demux, "| | | | + Track Video Display Unit=%s",
+// uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) );
+// }
+// else if( EbmlId( *el4 ) == KaxVideoAspectRatio::ClassInfos.GlobalId )
+// {
+// KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)el4;
+// ratio.ReadData( p_sys->es->I_O() );
+
+// msg_Dbg( p_demux, " | | | + Track Video Aspect Ratio Type=%u", uint8( ratio ) );
+// }
+// else if( EbmlId( *el4 ) == KaxVideoGamma::ClassInfos.GlobalId )
+// {
+// KaxVideoGamma &gamma = *(KaxVideoGamma*)el4;
+// gamma.ReadData( p_sys->es->I_O() );
+
+// msg_Dbg( p_demux, " | | | + fps=%f", float( gamma ) );
+// }
else
{
- msg_Dbg( p_input, "| | | | + Unknown (%s)", typeid(*el4).name() );
+ msg_Dbg( p_demux, "| | | | + Unknown (%s)", typeid(*el4).name() );
}
}
p_sys->ep->Up();
}
else if( EbmlId( *el3 ) == KaxTrackAudio::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| | | + Track Audio" );
- tk.i_channels = 0;
- tk.i_samplerate = 0;
- tk.i_bitspersample = 0;
+ msg_Dbg( p_demux, "| | | + Track Audio" );
p_sys->ep->Down();
KaxAudioSamplingFreq &afreq = *(KaxAudioSamplingFreq*)el4;
afreq.ReadData( p_sys->es->I_O() );
- tk.i_samplerate = (int)float( afreq );
- msg_Dbg( p_input, "| | | | + afreq=%d", tk.i_samplerate );
+ tk.fmt.audio.i_rate = (int)float( afreq );
+ msg_Dbg( p_demux, "| | | | + afreq=%d", tk.fmt.audio.i_rate );
}
else if( EbmlId( *el4 ) == KaxAudioChannels::ClassInfos.GlobalId )
{
KaxAudioChannels &achan = *(KaxAudioChannels*)el4;
achan.ReadData( p_sys->es->I_O() );
- tk.i_channels = uint8( achan );
- msg_Dbg( p_input, "| | | | + achan=%u", uint8( achan ) );
+ tk.fmt.audio.i_channels = uint8( achan );
+ msg_Dbg( p_demux, "| | | | + achan=%u", uint8( achan ) );
}
else if( EbmlId( *el4 ) == KaxAudioBitDepth::ClassInfos.GlobalId )
{
KaxAudioBitDepth &abits = *(KaxAudioBitDepth*)el4;
abits.ReadData( p_sys->es->I_O() );
- tk.i_bitspersample = uint8( abits );
- msg_Dbg( p_input, "| | | | + abits=%u", uint8( abits ) );
+ tk.fmt.audio.i_bitspersample = uint8( abits );
+ msg_Dbg( p_demux, "| | | | + abits=%u", uint8( abits ) );
}
else
{
- msg_Dbg( p_input, "| | | | + Unknown (%s)", typeid(*el4).name() );
+ msg_Dbg( p_demux, "| | | | + Unknown (%s)", typeid(*el4).name() );
}
}
p_sys->ep->Up();
}
else
{
- msg_Dbg( p_input, "| | | + Unknown (%s)",
+ msg_Dbg( p_demux, "| | | + Unknown (%s)",
typeid(*el3).name() );
}
}
}
else
{
- msg_Dbg( p_input, "| | + Unknown (%s)",
+ msg_Dbg( p_demux, "| | + Unknown (%s)",
typeid(*el2).name() );
}
#undef tk
}
else if( EbmlId( *el1 ) == KaxSeekHead::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Seek head" );
+ msg_Dbg( p_demux, "| + Seek head" );
p_sys->ep->Down();
while( ( el = p_sys->ep->Get() ) != NULL )
{
EbmlId id = EbmlVoid::ClassInfos.GlobalId;
int64_t i_pos = -1;
- //msg_Dbg( p_input, "| | + Seek" );
+ //msg_Dbg( p_demux, "| | + Seek" );
p_sys->ep->Down();
while( ( el = p_sys->ep->Get() ) != NULL )
{
{
KaxSeekID &sid = *(KaxSeekID*)el;
- sid.ReadData( p_sys->es->I_O() );
+ sid.ReadData( p_sys->es->I_O(), SCOPE_ALL_DATA );
id = EbmlId( sid.GetBuffer(), sid.GetSize() );
}
{
KaxSeekPosition &spos = *(KaxSeekPosition*)el;
- spos.ReadData( p_sys->es->I_O() );
+ spos.ReadData( p_sys->es->I_O(), SCOPE_ALL_DATA );
i_pos = uint64( spos );
}
else
{
- msg_Dbg( p_input, "| | | + Unknown (%s)",
+ msg_Dbg( p_demux, "| | | + Unknown (%s)",
typeid(*el).name() );
}
}
{
if( id == KaxCues::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| | | = cues at "I64Fd,
+ msg_Dbg( p_demux, "| | | = cues at "I64Fd,
i_pos );
p_sys->i_cues_position = p_sys->segment->GetGlobalPosition( i_pos );
}
else if( id == KaxChapters::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| | | = chapters at "I64Fd,
+ msg_Dbg( p_demux, "| | | = chapters at "I64Fd,
i_pos );
p_sys->i_chapters_position = p_sys->segment->GetGlobalPosition( i_pos );
}
else if( id == KaxTags::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| | | = tags at "I64Fd,
+ msg_Dbg( p_demux, "| | | = tags at "I64Fd,
i_pos );
p_sys->i_tags_position = p_sys->segment->GetGlobalPosition( i_pos );
}
}
else
{
- msg_Dbg( p_input, "| | + Unknown (%s)",
+ msg_Dbg( p_demux, "| | + Unknown (%s)",
typeid(*el).name() );
}
}
}
else if( EbmlId( *el1 ) == KaxCues::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Cues" );
+ msg_Dbg( p_demux, "| + Cues" );
}
else if( EbmlId( *el1 ) == KaxCluster::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Cluster" );
+ msg_Dbg( p_demux, "| + Cluster" );
p_sys->cluster = (KaxCluster*)el1;
else if( EbmlId( *el1 ) == KaxAttachements::ClassInfos.GlobalId )
#endif
{
- msg_Dbg( p_input, "| + Attachments FIXME TODO (but probably never supported)" );
+ msg_Dbg( p_demux, "| + Attachments FIXME TODO (but probably never supported)" );
}
else if( EbmlId( *el1 ) == KaxChapters::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Chapters FIXME TODO" );
+ msg_Dbg( p_demux, "| + Chapters FIXME TODO" );
}
else if( EbmlId( *el1 ) == KaxTag::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Tags FIXME TODO" );
+ msg_Dbg( p_demux, "| + Tags FIXME TODO" );
}
else
{
- msg_Dbg( p_input, "| + Unknown (%s)", typeid(*el1).name() );
+ msg_Dbg( p_demux, "| + Unknown (%s)", typeid(*el1).name() );
}
}
if( p_sys->cluster == NULL )
{
- msg_Err( p_input, "cannot find any cluster, damaged file ?" );
+ msg_Err( p_demux, "cannot find any cluster, damaged file ?" );
goto error;
}
if( p_sys->i_chapters_position >= 0 )
{
- msg_Warn( p_input, "chapters unsupported" );
+ msg_Warn( p_demux, "chapters unsupported" );
}
/* *** Load the cue if found *** */
{
vlc_bool_t b_seekable;
- stream_Control( p_sys->s, STREAM_CAN_FASTSEEK, &b_seekable );
+ stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable );
if( b_seekable )
{
- LoadCues( p_input );
+ LoadCues( p_demux );
}
}
if( !p_sys->b_cues || p_sys->i_index <= 0 )
{
- msg_Warn( p_input, "no cues/empty cues found->seek won't be precise" );
+ msg_Warn( p_demux, "no cues/empty cues found->seek won't be precise" );
- IndexAppendCluster( p_input, p_sys->cluster );
+ IndexAppendCluster( p_demux, p_sys->cluster );
p_sys->b_cues = VLC_FALSE;
}
- /* Create one program */
- vlc_mutex_lock( &p_input->stream.stream_lock );
- if( input_InitStream( p_input, 0 ) == -1)
- {
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- msg_Err( p_input, "cannot init stream" );
- goto error;
- }
- if( input_AddProgram( p_input, 0, 0) == NULL )
- {
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- msg_Err( p_input, "cannot add program" );
- goto error;
- }
- p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
- p_input->stream.i_mux_rate = 0;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- if( p_sys->f_duration > 1001.0 )
- {
- mtime_t i_duration = (mtime_t)( p_sys->f_duration / 1000.0 );
- p_input->stream.i_mux_rate = stream_Size( p_sys->s ) / 50 / i_duration;
- }
-
/* add all es */
- msg_Dbg( p_input, "found %d es", p_sys->i_track );
+ msg_Dbg( p_demux, "found %d es", p_sys->i_track );
for( i_track = 0; i_track < p_sys->i_track; i_track++ )
{
#define tk p_sys->track[i_track]
- if( tk.i_cat == UNKNOWN_ES )
+ if( tk.fmt.i_cat == UNKNOWN_ES )
{
- msg_Warn( p_input, "invalid track[%d, n=%d]", i_track, tk.i_number );
+ msg_Warn( p_demux, "invalid track[%d, n=%d]", i_track, tk.i_number );
tk.p_es = NULL;
continue;
}
- tk.p_es = input_AddES( p_input,
- p_input->stream.p_selected_program,
- i_track + 1,
- tk.i_cat,
- tk.psz_language, 0 );
- if( tk.i_cat == SPU_ES )
- {
- vlc_value_t val;
- val.psz_string = "UTF-8";
-#if defined(HAVE_ICONV)
- var_Create( p_input, "subsdec-encoding", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-#endif
- var_Set( p_input, "subsdec-encoding", val );
- }
+
if( !strcmp( tk.psz_codec, "V_MS/VFW/FOURCC" ) )
{
if( tk.i_extra_data < (int)sizeof( BITMAPINFOHEADER ) )
{
- msg_Err( p_input, "missing/invalid BITMAPINFOHEADER" );
- tk.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+ msg_Err( p_demux, "missing/invalid BITMAPINFOHEADER" );
+ tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
}
else
{
BITMAPINFOHEADER *p_bih = (BITMAPINFOHEADER*)tk.p_extra_data;
- p_bih->biSize = GetDWLE( &p_bih->biSize );
- p_bih->biWidth = GetDWLE( &p_bih->biWidth );
- p_bih->biHeight = GetDWLE( &p_bih->biHeight );
- p_bih->biPlanes = GetWLE( &p_bih->biPlanes );
- p_bih->biBitCount = GetWLE( &p_bih->biBitCount );
- p_bih->biCompression = GetFOURCC( &p_bih->biCompression );
- p_bih->biSizeImage = GetDWLE( &p_bih->biSizeImage );
- p_bih->biXPelsPerMeter = GetDWLE( &p_bih->biXPelsPerMeter );
- p_bih->biYPelsPerMeter = GetDWLE( &p_bih->biYPelsPerMeter );
- p_bih->biClrUsed = GetDWLE( &p_bih->biClrUsed );
- p_bih->biClrImportant = GetDWLE( &p_bih->biClrImportant );
-
-
- tk.i_codec = p_bih->biCompression;
- tk.p_es->p_bitmapinfoheader = p_bih;
+ tk.fmt.video.i_width = GetDWLE( &p_bih->biWidth );
+ tk.fmt.video.i_height= GetDWLE( &p_bih->biHeight );
+ tk.fmt.i_codec = GetFOURCC( &p_bih->biCompression );
+
+ tk.fmt.i_extra = GetDWLE( &p_bih->biSize ) - sizeof( BITMAPINFOHEADER );
+ if( tk.fmt.i_extra > 0 )
+ {
+ tk.fmt.p_extra = malloc( tk.fmt.i_extra );
+ memcpy( tk.fmt.p_extra, &p_bih[1], tk.fmt.i_extra );
+ }
}
}
else if( !strcmp( tk.psz_codec, "V_MPEG1" ) ||
!strcmp( tk.psz_codec, "V_MPEG2" ) )
{
- tk.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' );
+ tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' );
}
else if( !strncmp( tk.psz_codec, "V_MPEG4", 7 ) )
{
- BITMAPINFOHEADER *p_bih;
-
- tk.i_extra_data = sizeof( BITMAPINFOHEADER );
- tk.p_extra_data = (uint8_t*)malloc( tk.i_extra_data );
-
- p_bih = (BITMAPINFOHEADER*)tk.p_extra_data;
- memset( p_bih, 0, sizeof( BITMAPINFOHEADER ) );
- p_bih->biSize = sizeof( BITMAPINFOHEADER );
- p_bih->biWidth = tk.i_width;
- p_bih->biHeight= tk.i_height;
-
if( !strcmp( tk.psz_codec, "V_MPEG4/MS/V3" ) )
{
- tk.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' );
+ tk.fmt.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' );
}
else
{
- tk.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' );
+ tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' );
}
}
else if( !strcmp( tk.psz_codec, "A_MS/ACM" ) )
{
if( tk.i_extra_data < (int)sizeof( WAVEFORMATEX ) )
{
- msg_Err( p_input, "missing/invalid WAVEFORMATEX" );
- tk.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+ msg_Err( p_demux, "missing/invalid WAVEFORMATEX" );
+ tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
}
else
{
WAVEFORMATEX *p_wf = (WAVEFORMATEX*)tk.p_extra_data;
- p_wf->wFormatTag = GetWLE( &p_wf->wFormatTag );
- p_wf->nChannels = GetWLE( &p_wf->nChannels );
- p_wf->nSamplesPerSec = GetDWLE( &p_wf->nSamplesPerSec );
- p_wf->nAvgBytesPerSec = GetDWLE( &p_wf->nAvgBytesPerSec );
- p_wf->nBlockAlign = GetWLE( &p_wf->nBlockAlign );
- p_wf->wBitsPerSample = GetWLE( &p_wf->wBitsPerSample );
- p_wf->cbSize = GetWLE( &p_wf->cbSize );
+ wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &tk.fmt.i_codec, NULL );
- wf_tag_to_fourcc( p_wf->wFormatTag, &tk.i_codec, NULL );
- tk.p_es->p_waveformatex = p_wf;
+ tk.fmt.audio.i_channels = GetWLE( &p_wf->nChannels );
+ tk.fmt.audio.i_rate = GetDWLE( &p_wf->nSamplesPerSec );
+ tk.fmt.i_bitrate = GetDWLE( &p_wf->nAvgBytesPerSec ) * 8;
+ tk.fmt.audio.i_blockalign = GetWLE( &p_wf->nBlockAlign );;
+ tk.fmt.audio.i_bitspersample = GetWLE( &p_wf->wBitsPerSample );
+
+ tk.fmt.i_extra = GetWLE( &p_wf->cbSize );
+ if( tk.fmt.i_extra > 0 )
+ {
+ tk.fmt.p_extra = malloc( tk.fmt.i_extra );
+ memcpy( tk.fmt.p_extra, &p_wf[1], tk.fmt.i_extra );
+ }
}
}
else if( !strcmp( tk.psz_codec, "A_MPEG/L3" ) ||
!strcmp( tk.psz_codec, "A_MPEG/L2" ) ||
!strcmp( tk.psz_codec, "A_MPEG/L1" ) )
{
- tk.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' );
+ tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' );
}
else if( !strcmp( tk.psz_codec, "A_AC3" ) )
{
- tk.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
+ tk.fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
}
else if( !strcmp( tk.psz_codec, "A_DTS" ) )
{
- tk.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
+ tk.fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
+ }
+ else if( !strcmp( tk.psz_codec, "A_FLAC" ) )
+ {
+ tk.fmt.i_codec = VLC_FOURCC( 'f', 'l', 'a', 'c' );
+ tk.fmt.i_extra = tk.i_extra_data;
+ tk.fmt.p_extra = malloc( tk.i_extra_data );
+ memcpy( tk.fmt.p_extra,tk.p_extra_data, tk.i_extra_data );
}
else if( !strcmp( tk.psz_codec, "A_VORBIS" ) )
{
- tk.i_codec = VLC_FOURCC( 'v', 'o', 'r', 'b' );
+ tk.fmt.i_codec = VLC_FOURCC( 'v', 'o', 'r', 'b' );
tk.i_data_init = tk.i_extra_data;
tk.p_data_init = tk.p_extra_data;
}
!strncmp( tk.psz_codec, "A_AAC/MPEG4/", strlen( "A_AAC/MPEG4/" ) ) )
{
int i_profile, i_srate;
- static int i_sample_rates[] =
+ static unsigned int i_sample_rates[] =
{
96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
16000, 12000, 11025, 8000, 7350, 0, 0, 0
};
- WAVEFORMATEX *p_wf;
- tk.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' );
+ tk.fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' );
/* create data for faad (MP4DecSpecificDescrTag)*/
if( !strcmp( &tk.psz_codec[12], "MAIN" ) )
for( i_srate = 0; i_srate < 13; i_srate++ )
{
- if( i_sample_rates[i_srate] == tk.i_samplerate )
+ if( i_sample_rates[i_srate] == tk.fmt.audio.i_rate )
{
break;
}
}
- msg_Dbg( p_input, "profile=%d srate=%d", i_profile, i_srate );
-
- tk.i_extra_data = sizeof( WAVEFORMATEX ) + 2;
- tk.p_extra_data = (uint8_t*)malloc( tk.i_extra_data );
- p_wf = (WAVEFORMATEX*)tk.p_extra_data;
+ msg_Dbg( p_demux, "profile=%d srate=%d", i_profile, i_srate );
- p_wf->wFormatTag = WAVE_FORMAT_UNKNOWN;
- p_wf->nChannels = tk.i_channels;
- p_wf->nSamplesPerSec = tk.i_samplerate;
- p_wf->nAvgBytesPerSec = 0;
- p_wf->nBlockAlign = 0;
- p_wf->wBitsPerSample = 0;
- p_wf->cbSize = 2;
-
- tk.p_extra_data[sizeof( WAVEFORMATEX )+ 0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1);
- tk.p_extra_data[sizeof( WAVEFORMATEX )+ 1] = ((i_srate & 0x1) << 7) | (tk.i_channels << 3);
-
- tk.p_es->p_waveformatex = p_wf;
+ tk.fmt.i_extra = 2;
+ tk.fmt.p_extra = malloc( tk.fmt.i_extra );
+ ((uint8_t*)tk.fmt.p_extra)[0] = ((i_profile + 1) << 3) | ((i_srate&0xe) >> 1);
+ ((uint8_t*)tk.fmt.p_extra)[1] = ((i_srate & 0x1) << 7) | (tk.fmt.audio.i_channels << 3);
}
else if( !strcmp( tk.psz_codec, "A_PCM/INT/BIG" ) ||
!strcmp( tk.psz_codec, "A_PCM/INT/LIT" ) ||
!strcmp( tk.psz_codec, "A_PCM/FLOAT/IEEE" ) )
{
- WAVEFORMATEX *p_wf;
-
- tk.i_extra_data = sizeof( WAVEFORMATEX );
- tk.p_extra_data = (uint8_t*)malloc( tk.i_extra_data );
-
- p_wf = (WAVEFORMATEX*)tk.p_extra_data;
-
- if( !strncmp( &tk.psz_codec[6], "INT", 3 ) )
- {
- p_wf->wFormatTag = WAVE_FORMAT_PCM;
- }
- else
- {
- p_wf->wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
- }
- p_wf->nChannels = tk.i_channels;
- p_wf->nSamplesPerSec = tk.i_samplerate;
- p_wf->nAvgBytesPerSec = 0;
- p_wf->nBlockAlign = ( tk.i_bitspersample + 7 ) / 8 * tk.i_channels;
- p_wf->wBitsPerSample = tk.i_bitspersample;
- p_wf->cbSize = 0;
-
- tk.p_es->p_waveformatex = p_wf;
-
if( !strcmp( tk.psz_codec, "A_PCM/INT/BIG" ) )
{
- tk.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' );
+ tk.fmt.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' );
}
else
{
- tk.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' );
+ tk.fmt.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' );
}
+ tk.fmt.audio.i_blockalign = ( tk.fmt.audio.i_bitspersample + 7 ) / 8 * tk.fmt.audio.i_channels;
}
else if( !strcmp( tk.psz_codec, "S_TEXT/UTF8" ) )
{
- tk.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
+ tk.fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
+ tk.fmt.subs.psz_encoding = strdup( "UTF-8" );
}
- else if( !strcmp( tk.psz_codec, "S_TEXT/SSA" ) )
+ else if( !strcmp( tk.psz_codec, "S_TEXT/SSA" ) ||
+ !strcmp( tk.psz_codec, "S_SSA" ) ||
+ !strcmp( tk.psz_codec, "S_ASS" ))
{
- tk.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
+ tk.fmt.i_codec = VLC_FOURCC( 's', 's', 'a', ' ' );
+ tk.fmt.subs.psz_encoding = strdup( "UTF-8" );
}
- else
+ else if( !strcmp( tk.psz_codec, "S_VOBSUB" ) )
{
- msg_Err( p_input, "unknow codec id=`%s'", tk.psz_codec );
- tk.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+ tk.fmt.i_codec = VLC_FOURCC( 's','p','u',' ' );
}
-
- tk.p_es->i_fourcc = tk.i_codec;
-#undef tk
- }
-
- /* select track all video, one audio, no spu TODO : improve */
- b_audio_selected = VLC_FALSE;
- i_audio_channel = 0;
- i_spu_channel = 0;
- for( i_track = 0; i_track < p_sys->i_track; i_track++ )
- {
-#define tk p_sys->track[i_track]
- switch( tk.i_cat )
+ else
{
- case VIDEO_ES:
- vlc_mutex_lock( &p_input->stream.stream_lock );
- input_SelectES( p_input, tk.p_es );
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- break;
-
- case AUDIO_ES:
- if( ( !b_audio_selected && config_GetInt( p_input, "audio-channel" ) < 0 ) ||
- i_audio_channel == config_GetInt( p_input, "audio-channel" ) )
- {
- vlc_mutex_lock( &p_input->stream.stream_lock );
- input_SelectES( p_input, tk.p_es );
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- b_audio_selected = tk.p_es->p_decoder_fifo ? VLC_TRUE : VLC_FALSE;
- }
- i_audio_channel++;
- break;
- case SPU_ES:
- if( i_spu_channel == config_GetInt( p_input, "spu-channel" ) )
- {
- vlc_mutex_lock( &p_input->stream.stream_lock );
- input_SelectES( p_input, tk.p_es );
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
- i_spu_channel++;
- break;
+ msg_Err( p_demux, "unknow codec id=`%s'", tk.psz_codec );
+ tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
}
-#undef tk
- }
- if( !b_audio_selected )
- {
- msg_Warn( p_input, "cannot find/select audio track" );
+ tk.p_es = es_out_Add( p_demux->out, &tk.fmt );
+#undef tk
}
/* add informations */
- InformationsCreate( p_input );
+ InformationsCreate( p_demux );
return VLC_SUCCESS;
error:
delete p_sys->es;
delete p_sys->in;
- stream_Release( p_sys->s );
free( p_sys );
return VLC_EGENERIC;
}
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
- input_thread_t *p_input = (input_thread_t *)p_this;
- demux_sys_t *p_sys = p_input->p_demux_data;
-
- int i_track;
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int i_track;
for( i_track = 0; i_track < p_sys->i_track; i_track++ )
{
#define tk p_sys->track[i_track]
+ if( tk.fmt.psz_description )
+ {
+ free( tk.fmt.psz_description );
+ }
if( tk.psz_codec )
{
free( tk.psz_codec );
}
- if( tk.psz_language )
+ if( tk.fmt.psz_language )
{
- free( tk.psz_language );
+ free( tk.fmt.psz_language );
}
#undef tk
}
delete p_sys->ep;
delete p_sys->es;
delete p_sys->in;
- stream_Release( p_sys->s );
free( p_sys );
}
-static int BlockGet( input_thread_t *p_input, KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration )
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( demux_t *p_demux, int i_query, va_list args )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int64_t *pi64;
+ double *pf, f;
+
+ vlc_meta_t **pp_meta;
+
+ switch( i_query )
+ {
+ case DEMUX_GET_META:
+ pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
+ *pp_meta = vlc_meta_Duplicate( p_sys->meta );
+ return VLC_SUCCESS;
+
+ case DEMUX_GET_LENGTH:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( p_sys->f_duration > 0.0 )
+ {
+ *pi64 = (int64_t)(p_sys->f_duration * 1000);
+ return VLC_SUCCESS;
+ }
+ return VLC_EGENERIC;
+
+ case DEMUX_GET_POSITION:
+ pf = (double*)va_arg( args, double * );
+ *pf = (double)p_sys->in->getFilePointer() / (double)stream_Size( p_demux->s );
+ return VLC_SUCCESS;
+
+ case DEMUX_SET_POSITION:
+ f = (double)va_arg( args, double );
+ Seek( p_demux, -1, (int)(100.0 * f) );
+ return VLC_EGENERIC;
+
+ case DEMUX_GET_TIME:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( p_sys->f_duration > 0.0 )
+ {
+ mtime_t i_duration = (mtime_t)( p_sys->f_duration / 1000 );
+
+ /* FIXME */
+ *pi64 = (mtime_t)1000000 *
+ (mtime_t)i_duration*
+ (mtime_t)p_sys->in->getFilePointer() /
+ (mtime_t)stream_Size( p_demux->s );
+ return VLC_SUCCESS;
+ }
+ return VLC_EGENERIC;
+
+ case DEMUX_SET_TIME:
+ case DEMUX_GET_FPS:
+ default:
+ return VLC_EGENERIC;
+ }
+}
+
+static int BlockGet( demux_t *p_demux, KaxBlock **pp_block, int64_t *pi_ref1, int64_t *pi_ref2, int64_t *pi_duration )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
*pp_block = NULL;
*pi_ref1 = -1;
EbmlElement *el;
int i_level;
- if( p_input->b_die )
+ if( p_demux->b_die )
{
return VLC_EGENERIC;
}
p_sys->ep->Up();
continue;
}
- msg_Warn( p_input, "EOF" );
+ msg_Warn( p_demux, "EOF" );
return VLC_EGENERIC;
}
if( p_sys->i_index == 0 ||
( p_sys->i_index > 0 && p_sys->index[p_sys->i_index - 1].i_position < (int64_t)p_sys->cluster->GetElementPosition() ) )
{
- IndexAppendCluster( p_input, p_sys->cluster );
+ IndexAppendCluster( p_demux, p_sys->cluster );
}
p_sys->ep->Down();
}
else if( EbmlId( *el ) == KaxCues::ClassInfos.GlobalId )
{
- msg_Warn( p_input, "find KaxCues FIXME" );
+ msg_Warn( p_demux, "find KaxCues FIXME" );
return VLC_EGENERIC;
}
else
{
- msg_Dbg( p_input, "unknown (%s)", typeid( el ).name() );
+ msg_Dbg( p_demux, "unknown (%s)", typeid( el ).name() );
}
}
else if( i_level == 2 )
{
KaxClusterTimecode &ctc = *(KaxClusterTimecode*)el;
- ctc.ReadData( p_sys->es->I_O() );
+ ctc.ReadData( p_sys->es->I_O(), SCOPE_ALL_DATA );
p_sys->cluster->InitTimecode( uint64( ctc ), p_sys->i_timescale );
}
else if( EbmlId( *el ) == KaxBlockGroup::ClassInfos.GlobalId )
}
else
{
- msg_Err( p_input, "invalid level = %d", i_level );
+ msg_Err( p_demux, "invalid level = %d", i_level );
return VLC_EGENERIC;
}
}
}
-static pes_packet_t *MemToPES( input_thread_t *p_input, uint8_t *p_mem, int i_mem )
+static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, int i_mem)
{
- pes_packet_t *p_pes;
- data_packet_t *p_data;
-
- if( ( p_pes = input_NewPES( p_input->p_method_data ) ) == NULL )
- {
- return NULL;
- }
-
- p_data = input_NewPacket( p_input->p_method_data, i_mem);
-
- memcpy( p_data->p_payload_start, p_mem, i_mem );
- p_data->p_payload_end = p_data->p_payload_start + i_mem;
-
- p_pes->p_first = p_pes->p_last = p_data;
- p_pes->i_nb_data = 1;
- p_pes->i_pes_size = i_mem;
-
- return p_pes;
+ block_t *p_block;
+ if( !(p_block = block_New( p_demux, i_mem ) ) ) return NULL;
+ memcpy( p_block->p_buffer, p_mem, i_mem );
+ //p_block->i_rate = p_input->stream.control.i_rate;
+ return p_block;
}
-static void BlockDecode( input_thread_t *p_input, KaxBlock *block, mtime_t i_pts, mtime_t i_duration )
+static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, mtime_t i_duration )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
int i_track;
unsigned int i;
+ vlc_bool_t b;
#define tk p_sys->track[i_track]
for( i_track = 0; i_track < p_sys->i_track; i_track++ )
if( i_track >= p_sys->i_track )
{
- msg_Err( p_input, "invalid track number=%d", block->TrackNum() );
+ msg_Err( p_demux, "invalid track number=%d", block->TrackNum() );
return;
}
- if( tk.p_es->p_decoder_fifo == NULL )
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk.p_es, &b );
+ if( !b )
{
tk.b_inited = VLC_FALSE;
return;
}
- if( tk.i_cat == AUDIO_ES && p_input->stream.control.b_mute )
- {
- return;
- }
-
/* First send init data */
if( !tk.b_inited && tk.i_data_init > 0 )
{
- pes_packet_t *p_init;
+ block_t *p_init;
- msg_Dbg( p_input, "sending header (%d bytes)", tk.i_data_init );
+ msg_Dbg( p_demux, "sending header (%d bytes)", tk.i_data_init );
- if( tk.i_codec == VLC_FOURCC( 'v', 'o', 'r', 'b' ) )
+ if( tk.fmt.i_codec == VLC_FOURCC( 'v', 'o', 'r', 'b' ) )
{
int i;
int i_offset = 1;
/* XXX hack split the 3 headers */
if( tk.p_data_init[0] != 0x02 )
{
- msg_Err( p_input, "invalid vorbis header" );
+ msg_Err( p_demux, "invalid vorbis header" );
}
for( i = 0; i < 2; i++ )
i_size[1] = __MIN( i_size[1], tk.i_data_init - i_offset - i_size[0] );
i_size[2] = tk.i_data_init - i_offset - i_size[0] - i_size[1];
- p_init = MemToPES( p_input, &tk.p_data_init[i_offset], i_size[0] );
+ p_init = MemToBlock( p_demux, &tk.p_data_init[i_offset], i_size[0] );
if( p_init )
{
- input_DecodePES( tk.p_es->p_decoder_fifo, p_init );
+ es_out_Send( p_demux->out, tk.p_es, p_init );
}
- p_init = MemToPES( p_input, &tk.p_data_init[i_offset+i_size[0]], i_size[1] );
+ p_init = MemToBlock( p_demux, &tk.p_data_init[i_offset+i_size[0]], i_size[1] );
if( p_init )
{
- input_DecodePES( tk.p_es->p_decoder_fifo, p_init );
+ es_out_Send( p_demux->out, tk.p_es, p_init );
}
- p_init = MemToPES( p_input, &tk.p_data_init[i_offset+i_size[0]+i_size[1]], i_size[2] );
+ p_init = MemToBlock( p_demux, &tk.p_data_init[i_offset+i_size[0]+i_size[1]], i_size[2] );
if( p_init )
{
- input_DecodePES( tk.p_es->p_decoder_fifo, p_init );
+ es_out_Send( p_demux->out, tk.p_es, p_init );
}
}
else
{
- p_init = MemToPES( p_input, tk.p_data_init, tk.i_data_init );
+ p_init = MemToBlock( p_demux, tk.p_data_init, tk.i_data_init );
if( p_init )
{
- input_DecodePES( tk.p_es->p_decoder_fifo, p_init );
+ es_out_Send( p_demux->out, tk.p_es, p_init );
}
}
}
for( i = 0; i < block->NumberFrames(); i++ )
{
- pes_packet_t *p_pes;
+ block_t *p_block;
DataBuffer &data = block->GetBuffer(i);
- p_pes = MemToPES( p_input, data.Buffer(), data.Size() );
- if( p_pes == NULL )
+ p_block = MemToBlock( p_demux, data.Buffer(), data.Size() );
+ if( p_block == NULL )
{
break;
}
- p_pes->i_pts = i_pts;
- p_pes->i_dts = i_pts;
-
- if( tk.i_cat == SPU_ES )
+ if( tk.fmt.i_cat != VIDEO_ES )
+ p_block->i_dts = p_block->i_pts = i_pts;
+ else
{
- if( i_duration > 0 )
- {
- /* FIXME not sure about that */
- p_pes->i_dts += i_duration * 1000;// * (mtime_t) 1000 / p_sys->i_timescale;
- }
- else
- {
- p_pes->i_dts = 0;
- }
-
- if( p_pes->p_first && p_pes->i_pes_size > 0 )
- {
- p_pes->p_first->p_payload_end[-1] = '\0';
- }
- if( !strcmp( tk.psz_codec, "S_TEXT/SSA" ) )
- {
- /* remove all fields before text for now */
- char *start = (char*)p_pes->p_first->p_payload_start;
- int i_comma = 0;
-
- while( *start && i_comma < 8 )
- {
- if( *start++ == ',' )
- {
- i_comma++;
- }
- }
- memmove( p_pes->p_first->p_payload_start, start,
- strlen( start) + 1 );
- }
+ p_block->i_dts = i_pts;
+ p_block->i_pts = 0;
}
- input_DecodePES( tk.p_es->p_decoder_fifo, p_pes );
+ if( tk.fmt.i_cat == SPU_ES && strcmp( tk.psz_codec, "S_VOBSUB" ) )
+ {
+ p_block->i_length = i_duration * 1000;
+ }
+ es_out_Send( p_demux->out, tk.p_es, p_block );
/* use time stamp only for first block */
i_pts = 0;
#undef tk
}
-static void Seek( input_thread_t *p_input, mtime_t i_date, int i_percent)
+static void Seek( demux_t *p_demux, mtime_t i_date, int i_percent)
{
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
KaxBlock *block;
int64_t i_block_duration;
int i_track_skipping;
int i_track;
- msg_Dbg( p_input, "seek request to "I64Fd" (%d%%)", i_date, i_percent );
+ msg_Dbg( p_demux, "seek request to "I64Fd" (%d%%)", i_date, i_percent );
if( i_date < 0 && i_percent < 0 )
{
return;
p_sys->cluster = NULL;
/* seek without index or without date */
- if( config_GetInt( p_input, "mkv-seek-percent" ) || !p_sys->b_cues || i_date < 0 )
+ if( config_GetInt( p_demux, "mkv-seek-percent" ) || !p_sys->b_cues || i_date < 0 )
{
- int64_t i_pos = i_percent * stream_Size( p_sys->s ) / 100;
+ int64_t i_pos = i_percent * stream_Size( p_demux->s ) / 100;
- msg_Dbg( p_input, "imprecise way of seeking" );
+ msg_Dbg( p_demux, "inacurate way of seeking" );
for( i_index = 0; i_index < p_sys->i_index; i_index++ )
{
if( p_sys->index[i_index].i_position >= i_pos)
i_index--;
}
- p_sys->in->setFilePointer( p_sys->index[i_index].i_position, seek_beginning );
+ p_sys->in->setFilePointer( p_sys->index[i_index].i_position,
+ seek_beginning );
if( p_sys->index[i_index].i_position < i_pos )
{
EbmlElement *el;
- msg_Warn( p_input, "searching for cluster, could take some time" );
+ msg_Warn( p_demux, "searching for cluster, could take some time" );
/* search a cluster */
while( ( el = p_sys->ep->Get() ) != NULL )
KaxCluster *cluster = (KaxCluster*)el;
/* add it to the index */
- IndexAppendCluster( p_input, cluster );
+ IndexAppendCluster( p_demux, cluster );
if( (int64_t)cluster->GetElementPosition() >= i_pos )
{
i_index--;
}
- msg_Dbg( p_input, "seek got "I64Fd" (%d%%)",
+ msg_Dbg( p_demux, "seek got "I64Fd" (%d%%)",
p_sys->index[i_index].i_time,
(int)( 100 * p_sys->index[i_index].i_position /
- stream_Size( p_sys->s ) ) );
+ stream_Size( p_demux->s ) ) );
p_sys->in->setFilePointer( p_sys->index[i_index].i_position,
seek_beginning );
i_track_skipping = 0;
for( i_track = 0; i_track < p_sys->i_track; i_track++ )
{
- if( tk.i_cat == VIDEO_ES )
+ if( tk.fmt.i_cat == VIDEO_ES )
{
tk.b_search_keyframe = VLC_TRUE;
i_track_skipping++;
while( i_track_skipping > 0 )
{
- if( BlockGet( p_input, &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
+ if( BlockGet( p_demux, &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
{
- msg_Warn( p_input, "cannot get block EOF?" );
+ msg_Warn( p_demux, "cannot get block EOF?" );
return;
}
if( i_track < p_sys->i_track )
{
- if( tk.i_cat == VIDEO_ES && i_block_ref1 == -1 && tk.b_search_keyframe )
+ if( tk.fmt.i_cat == VIDEO_ES && i_block_ref1 == -1 && tk.b_search_keyframe )
{
tk.b_search_keyframe = VLC_FALSE;
i_track_skipping--;
}
- if( tk.i_cat == VIDEO_ES && !tk.b_search_keyframe )
+ if( tk.fmt.i_cat == VIDEO_ES && !tk.b_search_keyframe )
{
- BlockDecode( p_input, block, 0, 0 );
+ BlockDecode( p_demux, block, 0, 0 );
}
}
*****************************************************************************
* Returns -1 in case of error, 0 in case of EOF, 1 otherwise
*****************************************************************************/
-static int Demux( input_thread_t * p_input )
+static int Demux( demux_t *p_demux)
{
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
mtime_t i_start_pts;
int i_block_count = 0;
int64_t i_block_ref1;
int64_t i_block_ref2;
- if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
- {
- mtime_t i_duration = (mtime_t)( p_sys->f_duration / 1000 );
- mtime_t i_date = -1;
- int i_percent = -1;
-
- if( i_duration > 0 )
- {
- i_date = (mtime_t)1000000 *
- (mtime_t)i_duration*
- (mtime_t)p_sys->in->getFilePointer() /
- (mtime_t)stream_Size( p_sys->s );
- }
- if( stream_Size( p_sys->s ) > 0 )
- {
- i_percent = 100 * p_sys->in->getFilePointer() /
- stream_Size( p_sys->s );
- }
-
- Seek( p_input, i_date, i_percent);
- }
-
i_start_pts = -1;
for( ;; )
{
- mtime_t i_pts;
-
- if( BlockGet( p_input, &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
+ if( BlockGet( p_demux, &block, &i_block_ref1, &i_block_ref2, &i_block_duration ) )
{
- msg_Warn( p_input, "cannot get block EOF?" );
+ msg_Warn( p_demux, "cannot get block EOF?" );
return 0;
}
if( p_sys->i_pts > 0 )
{
- input_ClockManageRef( p_input,
- p_input->stream.p_selected_program,
- p_sys->i_pts * 9 / 100 );
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pts );
}
- i_pts = input_ClockGetTS( p_input,
- p_input->stream.p_selected_program,
- p_sys->i_pts * 9 / 100 );
-
-
-
- BlockDecode( p_input, block, i_pts, i_block_duration );
+ BlockDecode( p_demux, block, p_sys->i_pts, i_block_duration );
delete block;
i_block_count++;
* * InformationsCreate : create all informations, load tags if present
*
*****************************************************************************/
-static void LoadCues( input_thread_t *p_input )
+static void LoadCues( demux_t *p_demux )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
int64_t i_sav_position = p_sys->in->getFilePointer();
EbmlParser *ep;
EbmlElement *el, *cues;
- msg_Dbg( p_input, "loading cues" );
+ msg_Dbg( p_demux, "loading cues" );
p_sys->in->setFilePointer( p_sys->i_cues_position, seek_beginning );
cues = p_sys->es->FindNextID( KaxCues::ClassInfos, 0xFFFFFFFFL);
if( cues == NULL )
{
- msg_Err( p_input, "cannot load cues (broken seekhead or file)" );
+ msg_Err( p_demux, "cannot load cues (broken seekhead or file)" );
+ p_sys->in->setFilePointer( i_sav_position, seek_beginning );
return;
}
}
else
{
- msg_Dbg( p_input, " * Unknown (%s)", typeid(*el).name() );
+ msg_Dbg( p_demux, " * Unknown (%s)", typeid(*el).name() );
}
}
ep->Up();
}
else
{
- msg_Dbg( p_input, " * Unknown (%s)", typeid(*el).name() );
+ msg_Dbg( p_demux, " * Unknown (%s)", typeid(*el).name() );
}
}
ep->Up();
- msg_Dbg( p_input, " * added time="I64Fd" pos="I64Fd
+#if 0
+ msg_Dbg( p_demux, " * added time="I64Fd" pos="I64Fd
" track=%d bnum=%d", idx.i_time, idx.i_position,
idx.i_track, idx.i_block_number );
+#endif
p_sys->i_index++;
if( p_sys->i_index >= p_sys->i_index_max )
}
else
{
- msg_Dbg( p_input, " * Unknown (%s)", typeid(*el).name() );
+ msg_Dbg( p_demux, " * Unknown (%s)", typeid(*el).name() );
}
}
delete ep;
p_sys->b_cues = VLC_TRUE;
- msg_Dbg( p_input, "loading cues done." );
+ msg_Dbg( p_demux, "loading cues done." );
p_sys->in->setFilePointer( i_sav_position, seek_beginning );
}
-static void LoadTags( input_thread_t *p_input )
+static void LoadTags( demux_t *p_demux )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
int64_t i_sav_position = p_sys->in->getFilePointer();
EbmlParser *ep;
EbmlElement *el, *tags;
- msg_Dbg( p_input, "loading tags" );
+ msg_Dbg( p_demux, "loading tags" );
p_sys->in->setFilePointer( p_sys->i_tags_position, seek_beginning );
tags = p_sys->es->FindNextID( KaxTags::ClassInfos, 0xFFFFFFFFL);
if( tags == NULL )
{
- msg_Err( p_input, "cannot load tags (broken seekhead or file)" );
+ msg_Err( p_demux, "cannot load tags (broken seekhead or file)" );
+ p_sys->in->setFilePointer( i_sav_position, seek_beginning );
return;
}
- msg_Dbg( p_input, "Tags" );
+ msg_Dbg( p_demux, "Tags" );
ep = new EbmlParser( p_sys->es, tags );
while( ( el = ep->Get() ) != NULL )
{
if( EbmlId( *el ) == KaxTag::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "+ Tag" );
+ msg_Dbg( p_demux, "+ Tag" );
ep->Down();
while( ( el = ep->Get() ) != NULL )
{
if( EbmlId( *el ) == KaxTagTargets::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Targets" );
+ msg_Dbg( p_demux, "| + Targets" );
ep->Down();
while( ( el = ep->Get() ) != NULL )
{
- msg_Dbg( p_input, "| | + Unknown (%s)", typeid( *el ).name() );
+ msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() );
}
ep->Up();
}
else if( EbmlId( *el ) == KaxTagGeneral::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + General" );
+ msg_Dbg( p_demux, "| + General" );
ep->Down();
while( ( el = ep->Get() ) != NULL )
{
- msg_Dbg( p_input, "| | + Unknown (%s)", typeid( *el ).name() );
+ msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() );
}
ep->Up();
}
else if( EbmlId( *el ) == KaxTagGenres::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Genres" );
+ msg_Dbg( p_demux, "| + Genres" );
ep->Down();
while( ( el = ep->Get() ) != NULL )
{
- msg_Dbg( p_input, "| | + Unknown (%s)", typeid( *el ).name() );
+ msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() );
}
ep->Up();
}
else if( EbmlId( *el ) == KaxTagAudioSpecific::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Audio Specific" );
+ msg_Dbg( p_demux, "| + Audio Specific" );
ep->Down();
while( ( el = ep->Get() ) != NULL )
{
- msg_Dbg( p_input, "| | + Unknown (%s)", typeid( *el ).name() );
+ msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() );
}
ep->Up();
}
else if( EbmlId( *el ) == KaxTagImageSpecific::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Images Specific" );
+ msg_Dbg( p_demux, "| + Images Specific" );
ep->Down();
while( ( el = ep->Get() ) != NULL )
{
- msg_Dbg( p_input, "| | + Unknown (%s)", typeid( *el ).name() );
+ msg_Dbg( p_demux, "| | + Unknown (%s)", typeid( *el ).name() );
}
ep->Up();
}
else if( EbmlId( *el ) == KaxTagMultiComment::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Multi Comment" );
+ msg_Dbg( p_demux, "| + Multi Comment" );
}
else if( EbmlId( *el ) == KaxTagMultiCommercial::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Multi Commercial" );
+ msg_Dbg( p_demux, "| + Multi Commercial" );
}
else if( EbmlId( *el ) == KaxTagMultiDate::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Multi Date" );
+ msg_Dbg( p_demux, "| + Multi Date" );
}
else if( EbmlId( *el ) == KaxTagMultiEntity::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Multi Entity" );
+ msg_Dbg( p_demux, "| + Multi Entity" );
}
else if( EbmlId( *el ) == KaxTagMultiIdentifier::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Multi Identifier" );
+ msg_Dbg( p_demux, "| + Multi Identifier" );
}
else if( EbmlId( *el ) == KaxTagMultiLegal::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Multi Legal" );
+ msg_Dbg( p_demux, "| + Multi Legal" );
}
else if( EbmlId( *el ) == KaxTagMultiTitle::ClassInfos.GlobalId )
{
- msg_Dbg( p_input, "| + Multi Title" );
+ msg_Dbg( p_demux, "| + Multi Title" );
}
else
{
- msg_Dbg( p_input, "| + Unknown (%s)", typeid( *el ).name() );
+ msg_Dbg( p_demux, "| + Unknown (%s)", typeid( *el ).name() );
}
}
ep->Up();
}
else
{
- msg_Dbg( p_input, "+ Unknown (%s)", typeid( *el ).name() );
+ msg_Dbg( p_demux, "+ Unknown (%s)", typeid( *el ).name() );
}
}
delete ep;
delete tags;
- msg_Dbg( p_input, "loading tags done." );
+ msg_Dbg( p_demux, "loading tags done." );
p_sys->in->setFilePointer( i_sav_position, seek_beginning );
}
-static void InformationsCreate( input_thread_t *p_input )
+static void InformationsCreate( demux_t *p_demux )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
- input_info_category_t *p_cat;
- int i_track;
-
- p_cat = input_InfoCategory( p_input, "Matroska" );
- if( p_sys->f_duration > 1000.1 )
- {
- int64_t i_sec = (int64_t)p_sys->f_duration / 1000;
- int h,m,s;
-
- h = i_sec / 3600;
- m = ( i_sec / 60 ) % 60;
- s = i_sec % 60;
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int i_track;
- input_AddInfo( p_cat, _("Duration"), "%d:%2.2d:%2.2d" , h, m, s );
- }
+ p_sys->meta = vlc_meta_New();
if( p_sys->psz_title )
{
- input_AddInfo( p_cat, _("Title"), "%s" ,p_sys->psz_title );
+ vlc_meta_Add( p_sys->meta, VLC_META_TITLE, p_sys->psz_title );
}
if( p_sys->psz_date_utc )
{
- input_AddInfo( p_cat, _("Date UTC"), "%s" ,p_sys->psz_date_utc );
+ vlc_meta_Add( p_sys->meta, VLC_META_DATE, p_sys->psz_date_utc );
}
if( p_sys->psz_segment_filename )
{
- input_AddInfo( p_cat, _("Segment Filename"), "%s" ,p_sys->psz_segment_filename );
+ vlc_meta_Add( p_sys->meta, _("Segment filename"), p_sys->psz_segment_filename );
}
if( p_sys->psz_muxing_application )
{
- input_AddInfo( p_cat, _("Muxing Application"), "%s" ,p_sys->psz_muxing_application );
+ vlc_meta_Add( p_sys->meta, _("Muxing application"), p_sys->psz_muxing_application );
}
if( p_sys->psz_writing_application )
{
- input_AddInfo( p_cat, _("Writing Application"), "%s" ,p_sys->psz_writing_application );
+ vlc_meta_Add( p_sys->meta, _("Writing application"), p_sys->psz_writing_application );
}
- input_AddInfo( p_cat, _("Number of streams"), "%d" , p_sys->i_track );
for( i_track = 0; i_track < p_sys->i_track; i_track++ )
{
- char psz_cat[strlen( "Stream " ) + 10];
-#define tk p_sys->track[i_track]
+ mkv_track_t *tk = &p_sys->track[i_track];
+ vlc_meta_t *mtk = vlc_meta_New();
- sprintf( psz_cat, "Stream %d", i_track );
- p_cat = input_InfoCategory( p_input, psz_cat);
- if( tk.psz_name )
- {
- input_AddInfo( p_cat, _("Name"), "%s", tk.psz_name );
- }
- if( tk.psz_codec_name )
+ p_sys->meta->track = (vlc_meta_t**)realloc( p_sys->meta->track,
+ sizeof( vlc_meta_t * ) * ( p_sys->meta->i_track + 1 ) );
+ p_sys->meta->track[p_sys->meta->i_track++] = mtk;
+
+ if( tk->fmt.psz_description )
{
- input_AddInfo( p_cat, _("Codec Name"), "%s", tk.psz_codec_name );
+ vlc_meta_Add( p_sys->meta, VLC_META_DESCRIPTION, tk->fmt.psz_description );
}
- if( tk.psz_codec_settings )
+ if( tk->psz_codec_name )
{
- input_AddInfo( p_cat, _("Codec Setting"), "%s", tk.psz_codec_settings );
+ vlc_meta_Add( p_sys->meta, VLC_META_CODEC_NAME, tk->psz_codec_name );
}
- if( tk.psz_codec_info_url )
+ if( tk->psz_codec_settings )
{
- input_AddInfo( p_cat, _("Codec Info"), "%s", tk.psz_codec_info_url );
+ vlc_meta_Add( p_sys->meta, VLC_META_SETTING, tk->psz_codec_settings );
}
- if( tk.psz_codec_download_url )
+ if( tk->psz_codec_info_url )
{
- input_AddInfo( p_cat, _("Codec Download"), "%s", tk.psz_codec_download_url );
+ vlc_meta_Add( p_sys->meta, VLC_META_CODEC_DESCRIPTION, tk->psz_codec_info_url );
}
-
- switch( tk.i_cat )
+ if( tk->psz_codec_download_url )
{
- case AUDIO_ES:
- input_AddInfo( p_cat, _("Type"), _("Audio") );
- input_AddInfo( p_cat, _("Codec"), "%.4s (%s)", (char*)&tk.i_codec, tk.psz_codec );
- if( tk.i_channels > 0 )
- {
- input_AddInfo( p_cat, _("Channels"), "%d", tk.i_channels );
- }
- if( tk.i_samplerate > 0 )
- {
- input_AddInfo( p_cat, _("Sample Rate"), "%d", tk.i_samplerate );
- }
- if( tk.i_bitspersample )
- {
- input_AddInfo( p_cat, _("Bits Per Sample"), "%d", tk.i_bitspersample );
- }
- break;
- case VIDEO_ES:
- input_AddInfo( p_cat, _("Type"), _("Video") );
- input_AddInfo( p_cat, _("Codec"), "%.4s (%s)", (char*)&tk.i_codec, tk.psz_codec );
- if( tk.i_width > 0 && tk.i_height )
- {
- input_AddInfo( p_cat, _("Resolution"), "%dx%d", tk.i_width, tk.i_height );
- }
- if( tk.i_display_width > 0 && tk.i_display_height )
- {
- input_AddInfo( p_cat, _("Display Resolution"), "%dx%d", tk.i_display_width, tk.i_display_height );
- }
- if( tk.f_fps > 0.1 )
- {
- input_AddInfo( p_cat, _("Frame Per Second"), "%.3f", tk.f_fps );
- }
- break;
- case SPU_ES:
- input_AddInfo( p_cat, _("Type"), _("Subtitle") );
- input_AddInfo( p_cat, _("Codec"), "%s", tk.psz_codec );
- break;
+ vlc_meta_Add( p_sys->meta, VLC_META_URL, tk->psz_codec_download_url );
}
-
-#undef tk
}
if( p_sys->i_tags_position >= 0 )
{
vlc_bool_t b_seekable;
- stream_Control( p_sys->s, STREAM_CAN_FASTSEEK, &b_seekable );
+ stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable );
if( b_seekable )
{
- LoadTags( p_input );
+ LoadTags( p_demux );
}
}
}
* Divers
*****************************************************************************/
-static void IndexAppendCluster( input_thread_t *p_input, KaxCluster *cluster )
+static void IndexAppendCluster( demux_t *p_demux, KaxCluster *cluster )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
#define idx p_sys->index[p_sys->i_index]
idx.i_track = -1;
return dst;
}
-static char *LanguageGetName ( const char *psz_code )
-{
- const iso639_lang_t *pl;
-
- if( strlen( psz_code ) == 2 )
- {
- pl = GetLang_1( psz_code );
- }
- else if( strlen( psz_code ) == 3 )
- {
- pl = GetLang_2B( psz_code );
- if( !strcmp( pl->psz_iso639_1, "??" ) )
- {
- pl = GetLang_2T( psz_code );
- }
- }
- else
- {
- return strdup( psz_code );
- }
-
- if( !strcmp( pl->psz_iso639_1, "??" ) )
- {
- return strdup( psz_code );
- }
- else
- {
- if( *pl->psz_native_name )
- {
- return strdup( pl->psz_native_name );
- }
- return strdup( pl->psz_eng_name );
- }
-}
-
projects / vlc / blobdiff