X11: add unpadded width/height as videometa

We need to add the real width/height as the values in the video metadata instead
of the padded values.

diff --git a/sys/ximage/ximagepool.c b/sys/ximage/ximagepool.c
index decdbaffc58f8d3e17bebd4a7a631ca777429766..86b35294e098480997aea305f171f1a1959e0173 100644 (file)
--- a/sys/ximage/ximagepool.c
+++ b/sys/ximage/ximagepool.c
@@ -589,8 +589,9 @@ ximage_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
     GST_DEBUG_OBJECT (pool, "adding GstVideoMeta");
     /* these are just the defaults for now */
     gst_buffer_add_video_meta_full (ximage, GST_VIDEO_FRAME_FLAG_NONE,
-        GST_VIDEO_INFO_FORMAT (info), priv->padded_width, priv->padded_height,
-        GST_VIDEO_INFO_N_PLANES (info), info->offset, info->stride);
+        GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
+        GST_VIDEO_INFO_HEIGHT (info), GST_VIDEO_INFO_N_PLANES (info),
+        info->offset, info->stride);
   }
   *buffer = ximage;
 

diff --git a/sys/xvimage/xvimagepool.c b/sys/xvimage/xvimagepool.c
index 00a7c31b1d92b121925f7d68bbc3eb0a5fbebd58..c8e06727419c1de9b085ab23e92c172adb0c32e7 100644 (file)
--- a/sys/xvimage/xvimagepool.c
+++ b/sys/xvimage/xvimagepool.c
@@ -638,8 +638,9 @@ xvimage_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
   if (priv->add_metavideo) {
     GST_DEBUG_OBJECT (pool, "adding GstVideoMeta");
     gst_buffer_add_video_meta_full (xvimage, GST_VIDEO_FRAME_FLAG_NONE,
-        GST_VIDEO_INFO_FORMAT (info), priv->padded_width, priv->padded_height,
-        GST_VIDEO_INFO_N_PLANES (info), info->offset, info->stride);
+        GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
+        GST_VIDEO_INFO_HEIGHT (info), GST_VIDEO_INFO_N_PLANES (info),
+        info->offset, info->stride);
   }
 
   *buffer = xvimage;