#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc_interaction.h>
+#include <vlc_demux.h>
+#include <vlc_interface.h>
-#include "vlc_meta.h"
-
-#include "codecs.h" /* BITMAPINFOHEADER, WAVEFORMATEX */
+#include <vlc_meta.h>
+#include <vlc_access.h> /* GET_PRIVATE_ID_STATE */
+#include <vlc_codecs.h> /* BITMAPINFOHEADER, WAVEFORMATEX */
#include "libasf.h"
/* TODO
int64_t i_data_begin;
int64_t i_data_end;
+ vlc_bool_t b_index;
vlc_meta_t *meta;
};
/* Load the headers */
if( DemuxInit( p_demux ) )
{
+ free( p_sys );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
mtime_t i_time_begin = GetMoviePTS( p_sys );
int i_result;
- if( p_demux->b_die )
- {
- break;
- }
+ if( p_demux->b_die ) break;
/* Check if we have concatenated files */
if( stream_Peek( p_demux->s, &p_peek, 16 ) == 16 )
else
{
i_length = GetMoviePTS( p_sys ) - i_time_begin;
- if( i_length < 0 || i_length >= 40 * 1000 )
- {
- break;
- }
+ if( i_length < 0 || i_length >= 40 * 1000 ) break;
}
}
free( p_demux->p_sys );
}
+/*****************************************************************************
+ * SeekIndex: goto to i_date or i_percent
+ *****************************************************************************/
+static int SeekIndex( demux_t *p_demux, mtime_t i_date, float f_pos )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ asf_object_index_t *p_index;
+ int64_t i_pos;
+
+ msg_Dbg( p_demux, "seek with index: %i seconds, position %f",
+ (int)(i_date/1000000), f_pos );
+
+ p_index = ASF_FindObject( p_sys->p_root, &asf_object_index_guid, 0 );
+
+ if( i_date < 0 ) i_date = p_sys->i_length * f_pos;
+
+ i_pos = i_date * 10 / p_index->i_index_entry_time_interval;
+ i_pos = p_index->index_entry[i_pos].i_packet_number *
+ p_sys->p_fp->i_min_data_packet_size;
+
+ return stream_Seek( p_demux->s, p_sys->i_data_begin + i_pos );
+}
+
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
- int64_t *pi64;
+ vlc_meta_t *p_meta;
+ int64_t i64, *pi64;
+ double f, *pf;
int i;
- vlc_meta_t *p_meta;
switch( i_query )
{
- case DEMUX_SET_TIME:
- return VLC_EGENERIC;
-
- case DEMUX_GET_LENGTH:
- pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = p_sys->i_length;
- return VLC_SUCCESS;
+ case DEMUX_GET_LENGTH:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ *pi64 = p_sys->i_length;
+ return VLC_SUCCESS;
+
+ case DEMUX_GET_TIME:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( p_sys->i_time < 0 ) return VLC_EGENERIC;
+ *pi64 = p_sys->i_time;
+ return VLC_SUCCESS;
+
+ case DEMUX_SET_TIME:
+ p_sys->i_time = -1;
+ for( i = 0; i < 128 ; i++ )
+ if( p_sys->track[i] ) p_sys->track[i]->i_time = -1;
+
+ if( p_sys->b_index && p_sys->i_length > 0 )
+ {
+ i64 = (int64_t)va_arg( args, int64_t );
+ return SeekIndex( p_demux, i64, -1 );
+ }
+ else
+ {
+ return demux2_vaControlHelper( p_demux->s, p_sys->i_data_begin,
+ p_sys->i_data_end, p_sys->i_bitrate,
+ p_sys->p_fp->i_min_data_packet_size,
+ i_query, args );
+ }
- case DEMUX_GET_META:
- p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
- vlc_meta_Merge( p_meta, p_sys->meta );
+ case DEMUX_GET_POSITION:
+ if( p_sys->i_time < 0 ) return VLC_EGENERIC;
+ if( p_sys->i_length > 0 )
+ {
+ pf = (double*)va_arg( args, double * );
+ *pf = p_sys->i_time / (double)p_sys->i_length;
return VLC_SUCCESS;
+ }
+ return demux2_vaControlHelper( p_demux->s, p_sys->i_data_begin,
+ p_sys->i_data_end, p_sys->i_bitrate,
+ p_sys->p_fp->i_min_data_packet_size,
+ i_query, args );
- case DEMUX_SET_POSITION:
- p_sys->i_time = -1;
- for( i = 0; i < 128 ; i++ )
- {
- asf_track_t *tk = p_sys->track[i];
- if( tk ) tk->i_time = -1;
- }
+ case DEMUX_SET_POSITION:
+ p_sys->i_time = -1;
+ for( i = 0; i < 128 ; i++ )
+ if( p_sys->track[i] ) p_sys->track[i]->i_time = -1;
- default:
- return demux2_vaControlHelper( p_demux->s,
- p_sys->i_data_begin, p_sys->i_data_end,
- p_sys->i_bitrate, p_sys->p_fp->i_min_data_packet_size,
+ if( p_sys->b_index && p_sys->i_length > 0 )
+ {
+ f = (double)va_arg( args, double );
+ return SeekIndex( p_demux, -1, f );
+ }
+ else
+ {
+ return demux2_vaControlHelper( p_demux->s, p_sys->i_data_begin,
+ p_sys->i_data_end, p_sys->i_bitrate,
+ p_sys->p_fp->i_min_data_packet_size,
i_query, args );
+ }
+
+ case DEMUX_GET_META:
+ p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
+ vlc_meta_Merge( p_meta, p_sys->meta );
+ return VLC_SUCCESS;
+
+ default:
+ return demux2_vaControlHelper( p_demux->s, p_sys->i_data_begin,
+ p_sys->i_data_end, p_sys->i_bitrate,
+ p_sys->p_fp->i_min_data_packet_size,
+ i_query, args );
}
}
*****************************************************************************/
static mtime_t GetMoviePTS( demux_sys_t *p_sys )
{
- mtime_t i_time;
+ mtime_t i_time = -1;
int i;
- i_time = -1;
for( i = 0; i < 128 ; i++ )
{
asf_track_t *tk = p_sys->track[i];
if( tk && tk->p_es && tk->i_time > 0)
{
- if( i_time < 0 )
- {
- i_time = tk->i_time;
- }
- else
- {
- i_time = __MIN( i_time, tk->i_time );
- }
+ if( i_time < 0 ) i_time = tk->i_time;
+ else i_time = __MIN( i_time, tk->i_time );
}
}
{
asf_track_t *tk;
+ int i_packet_keyframe;
int i_stream_number;
int i_media_object_number;
int i_media_object_offset;
break;
}
- i_stream_number = p_peek[i_skip] & 0x7f;
- i_skip++;
+ i_packet_keyframe = p_peek[i_skip] >> 7;
+ i_stream_number = p_peek[i_skip++] & 0x7f;
GETVALUE2b( i_packet_property >> 4, i_media_object_number, 0 );
GETVALUE2b( i_packet_property >> 2, i_tmp, 0 );
static int DemuxInit( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
- vlc_bool_t b_seekable;
- int i;
-
- unsigned int i_stream;
+ vlc_bool_t b_seekable;
+ unsigned int i_stream, i;
asf_object_content_description_t *p_cd;
+ asf_object_index_t *p_index;
+ vlc_bool_t b_index;
/* init context */
p_sys->i_time = -1;
p_sys->i_bitrate = 0;
p_sys->p_root = NULL;
p_sys->p_fp = NULL;
+ p_sys->b_index = 0;
p_sys->i_track = 0;
for( i = 0; i < 128; i++ )
{
/* Now load all object ( except raw data ) */
stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable );
- if( (p_sys->p_root = ASF_ReadObjectRoot( p_demux->s, b_seekable )) == NULL )
+ if( !(p_sys->p_root = ASF_ReadObjectRoot(p_demux->s, b_seekable)) )
{
msg_Warn( p_demux, "ASF plugin discarded (not a valid file)" );
return VLC_EGENERIC;
goto error;
}
+ /* check if index is available */
+ p_index = ASF_FindObject( p_sys->p_root, &asf_object_index_guid, 0 );
+ b_index = p_index && p_index->i_index_entry_count;
+
msg_Dbg( p_demux, "found %d streams", p_sys->i_track );
for( i_stream = 0; i_stream < p_sys->i_track; i_stream ++ )
fmt.video.i_width = GetDWLE( p_data + 4 );
fmt.video.i_height= GetDWLE( p_data + 8 );
+
+ if( fmt.i_codec == VLC_FOURCC( 'D','V','R',' ') )
+ {
+ /* DVR-MS special ASF */
+ fmt.i_codec = VLC_FOURCC( 'm','p','g','2' ) ;
+ fmt.b_packetized = VLC_FALSE;
+ }
+
if( p_sp->i_type_specific_data_length > 11 +
sizeof( BITMAPINFOHEADER ) )
{
tk->p_es = es_out_Add( p_demux->out, &fmt );
es_format_Clean( &fmt );
+ /* If there is a video track then use the index for seeking */
+ p_sys->b_index = b_index;
+
msg_Dbg( p_demux, "added new video stream(ID:%d)",
p_sp->i_stream_number );
}
+ else if( ASF_CmpGUID( &p_sp->i_stream_type, &asf_object_extended_stream_header ) &&
+ p_sp->i_type_specific_data_length >= 64 )
+ {
+ /* Now follows a 64 byte header of which we don't know much */
+ es_format_t fmt;
+ guid_t *p_ref = (guid_t *)p_sp->p_type_specific_data;
+ uint8_t *p_data = p_sp->p_type_specific_data + 64;
+ unsigned int i_data = p_sp->i_type_specific_data_length - 64;
+
+ msg_Dbg( p_demux, "Ext stream header detected. datasize = %d", p_sp->i_type_specific_data_length );
+ if( ASF_CmpGUID( p_ref, &asf_object_extended_stream_type_audio ) &&
+ i_data >= sizeof( WAVEFORMATEX ) - 2)
+ {
+ int i_format;
+ es_format_Init( &fmt, AUDIO_ES, 0 );
+ i_format = GetWLE( &p_data[0] );
+ if( i_format == 0 )
+ fmt.i_codec = VLC_FOURCC( 'a','5','2',' ');
+ else
+ wf_tag_to_fourcc( i_format, &fmt.i_codec, NULL );
+ fmt.audio.i_channels = GetWLE( &p_data[2] );
+ fmt.audio.i_rate = GetDWLE( &p_data[4] );
+ fmt.i_bitrate = GetDWLE( &p_data[8] ) * 8;
+ fmt.audio.i_blockalign = GetWLE( &p_data[12] );
+ fmt.audio.i_bitspersample = GetWLE( &p_data[14] );
+ fmt.b_packetized = VLC_TRUE;
+
+ if( p_sp->i_type_specific_data_length > sizeof( WAVEFORMATEX ) &&
+ i_format != WAVE_FORMAT_MPEGLAYER3 &&
+ i_format != WAVE_FORMAT_MPEG )
+ {
+ fmt.i_extra = __MIN( GetWLE( &p_data[16] ),
+ p_sp->i_type_specific_data_length -
+ sizeof( WAVEFORMATEX ) );
+ fmt.p_extra = malloc( fmt.i_extra );
+ memcpy( fmt.p_extra, &p_data[sizeof( WAVEFORMATEX )],
+ fmt.i_extra );
+ }
+
+ tk->i_cat = AUDIO_ES;
+ tk->p_es = es_out_Add( p_demux->out, &fmt );
+ es_format_Clean( &fmt );
+
+ msg_Dbg( p_demux, "added new audio stream (codec:0x%x,ID:%d)",
+ i_format, p_sp->i_stream_number );
+ }
+ }
else
{
tk->i_cat = UNKNOWN_ES;
p_sys->i_data_end = -1;
}
-
/* go to first packet */
stream_Seek( p_demux->s, p_sys->i_data_begin );
{
vlc_meta_SetTitle( p_sys->meta, p_cd->psz_title );
}
- if( p_cd->psz_author && *p_cd->psz_author )
+ if( p_cd->psz_artist && *p_cd->psz_artist )
{
- vlc_meta_SetAuthor( p_sys->meta, p_cd->psz_author );
+ vlc_meta_SetArtist( p_sys->meta, p_cd->psz_artist );
}
if( p_cd->psz_copyright && *p_cd->psz_copyright )
{
projects / vlc / blobdiff