diff options
| -rw-r--r-- | vp8/vp8_cx_iface.c | 2 | ||||
| -rw-r--r-- | vp8/vp8_dx_iface.c | 2 | ||||
| -rw-r--r-- | vpx_scale/generic/yv12extend.c | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index b985cb1b7..4531d5ad0 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -684,6 +684,8 @@ static vpx_codec_err_t image2yuvconfig(const vpx_image_t *img, 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; diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c index f3834b063..90a175436 100644 --- a/vp8/vp8_dx_iface.c +++ b/vp8/vp8_dx_iface.c @@ -790,6 +790,8 @@ static vpx_codec_err_t image2yuvconfig(const vpx_image_t *img, 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; diff --git a/vpx_scale/generic/yv12extend.c b/vpx_scale/generic/yv12extend.c index 49d7e8e56..a322e0a2c 100644 --- a/vpx_scale/generic/yv12extend.c +++ b/vpx_scale/generic/yv12extend.c @@ -117,8 +117,13 @@ vp8_yv12_copy_frame_c(YV12_BUFFER_CONFIG *src_ybc, 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; |