X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fasf%2Fasf.c;h=18c293d3cae52e0d931594e2d7abfce877bb809e;hb=55c960749e8f91763e720ac610d5dd56f90fcde1;hp=3000330ae96c51049ffd9eeaf73e7ea2d1ffe78e;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c index 3000330ae9..18c293d3ca 100644 --- a/modules/demux/asf/asf.c +++ b/modules/demux/asf/asf.c @@ -24,11 +24,15 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include -#include +#include #include #include /* GET_PRIVATE_ID_STATE */ @@ -46,14 +50,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - 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(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("ASF v1.0 demuxer") ) + set_capability( "demux", 200 ) + set_callbacks( Open, Close ) + add_shortcut( "asf" ) +vlc_module_end () /***************************************************************************** @@ -86,11 +90,12 @@ struct demux_sys_t asf_object_file_properties_t *p_fp; unsigned int i_track; - asf_track_t *track[128]; + asf_track_t *track[128]; /* track number is stored on 7 bits */ int64_t i_data_begin; int64_t i_data_end; + bool b_index; vlc_meta_t *meta; }; @@ -107,7 +112,7 @@ static int Open( vlc_object_t * p_this ) demux_t *p_demux = (demux_t *)p_this; demux_sys_t *p_sys; guid_t guid; - uint8_t *p_peek; + 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; @@ -124,6 +129,7 @@ static int Open( vlc_object_t * p_this ) /* Load the headers */ if( DemuxInit( p_demux ) ) { + free( p_sys ); return VLC_EGENERIC; } return VLC_SUCCESS; @@ -139,15 +145,19 @@ static int Demux( demux_t *p_demux ) for( ;; ) { - uint8_t *p_peek; + const uint8_t *p_peek; mtime_t i_length; mtime_t i_time_begin = GetMoviePTS( p_sys ); int i_result; - if( p_demux->b_die ) - { + if( !vlc_object_alive (p_demux) ) break; - } +#if 0 + /* FIXME: returns EOF too early for some mms streams */ + if( p_sys->i_data_end >= 0 && + stream_Tell( p_demux->s ) >= p_sys->i_data_end ) + return 0; /* EOF */ +#endif /* Check if we have concatenated files */ if( stream_Peek( p_demux->s, &p_peek, 16 ) == 16 ) @@ -165,10 +175,11 @@ static int Demux( demux_t *p_demux ) if( DemuxInit( p_demux ) ) { msg_Err( p_demux, "failed to load the new header" ); - intf_UserFatal( p_demux, VLC_FALSE, _("Could not demux ASF stream"), + dialog_Fatal( p_demux, _("Could not demux ASF stream"), _("VLC failed to load the ASF header.") ); return 0; } + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); continue; } } @@ -185,10 +196,7 @@ static int Demux( demux_t *p_demux ) else { i_length = GetMoviePTS( p_sys ) - i_time_begin; - if( i_length < 0 || i_length >= 40 * 1000 ) - { - break; - } + if( i_length < 0 || i_length >= 40 * 1000 ) break; } } @@ -196,7 +204,7 @@ static int Demux( demux_t *p_demux ) 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 ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time+1 ); } return 1; @@ -214,44 +222,125 @@ static void Close( vlc_object_t * p_this ) free( p_demux->p_sys ); } +/***************************************************************************** + * SeekIndex: goto to i_date or i_percent + *****************************************************************************/ +static int SeekIndex( demux_t *p_demux, mtime_t i_date, float f_pos ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + asf_object_index_t *p_index; + int64_t i_pos; + + msg_Dbg( p_demux, "seek with index: %i seconds, position %f", + (int)(i_date/1000000), f_pos ); + + p_index = ASF_FindObject( p_sys->p_root, &asf_object_index_guid, 0 ); + + if( i_date < 0 ) i_date = p_sys->i_length * f_pos; + + i_pos = i_date * 10 / p_index->i_index_entry_time_interval; + i_pos = p_index->index_entry[i_pos].i_packet_number * + p_sys->p_fp->i_min_data_packet_size; + + return stream_Seek( p_demux->s, p_sys->i_data_begin + i_pos ); +} + +static void SeekPrepare( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + p_sys->i_time = -1; + for( int i = 0; i < 128 ; i++ ) + { + asf_track_t *tk = p_sys->track[i]; + if( !tk ) + continue; + + tk->i_time = 1; + if( tk->p_frame ) + block_ChainRelease( tk->p_frame ); + tk->p_frame = NULL; + } +} + /***************************************************************************** * Control: *****************************************************************************/ static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; - int64_t *pi64; - int i; - vlc_meta_t *p_meta; + vlc_meta_t *p_meta; + int64_t i64, *pi64; + double f, *pf; switch( i_query ) { - case DEMUX_SET_TIME: - return VLC_EGENERIC; + case DEMUX_GET_LENGTH: + pi64 = (int64_t*)va_arg( args, int64_t * ); + *pi64 = p_sys->i_length; + return VLC_SUCCESS; - case DEMUX_GET_LENGTH: - pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = p_sys->i_length; - return VLC_SUCCESS; + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( p_sys->i_time < 0 ) return VLC_EGENERIC; + *pi64 = p_sys->i_time; + return VLC_SUCCESS; - case DEMUX_GET_META: - p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* ); - vlc_meta_Merge( p_meta, p_sys->meta ); + case DEMUX_SET_TIME: + SeekPrepare( p_demux ); + + if( p_sys->b_index && p_sys->i_length > 0 ) + { + i64 = (int64_t)va_arg( args, int64_t ); + return SeekIndex( p_demux, i64, -1 ); + } + else + { + return demux_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_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 demux_vaControlHelper( p_demux->s, p_sys->i_data_begin, + p_sys->i_data_end, p_sys->i_bitrate, + p_sys->p_fp->i_min_data_packet_size, + i_query, args ); - case DEMUX_SET_POSITION: - p_sys->i_time = -1; - for( i = 0; i < 128 ; i++ ) - { - asf_track_t *tk = p_sys->track[i]; - if( tk ) tk->i_time = -1; - } + case DEMUX_SET_POSITION: + SeekPrepare( p_demux ); - default: - return demux2_vaControlHelper( p_demux->s, - p_sys->i_data_begin, p_sys->i_data_end, - p_sys->i_bitrate, p_sys->p_fp->i_min_data_packet_size, + if( p_sys->b_index && p_sys->i_length > 0 ) + { + f = (double)va_arg( args, double ); + return SeekIndex( p_demux, -1, f ); + } + else + { + return demux_vaControlHelper( p_demux->s, p_sys->i_data_begin, + p_sys->i_data_end, p_sys->i_bitrate, + p_sys->p_fp->i_min_data_packet_size, i_query, args ); + } + + case DEMUX_GET_META: + p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* ); + vlc_meta_Merge( p_meta, p_sys->meta ); + return VLC_SUCCESS; + + default: + return demux_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 ); } } @@ -260,24 +349,18 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) *****************************************************************************/ static mtime_t GetMoviePTS( demux_sys_t *p_sys ) { - mtime_t i_time; + mtime_t i_time = -1; int i; - i_time = -1; for( i = 0; i < 128 ; i++ ) { asf_track_t *tk = p_sys->track[i]; if( tk && tk->p_es && tk->i_time > 0) { - if( i_time < 0 ) - { - i_time = tk->i_time; - } - else - { - i_time = __MIN( i_time, tk->i_time ); - } + if( i_time < 0 ) i_time = tk->i_time; + else i_time = __MIN( i_time, tk->i_time ); + break; } } @@ -298,7 +381,7 @@ static int DemuxPacket( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; int i_data_packet_min = p_sys->p_fp->i_min_data_packet_size; - uint8_t *p_peek; + const uint8_t *p_peek; int i_skip; int i_packet_size_left; @@ -366,12 +449,17 @@ static int DemuxPacket( demux_t *p_demux ) GETVALUE2b( i_packet_flags >> 1, i_packet_sequence, 0 ); GETVALUE2b( i_packet_flags >> 3, i_packet_padding_length, 0 ); + if( i_packet_padding_length > i_packet_length ) + { + msg_Warn( p_demux, "Too large padding: %d", i_packet_padding_length ); + goto loop_error_recovery; + } + 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 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; + i_packet_size_left = i_data_packet_min /*i_packet_length*/ ; if( b_packet_multiple_payload ) { @@ -389,6 +477,7 @@ static int DemuxPacket( demux_t *p_demux ) { asf_track_t *tk; + int i_packet_keyframe; int i_stream_number; int i_media_object_number; int i_media_object_offset; @@ -407,8 +496,8 @@ static int DemuxPacket( demux_t *p_demux ) 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 ); @@ -452,10 +541,10 @@ static int DemuxPacket( demux_t *p_demux ) else { i_payload_data_length = i_packet_length - - i_packet_padding_length - i_skip; + i_packet_padding_length - i_skip; } - if( i_payload_data_length < 0 || i_skip + i_payload_data_length > i_packet_size_left ) + if( i_payload_data_length < 0 || i_payload_data_length > i_packet_size_left ) { break; } @@ -506,6 +595,9 @@ static int DemuxPacket( demux_t *p_demux ) /* send complete packet to decoder */ block_t *p_gather = block_ChainGather( tk->p_frame ); + if( p_sys->i_time < 0 ) + es_out_Control( p_demux->out, ES_OUT_SET_PCR, tk->i_time ); + es_out_Send( p_demux->out, tk->p_es, p_gather ); tk->p_frame = NULL; @@ -555,10 +647,18 @@ static int DemuxPacket( demux_t *p_demux ) if( i_packet_size_left > 0 ) { +#ifdef ASF_DEBUG + if( i_packet_size_left > i_packet_padding_length ) + msg_Warn( p_demux, "Didn't read %d bytes in the packet", + i_packet_size_left - i_packet_padding_length ); + else if( i_packet_size_left < i_packet_padding_length ) + msg_Warn( p_demux, "Read %d too much bytes in the packet", + i_packet_padding_length - i_packet_size_left ); +#endif if( stream_Read( p_demux->s, NULL, i_packet_size_left ) < i_packet_size_left ) { - msg_Warn( p_demux, "cannot skip data, EOF ?" ); + msg_Err( p_demux, "cannot skip data, EOF ?" ); return 0; } } @@ -572,7 +672,11 @@ loop_error_recovery: msg_Err( p_demux, "unsupported packet header, fatal error" ); return -1; } - stream_Read( p_demux->s, NULL, i_data_packet_min ); + if( stream_Read( p_demux->s, NULL, i_data_packet_min ) != i_data_packet_min ) + { + msg_Warn( p_demux, "cannot skip data, EOF ?" ); + return 0; + } return 1; } @@ -583,11 +687,11 @@ loop_error_recovery: static int DemuxInit( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - vlc_bool_t b_seekable; - int i; - - unsigned int i_stream; + bool b_seekable; + unsigned int i_stream; asf_object_content_description_t *p_cd; + asf_object_index_t *p_index; + bool b_index; /* init context */ p_sys->i_time = -1; @@ -595,8 +699,9 @@ static int DemuxInit( demux_t *p_demux ) 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++ ) + for( int i = 0; i < 128; i++ ) { p_sys->track[i] = NULL; } @@ -606,7 +711,7 @@ static int DemuxInit( demux_t *p_demux ) /* Now load all object ( except raw data ) */ stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable ); - if( (p_sys->p_root = ASF_ReadObjectRoot( p_demux->s, b_seekable )) == NULL ) + if( !(p_sys->p_root = ASF_ReadObjectRoot(p_demux->s, b_seekable)) ) { msg_Warn( p_demux, "ASF plugin discarded (not a valid file)" ); return VLC_EGENERIC; @@ -627,17 +732,24 @@ static int DemuxInit( demux_t *p_demux ) goto error; } + /* check if index is available */ + p_index = ASF_FindObject( p_sys->p_root, &asf_object_index_guid, 0 ); + b_index = p_index && p_index->i_index_entry_count; + msg_Dbg( p_demux, "found %d streams", p_sys->i_track ); for( i_stream = 0; i_stream < p_sys->i_track; i_stream ++ ) { asf_track_t *tk; asf_object_stream_properties_t *p_sp; - vlc_bool_t b_access_selected; + asf_object_extended_stream_properties_t *p_esp; + asf_object_t *p_hdr_ext; + bool b_access_selected; p_sp = ASF_FindObject( p_sys->p_root->p_hdr, &asf_object_stream_properties_guid, i_stream ); + p_esp = NULL; tk = p_sys->track[p_sp->i_stream_number] = malloc( sizeof( asf_track_t ) ); memset( tk, 0, sizeof( asf_track_t ) ); @@ -658,6 +770,26 @@ static int DemuxInit( demux_t *p_demux ) continue; } + /* Find the associated extended_stream_properties if any */ + p_hdr_ext = ASF_FindObject( p_sys->p_root->p_hdr, + &asf_object_header_extension_guid, 0 ); + if( p_hdr_ext ) + { + int i_ext_stream = ASF_CountObject( p_hdr_ext, + &asf_object_extended_stream_properties ); + for( int i = 0; i < i_ext_stream; i++ ) + { + asf_object_t *p_tmp = + ASF_FindObject( p_hdr_ext, + &asf_object_extended_stream_properties, i ); + if( p_tmp->ext_stream.i_stream_number == p_sp->i_stream_number ) + { + p_esp = &p_tmp->ext_stream; + break; + } + } + } + if( ASF_CmpGUID( &p_sp->i_stream_type, &asf_object_stream_type_audio ) && p_sp->i_type_specific_data_length >= sizeof( WAVEFORMATEX ) - 2 ) { @@ -707,12 +839,17 @@ static int DemuxInit( demux_t *p_demux ) fmt.video.i_width = GetDWLE( p_data + 4 ); fmt.video.i_height= GetDWLE( p_data + 8 ); + if( p_esp && p_esp->i_average_time_per_frame > 0 ) + { + fmt.video.i_frame_rate = 10000000; + fmt.video.i_frame_rate_base = p_esp->i_average_time_per_frame; + } 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; + fmt.b_packetized = false; } if( p_sp->i_type_specific_data_length > 11 + @@ -757,12 +894,15 @@ static int DemuxInit( demux_t *p_demux ) (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 ); } @@ -776,14 +916,14 @@ static int DemuxInit( demux_t *p_demux ) 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 ) && + if( ASF_CmpGUID( p_ref, &asf_object_extended_stream_type_audio ) && i_data >= sizeof( WAVEFORMATEX ) - 2) { int i_format; es_format_Init( &fmt, AUDIO_ES, 0 ); i_format = GetWLE( &p_data[0] ); - if( i_format == 0 ) - fmt.i_codec = VLC_FOURCC( 'a','5','2',' '); + if( i_format == 0 ) + fmt.i_codec = VLC_CODEC_A52; else wf_tag_to_fourcc( i_format, &fmt.i_codec, NULL ); fmt.audio.i_channels = GetWLE( &p_data[2] ); @@ -791,7 +931,7 @@ static int DemuxInit( demux_t *p_demux ) 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; + fmt.b_packetized = true; if( p_sp->i_type_specific_data_length > sizeof( WAVEFORMATEX ) && i_format != WAVE_FORMAT_MPEGLAYER3 && @@ -832,7 +972,6 @@ static int DemuxInit( demux_t *p_demux ) p_sys->i_data_end = -1; } - /* go to first packet */ stream_Seek( p_demux->s, p_sys->i_data_begin ); @@ -920,8 +1059,6 @@ static int DemuxInit( demux_t *p_demux ) } } #endif - - es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); return VLC_SUCCESS; error: