Merge "vp8: set y_crop_{width,height}" into experimental
This commit is contained in:
commit
2dc6acc0fc
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user