diff options
author | John Koleszar <jkoleszar@google.com> | 2013-05-10 16:56:45 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-10 16:56:45 -0700 |
commit | 0e59dad0deeac1f17602d1edc8fb88f5f9604520 (patch) | |
tree | 82b45260ae4bab1e5dea1276060c0794b585edd5 /vp9/encoder | |
parent | cf793a32bd82a8f0bc435962700afc39eec6ebb6 (diff) | |
parent | 6dab4d205e5c3cb51fc104109359a41f9c1b9111 (diff) | |
download | libvpx-0e59dad0deeac1f17602d1edc8fb88f5f9604520.tar libvpx-0e59dad0deeac1f17602d1edc8fb88f5f9604520.tar.gz libvpx-0e59dad0deeac1f17602d1edc8fb88f5f9604520.tar.bz2 libvpx-0e59dad0deeac1f17602d1edc8fb88f5f9604520.zip |
Merge "Fix 4:2:0 assumptions in debug plane output" into experimental
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index cddd058a0..610d7330b 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -1949,8 +1949,8 @@ static void generate_psnr_packet(VP9_COMP *cpi) { pkt.data.psnr.samples[0] = width * height; pkt.data.psnr.samples[1] = width * height; - width = (width + 1) / 2; - height = (height + 1) / 2; + width = orig->uv_width; + height = orig->uv_height; sse = calc_plane_error(orig->u_buffer, orig->uv_stride, recon->u_buffer, recon->uv_stride, @@ -2104,7 +2104,7 @@ void vp9_write_yuv_rec_frame(VP9_COMMON *cm) { } while (--h); src = s->u_buffer; - h = (cm->height + 1) / 2; + h = s->uv_height; do { fwrite(src, s->uv_width, 1, yuv_rec_file); @@ -2112,7 +2112,7 @@ void vp9_write_yuv_rec_frame(VP9_COMMON *cm) { } while (--h); src = s->v_buffer; - h = (cm->height + 1) / 2; + h = s->uv_height; do { fwrite(src, s->uv_width, 1, yuv_rec_file); |