Commit 76795ad9 authored by Laurent Aimar's avatar Laurent Aimar

Read frame rate from asf container if presents.

It helps when reconstructing the video pts as asf does not have them :(
parent 9c26b8e2
...@@ -729,11 +729,14 @@ static int DemuxInit( demux_t *p_demux ) ...@@ -729,11 +729,14 @@ static int DemuxInit( demux_t *p_demux )
{ {
asf_track_t *tk; asf_track_t *tk;
asf_object_stream_properties_t *p_sp; asf_object_stream_properties_t *p_sp;
asf_object_extended_stream_properties_t *p_esp;
asf_object_t *p_hdr_ext;
bool b_access_selected; bool b_access_selected;
p_sp = ASF_FindObject( p_sys->p_root->p_hdr, p_sp = ASF_FindObject( p_sys->p_root->p_hdr,
&asf_object_stream_properties_guid, &asf_object_stream_properties_guid,
i_stream ); i_stream );
p_esp = NULL;
tk = p_sys->track[p_sp->i_stream_number] = malloc( sizeof( asf_track_t ) ); tk = p_sys->track[p_sp->i_stream_number] = malloc( sizeof( asf_track_t ) );
memset( tk, 0, sizeof( asf_track_t ) ); memset( tk, 0, sizeof( asf_track_t ) );
...@@ -754,6 +757,26 @@ static int DemuxInit( demux_t *p_demux ) ...@@ -754,6 +757,26 @@ static int DemuxInit( demux_t *p_demux )
continue; 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( 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 ) && if( ASF_CmpGUID( &p_sp->i_stream_type, &asf_object_stream_type_audio ) &&
p_sp->i_type_specific_data_length >= sizeof( WAVEFORMATEX ) - 2 ) p_sp->i_type_specific_data_length >= sizeof( WAVEFORMATEX ) - 2 )
{ {
...@@ -803,6 +826,11 @@ static int DemuxInit( demux_t *p_demux ) ...@@ -803,6 +826,11 @@ static int DemuxInit( demux_t *p_demux )
fmt.video.i_width = GetDWLE( p_data + 4 ); fmt.video.i_width = GetDWLE( p_data + 4 );
fmt.video.i_height= GetDWLE( p_data + 8 ); 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',' ') ) if( fmt.i_codec == VLC_FOURCC( 'D','V','R',' ') )
{ {
...@@ -853,7 +881,7 @@ static int DemuxInit( demux_t *p_demux ) ...@@ -853,7 +881,7 @@ static int DemuxInit( demux_t *p_demux )
(int64_t)fmt.video.i_width * VOUT_ASPECT_FACTOR / (int64_t)fmt.video.i_width * VOUT_ASPECT_FACTOR /
fmt.video.i_height / i_aspect_y; fmt.video.i_height / i_aspect_y;
} }
} }
tk->i_cat = VIDEO_ES; tk->i_cat = VIDEO_ES;
tk->p_es = es_out_Add( p_demux->out, &fmt ); tk->p_es = es_out_Add( p_demux->out, &fmt );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment