Skip to content

V
vlc
Commit 6798e163 authored by Marian Durkovic's avatar Marian Durkovic
Browse files
Options

calculate SAR from visible width/height

parent e75daaa6
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 12 deletions
src/input/decoder.c
View file @ 6798e163
...@@ -917,14 +917,29 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) ...@@ -917,14 +917,29 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
return NULL; return NULL;
} }
if( !p_dec->fmt_out.video.i_visible_width ||
!p_dec->fmt_out.video.i_visible_height )
{
p_dec->fmt_out.video.i_visible_width =
p_dec->fmt_out.video.i_width;
p_dec->fmt_out.video.i_visible_height =
p_dec->fmt_out.video.i_height;
}
if( p_dec->fmt_out.video.i_visible_height == 1088 )
{
/* p_dec->fmt_out.video.i_visible_height = 1080; */
msg_Warn( p_dec, "Broken HDTV stream (display_height=1088)");
}
if( !p_dec->fmt_out.video.i_sar_num || if( !p_dec->fmt_out.video.i_sar_num ||
!p_dec->fmt_out.video.i_sar_den ) !p_dec->fmt_out.video.i_sar_den )
{ {
p_dec->fmt_out.video.i_sar_num = p_dec->fmt_out.video.i_sar_num = p_dec->fmt_out.video.i_aspect *
p_dec->fmt_out.video.i_aspect * p_dec->fmt_out.video.i_height; p_dec->fmt_out.video.i_visible_height;
p_dec->fmt_out.video.i_sar_den = VOUT_ASPECT_FACTOR * p_dec->fmt_out.video.i_sar_den = VOUT_ASPECT_FACTOR *
p_dec->fmt_out.video.i_width; p_dec->fmt_out.video.i_visible_width;
} }
vlc_ureduce( &p_dec->fmt_out.video.i_sar_num, vlc_ureduce( &p_dec->fmt_out.video.i_sar_num,
...@@ -932,15 +947,6 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) ...@@ -932,15 +947,6 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
p_dec->fmt_out.video.i_sar_num, p_dec->fmt_out.video.i_sar_num,
p_dec->fmt_out.video.i_sar_den, 0 ); p_dec->fmt_out.video.i_sar_den, 0 );
if( !p_dec->fmt_out.video.i_visible_width ||
!p_dec->fmt_out.video.i_visible_height )
{
p_dec->fmt_out.video.i_visible_width =
p_dec->fmt_out.video.i_width;
p_dec->fmt_out.video.i_visible_height =
p_dec->fmt_out.video.i_height;
}
p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec; p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
p_sys->video = p_dec->fmt_out.video; p_sys->video = p_dec->fmt_out.video;
......
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