/*****************************************************************************
- * asf.c : ASFv01 file input module for vlc
+ * asf.c : ASF demux module
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: asf.c,v 1.18 2003/01/25 16:58:34 fenrir Exp $
+ * Copyright (C) 2002-2003 the VideoLAN team
+ * $Id$
+ *
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
-#include <errno.h>
-#include <sys/types.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_demux.h>
+#include <vlc_interface.h>
+#include <vlc_meta.h>
+#include <vlc_access.h> /* GET_PRIVATE_ID_STATE */
+#include <vlc_codecs.h> /* BITMAPINFOHEADER, WAVEFORMATEX */
#include "libasf.h"
-#include "asf.h"
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int Activate ( vlc_object_t * );
-static void Deactivate ( vlc_object_t * );
-static int Demux ( input_thread_t * );
+/* TODO
+ * - add support for the newly added object: language, bitrate,
+ * extended stream properties.
+ */
/*****************************************************************************
* Module descriptor
*****************************************************************************/
+static int Open ( vlc_object_t * );
+static void Close ( vlc_object_t * );
+
vlc_module_begin();
- set_description( "ASF v1.0 demuxer (file only)" );
- set_capability( "demux", 200 );
- set_callbacks( Activate, Deactivate );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
+ set_description( _("ASF v1.0 demuxer") );
+ set_capability( "demux2", 200 );
+ set_callbacks( Open, Close );
add_shortcut( "asf" );
vlc_module_end();
-static uint16_t GetWLE( uint8_t *p_buff )
-{
- return( (p_buff[0]) + ( p_buff[1] <<8 ) );
-}
-static uint32_t GetDWLE( uint8_t *p_buff )
-{
- return( p_buff[0] + ( p_buff[1] <<8 ) +
- ( p_buff[2] <<16 ) + ( p_buff[3] <<24 ) );
-}
/*****************************************************************************
- * Activate: check file and initializes ASF structures
+ * Local prototypes
*****************************************************************************/
-static int Activate( vlc_object_t * p_this )
+static int Demux ( demux_t * );
+static int Control( demux_t *, int i_query, va_list args );
+
+typedef struct
{
- input_thread_t *p_input = (input_thread_t *)p_this;
- uint8_t *p_peek;
- guid_t guid;
+ int i_cat;
- demux_sys_t *p_demux;
- int i_stream;
+ es_out_id_t *p_es;
- /* Initialize access plug-in structures. */
- if( p_input->i_mtu == 0 )
- {
- /* Improve speed. */
- p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
- }
+ asf_object_stream_properties_t *p_sp;
- p_input->pf_demux = Demux;
+ mtime_t i_time;
- /* a little test to see if it could be a asf stream */
- if( input_Peek( p_input, &p_peek, 16 ) < 16 )
- {
- msg_Warn( p_input, "ASF v1.0 plugin discarded (cannot peek)" );
- return( -1 );
- }
- GetGUID( &guid, p_peek );
- if( !CmpGUID( &guid, &asf_object_header_guid ) )
- {
- msg_Warn( p_input, "ASF v1.0 plugin discarded (not a valid file)" );
- return( -1 );
- }
+ block_t *p_frame; /* use to gather complete frame */
- /* create our structure that will contains all data */
- if( !( p_input->p_demux_data =
- p_demux = malloc( sizeof( demux_sys_t ) ) ) )
- {
- msg_Err( p_input, "out of memory" );
- return( -1 );
- }
- memset( p_demux, 0, sizeof( demux_sys_t ) );
- p_demux->i_first_pts = -1;
+} asf_track_t;
- /* Now load all object ( except raw data ) */
- if( !ASF_ReadObjectRoot( p_input, &p_demux->root, p_input->stream.b_seekable ) )
- {
- msg_Warn( p_input, "ASF v1.0 plugin discarded (not a valid file)" );
- free( p_demux );
- return( -1 );
- }
- /* Check if we have found all mandatory asf object */
- if( !p_demux->root.p_hdr || !p_demux->root.p_data )
- {
- ASF_FreeObjectRoot( p_input, &p_demux->root );
- free( p_demux );
- msg_Warn( p_input, "ASF v1.0 plugin discarded (not a valid file)" );
- return( -1 );
- }
+struct demux_sys_t
+{
+ mtime_t i_time; /* s */
+ mtime_t i_length; /* length of file file */
+ int64_t i_bitrate; /* global file bitrate */
- if( !( p_demux->p_fp = ASF_FindObject( p_demux->root.p_hdr,
- &asf_object_file_properties_guid, 0 ) ) )
- {
- ASF_FreeObjectRoot( p_input, &p_demux->root );
- free( p_demux );
- msg_Warn( p_input, "ASF v1.0 plugin discarded (missing file_properties object)" );
- return( -1 );
- }
+ asf_object_root_t *p_root;
+ asf_object_file_properties_t *p_fp;
- if( p_demux->p_fp->i_min_data_packet_size != p_demux->p_fp->i_max_data_packet_size )
- {
- ASF_FreeObjectRoot( p_input, &p_demux->root );
- free( p_demux );
- msg_Warn( p_input, "ASF v1.0 plugin discarded (invalid file_properties object)" );
- return( -1 );
- }
+ unsigned int i_track;
+ asf_track_t *track[128];
- p_demux->i_streams = ASF_CountObject( p_demux->root.p_hdr,
- &asf_object_stream_properties_guid );
- if( !p_demux->i_streams )
- {
- ASF_FreeObjectRoot( p_input, &p_demux->root );
- free( p_demux );
- msg_Warn( p_input, "ASF plugin discarded (cannot find any stream!)" );
- return( -1 );
- }
- else
- {
- input_info_category_t *p_cat = input_InfoCategory( p_input, "Asf" );
- msg_Dbg( p_input, "found %d streams", p_demux->i_streams );
- input_AddInfo( p_cat, "Number of streams", "%d" , p_demux->i_streams );
- }
+ int64_t i_data_begin;
+ int64_t i_data_end;
- /* 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" );
- return( -1 );
- }
- if( input_AddProgram( p_input, 0, 0) == NULL )
+ vlc_bool_t b_index;
+ vlc_meta_t *meta;
+};
+
+static mtime_t GetMoviePTS( demux_sys_t * );
+static int DemuxInit( demux_t * );
+static void DemuxEnd( demux_t * );
+static int DemuxPacket( demux_t * );
+
+/*****************************************************************************
+ * Open: check file and initializes ASF structures
+ *****************************************************************************/
+static int Open( vlc_object_t * p_this )
+{
+ demux_t *p_demux = (demux_t *)p_this;
+ demux_sys_t *p_sys;
+ guid_t guid;
+ const uint8_t *p_peek;
+
+ /* A little test to see if it could be a asf stream */
+ if( stream_Peek( p_demux->s, &p_peek, 16 ) < 16 ) return VLC_EGENERIC;
+
+ ASF_GetGUID( &guid, p_peek );
+ if( !ASF_CmpGUID( &guid, &asf_object_header_guid ) ) return VLC_EGENERIC;
+
+ /* Set p_demux fields */
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
+ p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ memset( p_sys, 0, sizeof( demux_sys_t ) );
+
+ /* Load the headers */
+ if( DemuxInit( p_demux ) )
{
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- msg_Err( p_input, "cannot add program" );
- return( -1 );
+ free( p_sys );
+ return VLC_EGENERIC;
}
- p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
- p_input->stream.i_mux_rate = 0 ; /* FIXME */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ return VLC_SUCCESS;
+}
- for( i_stream = 0; i_stream < p_demux->i_streams; i_stream ++ )
- {
- asf_stream_t *p_stream;
- asf_object_stream_properties_t *p_sp;
- char psz_cat[sizeof("Stream ")+10];
- input_info_category_t *p_cat;
- sprintf( psz_cat, "Stream %d", i_stream );
- p_cat = input_InfoCategory( p_input, psz_cat);
- p_sp = ASF_FindObject( p_demux->root.p_hdr,
- &asf_object_stream_properties_guid,
- i_stream );
+/*****************************************************************************
+ * Demux: read packet and send them to decoders
+ *****************************************************************************/
+static int Demux( demux_t *p_demux )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
- p_stream =
- p_demux->stream[p_sp->i_stream_number] =
- malloc( sizeof( asf_stream_t ) );
- memset( p_stream, 0, sizeof( asf_stream_t ) );
- p_stream->p_sp = p_sp;
+ for( ;; )
+ {
+ const uint8_t *p_peek;
+ mtime_t i_length;
+ mtime_t i_time_begin = GetMoviePTS( p_sys );
+ int i_result;
- vlc_mutex_lock( &p_input->stream.stream_lock );
- p_stream->p_es =
- input_AddES( p_input,
- p_input->stream.p_selected_program,
- p_sp->i_stream_number,
- 0 );
+ if( p_demux->b_die ) break;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- if( CmpGUID( &p_sp->i_stream_type, &asf_object_stream_type_audio ) )
+ /* Check if we have concatenated files */
+ if( stream_Peek( p_demux->s, &p_peek, 16 ) == 16 )
{
- int i_codec;
- if( p_sp->p_type_specific_data )
- {
- i_codec = GetWLE( p_sp->p_type_specific_data );
- }
- else
- {
- i_codec = -1;
- }
+ guid_t guid;
- p_stream->i_cat = AUDIO_ES;
- input_AddInfo( p_cat, "Type", "Audio" );
- msg_Dbg( p_input,
- "adding new audio stream(codec:0x%x,ID:%d)",
- i_codec,
- p_sp->i_stream_number );
- switch( i_codec )
- {
- case( 0x01 ):
- p_stream->p_es->i_fourcc =
- VLC_FOURCC( 'a', 'r', 'a', 'w' );
- break;
- case( 0x50 ):
- case( 0x55 ):
- p_stream->p_es->i_fourcc =
- VLC_FOURCC( 'm','p','g','a' );
- break;
- case( 0x2000 ):
- p_stream->p_es->i_fourcc =
- VLC_FOURCC( 'a','5','2',' ' );
- break;
- case( 0x160 ):
- p_stream->p_es->i_fourcc =
- VLC_FOURCC( 'w','m','a','1' );
- break;
- case( 0x161 ):
- p_stream->p_es->i_fourcc =
- VLC_FOURCC( 'w','m','a','2' );
- break;
- default:
- p_stream->p_es->i_fourcc =
- VLC_FOURCC( 'm','s',(i_codec >> 8)&0xff,i_codec&0xff );
- }
- input_AddInfo( p_cat, "Codec", "%.4s", (char*)&p_stream->p_es->i_fourcc );
- if( p_sp->i_type_specific_data_length > 0 )
+ ASF_GetGUID( &guid, p_peek );
+ if( ASF_CmpGUID( &guid, &asf_object_header_guid ) )
{
- WAVEFORMATEX *p_wf;
- size_t i_size;
- uint8_t *p_data;
-
- i_size = p_sp->i_type_specific_data_length;
-
- p_wf = malloc( i_size );
- p_stream->p_es->p_waveformatex = (void*)p_wf;
- p_data = p_sp->p_type_specific_data;
-
- p_wf->wFormatTag = GetWLE( p_data );
- p_wf->nChannels = GetWLE( p_data + 2 );
- input_AddInfo( p_cat, "Channels", "%d", p_wf->nChannels );
- p_wf->nSamplesPerSec = GetDWLE( p_data + 4 );
- input_AddInfo( p_cat, "Sample rate", "%d", p_wf->nSamplesPerSec );
- p_wf->nAvgBytesPerSec = GetDWLE( p_data + 8 );
- input_AddInfo( p_cat, "Avg. byterate", "%d", p_wf->nAvgBytesPerSec );
- p_wf->nBlockAlign = GetWLE( p_data + 12 );
- p_wf->wBitsPerSample = GetWLE( p_data + 14 );
- input_AddInfo( p_cat, "Bits Per Sample", "%d", p_wf->wBitsPerSample );
- p_wf->cbSize = __MAX( 0,
- i_size - sizeof( WAVEFORMATEX ));
- if( i_size > sizeof( WAVEFORMATEX ) )
- {
- memcpy( (uint8_t*)p_wf + sizeof( WAVEFORMATEX ),
- p_data + sizeof( WAVEFORMATEX ),
- i_size - sizeof( WAVEFORMATEX ) );
- }
- }
+ msg_Warn( p_demux, "found a new ASF header" );
+ /* We end this stream */
+ DemuxEnd( p_demux );
- }
- else
- if( CmpGUID( &p_sp->i_stream_type, &asf_object_stream_type_video ) )
- {
- p_stream->i_cat = VIDEO_ES;
- input_AddInfo( p_cat, "Type", "Video" );
- msg_Dbg( p_input,
- "adding new video stream(ID:%d)",
- p_sp->i_stream_number );
- if( p_sp->p_type_specific_data )
- {
- p_stream->p_es->i_fourcc =
- VLC_FOURCC( p_sp->p_type_specific_data[27],
- p_sp->p_type_specific_data[28],
- p_sp->p_type_specific_data[29],
- p_sp->p_type_specific_data[30] );
- }
- else
- {
- p_stream->p_es->i_fourcc =
- VLC_FOURCC( 'u','n','d','f' );
- }
- input_AddInfo( p_cat, "Codec", "%.4s", (char*)&p_stream->p_es->i_fourcc );
- if( p_sp->i_type_specific_data_length > 11 )
- {
- BITMAPINFOHEADER *p_bih;
- size_t i_size;
- uint8_t *p_data;
-
- i_size = p_sp->i_type_specific_data_length - 11;
-
- p_bih = malloc( i_size );
- p_stream->p_es->p_bitmapinfoheader = (void*)p_bih;
- p_data = p_sp->p_type_specific_data + 11;
-
- p_bih->biSize = GetDWLE( p_data );
- input_AddInfo( p_cat, "Size", "%d", p_bih->biSize );
- p_bih->biWidth = GetDWLE( p_data + 4 );
- p_bih->biHeight = GetDWLE( p_data + 8 );
- input_AddInfo( p_cat, "Resolution", "%dx%d", p_bih->biWidth, p_bih->biHeight );
- p_bih->biPlanes = GetDWLE( p_data + 12 );
- input_AddInfo( p_cat, "Planes", "%d", p_bih->biPlanes );
- p_bih->biBitCount = GetDWLE( p_data + 14 );
- input_AddInfo( p_cat, "Bits per pixel", "%d", p_bih->biBitCount );
- p_bih->biCompression= GetDWLE( p_data + 16 );
- input_AddInfo( p_cat, "Compression Rate", "%d", p_bih->biCompression );
- p_bih->biSizeImage = GetDWLE( p_data + 20 );
- input_AddInfo( p_cat, "Image Size", "%d", p_bih->biSizeImage );
- p_bih->biXPelsPerMeter = GetDWLE( p_data + 24 );
- input_AddInfo( p_cat, "X pixels per meter", "%d", p_bih->biXPelsPerMeter );
- p_bih->biYPelsPerMeter = GetDWLE( p_data + 28 );
- input_AddInfo( p_cat, "Y pixels per meter", "%d", p_bih->biYPelsPerMeter );
- p_bih->biClrUsed = GetDWLE( p_data + 32 );
- p_bih->biClrImportant = GetDWLE( p_data + 36 );
-
- if( i_size > sizeof( BITMAPINFOHEADER ) )
+ /* And we prepare to read the next one */
+ if( DemuxInit( p_demux ) )
{
- memcpy( (uint8_t*)p_bih + sizeof( BITMAPINFOHEADER ),
- p_data + sizeof( BITMAPINFOHEADER ),
- i_size - sizeof( BITMAPINFOHEADER ) );
+ msg_Err( p_demux, "failed to load the new header" );
+ intf_UserFatal( p_demux, VLC_FALSE, _("Could not demux ASF stream"),
+ _("VLC failed to load the ASF header.") );
+ return 0;
}
+ continue;
}
+ }
+ /* Read and demux a packet */
+ if( ( i_result = DemuxPacket( p_demux ) ) <= 0 )
+ {
+ return i_result;
}
- else
+ if( i_time_begin == -1 )
{
- p_stream->i_cat = UNKNOWN_ES;
- msg_Dbg( p_input,
- "ignoring unknown stream(ID:%d)",
- p_sp->i_stream_number );
- p_stream->p_es->i_fourcc = VLC_FOURCC( 'u','n','d','f' );
+ i_time_begin = GetMoviePTS( p_sys );
}
- p_stream->p_es->i_cat = p_stream->i_cat;
-
- vlc_mutex_lock( &p_input->stream.stream_lock );
- if( p_stream->p_es->i_fourcc != VLC_FOURCC( 'u','n','d','f' ) )
+ else
{
- input_SelectES( p_input, p_stream->p_es );
+ i_length = GetMoviePTS( p_sys ) - i_time_begin;
+ if( i_length < 0 || i_length >= 40 * 1000 ) break;
}
- vlc_mutex_unlock( &p_input->stream.stream_lock );
}
-
- p_demux->i_data_begin = p_demux->root.p_data->i_object_pos + 50;
- if( p_demux->root.p_data->i_object_size != 0 )
- { // local file
- p_demux->i_data_end = p_demux->root.p_data->i_object_pos +
- p_demux->root.p_data->i_object_size;
- }
- else
- { // live/broacast
- p_demux->i_data_end = -1;
+ /* Set the PCR */
+ p_sys->i_time = GetMoviePTS( p_sys );
+ if( p_sys->i_time >= 0 )
+ {
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time );
}
+ return 1;
+}
+
+/*****************************************************************************
+ * Close: frees unused data
+ *****************************************************************************/
+static void Close( vlc_object_t * p_this )
+{
+ demux_t *p_demux = (demux_t *)p_this;
+
+ DemuxEnd( p_demux );
- // go to first packet
- ASF_SeekAbsolute( p_input, p_demux->i_data_begin );
+ free( p_demux->p_sys );
+}
- vlc_mutex_lock( &p_input->stream.stream_lock );
- /* try to calculate movie time */
- if( p_demux->p_fp->i_data_packets_count > 0 )
+/*****************************************************************************
+ * 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;
+ vlc_meta_t *p_meta;
+ int64_t i64, *pi64;
+ double f, *pf;
+ int i;
+
+ switch( i_query )
{
- int64_t i_count;
- mtime_t i_length;
+ 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;
- /* real number of packets */
- i_count = ( p_input->stream.p_selected_area->i_size -
- p_demux->i_data_begin ) /
- p_demux->p_fp->i_min_data_packet_size;
- /* calculate the time duration in s */
- i_length = (mtime_t)p_demux->p_fp->i_play_duration / 10 *
- (mtime_t)i_count /
- (mtime_t)p_demux->p_fp->i_data_packets_count /
- (mtime_t)1000000;
- if( i_length > 0 )
+ if( p_sys->b_index && p_sys->i_length > 0 )
{
- p_input->stream.i_mux_rate =
- p_input->stream.p_selected_area->i_size / 50 / i_length;
+ i64 = (int64_t)va_arg( args, int64_t );
+ return SeekIndex( p_demux, i64, -1 );
}
else
{
- p_input->stream.i_mux_rate = 0;
+ 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 );
}
- }
- else
- {
- /* cannot known */
- p_input->stream.i_mux_rate = 0;
- }
-
+ 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++ )
+ if( p_sys->track[i] ) p_sys->track[i]->i_time = -1;
- p_input->stream.p_selected_program->b_is_ok = 1;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ 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;
- return( 0 );
+ 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 );
+ }
}
/*****************************************************************************
- * Demux: read packet and send them to decoders
+ *
*****************************************************************************/
+static mtime_t GetMoviePTS( demux_sys_t *p_sys )
+{
+ mtime_t i_time = -1;
+ int i;
+
+ 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 );
+ }
+ }
+
+ return i_time;
+}
+
#define GETVALUE2b( bits, var, def ) \
switch( (bits)&0x03 ) \
{ \
default: var = def; break;\
}
-static int DemuxPacket( input_thread_t *p_input, vlc_bool_t b_play_audio )
+static int DemuxPacket( demux_t *p_demux )
{
- demux_sys_t *p_demux = p_input->p_demux_data;
- int i_data_packet_min = p_demux->p_fp->i_min_data_packet_size;
- uint8_t *p_peek;
- int i_skip;
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int i_data_packet_min = p_sys->p_fp->i_min_data_packet_size;
+ const uint8_t *p_peek;
+ int i_skip;
- int i_packet_size_left;
- int i_packet_flags;
- int i_packet_property;
+ int i_packet_size_left;
+ int i_packet_flags;
+ int i_packet_property;
- int b_packet_multiple_payload;
- int i_packet_length;
- int i_packet_sequence;
- int i_packet_padding_length;
+ int b_packet_multiple_payload;
+ int i_packet_length;
+ int i_packet_sequence;
+ int i_packet_padding_length;
uint32_t i_packet_send_time;
uint16_t i_packet_duration;
int i_payload_length_type;
- if( input_Peek( p_input, &p_peek, i_data_packet_min ) < i_data_packet_min )
+ if( stream_Peek( p_demux->s, &p_peek,i_data_packet_min)<i_data_packet_min )
{
- // EOF ?
- msg_Warn( p_input, "cannot peek while getting new packet, EOF ?" );
- return( 0 );
+ msg_Warn( p_demux, "cannot peek while getting new packet, EOF ?" );
+ return 0;
}
i_skip = 0;
/* *** parse error correction if present *** */
if( p_peek[0]&0x80 )
{
- int i_error_correction_length_type;
- int i_error_correction_data_length;
- int i_opaque_data_present;
+ unsigned int i_error_correction_length_type;
+ unsigned int i_error_correction_data_length;
+ unsigned int i_opaque_data_present;
i_error_correction_data_length = p_peek[0] & 0x0f; // 4bits
i_opaque_data_present = ( p_peek[0] >> 4 )& 0x01; // 1bit
}
else
{
- msg_Warn( p_input, "p_peek[0]&0x80 != 0x80" );
+ msg_Warn( p_demux, "p_peek[0]&0x80 != 0x80" );
+ }
+
+ /* sanity check */
+ if( i_skip + 2 >= i_data_packet_min )
+ {
+ goto loop_error_recovery;
}
i_packet_flags = p_peek[i_skip]; i_skip++;
i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4;
i_packet_duration = GetWLE( p_peek + i_skip ); i_skip += 2;
-// i_packet_size_left = i_packet_length; // XXX données reellement lu
+// i_packet_size_left = i_packet_length; // XXX data really read
/* FIXME I have to do that for some file, I don't known why */
i_packet_size_left = i_data_packet_min;
for( i_payload = 0; i_payload < i_payload_count ; i_payload++ )
{
- asf_stream_t *p_stream;
+ 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 );
i_pts_delta = 0;
i_media_object_offset = i_tmp;
+
+ if( i_skip >= i_packet_size_left )
+ {
+ break;
+ }
}
else if( i_replicated_data_length == 1 )
{
-
- msg_Dbg( p_input, "found compressed payload" );
+ /* msg_Dbg( p_demux, "found compressed payload" ); */
i_pts = (mtime_t)i_tmp * 1000;
i_pts_delta = (mtime_t)p_peek[i_skip] * 1000; i_skip++;
i_media_object_offset = i_tmp;
}
- i_pts = __MAX( i_pts - p_demux->p_fp->i_preroll * 1000, 0 );
+ i_pts = __MAX( i_pts - p_sys->p_fp->i_preroll * 1000, 0 );
if( b_packet_multiple_payload )
{
GETVALUE2b( i_payload_length_type, i_payload_data_length, 0 );
i_packet_padding_length - i_skip;
}
+ if( i_payload_data_length < 0 || i_skip + i_payload_data_length > i_packet_size_left )
+ {
+ break;
+ }
#if 0
- msg_Dbg( p_input,
+ msg_Dbg( p_demux,
"payload(%d/%d) stream_number:%d media_object_number:%d media_object_offset:%d replicated_data_length:%d payload_data_length %d",
- i_payload + 1,
- i_payload_count,
- i_stream_number,
- i_media_object_number,
- i_media_object_offset,
- i_replicated_data_length,
- i_payload_data_length );
+ i_payload + 1, i_payload_count, i_stream_number, i_media_object_number,
+ i_media_object_offset, i_replicated_data_length, i_payload_data_length );
#endif
- if( !( p_stream = p_demux->stream[i_stream_number] ) )
+ if( ( tk = p_sys->track[i_stream_number] ) == NULL )
{
- msg_Warn( p_input,
+ msg_Warn( p_demux,
"undeclared stream[Id 0x%x]", i_stream_number );
i_skip += i_payload_data_length;
continue; // over payload
}
- if( !p_stream->p_es || !p_stream->p_es->p_decoder_fifo )
+ if( !tk->p_es )
{
i_skip += i_payload_data_length;
continue;
i_packet_size_left > 0;
i_payload_data_pos += i_sub_payload_data_length )
{
- data_packet_t *p_data;
+ block_t *p_frag;
int i_read;
+
// read sub payload length
if( i_replicated_data_length == 1 )
{
}
/* FIXME I don't use i_media_object_number, sould I ? */
- if( p_stream->p_pes && i_media_object_offset == 0 ) {
+ if( tk->p_frame && i_media_object_offset == 0 )
+ {
/* send complete packet to decoder */
- if( p_stream->p_pes->i_pes_size > 0 )
- {
- if( p_stream->p_es->p_decoder_fifo &&
- ( b_play_audio || p_stream->i_cat != AUDIO_ES ) )
- {
- input_DecodePES( p_stream->p_es->p_decoder_fifo,
- p_stream->p_pes );
- }
- else
- {
- input_DeletePES( p_input->p_method_data,
- p_stream->p_pes );
- }
- p_stream->p_pes = NULL;
- }
- }
+ block_t *p_gather = block_ChainGather( tk->p_frame );
- if( !p_stream->p_pes ) // add a new PES
- {
- p_stream->i_time =
- ( (mtime_t)i_pts + i_payload * (mtime_t)i_pts_delta );
+ es_out_Send( p_demux->out, tk->p_es, p_gather );
- if( p_demux->i_first_pts == -1 )
- {
- p_demux->i_first_pts = p_stream->i_time;
- }
- p_stream->i_time -= p_demux->i_first_pts;
-
- p_stream->p_pes = input_NewPES( p_input->p_method_data );
- p_stream->p_pes->i_dts =
- p_stream->p_pes->i_pts =
- input_ClockGetTS( p_input,
- p_input->stream.p_selected_program,
- ( p_stream->i_time+DEFAULT_PTS_DELAY) * 9 /100 );
-
- p_stream->p_pes->p_next = NULL;
- p_stream->p_pes->i_nb_data = 0;
- p_stream->p_pes->i_pes_size = 0;
+ tk->p_frame = NULL;
}
i_read = i_sub_payload_data_length + i_skip;
- if( input_SplitBuffer( p_input, &p_data, i_read ) < i_read )
+ if( ( p_frag = stream_Block( p_demux->s, i_read ) ) == NULL )
{
- msg_Warn( p_input, "cannot read data" );
- return( 0 );
+ msg_Warn( p_demux, "cannot read data" );
+ return 0;
}
- p_data->p_payload_start += i_skip;
i_packet_size_left -= i_read;
+ p_frag->p_buffer += i_skip;
+ p_frag->i_buffer -= i_skip;
- if( !p_stream->p_pes->p_first )
+ if( tk->p_frame == NULL )
{
- p_stream->p_pes->p_first = p_stream->p_pes->p_last = p_data;
- }
- else
- {
- p_stream->p_pes->p_last->p_next = p_data;
- p_stream->p_pes->p_last = p_data;
+ tk->i_time =
+ ( (mtime_t)i_pts + i_payload * (mtime_t)i_pts_delta );
+
+ p_frag->i_pts = tk->i_time;
+
+ if( tk->i_cat != VIDEO_ES )
+ p_frag->i_dts = p_frag->i_pts;
+ else
+ {
+ p_frag->i_dts = p_frag->i_pts;
+ p_frag->i_pts = 0;
+ }
}
- p_stream->p_pes->i_pes_size += i_sub_payload_data_length;
- p_stream->p_pes->i_nb_data++;
+
+ block_ChainAppend( &tk->p_frame, p_frag );
i_skip = 0;
if( i_packet_size_left > 0 )
{
- if( input_Peek( p_input, &p_peek, i_packet_size_left ) < i_packet_size_left )
+ if( stream_Peek( p_demux->s, &p_peek, i_packet_size_left )
+ < i_packet_size_left )
{
- // EOF ?
- msg_Warn( p_input, "cannot peek, EOF ?" );
- return( 0 );
+ msg_Warn( p_demux, "cannot peek, EOF ?" );
+ return 0;
}
}
}
if( i_packet_size_left > 0 )
{
- if( !ASF_SkipBytes( p_input, i_packet_size_left ) )
+ if( stream_Read( p_demux->s, NULL, i_packet_size_left )
+ < i_packet_size_left )
{
- msg_Warn( p_input, "cannot skip data, EOF ?" );
- return( 0 );
+ msg_Warn( p_demux, "cannot skip data, EOF ?" );
+ return 0;
}
}
- return( 1 );
+ return 1;
loop_error_recovery:
- msg_Warn( p_input, "unsupported packet header" );
- if( p_demux->p_fp->i_min_data_packet_size != p_demux->p_fp->i_max_data_packet_size )
+ msg_Warn( p_demux, "unsupported packet header" );
+ if( p_sys->p_fp->i_min_data_packet_size != p_sys->p_fp->i_max_data_packet_size )
{
- msg_Err( p_input, "unsupported packet header, fatal error" );
- return( -1 );
+ msg_Err( p_demux, "unsupported packet header, fatal error" );
+ return -1;
}
- ASF_SkipBytes( p_input, i_data_packet_min );
+ stream_Read( p_demux->s, NULL, i_data_packet_min );
- return( 1 );
+ return 1;
}
-static int Demux( input_thread_t *p_input )
+/*****************************************************************************
+ *
+ *****************************************************************************/
+static int DemuxInit( demux_t *p_demux )
{
- demux_sys_t *p_demux = p_input->p_demux_data;
- vlc_bool_t b_play_audio;
- int i;
+ demux_sys_t *p_sys = p_demux->p_sys;
+ 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_length = 0;
+ 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++ )
+ {
+ p_sys->track[i] = NULL;
+ }
+ p_sys->i_data_begin = -1;
+ p_sys->i_data_end = -1;
+ p_sys->meta = NULL;
+
+ /* 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)) )
+ {
+ msg_Warn( p_demux, "ASF plugin discarded (not a valid file)" );
+ return VLC_EGENERIC;
+ }
+ p_sys->p_fp = p_sys->p_root->p_fp;
+
+ if( p_sys->p_fp->i_min_data_packet_size != p_sys->p_fp->i_max_data_packet_size )
+ {
+ msg_Warn( p_demux, "ASF plugin discarded (invalid file_properties object)" );
+ goto error;
+ }
+
+ p_sys->i_track = ASF_CountObject( p_sys->p_root->p_hdr,
+ &asf_object_stream_properties_guid );
+ if( p_sys->i_track <= 0 )
+ {
+ msg_Warn( p_demux, "ASF plugin discarded (cannot find any stream!)" );
+ goto error;
+ }
- /* catch seek from user */
- if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
+ /* 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 ++ )
{
- off_t i_offset;
- msleep( DEFAULT_PTS_DELAY );
- i_offset = ASF_TellAbsolute( p_input ) - p_demux->i_data_begin;
+ asf_track_t *tk;
+ asf_object_stream_properties_t *p_sp;
+ vlc_bool_t b_access_selected;
- if( i_offset < 0 )
+ p_sp = ASF_FindObject( p_sys->p_root->p_hdr,
+ &asf_object_stream_properties_guid,
+ i_stream );
+
+ tk = p_sys->track[p_sp->i_stream_number] = malloc( sizeof( asf_track_t ) );
+ memset( tk, 0, sizeof( asf_track_t ) );
+
+ tk->i_time = -1;
+ tk->p_sp = p_sp;
+ tk->p_es = NULL;
+ tk->p_frame = NULL;
+
+ /* Check (in case of mms) if this track is selected (ie will receive data) */
+ if( !stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_GET_PRIVATE_ID_STATE,
+ p_sp->i_stream_number, &b_access_selected ) &&
+ !b_access_selected )
{
- i_offset = 0;
+ tk->i_cat = UNKNOWN_ES;
+ msg_Dbg( p_demux, "ignoring not selected stream(ID:%d) (by access)",
+ p_sp->i_stream_number );
+ continue;
}
- /* XXX work only when i_min_data_packet_size == i_max_data_packet_size */
- i_offset += p_demux->p_fp->i_min_data_packet_size -
- i_offset % p_demux->p_fp->i_min_data_packet_size;
- ASF_SeekAbsolute( p_input, p_demux->i_data_begin + i_offset );
- p_demux->i_time = 0;
- for( i = 0; i < 128 ; i++ )
+ if( ASF_CmpGUID( &p_sp->i_stream_type, &asf_object_stream_type_audio ) &&
+ p_sp->i_type_specific_data_length >= sizeof( WAVEFORMATEX ) - 2 )
{
-#define p_stream p_demux->stream[i]
- if( p_stream )
+ es_format_t fmt;
+ uint8_t *p_data = p_sp->p_type_specific_data;
+ int i_format;
+
+ es_format_Init( &fmt, AUDIO_ES, 0 );
+ i_format = GetWLE( &p_data[0] );
+ 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] );
+
+ if( p_sp->i_type_specific_data_length > sizeof( WAVEFORMATEX ) &&
+ i_format != WAVE_FORMAT_MPEGLAYER3 &&
+ i_format != WAVE_FORMAT_MPEG )
{
- p_stream->i_time = 0;
+ 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 );
}
-#undef p_stream
+
+ 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)",
+ GetWLE( p_data ), p_sp->i_stream_number );
}
- p_demux->i_first_pts = -1;
- }
+ else if( ASF_CmpGUID( &p_sp->i_stream_type,
+ &asf_object_stream_type_video ) &&
+ p_sp->i_type_specific_data_length >= 11 +
+ sizeof( BITMAPINFOHEADER ) )
+ {
+ es_format_t fmt;
+ uint8_t *p_data = &p_sp->p_type_specific_data[11];
- vlc_mutex_lock( &p_input->stream.stream_lock );
- if( p_input->stream.control.i_rate == DEFAULT_RATE )
- {
- b_play_audio = VLC_TRUE;
- }
- else
- {
- int i;
+ es_format_Init( &fmt, VIDEO_ES,
+ VLC_FOURCC( p_data[16], p_data[17],
+ p_data[18], p_data[19] ) );
+ 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 ) )
+ {
+ fmt.i_extra = __MIN( GetDWLE( p_data ),
+ p_sp->i_type_specific_data_length - 11 -
+ sizeof( BITMAPINFOHEADER ) );
+ fmt.p_extra = malloc( fmt.i_extra );
+ memcpy( fmt.p_extra, &p_data[sizeof( BITMAPINFOHEADER )],
+ fmt.i_extra );
+ }
+
+ /* Look for an aspect ratio */
+ if( p_sys->p_root->p_metadata )
+ {
+ asf_object_metadata_t *p_meta = p_sys->p_root->p_metadata;
+ int i_aspect_x = 0, i_aspect_y = 0;
+ unsigned int i;
- b_play_audio = VLC_TRUE;
- for( i = 0; i < 128; i++ )
+ for( i = 0; i < p_meta->i_record_entries_count; i++ )
+ {
+ if( !strcmp( p_meta->record[i].psz_name, "AspectRatioX" ) )
+ {
+ if( (!i_aspect_x && !p_meta->record[i].i_stream) ||
+ p_meta->record[i].i_stream ==
+ p_sp->i_stream_number )
+ i_aspect_x = p_meta->record[i].i_val;
+ }
+ if( !strcmp( p_meta->record[i].psz_name, "AspectRatioY" ) )
+ {
+ if( (!i_aspect_y && !p_meta->record[i].i_stream) ||
+ p_meta->record[i].i_stream ==
+ p_sp->i_stream_number )
+ i_aspect_y = p_meta->record[i].i_val;
+ }
+ }
+
+ if( i_aspect_x && i_aspect_y )
+ {
+ fmt.video.i_aspect = i_aspect_x *
+ (int64_t)fmt.video.i_width * VOUT_ASPECT_FACTOR /
+ fmt.video.i_height / i_aspect_y;
+ }
+ }
+
+ tk->i_cat = VIDEO_ES;
+ 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 )
{
- if( p_demux->stream[i] &&
- p_demux->stream[i]->i_cat == VIDEO_ES &&
- p_demux->stream[i]->p_es &&
- p_demux->stream[i]->p_es->p_decoder_fifo )
+ /* 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)
{
- /* there is at least ine video track so no need to play audio */
- b_play_audio = VLC_FALSE;
+ 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;
+ msg_Dbg( p_demux, "ignoring unknown stream(ID:%d)",
+ p_sp->i_stream_number );
+ }
}
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ p_sys->i_data_begin = p_sys->p_root->p_data->i_object_pos + 50;
+ if( p_sys->p_root->p_data->i_object_size != 0 )
+ { /* local file */
+ p_sys->i_data_end = p_sys->p_root->p_data->i_object_pos +
+ p_sys->p_root->p_data->i_object_size;
+ }
+ else
+ { /* live/broacast */
+ p_sys->i_data_end = -1;
+ }
+
+ /* go to first packet */
+ stream_Seek( p_demux->s, p_sys->i_data_begin );
- for( i = 0; i < 10; i++ ) // parse 10 packets
+ /* try to calculate movie time */
+ if( p_sys->p_fp->i_data_packets_count > 0 )
{
- int i_result;
+ int64_t i_count;
+ int64_t i_size = stream_Size( p_demux->s );
- if( ( i_result = DemuxPacket( p_input, b_play_audio ) ) <= 0 )
+ if( p_sys->i_data_end > 0 && i_size > p_sys->i_data_end )
{
- return i_result;
+ i_size = p_sys->i_data_end;
+ }
+
+ /* real number of packets */
+ i_count = ( i_size - p_sys->i_data_begin ) /
+ p_sys->p_fp->i_min_data_packet_size;
+
+ /* calculate the time duration in micro-s */
+ p_sys->i_length = (mtime_t)p_sys->p_fp->i_play_duration / 10 *
+ (mtime_t)i_count /
+ (mtime_t)p_sys->p_fp->i_data_packets_count;
+
+ if( p_sys->i_length > 0 )
+ {
+ p_sys->i_bitrate = 8 * i_size * (int64_t)1000000 / p_sys->i_length;
}
}
- p_demux->i_time = -1;
- for( i = 0; i < 128 ; i++ )
+ /* Create meta information */
+ p_sys->meta = vlc_meta_New();
+
+ if( ( p_cd = ASF_FindObject( p_sys->p_root->p_hdr,
+ &asf_object_content_description_guid, 0 ) ) )
{
-#define p_stream p_demux->stream[i]
- if( p_stream && p_stream->p_es && p_stream->p_es->p_decoder_fifo )
+ if( p_cd->psz_title && *p_cd->psz_title )
{
- if( p_demux->i_time < 0 )
- {
- p_demux->i_time = p_stream->i_time;
- }
- else
- {
- p_demux->i_time = __MIN( p_demux->i_time, p_stream->i_time );
- }
+ vlc_meta_SetTitle( p_sys->meta, p_cd->psz_title );
+ }
+ if( p_cd->psz_artist && *p_cd->psz_artist )
+ {
+ vlc_meta_SetArtist( p_sys->meta, p_cd->psz_artist );
+ }
+ if( p_cd->psz_copyright && *p_cd->psz_copyright )
+ {
+ vlc_meta_SetCopyright( p_sys->meta, p_cd->psz_copyright );
+ }
+ if( p_cd->psz_description && *p_cd->psz_description )
+ {
+ vlc_meta_SetDescription( p_sys->meta, p_cd->psz_description );
+ }
+ if( p_cd->psz_rating && *p_cd->psz_rating )
+ {
+ vlc_meta_SetRating( p_sys->meta, p_cd->psz_rating );
}
-#undef p_stream
}
-
- if( p_demux->i_time >= 0 )
+ /// \tood Fix Child meta for ASF tracks
+#if 0
+ for( i_stream = 0, i = 0; i < 128; i++ )
{
- /* update pcr XXX in mpeg scale so in 90000 unit/s */
- p_demux->i_pcr =( __MAX( p_demux->i_time /*- DEFAULT_PTS_DELAY*/, 0 ) ) * 9 / 100;
+ asf_object_codec_list_t *p_cl = ASF_FindObject( p_sys->p_root->p_hdr,
+ &asf_object_codec_list_guid, 0 );
+
+ if( p_sys->track[i] )
+ {
+ vlc_meta_t *tk = vlc_meta_New();
+ TAB_APPEND( p_sys->meta->i_track, p_sys->meta->track, tk );
- /* first wait for the good time to read next packets */
- input_ClockManageRef( p_input,
- p_input->stream.p_selected_program,
- p_demux->i_pcr );
+ if( p_cl && i_stream < p_cl->i_codec_entries_count )
+ {
+ if( p_cl->codec[i_stream].psz_name &&
+ *p_cl->codec[i_stream].psz_name )
+ {
+ vlc_meta_Add( tk, VLC_META_CODEC_NAME,
+ p_cl->codec[i_stream].psz_name );
+ }
+ if( p_cl->codec[i_stream].psz_description &&
+ *p_cl->codec[i_stream].psz_description )
+ {
+ vlc_meta_Add( tk, VLC_META_CODEC_DESCRIPTION,
+ p_cl->codec[i_stream].psz_description );
+ }
+ }
+ i_stream++;
+ }
}
+#endif
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+ return VLC_SUCCESS;
- return( 1 );
+error:
+ ASF_FreeObjectRoot( p_demux->s, p_sys->p_root );
+ return VLC_EGENERIC;
}
-
/*****************************************************************************
- * MP4End: frees unused data
+ *
*****************************************************************************/
-static void Deactivate( vlc_object_t * p_this )
+static void DemuxEnd( demux_t *p_demux )
{
-#define FREE( p ) \
- if( p ) { free( p ); }
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int i;
- input_thread_t * p_input = (input_thread_t *)p_this;
- demux_sys_t *p_demux = p_input->p_demux_data;
- int i_stream;
+ if( p_sys->p_root )
+ {
+ ASF_FreeObjectRoot( p_demux->s, p_sys->p_root );
+ p_sys->p_root = NULL;
+ }
+ if( p_sys->meta )
+ {
+ vlc_meta_Delete( p_sys->meta );
+ p_sys->meta = NULL;
+ }
- msg_Dbg( p_input, "Freeing all memory" );
- ASF_FreeObjectRoot( p_input, &p_demux->root );
- for( i_stream = 0; i_stream < 128; i_stream++ )
+ for( i = 0; i < 128; i++ )
{
-#define p_stream p_demux->stream[i_stream]
- if( p_stream )
+ asf_track_t *tk = p_sys->track[i];
+
+ if( tk )
{
- if( p_stream->p_pes )
+ if( tk->p_frame )
+ {
+ block_ChainRelease( tk->p_frame );
+ }
+ if( tk->p_es )
{
- input_DeletePES( p_input->p_method_data, p_stream->p_pes );
+ es_out_Del( p_demux->out, tk->p_es );
}
- free( p_stream );
+ free( tk );
}
-#undef p_stream
+ p_sys->track[i] = 0;
}
- FREE( p_input->p_demux_data );
-#undef FREE
}
projects / vlc / blobdiff