shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp8: set y_crop_{width,height}" into experimental

--- a/vp8/vp8_cx_iface.c

+++ b/vp8/vp8_cx_iface.c

@@ -684,6 +684,8 @@

     yv12->u_buffer = img->planes[VPX_PLANE_U];

     yv12->v_buffer = img->planes[VPX_PLANE_V];

+    yv12->y_crop_width  = img->d_w;

+    yv12->y_crop_height = img->d_h;

     yv12->y_width  = img->d_w;

     yv12->y_height = img->d_h;

     yv12->uv_width = (1 + yv12->y_width) / 2;

--- a/vp8/vp8_dx_iface.c

+++ b/vp8/vp8_dx_iface.c

@@ -790,6 +790,8 @@

     yv12->u_buffer = img->planes[VPX_PLANE_U];

     yv12->v_buffer = img->planes[VPX_PLANE_V];

+    yv12->y_crop_width  = img->d_w;

+    yv12->y_crop_height = img->d_h;

     yv12->y_width  = img->d_w;

     yv12->y_height = img->d_h;

     yv12->uv_width = yv12->y_width / 2;

--- a/vpx_scale/generic/yv12extend.c

+++ b/vpx_scale/generic/yv12extend.c

@@ -117,8 +117,13 @@

   int row;

   unsigned char *source, *dest;

+#if 0

+  /* These assertions are valid in the codec, but the libvpx-tester uses

+   * this code slightly differently.

+   */

   assert(src_ybc->y_width == dst_ybc->y_width);

   assert(src_ybc->y_height == dst_ybc->y_height);

+#endif

   source = src_ybc->y_buffer;

   dest = dst_ybc->y_buffer;