video-info: fix GST_VIDEO_INFO_FIELD_HEIGHT() with frame odd height
authorGuillaume Desmottes <guillaume.desmottes@collabora.com>
Sat, 2 Nov 2019 11:15:15 +0000 (12:15 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.com>
Sat, 2 Nov 2019 12:05:43 +0000 (13:05 +0100)
We want to round up when halfing height.

I do have a test for this but it relies on my new video-align tests so
it's part of the next commit. Recording the fix separately if we want to
backport this fix to the stable branch.

gst-libs/gst/video/video-info.h

index b4d69d9..6adf03c 100644 (file)
@@ -359,7 +359,7 @@ GType gst_video_info_get_type            (void);
  *
  * Since: 1.16.
  */
-#define GST_VIDEO_INFO_FIELD_HEIGHT(i)   ((i)->interlace_mode == GST_VIDEO_INTERLACE_MODE_ALTERNATE? (i)->height / 2 : (i)->height)
+#define GST_VIDEO_INFO_FIELD_HEIGHT(i)   ((i)->interlace_mode == GST_VIDEO_INTERLACE_MODE_ALTERNATE? GST_ROUND_UP_2 ((i)->height) / 2 : (i)->height)
 #define GST_VIDEO_INFO_SIZE(i)           ((i)->size)
 #define GST_VIDEO_INFO_VIEWS(i)          ((i)->views)
 #define GST_VIDEO_INFO_PAR_N(i)          ((i)->par_n)