From: Yaowu Xu <yaowu@google.com>
Date: Thu, 5 Mar 2015 16:20:35 +0000 (-0800)
Subject: Use correct bsize for uv
X-Git-Tag: v1.4.0~79^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b573fef76d2a00ed54c6e94e529f9b4eaaf64ac3;p=libvpx

Use correct bsize for uv

Change-Id: I9c897d32af6c3a956bb6f424a74c12737727038a
---

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 3125a0eb7..2f04454ef 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -743,7 +743,11 @@ static void choose_partitioning(VP9_COMP *cpi,
     for (i = 1; i <= 2; ++i) {
       struct macroblock_plane  *p = &x->plane[i];
       struct macroblockd_plane *pd = &xd->plane[i];
+#if GLOBAL_MOTION
+      const BLOCK_SIZE bs = get_plane_block_size(bsize, pd);
+#else
       const BLOCK_SIZE bs = get_plane_block_size(BLOCK_64X64, pd);
+#endif
       uv_sad = cpi->fn_ptr[bs].sdf(p->src.buf, p->src.stride,
                                    pd->dst.buf, pd->dst.stride);