Commit 0e59dad0 authored by John Koleszar's avatar John Koleszar Committed by Gerrit Code Review
Browse files

Merge "Fix 4:2:0 assumptions in debug plane output" into experimental

parents cf793a32 6dab4d20
...@@ -1949,8 +1949,8 @@ static void generate_psnr_packet(VP9_COMP *cpi) { ...@@ -1949,8 +1949,8 @@ static void generate_psnr_packet(VP9_COMP *cpi) {
pkt.data.psnr.samples[0] = width * height; pkt.data.psnr.samples[0] = width * height;
pkt.data.psnr.samples[1] = width * height; pkt.data.psnr.samples[1] = width * height;
width = (width + 1) / 2; width = orig->uv_width;
height = (height + 1) / 2; height = orig->uv_height;
sse = calc_plane_error(orig->u_buffer, orig->uv_stride, sse = calc_plane_error(orig->u_buffer, orig->uv_stride,
recon->u_buffer, recon->uv_stride, recon->u_buffer, recon->uv_stride,
...@@ -2104,7 +2104,7 @@ void vp9_write_yuv_rec_frame(VP9_COMMON *cm) { ...@@ -2104,7 +2104,7 @@ void vp9_write_yuv_rec_frame(VP9_COMMON *cm) {
} while (--h); } while (--h);
src = s->u_buffer; src = s->u_buffer;
h = (cm->height + 1) / 2; h = s->uv_height;
do { do {
fwrite(src, s->uv_width, 1, yuv_rec_file); fwrite(src, s->uv_width, 1, yuv_rec_file);
...@@ -2112,7 +2112,7 @@ void vp9_write_yuv_rec_frame(VP9_COMMON *cm) { ...@@ -2112,7 +2112,7 @@ void vp9_write_yuv_rec_frame(VP9_COMMON *cm) {
} while (--h); } while (--h);
src = s->v_buffer; src = s->v_buffer;
h = (cm->height + 1) / 2; h = s->uv_height;
do { do {
fwrite(src, s->uv_width, 1, yuv_rec_file); fwrite(src, s->uv_width, 1, yuv_rec_file);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment