es_out.c: add frame rate to stream and media info dialog when available

avi.c: make frame rate info available
parent e5108404
...@@ -434,6 +434,8 @@ static int Open( vlc_object_t * p_this ) ...@@ -434,6 +434,8 @@ static int Open( vlc_object_t * p_this )
fmt.video.i_width = p_vids->p_bih->biWidth; fmt.video.i_width = p_vids->p_bih->biWidth;
fmt.video.i_height = p_vids->p_bih->biHeight; fmt.video.i_height = p_vids->p_bih->biHeight;
fmt.video.i_bits_per_pixel = p_vids->p_bih->biBitCount; 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 = fmt.i_extra =
__MIN( p_vids->p_bih->biSize - sizeof( BITMAPINFOHEADER ), __MIN( p_vids->p_bih->biSize - sizeof( BITMAPINFOHEADER ),
p_vids->i_chunk_size - sizeof(BITMAPINFOHEADER) ); p_vids->i_chunk_size - sizeof(BITMAPINFOHEADER) );
......
...@@ -1424,6 +1424,12 @@ static void EsOutAddInfo( es_out_t *out, es_out_id_t *es ) ...@@ -1424,6 +1424,12 @@ static void EsOutAddInfo( es_out_t *out, es_out_id_t *es )
_("Display resolution"), "%dx%d", _("Display resolution"), "%dx%d",
fmt->video.i_visible_width, fmt->video.i_visible_width,
fmt->video.i_visible_height); fmt->video.i_visible_height);
if( fmt->video.i_frame_rate > 0 &&
fmt->video.i_frame_rate_base > 0 )
input_Control( p_input, INPUT_ADD_INFO, psz_cat,
_("Frame rate"), "%f",
(float)fmt->video.i_frame_rate /
fmt->video.i_frame_rate_base );
break; break;
case SPU_ES: case SPU_ES:
......
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