X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Favi%2Favi.c;h=8bf5dbcb58fcc23390d19c85893967c7585495ff;hb=806cf5165824be921bf2402ecf11fd3ee6501f9c;hp=e61513f37e984f461223d469f0f9726e6695cf3f;hpb=091aff73545a19bdb1c1706acecfc86e326e2734;p=vlc diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index e61513f37e..8bf5dbcb58 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -1,8 +1,8 @@ /***************************************************************************** * avi.c : AVI file Stream input module for vlc ***************************************************************************** - * Copyright (C) 2001 VideoLAN - * $Id: avi.c,v 1.60 2003/09/07 22:48:29 fenrir Exp $ + * Copyright (C) 2001-2004 the VideoLAN team + * $Id$ * Authors: Laurent Aimar * * This program is free software; you can redistribute it and/or modify @@ -17,548 +17,656 @@ * * 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 /* malloc(), free() */ #include -#include -#include "codecs.h" +#include -#include "../util/sub.h" +#include + +#include +#include +#include #include "libavi.h" -#include "avi.h" /***************************************************************************** * Module descriptor *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); + +#define INTERLEAVE_TEXT N_("Force interleaved method" ) +#define INTERLEAVE_LONGTEXT N_( "Force interleaved method." ) + +#define INDEX_TEXT N_("Force index creation") +#define INDEX_LONGTEXT N_( \ + "Recreate a index for the AVI file. Use this if your AVI file is damaged "\ + "or incomplete (not seekable)." ) + +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); + +static int pi_index[] = {0,1,2}; + +static const char *ppsz_indexes[] = { N_("Ask"), N_("Always fix"), + N_("Never fix") }; vlc_module_begin(); - add_category_hint( N_("avi-demuxer"), NULL, VLC_TRUE ); - add_bool( "avi-interleaved", 0, NULL, - N_("force interleaved method"), - N_("force interleaved method"), VLC_TRUE ); - add_bool( "avi-index", 0, NULL, - N_("force index creation"), - N_("force index creation"), VLC_TRUE ); - - set_description( N_("AVI demuxer") ); - set_capability( "demux", 212 ); + set_shortname( "AVI" ); + set_description( _("AVI demuxer") ); + set_capability( "demux2", 212 ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + + add_bool( "avi-interleaved", 0, NULL, + INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, VLC_TRUE ); + change_safe(); + add_integer( "avi-index", 0, NULL, + INDEX_TEXT, INDEX_LONGTEXT, VLC_FALSE ); + change_safe(); + change_integer_list( pi_index, ppsz_indexes, 0 ); + set_callbacks( Open, Close ); vlc_module_end(); /***************************************************************************** * Local prototypes *****************************************************************************/ -static int Control ( input_thread_t *, int, va_list ); -static int Seek ( input_thread_t *, mtime_t, int ); -static int Demux_Seekable ( input_thread_t * ); -static int Demux_UnSeekable( input_thread_t *p_input ); +static int Control ( demux_t *, int, va_list ); +static int Seek ( demux_t *, mtime_t, int ); +static int Demux_Seekable ( demux_t * ); +static int Demux_UnSeekable( demux_t * ); -#define FREE( p ) if( p ) { free( p ); (p) = NULL; } #define __ABS( x ) ( (x) < 0 ? (-(x)) : (x) ) +typedef struct +{ + vlc_fourcc_t i_fourcc; + off_t i_pos; + uint32_t i_size; + vlc_fourcc_t i_type; /* only for AVIFOURCC_LIST */ + + uint8_t i_peek[8]; /* first 8 bytes */ + + unsigned int i_stream; + unsigned int i_cat; +} avi_packet_t; + + +typedef struct +{ + vlc_fourcc_t i_id; + uint32_t i_flags; + off_t i_pos; + uint32_t i_length; + uint32_t i_lengthtotal; + +} avi_entry_t; + +typedef struct +{ + vlc_bool_t b_activated; + + unsigned int i_cat; /* AUDIO_ES, VIDEO_ES */ + vlc_fourcc_t i_codec; + + int i_rate; + int i_scale; + int i_samplesize; + + es_out_id_t *p_es; + + /* Avi Index */ + avi_entry_t *p_index; + unsigned int i_idxnb; + unsigned int i_idxmax; + + unsigned int i_idxposc; /* numero of chunk */ + unsigned int i_idxposb; /* byte in the current chunk */ + + /* For VBR audio only */ + unsigned int i_blockno; + unsigned int i_blocksize; + + /* For muxed streams */ + stream_t *p_out_muxed; +} avi_track_t; + +struct demux_sys_t +{ + mtime_t i_time; + mtime_t i_length; + + vlc_bool_t b_seekable; + vlc_bool_t b_muxed; + avi_chunk_t ck_root; + + vlc_bool_t b_odml; + + off_t i_movi_begin; + off_t i_movi_lastchunk_pos; /* XXX position of last valid chunk */ + + /* number of streams and information */ + unsigned int i_track; + avi_track_t **track; + + /* meta */ + vlc_meta_t *meta; + + /* Progress box */ + mtime_t last_update; + int i_dialog_id; +}; + static inline off_t __EVEN( off_t i ) { return (i & 1) ? i + 1 : i; } -static mtime_t AVI_PTSToChunk( avi_stream_t *, mtime_t i_pts ); -static mtime_t AVI_PTSToByte ( avi_stream_t *, mtime_t i_pts ); -static mtime_t AVI_GetDPTS ( avi_stream_t *, int64_t i_count ); -static mtime_t AVI_GetPTS ( avi_stream_t * ); +static mtime_t AVI_PTSToChunk( avi_track_t *, mtime_t i_pts ); +static mtime_t AVI_PTSToByte ( avi_track_t *, mtime_t i_pts ); +static mtime_t AVI_GetDPTS ( avi_track_t *, int64_t i_count ); +static mtime_t AVI_GetPTS ( avi_track_t * ); -static int AVI_StreamChunkFind( input_thread_t *, unsigned int i_stream ); -static int AVI_StreamChunkSet ( input_thread_t *, +static int AVI_StreamChunkFind( demux_t *, unsigned int i_stream ); +static int AVI_StreamChunkSet ( demux_t *, unsigned int i_stream, unsigned int i_ck ); -static int AVI_StreamBytesSet ( input_thread_t *, +static int AVI_StreamBytesSet ( demux_t *, unsigned int i_stream, off_t i_byte ); vlc_fourcc_t AVI_FourccGetCodec( unsigned int i_cat, vlc_fourcc_t ); static int AVI_GetKeyFlag ( vlc_fourcc_t , uint8_t * ); -static vlc_bool_t AVI_Interleaved( input_thread_t *p_input ); +static int AVI_PacketGetHeader( demux_t *, avi_packet_t *p_pk ); +static int AVI_PacketNext ( demux_t * ); +static int AVI_PacketRead ( demux_t *, avi_packet_t *, block_t **); +static int AVI_PacketSearch ( demux_t * ); -static int AVI_PacketGetHeader( input_thread_t *, avi_packet_t *p_pk ); -static int AVI_PacketNext ( input_thread_t * ); -static int AVI_PacketRead ( input_thread_t *, avi_packet_t *, pes_packet_t **); -static int AVI_PacketSearch ( input_thread_t * ); +static void AVI_IndexLoad ( demux_t * ); +static void AVI_IndexCreate ( demux_t * ); +static void AVI_IndexAddEntry( demux_sys_t *, int, avi_entry_t * ); -static void AVI_IndexLoad ( input_thread_t * ); -static void AVI_IndexCreate ( input_thread_t * ); -static void AVI_IndexAddEntry( demux_sys_t *, int, AVIIndexEntry_t * ); - -static mtime_t AVI_MovieGetLength( input_thread_t * ); +static mtime_t AVI_MovieGetLength( demux_t * ); /***************************************************************************** * Stream management *****************************************************************************/ -static vlc_bool_t AVI_StreamStart ( input_thread_t *, int ); -static void AVI_StreamStop ( input_thread_t *, int ); -static int AVI_StreamSeek ( input_thread_t *, int, mtime_t ); -static int AVI_StreamStopFinishedStreams( input_thread_t *); +static int AVI_TrackSeek ( demux_t *, int, mtime_t ); +static int AVI_TrackStopFinishedStreams( demux_t *); + +/* Remarks: + - For VBR mp3 stream: + count blocks by rounded-up chunksizes instead of chunks + we need full emulation of dshow avi demuxer bugs :( + fixes silly nandub-style a-v delaying in avi with vbr mp3... + (from mplayer 2002/08/02) + - to complete.... + */ /***************************************************************************** * Open: check file and initializes AVI structures *****************************************************************************/ static int Open( vlc_object_t * p_this ) { - input_thread_t * p_input = (input_thread_t *)p_this; + demux_t *p_demux = (demux_t *)p_this; + demux_sys_t *p_sys; + + vlc_bool_t b_index = VLC_FALSE; + int i_do_index; + avi_chunk_t ck_riff; avi_chunk_list_t *p_riff = (avi_chunk_list_t*)&ck_riff; avi_chunk_list_t *p_hdrl, *p_movi; -#if 0 - avi_chunk_list_t *p_INFO; - avi_chunk_strz_t *p_name; -#endif avi_chunk_avih_t *p_avih; - demux_sys_t *p_avi; - es_descriptor_t *p_es = NULL; /* avoid warning */ - unsigned int i; - mtime_t i_microsecperframe = 0; // for some subtitle format - vlc_bool_t b_stream_audio, b_stream_video; - uint8_t *p_peek; + unsigned int i_track; + unsigned int i, i_peeker; + const uint8_t *p_peek; /* Is it an avi file ? */ - if( input_Peek( p_input, &p_peek, 12 ) < 12 ) + if( stream_Peek( p_demux->s, &p_peek, 200 ) < 200 ) return VLC_EGENERIC; + + for( i_peeker = 0; i_peeker < 188; i_peeker++ ) { - msg_Err( p_input, "cannot peek()" ); - return VLC_EGENERIC; + if( !strncmp( (char *)&p_peek[0], "RIFF", 4 ) && !strncmp( (char *)&p_peek[8], "AVI ", 4 ) ) + break; + if( !strncmp( (char *)&p_peek[0], "ON2 ", 4 ) && !strncmp( (char *)&p_peek[8], "ON2f", 4 ) ) + break; + p_peek++; } - if( strncmp( &p_peek[0], "RIFF", 4 ) || strncmp( &p_peek[8], "AVI ", 4 ) ) + if( i_peeker == 188 ) { - msg_Warn( p_input, "avi module discarded (invalid header)" ); return VLC_EGENERIC; } /* Initialize input structures. */ - p_avi = p_input->p_demux_data = malloc( sizeof(demux_sys_t) ); - memset( p_avi, 0, sizeof( demux_sys_t ) ); - p_avi->i_time = 0; - p_avi->i_pcr = 0; - p_avi->i_movi_lastchunk_pos = 0; - p_avi->b_odml = VLC_FALSE; - p_avi->b_interleaved = VLC_FALSE; - - /* Create stream facilities */ - if( ( p_avi->s = stream_OpenInput( p_input ) ) == NULL ) - { - msg_Err( p_input, "cannot create stream_t" ); - free( p_avi ); - return VLC_EGENERIC; - } - stream_Control( p_avi->s, STREAM_CAN_FASTSEEK, &p_avi->b_seekable ); + p_sys = p_demux->p_sys = malloc( sizeof(demux_sys_t) ); + memset( p_sys, 0, sizeof( demux_sys_t ) ); + p_sys->i_time = 0; + p_sys->i_length = 0; + p_sys->i_movi_lastchunk_pos = 0; + p_sys->b_odml = VLC_FALSE; + p_sys->b_muxed = VLC_FALSE; + p_sys->i_track = 0; + p_sys->track = NULL; + p_sys->meta = NULL; + + stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &p_sys->b_seekable ); + + p_demux->pf_control = Control; + p_demux->pf_demux = Demux_Seekable; - p_input->pf_demux_control = Control; - p_input->pf_demux = Demux_Seekable; /* For unseekable stream, automaticaly use Demux_UnSeekable */ - if( !p_avi->b_seekable || config_GetInt( p_input, "avi-interleaved" ) ) + if( !p_sys->b_seekable || config_GetInt( p_demux, "avi-interleaved" ) ) + { + p_demux->pf_demux = Demux_UnSeekable; + } + + if( i_peeker > 0 ) { - p_input->pf_demux = Demux_UnSeekable; + stream_Read( p_demux->s, NULL, i_peeker ); } - if( AVI_ChunkReadRoot( p_avi->s, &p_avi->ck_root ) ) + if( AVI_ChunkReadRoot( p_demux->s, &p_sys->ck_root ) ) { - msg_Err( p_input, "avi module discarded (invalid file)" ); + msg_Err( p_demux, "avi module discarded (invalid file)" ); return VLC_EGENERIC; } - if( AVI_ChunkCount( &p_avi->ck_root, AVIFOURCC_RIFF ) > 1 ) + if( AVI_ChunkCount( &p_sys->ck_root, AVIFOURCC_RIFF ) > 1 ) { unsigned int i_count = - AVI_ChunkCount( &p_avi->ck_root, AVIFOURCC_RIFF ); + AVI_ChunkCount( &p_sys->ck_root, AVIFOURCC_RIFF ); - msg_Warn( p_input, "multiple riff -> OpenDML ?" ); + msg_Warn( p_demux, "multiple riff -> OpenDML ?" ); for( i = 1; i < i_count; i++ ) { - avi_chunk_list_t *p_avix; + avi_chunk_list_t *p_sysx; - p_avix = AVI_ChunkFind( &p_avi->ck_root, AVIFOURCC_RIFF, i ); - if( p_avix->i_type == AVIFOURCC_AVIX ) + p_sysx = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, i ); + if( p_sysx->i_type == AVIFOURCC_AVIX ) { - msg_Warn( p_input, "detected OpenDML file" ); - p_avi->b_odml = VLC_TRUE; + msg_Warn( p_demux, "detected OpenDML file" ); + p_sys->b_odml = VLC_TRUE; break; } } } - p_riff = AVI_ChunkFind( &p_avi->ck_root, AVIFOURCC_RIFF, 0 ); + p_riff = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, 0 ); p_hdrl = AVI_ChunkFind( p_riff, AVIFOURCC_hdrl, 0 ); p_movi = AVI_ChunkFind( p_riff, AVIFOURCC_movi, 0 ); -#if 0 - p_INFO = AVI_ChunkFind( p_riff, AVIFOURCC_INFO, 0 ); - p_name = AVI_ChunkFind( p_INFO, AVIFOURCC_INAM, 0 ); -#endif if( !p_hdrl || !p_movi ) { - msg_Err( p_input, "avi module discarded (invalid file)" ); + msg_Err( p_demux, "avi module discarded (invalid file)" ); goto error; } if( !( p_avih = AVI_ChunkFind( p_hdrl, AVIFOURCC_avih, 0 ) ) ) { - msg_Err( p_input, "cannot find avih chunk" ); + msg_Err( p_demux, "cannot find avih chunk" ); goto error; } - p_avi->i_streams = AVI_ChunkCount( p_hdrl, AVIFOURCC_strl ); - if( p_avih->i_streams != p_avi->i_streams ) + i_track = AVI_ChunkCount( p_hdrl, AVIFOURCC_strl ); + if( p_avih->i_streams != i_track ) { - msg_Warn( p_input, + msg_Warn( p_demux, "found %d stream but %d are declared", - p_avi->i_streams, - p_avih->i_streams ); - } - if( p_avi->i_streams == 0 ) - { - msg_Err( p_input, "no stream defined!" ); - goto error; + i_track, p_avih->i_streams ); } - - /* create one program */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( input_InitStream( p_input, 0 ) == -1) + if( i_track == 0 ) { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot init stream" ); + msg_Err( p_demux, "no stream defined!" ); 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; /* Fixed later */ - vlc_mutex_unlock( &p_input->stream.stream_lock ); - /* print informations on streams */ - msg_Dbg( p_input, "AVIH: %d stream, flags %s%s%s%s ", - p_avi->i_streams, + /* print information on streams */ + msg_Dbg( p_demux, "AVIH: %d stream, flags %s%s%s%s ", + i_track, p_avih->i_flags&AVIF_HASINDEX?" HAS_INDEX":"", p_avih->i_flags&AVIF_MUSTUSEINDEX?" MUST_USE_INDEX":"", p_avih->i_flags&AVIF_ISINTERLEAVED?" IS_INTERLEAVED":"", p_avih->i_flags&AVIF_TRUSTCKTYPE?" TRUST_CKTYPE":"" ); + if( ( p_sys->meta = vlc_meta_New() ) ) { - input_info_category_t *p_cat = input_InfoCategory( p_input, _("Avi") ); - input_AddInfo( p_cat, _("Number of Streams"), "%d", p_avi->i_streams ); - input_AddInfo( p_cat, _("Flags"), "%s%s%s%s", - p_avih->i_flags&AVIF_HASINDEX?" HAS_INDEX":"", - p_avih->i_flags&AVIF_MUSTUSEINDEX?" MUST_USE_INDEX":"", - p_avih->i_flags&AVIF_ISINTERLEAVED?" IS_INTERLEAVED":"", - p_avih->i_flags&AVIF_TRUSTCKTYPE?" TRUST_CKTYPE":"" ); + char buffer[200]; + sprintf( buffer, "%s%s%s%s", + p_avih->i_flags&AVIF_HASINDEX?" HAS_INDEX":"", + p_avih->i_flags&AVIF_MUSTUSEINDEX?" MUST_USE_INDEX":"", + p_avih->i_flags&AVIF_ISINTERLEAVED?" IS_INTERLEAVED":"", + p_avih->i_flags&AVIF_TRUSTCKTYPE?" TRUST_CKTYPE":"" ); + vlc_meta_SetSetting( p_sys->meta, buffer ); } /* now read info on each stream and create ES */ - p_avi->pp_info = calloc( p_avi->i_streams, - sizeof( avi_stream_t* ) ); - memset( p_avi->pp_info, - 0, - sizeof( avi_stream_t* ) * p_avi->i_streams ); - - for( i = 0 ; i < p_avi->i_streams; i++ ) - { - avi_chunk_list_t *p_avi_strl; - avi_chunk_strh_t *p_avi_strh; - avi_chunk_strf_auds_t *p_avi_strf_auds; - avi_chunk_strf_vids_t *p_avi_strf_vids; - int i_init_size; - void *p_init_data; -#define p_info p_avi->pp_info[i] - p_info = malloc( sizeof(avi_stream_t ) ); - memset( p_info, 0, sizeof( avi_stream_t ) ); - - p_info->p_index = NULL; - p_info->i_idxnb = 0; - p_info->i_idxmax = 0; - - p_avi_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i ); - p_avi_strh = AVI_ChunkFind( p_avi_strl, AVIFOURCC_strh, 0 ); - p_avi_strf_auds = (void*) - p_avi_strf_vids = (void*) - AVI_ChunkFind( p_avi_strl, AVIFOURCC_strf, 0 ); - - if( !p_avi_strl || !p_avi_strh || - ( !p_avi_strf_auds && !p_avi_strf_vids ) ) - { - msg_Warn( p_input, "stream[%d] incomplete", i ); + for( i = 0 ; i < i_track; i++ ) + { + avi_track_t *tk = malloc( sizeof( avi_track_t ) ); + avi_chunk_list_t *p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i ); + avi_chunk_strh_t *p_strh = AVI_ChunkFind( p_strl, AVIFOURCC_strh, 0 ); + avi_chunk_STRING_t *p_strn = AVI_ChunkFind( p_strl, AVIFOURCC_strn, 0 ); + avi_chunk_strf_auds_t *p_auds = NULL; + avi_chunk_strf_vids_t *p_vids = NULL; + es_format_t fmt; + + tk->b_activated = VLC_FALSE; + tk->p_index = 0; + tk->i_idxnb = 0; + tk->i_idxmax = 0; + tk->i_idxposc = 0; + tk->i_idxposb = 0; + + tk->i_blockno = 0; + tk->i_blocksize = 0; + + tk->p_es = NULL; + tk->p_out_muxed = NULL; + + p_vids = (avi_chunk_strf_vids_t*)AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0 ); + p_auds = (avi_chunk_strf_auds_t*)AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0 ); + + if( p_strl == NULL || p_strh == NULL || p_auds == NULL || p_vids == NULL ) + { + msg_Warn( p_demux, "stream[%d] incomplete", i ); continue; } - /* *** Init p_info *** */ - p_info->i_rate = p_avi_strh->i_rate; - p_info->i_scale = p_avi_strh->i_scale; - p_info->i_samplesize = p_avi_strh->i_samplesize; - msg_Dbg( p_input, "stream[%d] rate:%d scale:%d samplesize:%d", - i, - p_info->i_rate, p_info->i_scale, p_info->i_samplesize ); - switch( p_avi_strh->i_type ) + tk->i_rate = p_strh->i_rate; + tk->i_scale = p_strh->i_scale; + tk->i_samplesize = p_strh->i_samplesize; + msg_Dbg( p_demux, "stream[%d] rate:%d scale:%d samplesize:%d", + i, tk->i_rate, tk->i_scale, tk->i_samplesize ); + + switch( p_strh->i_type ) { case( AVIFOURCC_auds ): - p_info->i_cat = AUDIO_ES; - p_info->i_fourcc = - AVI_FourccGetCodec( AUDIO_ES, - p_avi_strf_auds->p_wf->wFormatTag ); - p_info->i_codec = p_info->i_fourcc; - i_init_size = p_avi_strf_auds->i_chunk_size; - p_init_data = p_avi_strf_auds->p_wf; - msg_Dbg( p_input, "stream[%d] audio(0x%x) %d channels %dHz %dbits", - i, - p_avi_strf_auds->p_wf->wFormatTag, - p_avi_strf_auds->p_wf->nChannels, - p_avi_strf_auds->p_wf->nSamplesPerSec, - p_avi_strf_auds->p_wf->wBitsPerSample ); + tk->i_cat = AUDIO_ES; + tk->i_codec = AVI_FourccGetCodec( AUDIO_ES, + p_auds->p_wf->wFormatTag ); + if( ( tk->i_blocksize = p_auds->p_wf->nBlockAlign ) == 0 ) { - char psz_cat[ sizeof("Stream") + 10 ]; - input_info_category_t *p_cat; - sprintf( psz_cat, _("Stream %d"), i ); - p_cat = input_InfoCategory( p_input, psz_cat ); - input_AddInfo( p_cat, _("Type"), "Audio(0x%x)", - p_avi_strf_auds->p_wf->wFormatTag ); - input_AddInfo( p_cat, _("Codec"), "%4.4s", - (const char*)&(p_info->i_codec) ); - input_AddInfo( p_cat, _("FOURCC"), "0x%x", - p_info->i_codec ); - input_AddInfo( p_cat, _("Channels"), "%d", - p_avi_strf_auds->p_wf->nChannels ); - input_AddInfo( p_cat, _("Sample Rate"), "%d", - p_avi_strf_auds->p_wf->nSamplesPerSec ); - if( p_avi_strf_auds->p_wf->wBitsPerSample > 0 - && p_info->i_scale != 0 ) + if( p_auds->p_wf->wFormatTag == 1 ) { - input_AddInfo( p_cat, _("Bits Per Sample"), "%d", - p_avi_strf_auds->p_wf->wBitsPerSample ); - input_AddInfo( p_cat, _("Audio Bitrate"), "%d", - p_info->i_samplesize * p_info->i_rate - / p_info->i_scale ); + tk->i_blocksize = p_auds->p_wf->nChannels * (p_auds->p_wf->wBitsPerSample/8); + } + else + { + tk->i_blocksize = 1; } } + es_format_Init( &fmt, AUDIO_ES, tk->i_codec ); + + fmt.audio.i_channels = p_auds->p_wf->nChannels; + fmt.audio.i_rate = p_auds->p_wf->nSamplesPerSec; + fmt.i_bitrate = p_auds->p_wf->nAvgBytesPerSec*8; + fmt.audio.i_blockalign = p_auds->p_wf->nBlockAlign; + fmt.audio.i_bitspersample = p_auds->p_wf->wBitsPerSample; + fmt.b_packetized = !tk->i_blocksize; + fmt.i_extra = __MIN( p_auds->p_wf->cbSize, + p_auds->i_chunk_size - sizeof(WAVEFORMATEX) ); + fmt.p_extra = &p_auds->p_wf[1]; + msg_Dbg( p_demux, "stream[%d] audio(0x%x) %d channels %dHz %dbits", + i, p_auds->p_wf->wFormatTag, p_auds->p_wf->nChannels, + p_auds->p_wf->nSamplesPerSec, p_auds->p_wf->wBitsPerSample); break; case( AVIFOURCC_vids ): - p_info->i_cat = VIDEO_ES; - /* XXX quick hack for playing ffmpeg video, I don't know - who is doing something wrong */ - p_info->i_samplesize = 0; - p_info->i_fourcc = p_avi_strf_vids->p_bih->biCompression; - p_info->i_codec = - AVI_FourccGetCodec( VIDEO_ES, p_info->i_fourcc ); - i_init_size = p_avi_strf_vids->i_chunk_size; - p_init_data = p_avi_strf_vids->p_bih; - msg_Dbg( p_input, "stream[%d] video(%4.4s) %dx%d %dbpp %ffps", - i, - (char*)&p_avi_strf_vids->p_bih->biCompression, - p_avi_strf_vids->p_bih->biWidth, - p_avi_strf_vids->p_bih->biHeight, - p_avi_strf_vids->p_bih->biBitCount, - (float)p_info->i_rate / - (float)p_info->i_scale ); + tk->i_cat = VIDEO_ES; + tk->i_codec = AVI_FourccGetCodec( VIDEO_ES, + p_vids->p_bih->biCompression ); + if( p_vids->p_bih->biCompression == 0x00 ) { - char psz_cat[ sizeof("Stream") + 10 ]; - input_info_category_t *p_cat; - sprintf( psz_cat, "Stream %d", i ); - p_cat = input_InfoCategory( p_input, psz_cat ); - input_AddInfo( p_cat, _("Type"), _("Video") ); - input_AddInfo( p_cat, _("Codec"), "%4.4s", - (const char*)&(p_info->i_codec) ); - input_AddInfo( p_cat, _("FOURCC"), "0x%x", - p_info->i_codec ); - input_AddInfo( p_cat, _("Resolution"), "%dx%d", - p_avi_strf_vids->p_bih->biWidth, - p_avi_strf_vids->p_bih->biHeight ); - input_AddInfo( p_cat, _("Frame Rate"), "%f", - (float)p_info->i_rate / - (float)p_info->i_scale ); - input_AddInfo( p_cat, _("Bits Per Pixel"), "%d", - p_avi_strf_vids->p_bih->biBitCount ); + switch( p_vids->p_bih->biBitCount ) + { + case 32: + tk->i_codec = VLC_FOURCC('R','V','3','2'); + break; + case 24: + tk->i_codec = VLC_FOURCC('R','V','2','4'); + break; + case 16: + /* tk->i_codec = VLC_FOURCC('R','V','1','6');*/ + /* break;*/ + case 15: + tk->i_codec = VLC_FOURCC('R','V','1','5'); + break; + case 9: + tk->i_codec = VLC_FOURCC( 'Y', 'V', 'U', '9' ); /* <- TODO check that */ + break; + case 8: + tk->i_codec = VLC_FOURCC('Y','8','0','0'); + break; + } + es_format_Init( &fmt, VIDEO_ES, tk->i_codec ); + + if( p_vids->p_bih->biBitCount == 24 ) + { + /* This is in BGR format */ + fmt.video.i_bmask = 0x00ff0000; + fmt.video.i_gmask = 0x0000ff00; + fmt.video.i_rmask = 0x000000ff; + } } - if( i_microsecperframe == 0 ) + else { - i_microsecperframe = (mtime_t)1000000 * - (mtime_t)p_info->i_scale / - (mtime_t)p_info->i_rate; + es_format_Init( &fmt, VIDEO_ES, p_vids->p_bih->biCompression ); + if( tk->i_codec == FOURCC_mp4v && + !strncasecmp( (char*)&p_strh->i_handler, "XVID", 4 ) ) + { + fmt.i_codec = VLC_FOURCC( 'X', 'V', 'I', 'D' ); + } } - break; - default: - msg_Warn( p_input, "stream[%d] unknown type", i ); - p_info->i_cat = UNKNOWN_ES; - i_init_size = 0; - p_init_data = NULL; + tk->i_samplesize = 0; + fmt.video.i_width = p_vids->p_bih->biWidth; + fmt.video.i_height = p_vids->p_bih->biHeight; + fmt.video.i_bits_per_pixel = p_vids->p_bih->biBitCount; + fmt.video.i_frame_rate = tk->i_rate; + fmt.video.i_frame_rate_base = tk->i_scale; + fmt.i_extra = + __MIN( p_vids->p_bih->biSize - sizeof( BITMAPINFOHEADER ), + p_vids->i_chunk_size - sizeof(BITMAPINFOHEADER) ); + fmt.p_extra = &p_vids->p_bih[1]; + msg_Dbg( p_demux, "stream[%d] video(%4.4s) %dx%d %dbpp %ffps", + i, (char*)&p_vids->p_bih->biCompression, + p_vids->p_bih->biWidth, + p_vids->p_bih->biHeight, + p_vids->p_bih->biBitCount, + (float)tk->i_rate/(float)tk->i_scale ); + + if( p_vids->p_bih->biCompression == 0x00 ) + { + /* RGB DIB are coded from bottom to top */ + fmt.video.i_height = + (unsigned int)(-(int)p_vids->p_bih->biHeight); + } + + /* Extract palette from extradata if bpp <= 8 + * (assumes that extradata contains only palette but appears + * to be true for all palettized codecs we support) */ + if( fmt.i_extra && fmt.video.i_bits_per_pixel <= 8 && + fmt.video.i_bits_per_pixel > 0 ) { - char psz_cat[32]; /* We'll clip i just in case */ - input_info_category_t *p_cat; - sprintf( psz_cat, "Stream %d", __MIN( i, 100000 ) ); - p_cat = input_InfoCategory( p_input, psz_cat ); - input_AddInfo( p_cat, _("Type"), _("Unknown") ); + int i; + + fmt.video.p_palette = calloc( sizeof(video_palette_t), 1 ); + fmt.video.p_palette->i_entries = 1; + + /* Apparently this is necessary. But why ? */ + fmt.i_extra = + p_vids->i_chunk_size - sizeof(BITMAPINFOHEADER); + for( i = 0; i < __MIN(fmt.i_extra/4, 256); i++ ) + { + ((uint32_t *)&fmt.video.p_palette->palette[0][0])[i] = + GetDWLE((uint32_t*)fmt.p_extra + i); + } } break; + + case( AVIFOURCC_txts): + tk->i_cat = SPU_ES; + tk->i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); + msg_Dbg( p_demux, "stream[%d] subtitles", i ); + es_format_Init( &fmt, SPU_ES, tk->i_codec ); + break; + + case( AVIFOURCC_iavs): + case( AVIFOURCC_ivas): + p_sys->b_muxed = VLC_TRUE; + msg_Dbg( p_demux, "stream[%d] iavs with handler %4.4s", i, (char *)&p_strh->i_handler ); + if( p_strh->i_handler == FOURCC_dvsd || + p_strh->i_handler == FOURCC_dvhd || + p_strh->i_handler == FOURCC_dvsl ) + { + tk->p_out_muxed = stream_DemuxNew( p_demux, (char *)"rawdv", p_demux->out ); + if( !tk->p_out_muxed ) + msg_Err( p_demux, "could not load the DV parser" ); + else break; + } + free( tk ); + continue; + + case( AVIFOURCC_mids): + msg_Dbg( p_demux, "stream[%d] midi is UNSUPPORTED", i ); + + default: + msg_Warn( p_demux, "stream[%d] unknown type %4.4s", i, (char *)&p_strh->i_type ); + free( tk ); + continue; } - p_info->b_activated = VLC_FALSE; - /* add one ES */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_info->p_es = - p_es = input_AddES( p_input, p_input->stream.p_selected_program, - 1+i, p_info->i_cat, NULL, 0 ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); - p_es->i_stream_id =i; /* XXX: i don't use it */ - p_es->i_fourcc = p_info->i_fourcc; - if( p_es->i_cat == AUDIO_ES ) - { - if( i_init_size < (int)sizeof( WAVEFORMATEX ) ) - { - i_init_size = sizeof( WAVEFORMATEX ); - } - p_es->p_waveformatex = malloc( i_init_size ); - memcpy( p_es->p_waveformatex, p_init_data, i_init_size ); - } - else if( p_es->i_cat == VIDEO_ES ) + if( p_strn ) { - p_es->p_bitmapinfoheader = malloc( i_init_size ); - memcpy( p_es->p_bitmapinfoheader, p_init_data, i_init_size ); + /* The charset of p_strn is undefined */ + EnsureUTF8( p_strn->p_str ); + fmt.psz_description = strdup( p_strn->p_str ); } -#undef p_info + if( tk->p_out_muxed == NULL ) + tk->p_es = es_out_Add( p_demux->out, &fmt ); + TAB_APPEND( p_sys->i_track, p_sys->track, tk ); } - if( ( p_avi->p_sub = subtitle_New( p_input, NULL, i_microsecperframe ) ) ) + if( p_sys->i_track <= 0 ) { - subtitle_Select( p_avi->p_sub ); + msg_Err( p_demux, "no valid track" ); + goto error; } - if( config_GetInt( p_input, "avi-index" ) ) + i_do_index = config_GetInt( p_demux, "avi-index" ); + if( i_do_index == 1 ) /* Always fix */ { - if( p_avi->b_seekable ) +aviindex: + if( p_sys->b_seekable ) { - AVI_IndexCreate( p_input ); + AVI_IndexCreate( p_demux ); } else { - msg_Warn( p_input, "cannot create index (unseekable stream)" ); - AVI_IndexLoad( p_input ); + msg_Warn( p_demux, "cannot create index (unseekable stream)" ); + AVI_IndexLoad( p_demux ); } } else { - AVI_IndexLoad( p_input ); + AVI_IndexLoad( p_demux ); } /* *** movie length in sec *** */ - p_avi->i_length = AVI_MovieGetLength( p_input ); - if( p_avi->i_length < (mtime_t)p_avih->i_totalframes * + p_sys->i_length = AVI_MovieGetLength( p_demux ); + if( p_sys->i_length < (mtime_t)p_avih->i_totalframes * (mtime_t)p_avih->i_microsecperframe / (mtime_t)1000000 ) { - msg_Warn( p_input, "broken or missing index, 'seek' will be axproximative or will have strange behavour" ); + msg_Warn( p_demux, "broken or missing index, 'seek' will be " + "axproximative or will have strange behaviour" ); + if( i_do_index == 0 && !b_index ) + { + int i_create; + i_create = intf_UserYesNo( p_demux, _("AVI Index") , + _( "This AVI file is broken. Seeking will not " + "work correctly.\nDo you want to " + "try to repair it?\n\nThis might take a long time." ), + _( "Repair" ), _( "Don't repair" ), _( "Cancel") ); + if( i_create == DIALOG_OK_YES ) + { + b_index = VLC_TRUE; + msg_Dbg( p_demux, "Fixing AVI index" ); + goto aviindex; + } + else if( i_create == DIALOG_CANCELLED ) + { + /* Kill input */ + vlc_object_kill( p_demux->p_parent ); + goto error; + } + } } + /* fix some BeOS MediaKit generated file */ - for( i = 0 ; i < p_avi->i_streams; i++ ) + for( i = 0 ; i < p_sys->i_track; i++ ) { - avi_chunk_list_t *p_avi_strl; - avi_chunk_strh_t *p_avi_strh; - avi_chunk_strf_auds_t *p_avi_strf_auds; -#define p_stream p_avi->pp_info[i] + avi_track_t *tk = p_sys->track[i]; + avi_chunk_list_t *p_strl; + avi_chunk_strh_t *p_strh; + avi_chunk_strf_auds_t *p_auds; - if( p_stream->i_cat != AUDIO_ES ) + if( tk->i_cat != AUDIO_ES ) { continue; } - if( p_stream->i_idxnb < 1 || - p_stream->i_scale != 1 || - p_stream->i_samplesize != 0 ) + if( tk->i_idxnb < 1 || + tk->i_scale != 1 || + tk->i_samplesize != 0 ) { continue; } - p_avi_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i ); - p_avi_strh = AVI_ChunkFind( p_avi_strl, AVIFOURCC_strh, 0 ); - p_avi_strf_auds = AVI_ChunkFind( p_avi_strl, AVIFOURCC_strf, 0 ); + p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i ); + p_strh = AVI_ChunkFind( p_strl, AVIFOURCC_strh, 0 ); + p_auds = AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0 ); - if( p_avi_strf_auds->p_wf->wFormatTag != WAVE_FORMAT_PCM && - (unsigned int)p_stream->i_rate == p_avi_strf_auds->p_wf->nSamplesPerSec ) + if( p_auds->p_wf->wFormatTag != WAVE_FORMAT_PCM && + (unsigned int)tk->i_rate == p_auds->p_wf->nSamplesPerSec ) { int64_t i_track_length = - p_stream->p_index[p_stream->i_idxnb-1].i_length + - p_stream->p_index[p_stream->i_idxnb-1].i_lengthtotal; + tk->p_index[tk->i_idxnb-1].i_length + + tk->p_index[tk->i_idxnb-1].i_lengthtotal; mtime_t i_length = (mtime_t)p_avih->i_totalframes * (mtime_t)p_avih->i_microsecperframe; if( i_length == 0 ) { - msg_Warn( p_input, "track[%d] cannot be fixed (BeOS MediaKit generated)", i ); + msg_Warn( p_demux, "track[%d] cannot be fixed (BeOS MediaKit generated)", i ); continue; } - p_stream->i_samplesize = 1; - p_stream->i_rate = i_track_length * (int64_t)1000000/ i_length; - msg_Warn( p_input, "track[%d] fixed with rate=%d scale=%d (BeOS MediaKit generated)", i, p_stream->i_rate, p_stream->i_scale ); + tk->i_samplesize = 1; + tk->i_rate = i_track_length * (int64_t)1000000/ i_length; + msg_Warn( p_demux, "track[%d] fixed with rate=%d scale=%d (BeOS MediaKit generated)", i, tk->i_rate, tk->i_scale ); } -#undef p_stream } - if( p_avi->i_length ) - { - p_input->stream.i_mux_rate = - stream_Size( p_avi->s ) / 50 / p_avi->i_length; - - p_avi->b_interleaved = AVI_Interleaved( p_input ); - msg_Dbg( p_input, "interleaved=%s", - p_avi->b_interleaved ? "yes" : "no" ); - } - - b_stream_audio = VLC_FALSE; - b_stream_video = VLC_FALSE; - - for( i = 0; i < p_avi->i_streams; i++ ) - { -#define tk p_avi->pp_info[i] - if( tk->p_es->i_cat == VIDEO_ES && !b_stream_video ) - { - b_stream_video = AVI_StreamStart( p_input, i ); - } - else if(tk->p_es->i_cat == AUDIO_ES && !b_stream_audio ) - { - b_stream_audio = AVI_StreamStart( p_input, i ); - } -#undef tk - } - - if( !b_stream_video ) - { - msg_Warn( p_input, "no video stream found" ); - } - if( !b_stream_audio ) - { - msg_Warn( p_input, "no audio stream found!" ); - } - - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.p_selected_program->b_is_ok = 1; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - if( p_avi->b_seekable ) + if( p_sys->b_seekable ) { /* we have read all chunk so go back to movi */ - stream_Seek( p_avi->s, p_movi->i_chunk_pos ); + stream_Seek( p_demux->s, p_movi->i_chunk_pos ); } /* Skip movi header */ - stream_Read( p_avi->s, NULL, 12 ); + stream_Read( p_demux->s, NULL, 12 ); - p_avi->i_movi_begin = p_movi->i_chunk_pos; + p_sys->i_movi_begin = p_movi->i_chunk_pos; return VLC_SUCCESS; error: - AVI_ChunkFreeRoot( p_avi->s, &p_avi->ck_root ); - stream_Release( p_avi->s ); - free( p_avi ); + if( p_sys->meta ) + { + vlc_meta_Delete( p_sys->meta ); + } + AVI_ChunkFreeRoot( p_demux->s, &p_sys->ck_root ); + free( p_sys ); return VLC_EGENERIC; } @@ -567,27 +675,25 @@ error: *****************************************************************************/ static void Close ( vlc_object_t * p_this ) { - input_thread_t * p_input = (input_thread_t *)p_this; + demux_t * p_demux = (demux_t *)p_this; unsigned int i; - demux_sys_t *p_avi = p_input->p_demux_data ; + demux_sys_t *p_sys = p_demux->p_sys ; - for( i = 0; i < p_avi->i_streams; i++ ) + for( i = 0; i < p_sys->i_track; i++ ) { - if( p_avi->pp_info[i] ) + if( p_sys->track[i] ) { - FREE( p_avi->pp_info[i]->p_index ); - free( p_avi->pp_info[i] ); + if( p_sys->track[i]->p_out_muxed ) + stream_DemuxDelete( p_sys->track[i]->p_out_muxed ); + FREENULL( p_sys->track[i]->p_index ); + free( p_sys->track[i] ); } } - FREE( p_avi->pp_info ); - if( p_avi->p_sub ) - { - subtitle_Close( p_avi->p_sub ); - } - AVI_ChunkFreeRoot( p_avi->s, &p_avi->ck_root ); + FREENULL( p_sys->track ); + AVI_ChunkFreeRoot( p_demux->s, &p_sys->ck_root ); + vlc_meta_Delete( p_sys->meta ); - stream_Release( p_avi->s ); - free( p_avi ); + free( p_sys ); } /***************************************************************************** @@ -597,165 +703,132 @@ static void Close ( vlc_object_t * p_this ) ***************************************************************************** * Returns -1 in case of error, 0 in case of EOF, 1 otherwise *****************************************************************************/ -typedef struct avi_stream_toread_s +typedef struct { vlc_bool_t b_ok; int i_toread; - off_t i_posf; // where we will read : - // if i_idxposb == 0 : begining of chunk (+8 to acces data) - // else : point on data directly -} avi_stream_toread_t; + off_t i_posf; /* where we will read : + if i_idxposb == 0 : begining of chunk (+8 to acces data) + else : point on data directly */ +} avi_track_toread_t; -static int Demux_Seekable( input_thread_t *p_input ) +static int Demux_Seekable( demux_t *p_demux ) { - unsigned int i_stream_count; - unsigned int i_stream; - vlc_bool_t b_stream; - vlc_bool_t b_play_audio; - vlc_bool_t b_video; /* is there some video track selected */ - // cannot be more than 100 stream (dcXX or wbXX) - avi_stream_toread_t toread[100]; + demux_sys_t *p_sys = p_demux->p_sys; - demux_sys_t *p_avi = p_input->p_demux_data; + unsigned int i_track_count = 0; + unsigned int i_track; + vlc_bool_t b_stream; + /* cannot be more than 100 stream (dcXX or wbXX) */ + avi_track_toread_t toread[100]; /* detect new selected/unselected streams */ - for( i_stream = 0,i_stream_count= 0, b_video = VLC_FALSE; - i_stream < p_avi->i_streams; i_stream++ ) + for( i_track = 0; i_track < p_sys->i_track; i_track++ ) { -#define p_stream p_avi->pp_info[i_stream] - if( p_stream->p_es ) + avi_track_t *tk = p_sys->track[i_track]; + vlc_bool_t b; + + if( p_sys->b_muxed && tk->p_out_muxed ) { - if( p_stream->p_es->p_decoder_fifo && - !p_stream->b_activated ) - { - AVI_StreamStart( p_input, i_stream ); - } - else - if( !p_stream->p_es->p_decoder_fifo && - p_stream->b_activated ) - { - AVI_StreamStop( p_input, i_stream ); - } + i_track_count++; + tk->b_activated = VLC_TRUE; + continue; } - if( p_stream->b_activated ) + + es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b ); + if( b && !tk->b_activated ) { - i_stream_count++; - if( p_stream->i_cat == VIDEO_ES ) + if( p_sys->b_seekable) { - b_video = VLC_TRUE; + AVI_TrackSeek( p_demux, i_track, p_sys->i_time ); } + tk->b_activated = VLC_TRUE; + } + else if( !b && tk->b_activated ) + { + tk->b_activated = VLC_FALSE; + } + if( b ) + { + i_track_count++; } -#undef p_stream } - if( i_stream_count <= 0 ) + if( i_track_count <= 0 ) { - msg_Warn( p_input, "no track selected, exiting..." ); - return( 0 ); - } -#if 0 - if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT ) - { - mtime_t i_date; - int i_percent; - /* first wait for empty buffer, arbitrary time FIXME */ - //msleep( DEFAULT_PTS_DELAY ); - - i_date = (mtime_t)1000000 * - (mtime_t)p_avi->i_length * - (mtime_t)stream_Tell( p_avi->s ) / - (mtime_t)stream_Size( p_avi->s ); - i_percent = 100 * stream_Tell( p_avi->s ) / - stream_Size( p_avi->s ); - - Seek( p_input, i_date, i_percent); + int64_t i_length = p_sys->i_length * (mtime_t)1000000; - if( p_avi->p_sub ) + p_sys->i_time += 25*1000; /* read 25ms */ + if( i_length > 0 ) { - subtitle_Seek( p_avi->p_sub, p_avi->i_time ); + if( p_sys->i_time >= i_length ) + return 0; + return 1; } + msg_Warn( p_demux, "no track selected, exiting..." ); + return 0; } -#endif /* wait for the good time */ - - p_avi->i_pcr = p_avi->i_time * 9 / 100; - - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_avi->i_pcr ); - - - p_avi->i_time += 25*1000; /* read 25ms */ - - if( p_avi->p_sub ) - { - subtitle_Demux( p_avi->p_sub, p_avi->i_time ); - } - - /* Check if we need to send the audio data to decoder */ - b_play_audio = !p_input->stream.control.b_mute; + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time + 1 ); + p_sys->i_time += 25*1000; /* read 25ms */ /* init toread */ - for( i_stream = 0; i_stream < p_avi->i_streams; i_stream++ ) + for( i_track = 0; i_track < p_sys->i_track; i_track++ ) { -#define p_stream p_avi->pp_info[i_stream] + avi_track_t *tk = p_sys->track[i_track]; mtime_t i_dpts; - toread[i_stream].b_ok = p_stream->b_activated; - if( p_stream->i_idxposc < p_stream->i_idxnb ) + toread[i_track].b_ok = tk->b_activated; + if( tk->i_idxposc < tk->i_idxnb ) { - toread[i_stream].i_posf = - p_stream->p_index[p_stream->i_idxposc].i_pos; - if( p_stream->i_idxposb > 0 ) + toread[i_track].i_posf = tk->p_index[tk->i_idxposc].i_pos; + if( tk->i_idxposb > 0 ) { - toread[i_stream].i_posf += 8 + p_stream->i_idxposb; + toread[i_track].i_posf += 8 + tk->i_idxposb; } } else { - toread[i_stream].i_posf = -1; + toread[i_track].i_posf = -1; } - i_dpts = p_avi->i_time - AVI_GetPTS( p_stream ); + i_dpts = p_sys->i_time - AVI_GetPTS( tk ); - if( p_stream->i_samplesize ) + if( tk->i_samplesize ) { - toread[i_stream].i_toread = AVI_PTSToByte( p_stream, - __ABS( i_dpts ) ); + toread[i_track].i_toread = AVI_PTSToByte( tk, __ABS( i_dpts ) ); } else { - toread[i_stream].i_toread = AVI_PTSToChunk( p_stream, - __ABS( i_dpts ) ); + toread[i_track].i_toread = AVI_PTSToChunk( tk, __ABS( i_dpts ) ); } if( i_dpts < 0 ) { - toread[i_stream].i_toread *= -1; + toread[i_track].i_toread *= -1; } -#undef p_stream } b_stream = VLC_FALSE; for( ;; ) { -#define p_stream p_avi->pp_info[i_stream] + avi_track_t *tk; vlc_bool_t b_done; - pes_packet_t *p_pes; + block_t *p_frame; off_t i_pos; unsigned int i; size_t i_size; /* search for first chunk to be read */ - for( i = 0, b_done = VLC_TRUE, i_pos = -1; i < p_avi->i_streams; i++ ) + for( i = 0, b_done = VLC_TRUE, i_pos = -1; i < p_sys->i_track; i++ ) { if( !toread[i].b_ok || - AVI_GetDPTS( p_avi->pp_info[i], + AVI_GetDPTS( p_sys->track[i], toread[i].i_toread ) <= -25 * 1000 ) { continue; @@ -763,14 +836,13 @@ static int Demux_Seekable( input_thread_t *p_input ) if( toread[i].i_toread > 0 ) { - b_done = VLC_FALSE; // not yet finished + b_done = VLC_FALSE; /* not yet finished */ } - if( toread[i].i_posf > 0 ) { - if( i_pos == -1 || i_pos > toread[i_stream].i_posf ) + if( i_pos == -1 || i_pos > toread[i].i_posf ) { - i_stream = i; + i_track = i; i_pos = toread[i].i_posf; } } @@ -778,75 +850,89 @@ static int Demux_Seekable( input_thread_t *p_input ) if( b_done ) { -// return( b_stream ? 1 : 0 ); return( 1 ); } if( i_pos == -1 ) { + int i_loop_count = 0; + /* no valid index, we will parse directly the stream * in case we fail we will disable all finished stream */ - if( p_avi->i_movi_lastchunk_pos >= p_avi->i_movi_begin + 12 ) + if( p_sys->i_movi_lastchunk_pos >= p_sys->i_movi_begin + 12 ) { - stream_Seek( p_avi->s, p_avi->i_movi_lastchunk_pos ); - if( AVI_PacketNext( p_input ) ) + stream_Seek( p_demux->s, p_sys->i_movi_lastchunk_pos ); + if( AVI_PacketNext( p_demux ) ) { - return( AVI_StreamStopFinishedStreams( p_input ) ? 0 : 1 ); + return( AVI_TrackStopFinishedStreams( p_demux ) ? 0 : 1 ); } } else { - stream_Seek( p_avi->s, p_avi->i_movi_begin + 12 ); + stream_Seek( p_demux->s, p_sys->i_movi_begin + 12 ); } for( ;; ) { avi_packet_t avi_pk; - if( AVI_PacketGetHeader( p_input, &avi_pk ) ) + if( AVI_PacketGetHeader( p_demux, &avi_pk ) ) { - msg_Warn( p_input, + msg_Warn( p_demux, "cannot get packet header, track disabled" ); - return( AVI_StreamStopFinishedStreams( p_input ) ? 0 : 1 ); + return( AVI_TrackStopFinishedStreams( p_demux ) ? 0 : 1 ); } - if( avi_pk.i_stream >= p_avi->i_streams || + if( avi_pk.i_stream >= p_sys->i_track || ( avi_pk.i_cat != AUDIO_ES && avi_pk.i_cat != VIDEO_ES ) ) { - if( AVI_PacketNext( p_input ) ) + if( AVI_PacketNext( p_demux ) ) { - msg_Warn( p_input, + msg_Warn( p_demux, "cannot skip packet, track disabled" ); - return( AVI_StreamStopFinishedStreams( p_input ) ? 0 : 1 ); + return( AVI_TrackStopFinishedStreams( p_demux ) ? 0 : 1 ); + } + + /* Prevents from eating all the CPU with broken files. + * This value should be low enough so that it doesn't + * affect the reading speed too much. */ + if( !(++i_loop_count % 1024) ) + { + if( p_demux->b_die ) return -1; + msleep( 10000 ); + + if( !(i_loop_count % (1024 * 10)) ) + msg_Warn( p_demux, + "don't seem to find any data..." ); } continue; } else { /* add this chunk to the index */ - AVIIndexEntry_t index; + avi_entry_t index; index.i_id = avi_pk.i_fourcc; index.i_flags = - AVI_GetKeyFlag(p_avi->pp_info[avi_pk.i_stream]->i_codec, + AVI_GetKeyFlag(p_sys->track[avi_pk.i_stream]->i_codec, avi_pk.i_peek); index.i_pos = avi_pk.i_pos; index.i_length = avi_pk.i_size; - AVI_IndexAddEntry( p_avi, avi_pk.i_stream, &index ); + AVI_IndexAddEntry( p_sys, avi_pk.i_stream, &index ); - i_stream = avi_pk.i_stream; + i_track = avi_pk.i_stream; + tk = p_sys->track[i_track]; /* do we will read this data ? */ - if( AVI_GetDPTS( p_stream, - toread[i_stream].i_toread ) > -25 * 1000 ) + if( AVI_GetDPTS( tk, toread[i_track].i_toread ) > -25*1000 ) { break; } else { - if( AVI_PacketNext( p_input ) ) + if( AVI_PacketNext( p_demux ) ) { - msg_Warn( p_input, + msg_Warn( p_demux, "cannot skip packet, track disabled" ); - return( AVI_StreamStopFinishedStreams( p_input ) ? 0 : 1 ); + return( AVI_TrackStopFinishedStreams( p_demux ) ? 0 : 1 ); } } } @@ -855,124 +941,128 @@ static int Demux_Seekable( input_thread_t *p_input ) } else { - stream_Seek( p_avi->s, i_pos ); + stream_Seek( p_demux->s, i_pos ); } + /* Set the track to use */ + tk = p_sys->track[i_track]; + /* read thoses data */ - if( p_stream->i_samplesize ) + if( tk->i_samplesize ) { unsigned int i_toread; - if( ( i_toread = toread[i_stream].i_toread ) <= 0 ) + if( ( i_toread = toread[i_track].i_toread ) <= 0 ) { - if( p_stream->i_samplesize > 1 ) + if( tk->i_samplesize > 1 ) { - i_toread = p_stream->i_samplesize; + i_toread = tk->i_samplesize; } else { - i_toread = __MAX( AVI_PTSToByte( p_stream, 20 * 1000 ), 100 ); + i_toread = AVI_PTSToByte( tk, 20 * 1000 ); + i_toread = __MAX( i_toread, 100 ); } } - i_size = __MIN( p_stream->p_index[p_stream->i_idxposc].i_length - - p_stream->i_idxposb, + i_size = __MIN( tk->p_index[tk->i_idxposc].i_length - + tk->i_idxposb, i_toread ); } else { - i_size = p_stream->p_index[p_stream->i_idxposc].i_length; + i_size = tk->p_index[tk->i_idxposc].i_length; } - if( p_stream->i_idxposb == 0 ) + if( tk->i_idxposb == 0 ) { - i_size += 8; // need to read and skip header + i_size += 8; /* need to read and skip header */ } - if( ( p_pes = stream_PesPacket( p_avi->s, __EVEN( i_size ) ) ) == NULL ) + if( ( p_frame = stream_Block( p_demux->s, __EVEN( i_size ) ) )==NULL ) { - msg_Warn( p_input, "failled reading data" ); - AVI_StreamStop( p_input, i_stream ); - toread[i_stream].b_ok = VLC_FALSE; + msg_Warn( p_demux, "failed reading data" ); + tk->b_activated = VLC_FALSE; + toread[i_track].b_ok = VLC_FALSE; continue; } - if( i_size % 2 ) // read was padded on word boundary + if( i_size % 2 ) /* read was padded on word boundary */ { - p_pes->p_last->p_payload_end--; - p_pes->i_pes_size--; + p_frame->i_buffer--; } - // skip header - if( p_stream->i_idxposb == 0 ) + /* skip header */ + if( tk->i_idxposb == 0 ) { - p_pes->p_first->p_payload_start += 8; - p_pes->i_pes_size -= 8; + p_frame->p_buffer += 8; + p_frame->i_buffer -= 8; } - - p_pes->i_pts = AVI_GetPTS( p_stream ); - -#if 0 - /* fix pts for audio: ie pts sould be for the first byte of the first frame */ - if( p_stream->i_samplesize == 1 ) + p_frame->i_pts = AVI_GetPTS( tk ) + 1; + if( tk->p_index[tk->i_idxposc].i_flags&AVIIF_KEYFRAME ) { - AVI_FixPTS( p_stream, p_pes ); + p_frame->i_flags = BLOCK_FLAG_TYPE_I; + } + else + { + p_frame->i_flags = BLOCK_FLAG_TYPE_PB; } -#endif /* read data */ - if( p_stream->i_samplesize ) + if( tk->i_samplesize ) { - if( p_stream->i_idxposb == 0 ) + if( tk->i_idxposb == 0 ) { i_size -= 8; } - toread[i_stream].i_toread -= i_size; - p_stream->i_idxposb += i_size; - if( p_stream->i_idxposb >= - p_stream->p_index[p_stream->i_idxposc].i_length ) + toread[i_track].i_toread -= i_size; + tk->i_idxposb += i_size; + if( tk->i_idxposb >= + tk->p_index[tk->i_idxposc].i_length ) { - p_stream->i_idxposb = 0; - p_stream->i_idxposc++; + tk->i_idxposb = 0; + tk->i_idxposc++; } } else { - toread[i_stream].i_toread--; - p_stream->i_idxposc++; + int i_length = tk->p_index[tk->i_idxposc].i_length; + + tk->i_idxposc++; + if( tk->i_cat == AUDIO_ES ) + { + tk->i_blockno += tk->i_blocksize > 0 ? ( i_length + tk->i_blocksize - 1 ) / tk->i_blocksize : 1; + } + toread[i_track].i_toread--; } - if( p_stream->i_idxposc < p_stream->i_idxnb) + if( tk->i_idxposc < tk->i_idxnb) { - toread[i_stream].i_posf = - p_stream->p_index[p_stream->i_idxposc].i_pos; - if( p_stream->i_idxposb > 0 ) + toread[i_track].i_posf = + tk->p_index[tk->i_idxposc].i_pos; + if( tk->i_idxposb > 0 ) { - toread[i_stream].i_posf += 8 + p_stream->i_idxposb; + toread[i_track].i_posf += 8 + tk->i_idxposb; } } else { - toread[i_stream].i_posf = -1; + toread[i_track].i_posf = -1; } - b_stream = VLC_TRUE; // at least one read succeed + b_stream = VLC_TRUE; /* at least one read succeed */ - if( p_stream->p_es && p_stream->p_es->p_decoder_fifo && - ( b_play_audio || p_stream->i_cat != AUDIO_ES ) ) - { - p_pes->i_dts = - p_pes->i_pts = - input_ClockGetTS( p_input, - p_input->stream.p_selected_program, - p_pes->i_pts * 9/100); - - p_pes->i_rate = p_input->stream.control.i_rate; - - input_DecodePES( p_stream->p_es->p_decoder_fifo, p_pes ); - } + if( tk->i_cat != VIDEO_ES ) + p_frame->i_dts = p_frame->i_pts; else { - input_DeletePES( p_input->p_method_data, p_pes ); + p_frame->i_dts = p_frame->i_pts; + p_frame->i_pts = 0; } + + //p_pes->i_rate = p_demux->stream.control.i_rate; + if( tk->p_out_muxed ) + stream_DemuxSend( tk->p_out_muxed, p_frame ); + else + es_out_Send( p_demux->out, tk->p_es, p_frame ); } } @@ -982,61 +1072,60 @@ static int Demux_Seekable( input_thread_t *p_input ) ***************************************************************************** * Returns -1 in case of error, 0 in case of EOF, 1 otherwise *****************************************************************************/ -static int Demux_UnSeekable( input_thread_t *p_input ) +static int Demux_UnSeekable( demux_t *p_demux ) { - demux_sys_t *p_avi = p_input->p_demux_data; - avi_stream_t *p_stream_master; - vlc_bool_t b_audio; + demux_sys_t *p_sys = p_demux->p_sys; + avi_track_t *p_stream_master = NULL; unsigned int i_stream; unsigned int i_packet; - /* Check if we need to send the audio data to decoder */ - b_audio = !p_input->stream.control.b_mute; + if( p_sys->b_muxed ) + { + msg_Err( p_demux, "Can not yet process muxed avi substreams without seeking" ); + return VLC_EGENERIC; + } + + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time + 1 ); - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_avi->i_pcr ); /* *** find master stream for data packet skipping algo *** */ /* *** -> first video, if any, or first audio ES *** */ - for( i_stream = 0, p_stream_master = NULL; - i_stream < p_avi->i_streams; i_stream++ ) + for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ ) { -#define p_stream p_avi->pp_info[i_stream] - if( p_stream->p_es && - p_stream->p_es->p_decoder_fifo ) + avi_track_t *tk = p_sys->track[i_stream]; + vlc_bool_t b; + + es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b ); + + if( b && tk->i_cat == VIDEO_ES ) { - if( p_stream->i_cat == VIDEO_ES ) - { - p_stream_master = p_stream; - break; - } - if( p_stream->i_cat == AUDIO_ES && !p_stream_master ) - { - p_stream_master = p_stream; - } + p_stream_master = tk; + } + else if( b ) + { + p_stream_master = tk; } -#undef p_stream } + if( !p_stream_master ) { - msg_Warn( p_input, "no more stream selected" ); + msg_Warn( p_demux, "no more stream selected" ); return( 0 ); } - p_avi->i_pcr = AVI_GetPTS( p_stream_master ) * 9 / 100; + p_sys->i_time = AVI_GetPTS( p_stream_master ); for( i_packet = 0; i_packet < 10; i_packet++) { -#define p_stream p_avi->pp_info[avi_pk.i_stream] +#define p_stream p_sys->track[avi_pk.i_stream] avi_packet_t avi_pk; - if( AVI_PacketGetHeader( p_input, &avi_pk ) ) + if( AVI_PacketGetHeader( p_demux, &avi_pk ) ) { return( 0 ); } - if( avi_pk.i_stream >= p_avi->i_streams || + if( avi_pk.i_stream >= p_sys->i_track || ( avi_pk.i_cat != AUDIO_ES && avi_pk.i_cat != VIDEO_ES ) ) { /* we haven't found an audio or video packet: @@ -1048,63 +1137,53 @@ static int Demux_UnSeekable( input_thread_t *p_input ) case AVIFOURCC_JUNK: case AVIFOURCC_LIST: case AVIFOURCC_RIFF: - return( !AVI_PacketNext( p_input ) ? 1 : 0 ); + return( !AVI_PacketNext( p_demux ) ? 1 : 0 ); case AVIFOURCC_idx1: - if( p_avi->b_odml ) + if( p_sys->b_odml ) { - return( !AVI_PacketNext( p_input ) ? 1 : 0 ); + return( !AVI_PacketNext( p_demux ) ? 1 : 0 ); } - return( 0 ); // eof + return( 0 ); /* eof */ default: - msg_Warn( p_input, + msg_Warn( p_demux, "seems to have lost position, resync" ); - if( AVI_PacketSearch( p_input ) ) + if( AVI_PacketSearch( p_demux ) ) { - msg_Err( p_input, "resync failed" ); + msg_Err( p_demux, "resync failed" ); return( -1 ); } } } else { - /* do will send this packet to decoder ? */ - if( ( !b_audio && avi_pk.i_cat == AUDIO_ES )|| - !p_stream->p_es || - !p_stream->p_es->p_decoder_fifo ) + /* check for time */ + if( __ABS( AVI_GetPTS( p_stream ) - + AVI_GetPTS( p_stream_master ) )< 600*1000 ) { - if( AVI_PacketNext( p_input ) ) + /* load it and send to decoder */ + block_t *p_frame; + if( AVI_PacketRead( p_demux, &avi_pk, &p_frame ) || p_frame == NULL ) { - return( 0 ); + return( -1 ); + } + p_frame->i_pts = AVI_GetPTS( p_stream ) + 1; + + if( avi_pk.i_cat != VIDEO_ES ) + p_frame->i_dts = p_frame->i_pts; + else + { + p_frame->i_dts = p_frame->i_pts; + p_frame->i_pts = 0; } + + //p_pes->i_rate = p_demux->stream.control.i_rate; + es_out_Send( p_demux->out, p_stream->p_es, p_frame ); } else { - /* it's a selected stream, check for time */ - if( __ABS( AVI_GetPTS( p_stream ) - - AVI_GetPTS( p_stream_master ) )< 600*1000 ) - { - /* load it and send to decoder */ - pes_packet_t *p_pes; - if( AVI_PacketRead( p_input, &avi_pk, &p_pes ) || !p_pes) - { - return( -1 ); - } - p_pes->i_dts = - p_pes->i_pts = - input_ClockGetTS( p_input, - p_input->stream.p_selected_program, - AVI_GetPTS( p_stream ) * 9/100); - - p_pes->i_rate = p_input->stream.control.i_rate; - - input_DecodePES( p_stream->p_es->p_decoder_fifo, p_pes ); - } - else + if( AVI_PacketNext( p_demux ) ) { - if( AVI_PacketNext( p_input ) ) - { - return( 0 ); - } + return( 0 ); } } @@ -1115,11 +1194,14 @@ static int Demux_UnSeekable( input_thread_t *p_input ) } else { + if( p_stream->i_cat == AUDIO_ES ) + { + p_stream->i_blockno += p_stream->i_blocksize > 0 ? ( avi_pk.i_size + p_stream->i_blocksize - 1 ) / p_stream->i_blocksize : 1; + } p_stream->i_idxposc++; } } - #undef p_stream } @@ -1128,50 +1210,40 @@ static int Demux_UnSeekable( input_thread_t *p_input ) /***************************************************************************** * Seek: goto to i_date or i_percent - ***************************************************************************** - * Returns -1 in case of error, 0 in case of EOF, 1 otherwise *****************************************************************************/ -static int Seek( input_thread_t *p_input, mtime_t i_date, int i_percent ) +static int Seek( demux_t *p_demux, mtime_t i_date, int i_percent ) { - demux_sys_t *p_avi = p_input->p_demux_data; + demux_sys_t *p_sys = p_demux->p_sys; unsigned int i_stream; - msg_Dbg( p_input, - "seek requested: "I64Fd" secondes %d%%", - i_date / 1000000, - i_percent ); + msg_Dbg( p_demux, "seek requested: "I64Fd" seconds %d%%", + i_date / 1000000, i_percent ); - if( p_avi->b_seekable ) + if( p_sys->b_seekable ) { - if( !p_avi->i_length || p_avi->b_interleaved ) + if( !p_sys->i_length ) { - avi_stream_t *p_stream; + avi_track_t *p_stream; int64_t i_pos; /* use i_percent to create a true i_date */ - if( !p_avi->b_interleaved ) - { - msg_Warn( p_input, - "mmh, seeking without index at %d%%" - " work only for interleaved file", i_percent ); - } - + msg_Warn( p_demux, "seeking without index at %d%%" + " only works for interleaved files", i_percent ); if( i_percent >= 100 ) { - msg_Warn( p_input, "cannot seek so far !" ); - return( -1 ); + msg_Warn( p_demux, "cannot seek so far !" ); + return VLC_EGENERIC; } i_percent = __MAX( i_percent, 0 ); /* try to find chunk that is at i_percent or the file */ - i_pos = __MAX( i_percent * - stream_Size( p_avi->s ) / 100, - p_avi->i_movi_begin ); + i_pos = __MAX( i_percent * stream_Size( p_demux->s ) / 100, + p_sys->i_movi_begin ); /* search first selected stream */ for( i_stream = 0, p_stream = NULL; - i_stream < p_avi->i_streams; i_stream++ ) + i_stream < p_sys->i_track; i_stream++ ) { - p_stream = p_avi->pp_info[i_stream]; + p_stream = p_sys->track[i_stream]; if( p_stream->b_activated ) { break; @@ -1179,180 +1251,186 @@ static int Seek( input_thread_t *p_input, mtime_t i_date, int i_percent ) } if( !p_stream || !p_stream->b_activated ) { - msg_Warn( p_input, "cannot find any selected stream" ); - return( -1 ); + msg_Warn( p_demux, "cannot find any selected stream" ); + return VLC_EGENERIC; } /* be sure that the index exist */ - if( AVI_StreamChunkSet( p_input, - i_stream, - 0 ) ) + if( AVI_StreamChunkSet( p_demux, i_stream, 0 ) ) { - msg_Warn( p_input, "cannot seek" ); - return( -1 ); + msg_Warn( p_demux, "cannot seek" ); + return VLC_EGENERIC; } while( i_pos >= p_stream->p_index[p_stream->i_idxposc].i_pos + p_stream->p_index[p_stream->i_idxposc].i_length + 8 ) { /* search after i_idxposc */ - if( AVI_StreamChunkSet( p_input, + if( AVI_StreamChunkSet( p_demux, i_stream, p_stream->i_idxposc + 1 ) ) { - msg_Warn( p_input, "cannot seek" ); - return( -1 ); + msg_Warn( p_demux, "cannot seek" ); + return VLC_EGENERIC; } } + i_date = AVI_GetPTS( p_stream ); /* TODO better support for i_samplesize != 0 */ - msg_Dbg( p_input, "estimate date "I64Fd, i_date ); + msg_Dbg( p_demux, "estimate date "I64Fd, i_date ); } -#define p_stream p_avi->pp_info[i_stream] - p_avi->i_time = 0; - /* seek for chunk based streams */ - for( i_stream = 0; i_stream < p_avi->i_streams; i_stream++ ) + /* */ + for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ ) { - if( p_stream->b_activated && !p_stream->i_samplesize ) -// if( p_stream->b_activated ) - { - AVI_StreamSeek( p_input, i_stream, i_date ); - p_avi->i_time = __MAX( AVI_GetPTS( p_stream ), - p_avi->i_time ); - } - } -#if 1 - if( p_avi->i_time ) - { - i_date = p_avi->i_time; - } - /* seek for bytes based streams */ - for( i_stream = 0; i_stream < p_avi->i_streams; i_stream++ ) - { - if( p_stream->b_activated && p_stream->i_samplesize ) - { - AVI_StreamSeek( p_input, i_stream, i_date ); -// p_avi->i_time = __MAX( AVI_GetPTS( p_stream ), p_avi->i_time ); - } - } - msg_Dbg( p_input, "seek: "I64Fd" secondes", p_avi->i_time /1000000 ); - /* set true movie time */ -#endif - if( !p_avi->i_time ) - { - p_avi->i_time = i_date; + avi_track_t *p_stream = p_sys->track[i_stream]; + + if( !p_stream->b_activated ) + continue; + + AVI_TrackSeek( p_demux, i_stream, i_date ); } -#undef p_stream - return( 1 ); + p_sys->i_time = i_date; + msg_Dbg( p_demux, "seek: "I64Fd" seconds", p_sys->i_time /1000000 ); + return VLC_SUCCESS; } else { - msg_Err( p_input, "shouldn't yet be executed" ); - return( -1 ); + msg_Err( p_demux, "shouldn't yet be executed" ); + return VLC_EGENERIC; } } /***************************************************************************** * Control: - ***************************************************************************** - * *****************************************************************************/ -static int Control( input_thread_t *p_input, int i_query, va_list args ) +static double ControlGetPosition( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + if( p_sys->i_length > 0 ) + { + return (double)p_sys->i_time / (double)( p_sys->i_length * (mtime_t)1000000 ); + } + else if( stream_Size( p_demux->s ) > 0 ) + { + unsigned int i; + int64_t i_tmp; + int64_t i64 = 0; + + /* search the more advanced selected es */ + for( i = 0; i < p_sys->i_track; i++ ) + { + avi_track_t *tk = p_sys->track[i]; + if( tk->b_activated && tk->i_idxposc < tk->i_idxnb ) + { + i_tmp = tk->p_index[tk->i_idxposc].i_pos + + tk->p_index[tk->i_idxposc].i_length + 8; + if( i_tmp > i64 ) + { + i64 = i_tmp; + } + } + } + return (double)i64 / stream_Size( p_demux->s ); + } + return 0.0; +} + +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; + int i; double f, *pf; int64_t i64, *pi64; + vlc_meta_t *p_meta; switch( i_query ) { case DEMUX_GET_POSITION: pf = (double*)va_arg( args, double * ); - if( p_sys->i_length > 0 ) - { - *pf = (double)p_sys->i_time / (double)( p_sys->i_length * (mtime_t)1000000 ); - return VLC_SUCCESS; - } - else if( stream_Size( p_sys->s ) > 0 ) - { - unsigned int i; - int64_t i_tmp; - - i64 = 0; - /* search the more advanced selected es */ - for( i = 0; i < p_sys->i_streams; i++ ) - { -#define tk p_sys->pp_info[i] - if( tk->b_activated && tk->i_idxposc < tk->i_idxnb ) - { - i_tmp = tk->p_index[tk->i_idxposc].i_pos + - tk->p_index[tk->i_idxposc].i_length + 8; - if( i_tmp > i64 ) - { - i64 = i_tmp; - } - } -#undef tk - } - *pf = (double)i64 / (double)stream_Size( p_sys->s ); - return VLC_SUCCESS; - } - else - { - *pf = 0.0; - return VLC_SUCCESS; - } + *pf = ControlGetPosition( p_demux ); + return VLC_SUCCESS; case DEMUX_SET_POSITION: + f = (double)va_arg( args, double ); if( p_sys->b_seekable ) { - int i_ret; - - f = (double)va_arg( args, double ); i64 = (mtime_t)(1000000.0 * p_sys->i_length * f ); - i_ret = Seek( p_input, i64, (int)(f * 100) ); - if( p_sys->p_sub ) - { - subtitle_Seek( p_sys->p_sub, p_sys->i_time ); - } - return i_ret; + return Seek( p_demux, i64, (int)(f * 100) ); } else { - return demux_vaControlDefault( p_input, i_query, args ); + int64_t i_pos = stream_Size( p_demux->s ) * f; + return stream_Seek( p_demux->s, i_pos ); } + case DEMUX_GET_TIME: pi64 = (int64_t*)va_arg( args, int64_t * ); *pi64 = p_sys->i_time; return VLC_SUCCESS; case DEMUX_SET_TIME: - msg_Err( p_input, "FIXME DEMUX_SET_TIME to be implemented" ); - return VLC_EGENERIC; - /* return demux_vaControlDefault( p_input, i_query, args ); */ + { + int i_percent = 0; + i64 = (int64_t)va_arg( args, int64_t ); + if( p_sys->i_length > 0 ) + { + i_percent = 100 * i64 / (p_sys->i_length*1000000); + } + else if( p_sys->i_time > 0 ) + { + i_percent = (int)( 100.0 * ControlGetPosition( p_demux ) * + (double)i64 / (double)p_sys->i_time ); + } + return Seek( p_demux, i64, i_percent ); + } case DEMUX_GET_LENGTH: pi64 = (int64_t*)va_arg( args, int64_t * ); *pi64 = p_sys->i_length * (mtime_t)1000000; return VLC_SUCCESS; + case DEMUX_GET_FPS: + pf = (double*)va_arg( args, double * ); + *pf = 0.0; + for( i = 0; i < (int)p_sys->i_track; i++ ) + { + avi_track_t *tk = p_sys->track[i]; + if( tk->i_cat == VIDEO_ES && tk->i_scale > 0) + { + *pf = (float)tk->i_rate / (float)tk->i_scale; + break; + } + } + return VLC_SUCCESS; + 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 demux_vaControlDefault( p_input, i_query, args ); + return VLC_EGENERIC; } - return VLC_EGENERIC; } /***************************************************************************** * Function to convert pts to chunk or byte *****************************************************************************/ -static mtime_t AVI_PTSToChunk( avi_stream_t *tk, mtime_t i_pts ) +static mtime_t AVI_PTSToChunk( avi_track_t *tk, mtime_t i_pts ) { + if( !tk->i_scale ) + return (mtime_t)0; + return (mtime_t)((int64_t)i_pts * (int64_t)tk->i_rate / (int64_t)tk->i_scale / (int64_t)1000000 ); } -static mtime_t AVI_PTSToByte( avi_stream_t *tk, mtime_t i_pts ) +static mtime_t AVI_PTSToByte( avi_track_t *tk, mtime_t i_pts ) { + if( !tk->i_scale || !tk->i_samplesize ) + return (mtime_t)0; + return (mtime_t)((int64_t)i_pts * (int64_t)tk->i_rate / (int64_t)tk->i_scale / @@ -1360,9 +1438,12 @@ static mtime_t AVI_PTSToByte( avi_stream_t *tk, mtime_t i_pts ) (int64_t)tk->i_samplesize ); } -static mtime_t AVI_GetDPTS( avi_stream_t *tk, int64_t i_count ) +static mtime_t AVI_GetDPTS( avi_track_t *tk, int64_t i_count ) { - mtime_t i_dpts; + mtime_t i_dpts = 0; + + if( !tk->i_rate ) + return i_dpts; i_dpts = (mtime_t)( (int64_t)1000000 * (int64_t)i_count * @@ -1376,7 +1457,7 @@ static mtime_t AVI_GetDPTS( avi_stream_t *tk, int64_t i_count ) return i_dpts; } -static mtime_t AVI_GetPTS( avi_stream_t *tk ) +static mtime_t AVI_GetPTS( avi_track_t *tk ) { if( tk->i_samplesize ) { @@ -1400,119 +1481,86 @@ static mtime_t AVI_GetPTS( avi_stream_t *tk ) } else { - return AVI_GetDPTS( tk, tk->i_idxposc ); - } -} - -#if 0 -static void AVI_FixPTS( avi_stream_t *p_stream, pes_packet_t *p_pes ) -{ - data_packet_t *p_data; - uint8_t *p; - int i_pos = 0; - - switch( p_stream->i_fourcc ) - { - case VLC_FOURCC( 'm', 'p', 'g', 'a' ): - p_data = p_pes->p_first; - while( p_data ) - { - p = p_data->p_payload_start; - while( p < p_data->p_payload_end - 2 ) - { - if( p[0] == 0xff && ( p[1]&0xe0) == 0xe0 ) - { - mtime_t i_diff = AVI_GetDPTS( p_stream, i_pos ); - p_pes->i_dts += i_diff; - p_pes->i_pts += i_diff; - return; - } - p++; i_pos++; - } - p_data = p_data->p_next; - } - return; - case VLC_FOURCC( 'a', '5', '2', ' ' ): - p_data = p_pes->p_first; - while( p_data ) - { - p = p_data->p_payload_start; - while( p < p_data->p_payload_end - 2 ) - { - if( p[0] == 0x0b && p[1] == 0x77 ) - { - mtime_t i_diff = AVI_GetDPTS( p_stream, i_pos ); - p_pes->i_dts += i_diff; - p_pes->i_pts += i_diff; - } - p++; i_pos++; - } - p_data = p_data->p_next; - } - return; - default: - /* we can't fix :( */ - return; + if( tk->i_cat == AUDIO_ES ) + { + return AVI_GetDPTS( tk, tk->i_blockno ); + } + else + { + return AVI_GetDPTS( tk, tk->i_idxposc ); + } } } -#endif -static int AVI_StreamChunkFind( input_thread_t *p_input, - unsigned int i_stream ) +static int AVI_StreamChunkFind( demux_t *p_demux, unsigned int i_stream ) { - demux_sys_t *p_avi = p_input->p_demux_data; + demux_sys_t *p_sys = p_demux->p_sys; avi_packet_t avi_pk; + int i_loop_count = 0; /* find first chunk of i_stream that isn't in index */ - if( p_avi->i_movi_lastchunk_pos >= p_avi->i_movi_begin + 12 ) + if( p_sys->i_movi_lastchunk_pos >= p_sys->i_movi_begin + 12 ) { - stream_Seek( p_avi->s, p_avi->i_movi_lastchunk_pos ); - if( AVI_PacketNext( p_input ) ) + stream_Seek( p_demux->s, p_sys->i_movi_lastchunk_pos ); + if( AVI_PacketNext( p_demux ) ) { return VLC_EGENERIC; } } else { - stream_Seek( p_avi->s, p_avi->i_movi_begin + 12 ); + stream_Seek( p_demux->s, p_sys->i_movi_begin + 12 ); } for( ;; ) { + if( p_demux->b_die ) return VLC_EGENERIC; - if( AVI_PacketGetHeader( p_input, &avi_pk ) ) + if( AVI_PacketGetHeader( p_demux, &avi_pk ) ) { - msg_Warn( p_input, "cannot get packet header" ); + msg_Warn( p_demux, "cannot get packet header" ); return VLC_EGENERIC; } - if( avi_pk.i_stream >= p_avi->i_streams || + if( avi_pk.i_stream >= p_sys->i_track || ( avi_pk.i_cat != AUDIO_ES && avi_pk.i_cat != VIDEO_ES ) ) { - if( AVI_PacketNext( p_input ) ) + if( AVI_PacketNext( p_demux ) ) { return VLC_EGENERIC; } + + /* Prevents from eating all the CPU with broken files. + * This value should be low enough so that it doesn't + * affect the reading speed too much. */ + if( !(++i_loop_count % 1024) ) + { + if( p_demux->b_die ) return VLC_EGENERIC; + msleep( 10000 ); + + if( !(i_loop_count % (1024 * 10)) ) + msg_Warn( p_demux, "don't seem to find any data..." ); + } } else { /* add this chunk to the index */ - AVIIndexEntry_t index; + avi_entry_t index; index.i_id = avi_pk.i_fourcc; index.i_flags = - AVI_GetKeyFlag(p_avi->pp_info[avi_pk.i_stream]->i_codec, + AVI_GetKeyFlag(p_sys->track[avi_pk.i_stream]->i_codec, avi_pk.i_peek); index.i_pos = avi_pk.i_pos; index.i_length = avi_pk.i_size; - AVI_IndexAddEntry( p_avi, avi_pk.i_stream, &index ); + AVI_IndexAddEntry( p_sys, avi_pk.i_stream, &index ); if( avi_pk.i_stream == i_stream ) { return VLC_SUCCESS; } - if( AVI_PacketNext( p_input ) ) + if( AVI_PacketNext( p_demux ) ) { return VLC_EGENERIC; } @@ -1520,14 +1568,12 @@ static int AVI_StreamChunkFind( input_thread_t *p_input, } } - /* be sure that i_ck will be a valid index entry */ -static int AVI_StreamChunkSet( input_thread_t *p_input, - unsigned int i_stream, +static int AVI_StreamChunkSet( demux_t *p_demux, unsigned int i_stream, unsigned int i_ck ) { - demux_sys_t *p_avi = p_input->p_demux_data; - avi_stream_t *p_stream = p_avi->pp_info[i_stream]; + demux_sys_t *p_sys = p_demux->p_sys; + avi_track_t *p_stream = p_sys->track[i_stream]; p_stream->i_idxposc = i_ck; p_stream->i_idxposb = 0; @@ -1538,7 +1584,7 @@ static int AVI_StreamChunkSet( input_thread_t *p_input, do { p_stream->i_idxposc++; - if( AVI_StreamChunkFind( p_input, i_stream ) ) + if( AVI_StreamChunkFind( p_demux, i_stream ) ) { return VLC_EGENERIC; } @@ -1549,14 +1595,13 @@ static int AVI_StreamChunkSet( input_thread_t *p_input, return VLC_SUCCESS; } - /* XXX FIXME up to now, we assume that all chunk are one after one */ -static int AVI_StreamBytesSet( input_thread_t *p_input, +static int AVI_StreamBytesSet( demux_t *p_demux, unsigned int i_stream, off_t i_byte ) { - demux_sys_t *p_avi = p_input->p_demux_data; - avi_stream_t *p_stream = p_avi->pp_info[i_stream]; + demux_sys_t *p_sys = p_demux->p_sys; + avi_track_t *p_stream = p_sys->track[i_stream]; if( ( p_stream->i_idxnb > 0 ) &&( i_byte < p_stream->p_index[p_stream->i_idxnb - 1].i_lengthtotal + @@ -1600,7 +1645,7 @@ static int AVI_StreamBytesSet( input_thread_t *p_input, do { p_stream->i_idxposc++; - if( AVI_StreamChunkFind( p_input, i_stream ) ) + if( AVI_StreamChunkFind( p_demux, i_stream ) ) { return VLC_EGENERIC; } @@ -1614,26 +1659,45 @@ static int AVI_StreamBytesSet( input_thread_t *p_input, } } -static int AVI_StreamSeek( input_thread_t *p_input, +static int AVI_TrackSeek( demux_t *p_demux, int i_stream, mtime_t i_date ) { - demux_sys_t *p_avi = p_input->p_demux_data; -#define p_stream p_avi->pp_info[i_stream] + demux_sys_t *p_sys = p_demux->p_sys; + avi_track_t *tk = p_sys->track[i_stream]; + +#define p_stream p_sys->track[i_stream] mtime_t i_oldpts; i_oldpts = AVI_GetPTS( p_stream ); if( !p_stream->i_samplesize ) { - if( AVI_StreamChunkSet( p_input, + if( AVI_StreamChunkSet( p_demux, i_stream, AVI_PTSToChunk( p_stream, i_date ) ) ) { return VLC_EGENERIC; } - msg_Dbg( p_input, + if( p_stream->i_cat == AUDIO_ES ) + { + unsigned int i; + tk->i_blockno = 0; + for( i = 0; i < tk->i_idxposc; i++ ) + { + if( tk->i_blocksize > 0 ) + { + tk->i_blockno += ( tk->p_index[i].i_length + tk->i_blocksize - 1 ) / tk->i_blocksize; + } + else + { + tk->i_blockno++; + } + } + } + + msg_Dbg( p_demux, "old:"I64Fd" %s new "I64Fd, i_oldpts, i_oldpts > i_date ? ">" : "<", @@ -1642,27 +1706,30 @@ static int AVI_StreamSeek( input_thread_t *p_input, if( p_stream->i_cat == VIDEO_ES ) { /* search key frame */ - if( i_date < i_oldpts ) + //if( i_date < i_oldpts || 1 ) { while( p_stream->i_idxposc > 0 && !( p_stream->p_index[p_stream->i_idxposc].i_flags & AVIIF_KEYFRAME ) ) { - if( AVI_StreamChunkSet( p_input, + if( AVI_StreamChunkSet( p_demux, i_stream, p_stream->i_idxposc - 1 ) ) { return VLC_EGENERIC; } } + if( p_stream->p_es ) + es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, p_stream->p_es, i_date ); } +#if 0 else { while( p_stream->i_idxposc < p_stream->i_idxnb && !( p_stream->p_index[p_stream->i_idxposc].i_flags & AVIIF_KEYFRAME ) ) { - if( AVI_StreamChunkSet( p_input, + if( AVI_StreamChunkSet( p_demux, i_stream, p_stream->i_idxposc + 1 ) ) { @@ -1670,11 +1737,12 @@ static int AVI_StreamSeek( input_thread_t *p_input, } } } +#endif } } else { - if( AVI_StreamBytesSet( p_input, + if( AVI_StreamBytesSet( p_demux, i_stream, AVI_PTSToByte( p_stream, i_date ) ) ) { @@ -1685,64 +1753,6 @@ static int AVI_StreamSeek( input_thread_t *p_input, #undef p_stream } -/***************************************************************************** - * AVI_Interleaved: check weither a file is interleaved or not. - *****************************************************************************/ -static vlc_bool_t AVI_Interleaved( input_thread_t *p_input ) -{ - demux_sys_t *p_sys = p_input->p_demux_data; - unsigned int i; - mtime_t i_time = 0; - vlc_bool_t b_ret = VLC_TRUE; - - int64_t i_max; - - if( stream_Size( p_sys->s ) <= 100 ) - { - return VLC_FALSE; - } - - i_max = __MIN( 2000000, stream_Size( p_sys->s ) / 100 ); - -#define tk p_sys->pp_info[i] - while( i_time < p_sys->i_length * (mtime_t)1000000) - { - int64_t i_ref; - - i_ref = -1; - i_time += 50000; - for( i = 0; i < p_sys->i_streams; i++ ) - { - while( AVI_GetPTS( tk ) < i_time && tk->i_idxposc < tk->i_idxnb - 1 ) - { - tk->i_idxposc++; - } - - if( i_ref == -1 ) - { - i_ref = tk->p_index[tk->i_idxposc].i_pos; - } - if( __ABS( tk->p_index[tk->i_idxposc].i_pos - i_ref ) > i_max || - tk->p_index[tk->i_idxposc].i_length > i_max ) - { - msg_Dbg( p_input, "interleaved=no because ref=%lld pos=%lld length=%d (max=%lld)", - i_ref, tk->p_index[tk->i_idxposc].i_pos, tk->p_index[tk->i_idxposc].i_length, i_max ); - b_ret = VLC_FALSE; - goto exit; - } - } - } - -exit: - for( i = 0; i < p_sys->i_streams; i++ ) - { - tk->i_idxposc = 0; - tk->i_idxposb = 0; - } -#undef tk - return b_ret; -} - /**************************************************************************** * Return VLC_TRUE if it's a key frame ****************************************************************************/ @@ -1761,18 +1771,16 @@ static int AVI_GetKeyFlag( vlc_fourcc_t i_fourcc, uint8_t *p_byte ) /* it's not an msmpegv1 stream, strange...*/ return AVIIF_KEYFRAME; } - else - { - return p_byte[4] & 0x06 ? 0 : AVIIF_KEYFRAME; - } + return p_byte[4] & 0x06 ? 0 : AVIIF_KEYFRAME; + case FOURCC_DIV2: - case FOURCC_DIV3: // wmv1 also + case FOURCC_DIV3: /* wmv1 also */ /* we have * picture type 0(I),1(P) 2bits */ return p_byte[0] & 0xC0 ? 0 : AVIIF_KEYFRAME; case FOURCC_mp4v: - /* we should find first occurence of 0x000001b6 (32bits) + /* we should find first occurrence of 0x000001b6 (32bits) * startcode: 0x000001b6 32bits * piture type 0(I),1(P) 2bits */ @@ -1781,10 +1789,8 @@ static int AVI_GetKeyFlag( vlc_fourcc_t i_fourcc, uint8_t *p_byte ) /* not true , need to find the first VOP header */ return AVIIF_KEYFRAME; } - else - { - return p_byte[4] & 0xC0 ? 0 : AVIIF_KEYFRAME; - } + return p_byte[4] & 0xC0 ? 0 : AVIIF_KEYFRAME; + default: /* I can't do it, so say yes */ return AVIIF_KEYFRAME; @@ -1800,9 +1806,11 @@ vlc_fourcc_t AVI_FourccGetCodec( unsigned int i_cat, vlc_fourcc_t i_codec ) return i_codec; case VIDEO_ES: - // XXX DIV1 <- msmpeg4v1, DIV2 <- msmpeg4v2, DIV3 <- msmpeg4v3, mp4v for mpeg4 + /* XXX DIV1 <- msmpeg4v1, DIV2 <- msmpeg4v2, DIV3 <- msmpeg4v3, mp4v for mpeg4 */ switch( i_codec ) { + case FOURCC_1: + return VLC_FOURCC('m','r','l','e'); case FOURCC_DIV1: case FOURCC_div1: case FOURCC_MPG4: @@ -1843,6 +1851,7 @@ vlc_fourcc_t AVI_FourccGetCodec( unsigned int i_cat, vlc_fourcc_t i_codec ) case FOURCC_XVID: case FOURCC_XviD: case FOURCC_DX50: + case FOURCC_dx50: case FOURCC_mp4v: case FOURCC_4: case FOURCC_3IV2: @@ -1858,7 +1867,7 @@ vlc_fourcc_t AVI_FourccGetCodec( unsigned int i_cat, vlc_fourcc_t i_codec ) * ****************************************************************************/ static void AVI_ParseStreamHeader( vlc_fourcc_t i_id, - int *pi_number, int *pi_type ) + unsigned int *pi_number, unsigned int *pi_type ) { #define SET_PTR( p, v ) if( p ) *(p) = (v); int c1, c2; @@ -1894,18 +1903,17 @@ static void AVI_ParseStreamHeader( vlc_fourcc_t i_id, /**************************************************************************** * ****************************************************************************/ -static int AVI_PacketGetHeader( input_thread_t *p_input, avi_packet_t *p_pk ) +static int AVI_PacketGetHeader( demux_t *p_demux, avi_packet_t *p_pk ) { - demux_sys_t *p_sys = p_input->p_demux_data; - uint8_t *p_peek; + const uint8_t *p_peek; - if( stream_Peek( p_sys->s, &p_peek, 16 ) < 16 ) + if( stream_Peek( p_demux->s, &p_peek, 16 ) < 16 ) { return VLC_EGENERIC; } p_pk->i_fourcc = VLC_FOURCC( p_peek[0], p_peek[1], p_peek[2], p_peek[3] ); p_pk->i_size = GetDWLE( p_peek + 4 ); - p_pk->i_pos = stream_Tell( p_sys->s ); + p_pk->i_pos = stream_Tell( p_demux->s ); if( p_pk->i_fourcc == AVIFOURCC_LIST || p_pk->i_fourcc == AVIFOURCC_RIFF ) { p_pk->i_type = VLC_FOURCC( p_peek[8], p_peek[9], @@ -1922,13 +1930,12 @@ static int AVI_PacketGetHeader( input_thread_t *p_input, avi_packet_t *p_pk ) return VLC_SUCCESS; } -static int AVI_PacketNext( input_thread_t *p_input ) +static int AVI_PacketNext( demux_t *p_demux ) { - demux_sys_t *p_sys = p_input->p_demux_data; avi_packet_t avi_ck; int i_skip = 0; - if( AVI_PacketGetHeader( p_input, &avi_ck ) ) + if( AVI_PacketGetHeader( p_demux, &avi_ck ) ) { return VLC_EGENERIC; } @@ -1948,51 +1955,50 @@ static int AVI_PacketNext( input_thread_t *p_input ) i_skip = __EVEN( avi_ck.i_size ) + 8; } - if( stream_Read( p_sys->s, NULL, i_skip ) != i_skip ) + if( stream_Read( p_demux->s, NULL, i_skip ) != i_skip ) { return VLC_EGENERIC; } return VLC_SUCCESS; } -static int AVI_PacketRead( input_thread_t *p_input, + +static int AVI_PacketRead( demux_t *p_demux, avi_packet_t *p_pk, - pes_packet_t **pp_pes ) + block_t **pp_frame ) { - demux_sys_t *p_sys = p_input->p_demux_data; - size_t i_size; i_size = __EVEN( p_pk->i_size + 8 ); - if( ( *pp_pes = stream_PesPacket( p_sys->s, i_size ) ) == NULL ) + if( ( *pp_frame = stream_Block( p_demux->s, i_size ) ) == NULL ) { return VLC_EGENERIC; } - (*pp_pes)->p_first->p_payload_start += 8; - (*pp_pes)->i_pes_size -= 8; + (*pp_frame)->p_buffer += 8; + (*pp_frame)->i_buffer -= 8; if( i_size != p_pk->i_size + 8 ) { - (*pp_pes)->p_last->p_payload_end--; - (*pp_pes)->i_pes_size--; + (*pp_frame)->i_buffer--; } return VLC_SUCCESS; } -static int AVI_PacketSearch( input_thread_t *p_input ) +static int AVI_PacketSearch( demux_t *p_demux ) { - demux_sys_t *p_avi = p_input->p_demux_data; - + demux_sys_t *p_sys = p_demux->p_sys; avi_packet_t avi_pk; + int i_count = 0; + for( ;; ) { - if( stream_Read( p_avi->s, NULL, 1 ) != 1 ) + if( stream_Read( p_demux->s, NULL, 1 ) != 1 ) { return VLC_EGENERIC; } - AVI_PacketGetHeader( p_input, &avi_pk ); - if( avi_pk.i_stream < p_avi->i_streams && + AVI_PacketGetHeader( p_demux, &avi_pk ); + if( avi_pk.i_stream < p_sys->i_track && ( avi_pk.i_cat == AUDIO_ES || avi_pk.i_cat == VIDEO_ES ) ) { return VLC_SUCCESS; @@ -2005,22 +2011,35 @@ static int AVI_PacketSearch( input_thread_t *p_input ) case AVIFOURCC_idx1: return VLC_SUCCESS; } + + /* Prevents from eating all the CPU with broken files. + * This value should be low enough so that it doesn't affect the + * reading speed too much (not that we care much anyway because + * this code is called only on broken files). */ + if( !(++i_count % 1024) ) + { + if( p_demux->b_die ) return VLC_EGENERIC; + + msleep( 10000 ); + if( !(i_count % (1024 * 10)) ) + msg_Warn( p_demux, "trying to resync..." ); + } } } /**************************************************************************** * Index stuff. ****************************************************************************/ -static void AVI_IndexAddEntry( demux_sys_t *p_avi, +static void AVI_IndexAddEntry( demux_sys_t *p_sys, int i_stream, - AVIIndexEntry_t *p_index) + avi_entry_t *p_index) { - avi_stream_t *tk = p_avi->pp_info[i_stream]; + avi_track_t *tk = p_sys->track[i_stream]; /* Update i_movi_lastchunk_pos */ - if( p_avi->i_movi_lastchunk_pos < p_index->i_pos ) + if( p_sys->i_movi_lastchunk_pos < p_index->i_pos ) { - p_avi->i_movi_lastchunk_pos = p_index->i_pos; + p_sys->i_movi_lastchunk_pos = p_index->i_pos; } /* add the entry */ @@ -2028,7 +2047,7 @@ static void AVI_IndexAddEntry( demux_sys_t *p_avi, { tk->i_idxmax += 16384; tk->p_index = realloc( tk->p_index, - tk->i_idxmax * sizeof( AVIIndexEntry_t ) ); + tk->i_idxmax * sizeof( avi_entry_t ) ); if( tk->p_index == NULL ) { return; @@ -2049,9 +2068,9 @@ static void AVI_IndexAddEntry( demux_sys_t *p_avi, tk->p_index[tk->i_idxnb++] = *p_index; } -static int AVI_IndexLoad_idx1( input_thread_t *p_input ) +static int AVI_IndexLoad_idx1( demux_t *p_demux ) { - demux_sys_t *p_avi = p_input->p_demux_data; + demux_sys_t *p_sys = p_demux->p_sys; avi_chunk_list_t *p_riff; avi_chunk_list_t *p_movi; @@ -2062,18 +2081,20 @@ static int AVI_IndexLoad_idx1( input_thread_t *p_input ) off_t i_offset; unsigned int i; - p_riff = AVI_ChunkFind( &p_avi->ck_root, AVIFOURCC_RIFF, 0); + vlc_bool_t b_keyset[100]; + + p_riff = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, 0); p_idx1 = AVI_ChunkFind( p_riff, AVIFOURCC_idx1, 0); p_movi = AVI_ChunkFind( p_riff, AVIFOURCC_movi, 0); if( !p_idx1 ) { - msg_Warn( p_input, "cannot find idx1 chunk, no index defined" ); + msg_Warn( p_demux, "cannot find idx1 chunk, no index defined" ); return VLC_EGENERIC; } /* *** calculate offset *** */ - /* Well, avi is __SHIT__ so test more than one entry + /* Well, avi is __SHIT__ so test more than one entry * (needed for some avi files) */ i_offset = 0; for( i = 0; i < __MIN( p_idx1->i_entry_count, 10 ); i++ ) @@ -2085,6 +2106,10 @@ static int AVI_IndexLoad_idx1( input_thread_t *p_input ) } } + /* Reset b_keyset */ + for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ ) + b_keyset[i_stream] = VLC_FALSE; + for( i_index = 0; i_index < p_idx1->i_entry_count; i_index++ ) { unsigned int i_cat; @@ -2092,30 +2117,45 @@ static int AVI_IndexLoad_idx1( input_thread_t *p_input ) AVI_ParseStreamHeader( p_idx1->entry[i_index].i_fourcc, &i_stream, &i_cat ); - if( i_stream < p_avi->i_streams && - i_cat == p_avi->pp_info[i_stream]->i_cat ) + if( i_stream < p_sys->i_track && + i_cat == p_sys->track[i_stream]->i_cat ) { - AVIIndexEntry_t index; + avi_entry_t index; index.i_id = p_idx1->entry[i_index].i_fourcc; index.i_flags = p_idx1->entry[i_index].i_flags&(~AVIIF_FIXKEYFRAME); index.i_pos = p_idx1->entry[i_index].i_pos + i_offset; index.i_length = p_idx1->entry[i_index].i_length; - AVI_IndexAddEntry( p_avi, i_stream, &index ); + AVI_IndexAddEntry( p_sys, i_stream, &index ); + + if( index.i_flags&AVIIF_KEYFRAME ) + b_keyset[i_stream] = VLC_TRUE; + } + } + + for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ ) + { + if( !b_keyset[i_stream] ) + { + avi_track_t *tk = p_sys->track[i_stream]; + + msg_Dbg( p_demux, "no key frame set for track %d", i_stream ); + for( i_index = 0; i_index < tk->i_idxnb; i_index++ ) + tk->p_index[i_index].i_flags |= AVIIF_KEYFRAME; } } return VLC_SUCCESS; } -static void __Parse_indx( input_thread_t *p_input, +static void __Parse_indx( demux_t *p_demux, int i_stream, avi_chunk_indx_t *p_indx ) { - demux_sys_t *p_avi = p_input->p_demux_data; - AVIIndexEntry_t index; + demux_sys_t *p_sys = p_demux->p_sys; + avi_entry_t index; int32_t i; - msg_Dbg( p_input, "loading subindex(0x%x) %d entries", p_indx->i_indextype, p_indx->i_entriesinuse ); + msg_Dbg( p_demux, "loading subindex(0x%x) %d entries", p_indx->i_indextype, p_indx->i_entriesinuse ); if( p_indx->i_indexsubtype == 0 ) { for( i = 0; i < p_indx->i_entriesinuse; i++ ) @@ -2125,7 +2165,7 @@ static void __Parse_indx( input_thread_t *p_input, index.i_pos = p_indx->i_baseoffset + p_indx->idx.std[i].i_offset - 8; index.i_length = p_indx->idx.std[i].i_size&0x7fffffff; - AVI_IndexAddEntry( p_avi, i_stream, &index ); + AVI_IndexAddEntry( p_sys, i_stream, &index ); } } else if( p_indx->i_indexsubtype == AVI_INDEX_2FIELD ) @@ -2137,99 +2177,100 @@ static void __Parse_indx( input_thread_t *p_input, index.i_pos = p_indx->i_baseoffset + p_indx->idx.field[i].i_offset - 8; index.i_length = p_indx->idx.field[i].i_size; - AVI_IndexAddEntry( p_avi, i_stream, &index ); + AVI_IndexAddEntry( p_sys, i_stream, &index ); } } else { - msg_Warn( p_input, "unknow subtype index(0x%x)", p_indx->i_indexsubtype ); + msg_Warn( p_demux, "unknown subtype index(0x%x)", p_indx->i_indexsubtype ); } } -static void AVI_IndexLoad_indx( input_thread_t *p_input ) +static void AVI_IndexLoad_indx( demux_t *p_demux ) { - demux_sys_t *p_avi = p_input->p_demux_data; + demux_sys_t *p_sys = p_demux->p_sys; unsigned int i_stream; int32_t i; avi_chunk_list_t *p_riff; avi_chunk_list_t *p_hdrl; - p_riff = AVI_ChunkFind( &p_avi->ck_root, AVIFOURCC_RIFF, 0); + p_riff = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, 0); p_hdrl = AVI_ChunkFind( p_riff, AVIFOURCC_hdrl, 0 ); - for( i_stream = 0; i_stream < p_avi->i_streams; i_stream++ ) + for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ ) { avi_chunk_list_t *p_strl; avi_chunk_indx_t *p_indx; -#define p_stream p_avi->pp_info[i_stream] +#define p_stream p_sys->track[i_stream] p_strl = AVI_ChunkFind( p_hdrl, AVIFOURCC_strl, i_stream ); p_indx = AVI_ChunkFind( p_strl, AVIFOURCC_indx, 0 ); if( !p_indx ) { - msg_Warn( p_input, "cannot find indx (misdetect/broken OpenDML file?)" ); + msg_Warn( p_demux, "cannot find indx (misdetect/broken OpenDML " + "file?)" ); continue; } if( p_indx->i_indextype == AVI_INDEX_OF_CHUNKS ) { - __Parse_indx( p_input, i_stream, p_indx ); + __Parse_indx( p_demux, i_stream, p_indx ); } else if( p_indx->i_indextype == AVI_INDEX_OF_INDEXES ) { - avi_chunk_indx_t ck_sub; + avi_chunk_t ck_sub; for( i = 0; i < p_indx->i_entriesinuse; i++ ) { - if( stream_Seek( p_avi->s, p_indx->idx.super[i].i_offset )|| - AVI_ChunkRead( p_avi->s, &ck_sub, NULL ) ) + if( stream_Seek( p_demux->s, p_indx->idx.super[i].i_offset )|| + AVI_ChunkRead( p_demux->s, &ck_sub, NULL ) ) { break; } - __Parse_indx( p_input, i_stream, &ck_sub ); + __Parse_indx( p_demux, i_stream, &ck_sub.indx ); } } else { - msg_Warn( p_input, "unknow type index(0x%x)", p_indx->i_indextype ); + msg_Warn( p_demux, "unknown type index(0x%x)", p_indx->i_indextype ); } #undef p_stream } } -static void AVI_IndexLoad( input_thread_t *p_input ) +static void AVI_IndexLoad( demux_t *p_demux ) { - demux_sys_t *p_avi = p_input->p_demux_data; + demux_sys_t *p_sys = p_demux->p_sys; unsigned int i_stream; - for( i_stream = 0; i_stream < p_avi->i_streams; i_stream++ ) + for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ ) { - p_avi->pp_info[i_stream]->i_idxnb = 0; - p_avi->pp_info[i_stream]->i_idxmax = 0; - p_avi->pp_info[i_stream]->p_index = NULL; + p_sys->track[i_stream]->i_idxnb = 0; + p_sys->track[i_stream]->i_idxmax = 0; + p_sys->track[i_stream]->p_index = NULL; } - if( p_avi->b_odml ) + if( p_sys->b_odml ) { - AVI_IndexLoad_indx( p_input ); + AVI_IndexLoad_indx( p_demux ); } - else if( AVI_IndexLoad_idx1( p_input ) ) + else if( AVI_IndexLoad_idx1( p_demux ) ) { /* try indx if idx1 failed as some "normal" file have indx too */ - AVI_IndexLoad_indx( p_input ); + AVI_IndexLoad_indx( p_demux ); } - for( i_stream = 0; i_stream < p_avi->i_streams; i_stream++ ) + for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ ) { - msg_Dbg( p_input, "stream[%d] created %d index entries", - i_stream, p_avi->pp_info[i_stream]->i_idxnb ); + msg_Dbg( p_demux, "stream[%d] created %d index entries", + i_stream, p_sys->track[i_stream]->i_idxnb ); } } -static void AVI_IndexCreate( input_thread_t *p_input ) +static void AVI_IndexCreate( demux_t *p_demux ) { - demux_sys_t *p_avi = p_input->p_demux_data; + demux_sys_t *p_sys = p_demux->p_sys; avi_chunk_list_t *p_riff; avi_chunk_list_t *p_movi; @@ -2237,58 +2278,87 @@ static void AVI_IndexCreate( input_thread_t *p_input ) unsigned int i_stream; off_t i_movi_end; - p_riff = AVI_ChunkFind( &p_avi->ck_root, AVIFOURCC_RIFF, 0); + p_riff = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, 0); p_movi = AVI_ChunkFind( p_riff, AVIFOURCC_movi, 0); if( !p_movi ) { - msg_Err( p_input, "cannot find p_movi" ); + msg_Err( p_demux, "cannot find p_movi" ); return; } - for( i_stream = 0; i_stream < p_avi->i_streams; i_stream++ ) + for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ ) { - p_avi->pp_info[i_stream]->i_idxnb = 0; - p_avi->pp_info[i_stream]->i_idxmax = 0; - p_avi->pp_info[i_stream]->p_index = NULL; + p_sys->track[i_stream]->i_idxnb = 0; + p_sys->track[i_stream]->i_idxmax = 0; + p_sys->track[i_stream]->p_index = NULL; } i_movi_end = __MIN( (off_t)(p_movi->i_chunk_pos + p_movi->i_chunk_size), - stream_Size( p_avi->s ) ); + stream_Size( p_demux->s ) ); + + stream_Seek( p_demux->s, p_movi->i_chunk_pos + 12 ); + msg_Warn( p_demux, "creating index from LIST-movi, will take time !" ); + + + /* Only show dialog if AVI is > 10MB */ + p_demux->p_sys->i_dialog_id = -1; + if( stream_Size( p_demux->s ) > 10000000 ) + { + p_demux->p_sys->i_dialog_id = intf_IntfProgress( p_demux, + _( "Fixing AVI Index..." ), + 0.0 ); + p_demux->p_sys->last_update = mdate(); + } - stream_Seek( p_avi->s, p_movi->i_chunk_pos + 12 ); - msg_Warn( p_input, "creating index from LIST-movi, will take time !" ); for( ;; ) { avi_packet_t pk; - if( AVI_PacketGetHeader( p_input, &pk ) ) + if( p_demux->b_die ) + { + return; + } + + /* Don't update dialog too often */ + if( p_demux->p_sys->i_dialog_id > 0 && + mdate() - p_demux->p_sys->last_update > 100000 ) + { + int64_t i_pos = stream_Tell( p_demux->s )* 100 / + stream_Size( p_demux->s ); + float f_pos = (float)i_pos; + p_demux->p_sys->last_update = mdate(); + intf_ProgressUpdate( p_demux, p_demux->p_sys->i_dialog_id, + _( "Fixing AVI Index..." ), f_pos, -1 ); + } + + if( AVI_PacketGetHeader( p_demux, &pk ) ) { break; } - if( pk.i_stream < p_avi->i_streams && - pk.i_cat == p_avi->pp_info[pk.i_stream]->i_cat ) + if( pk.i_stream < p_sys->i_track && + pk.i_cat == p_sys->track[pk.i_stream]->i_cat ) { - AVIIndexEntry_t index; + avi_entry_t index; index.i_id = pk.i_fourcc; index.i_flags = - AVI_GetKeyFlag(p_avi->pp_info[pk.i_stream]->i_codec, pk.i_peek); + AVI_GetKeyFlag(p_sys->track[pk.i_stream]->i_codec, pk.i_peek); index.i_pos = pk.i_pos; index.i_length = pk.i_size; - AVI_IndexAddEntry( p_avi, pk.i_stream, &index ); + AVI_IndexAddEntry( p_sys, pk.i_stream, &index ); } else { switch( pk.i_fourcc ) { case AVIFOURCC_idx1: - if( p_avi->b_odml ) + if( p_sys->b_odml ) { - avi_chunk_list_t *p_avix; - p_avix = AVI_ChunkFind( &p_avi->ck_root, + avi_chunk_list_t *p_sysx; + p_sysx = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, 1 ); - msg_Dbg( p_input, "looking for new RIFF chunk" ); - if( stream_Seek( p_avi->s, p_avix->i_chunk_pos + 24 ) ) + msg_Dbg( p_demux, "looking for new RIFF chunk" ); + if( stream_Seek( p_demux->s, p_sysx->i_chunk_pos + 24)) { goto print_stat; } @@ -2296,110 +2366,63 @@ static void AVI_IndexCreate( input_thread_t *p_input ) } goto print_stat; case AVIFOURCC_RIFF: - msg_Dbg( p_input, "new RIFF chunk found" ); + msg_Dbg( p_demux, "new RIFF chunk found" ); case AVIFOURCC_rec: case AVIFOURCC_JUNK: break; default: - msg_Warn( p_input, "need resync, probably broken avi" ); - if( AVI_PacketSearch( p_input ) ) + msg_Warn( p_demux, "need resync, probably broken avi" ); + if( AVI_PacketSearch( p_demux ) ) { - msg_Warn( p_input, "lost sync, abord index creation" ); + msg_Warn( p_demux, "lost sync, abord index creation" ); goto print_stat; } } } - if( ( !p_avi->b_odml && pk.i_pos + pk.i_size >= i_movi_end ) || - AVI_PacketNext( p_input ) ) + if( ( !p_sys->b_odml && pk.i_pos + pk.i_size >= i_movi_end ) || + AVI_PacketNext( p_demux ) ) { break; } } print_stat: - for( i_stream = 0; i_stream < p_avi->i_streams; i_stream++ ) + if( p_demux->p_sys->i_dialog_id > 0 ) { - msg_Dbg( p_input, + intf_UserHide( p_demux, p_demux->p_sys->i_dialog_id ); + } + + for( i_stream = 0; i_stream < p_sys->i_track; i_stream++ ) + { + msg_Dbg( p_demux, "stream[%d] creating %d index entries", i_stream, - p_avi->pp_info[i_stream]->i_idxnb ); + p_sys->track[i_stream]->i_idxnb ); } } /***************************************************************************** * Stream management *****************************************************************************/ -static vlc_bool_t AVI_StreamStart( input_thread_t *p_input, int i_stream ) -{ - demux_sys_t *p_avi = p_input->p_demux_data; - avi_stream_t *tk = p_avi->pp_info[i_stream]; - - if( !tk->p_es ) - { - msg_Warn( p_input, "stream[%d] unselectable", i_stream ); - return VLC_FALSE; - } - if( tk->b_activated ) - { - msg_Warn( p_input, "stream[%d] already selected", i_stream ); - return VLC_TRUE; - } - - if( !tk->p_es->p_decoder_fifo ) - { - vlc_mutex_lock( &p_input->stream.stream_lock ); - input_SelectES( p_input, tk->p_es ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); - } - tk->b_activated = tk->p_es->p_decoder_fifo ? VLC_TRUE : VLC_FALSE; - if( tk->b_activated && p_avi->b_seekable) - { - AVI_StreamSeek( p_input, i_stream, p_avi->i_time ); - } - - return tk->b_activated; -} - -static void AVI_StreamStop( input_thread_t *p_input, int i_stream ) -{ - demux_sys_t *p_avi = p_input->p_demux_data; - avi_stream_t *tk = p_avi->pp_info[i_stream]; - - if( !tk->b_activated ) - { - msg_Warn( p_input, "stream[%d] already unselected", i_stream ); - return; - } - - if( tk->p_es->p_decoder_fifo ) - { - vlc_mutex_lock( &p_input->stream.stream_lock ); - input_UnselectES( p_input, tk->p_es ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); - } - - tk->b_activated = VLC_FALSE; -} - -static int AVI_StreamStopFinishedStreams( input_thread_t *p_input ) +static int AVI_TrackStopFinishedStreams( demux_t *p_demux ) { - demux_sys_t *p_avi = p_input->p_demux_data; + demux_sys_t *p_sys = p_demux->p_sys; unsigned int i; int b_end = VLC_TRUE; - for( i = 0; i < p_avi->i_streams; i++ ) + for( i = 0; i < p_sys->i_track; i++ ) { -#define tk p_avi->pp_info[i] + avi_track_t *tk = p_sys->track[i]; if( tk->i_idxposc >= tk->i_idxnb ) { - AVI_StreamStop( p_input, i ); + tk->b_activated = VLC_FALSE; + if( tk->p_es ) es_out_Control( p_demux->out, ES_OUT_SET_ES_STATE, tk->p_es, VLC_FALSE ); } else { b_end = VLC_FALSE; } -#undef tk } return( b_end ); } @@ -2407,15 +2430,15 @@ static int AVI_StreamStopFinishedStreams( input_thread_t *p_input ) /**************************************************************************** * AVI_MovieGetLength give max streams length in second ****************************************************************************/ -static mtime_t AVI_MovieGetLength( input_thread_t *p_input ) +static mtime_t AVI_MovieGetLength( 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_maxlength = 0; unsigned int i; - for( i = 0; i < p_sys->i_streams; i++ ) + for( i = 0; i < p_sys->i_track; i++ ) { -#define tk p_sys->pp_info[i] + avi_track_t *tk = p_sys->track[i]; mtime_t i_length; /* fix length for each stream */ @@ -2436,15 +2459,12 @@ static mtime_t AVI_MovieGetLength( input_thread_t *p_input ) } i_length /= (mtime_t)1000000; /* in seconds */ - msg_Dbg( p_input, + msg_Dbg( p_demux, "stream[%d] length:"I64Fd" (based on index)", i, i_length ); i_maxlength = __MAX( i_maxlength, i_length ); -#undef tk } return i_maxlength; } - -