[vlc-devel] [vlc-commits] libvlc: return useful/visible video dimensions (fixes #15122)

Thomas Guillem thomas at gllm.fr
Mon Oct 5 13:54:56 CEST 2015



On Sun, Aug 23, 2015, at 11:47, Rémi Denis-Courmont wrote:
> vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> |
> Sun Aug 23 12:46:44 2015 +0300|
> [b185aad11dc2f5ed31e65916e3eedcbf29c1d61f] | committer: Rémi
> Denis-Courmont
> 
> libvlc: return useful/visible video dimensions (fixes #15122)
> 
> (cherry picked from commit 5f000e6ac6154f0f30f376adc5595aeaec876da4)
> 
> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=b185aad11dc2f5ed31e65916e3eedcbf29c1d61f
> ---
> 
>  lib/media.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/media.c b/lib/media.c
> index c2a4ef5..6f324aa 100644
> --- a/lib/media.c
> +++ b/lib/media.c
> @@ -766,8 +766,8 @@ libvlc_media_get_tracks_info( libvlc_media_t *p_md,
> libvlc_media_track_info_t **
>              break;
>          case VIDEO_ES:
>              p_mes->i_type = libvlc_track_video;
> -            p_mes->u.video.i_height = p_es->video.i_height;
> -            p_mes->u.video.i_width = p_es->video.i_width;
> +            p_mes->u.video.i_height = p_es->video.i_visible_height;
> +            p_mes->u.video.i_width = p_es->video.i_visible_width;
>              break;
>          case AUDIO_ES:
>              p_mes->i_type = libvlc_track_audio;
> @@ -842,8 +842,8 @@ libvlc_media_tracks_get( libvlc_media_t *p_md,
> libvlc_media_track_t *** pp_es )
>              break;
>          case VIDEO_ES:
>              p_mes->i_type = libvlc_track_video;
> -            p_mes->video->i_height = p_es->video.i_height;
> -            p_mes->video->i_width = p_es->video.i_width;
> +            p_mes->video->i_height = p_es->video.i_visible_height;
> +            p_mes->video->i_width = p_es->video.i_visible_width;


What do we do if i_visible_width/height is 0 ?

1/ we set p_mes->video->i_width/height to be p_es->video.i_width/height,

2/ we fix demuxes to also set the i_visible_width/height when they set
i_width/height (avi and mkv don't set the visible size for example).

In others word, can i_visible_width/height be 0 when it has a valid size
?

>              p_mes->video->i_sar_num = p_es->video.i_sar_num;
>              p_mes->video->i_sar_den = p_es->video.i_sar_den;
>              p_mes->video->i_frame_rate_num = p_es->video.i_frame_rate;
> 
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits


More information about the vlc-devel mailing list