diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-03-05 08:20:35 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2015-03-05 08:20:35 -0800 |
| commit | b573fef76d2a00ed54c6e94e529f9b4eaaf64ac3 (patch) | |
| tree | 86bb66e9f42e9d51606a78c243271dddcd1be3f0 | |
| parent | 42eb97eb91063b9f83241f68fe006441f99d4911 (diff) | |
| download | libvpx-b573fef76d2a00ed54c6e94e529f9b4eaaf64ac3.tar libvpx-b573fef76d2a00ed54c6e94e529f9b4eaaf64ac3.tar.gz libvpx-b573fef76d2a00ed54c6e94e529f9b4eaaf64ac3.tar.bz2 libvpx-b573fef76d2a00ed54c6e94e529f9b4eaaf64ac3.zip | |
Use correct bsize for uv
Change-Id: I9c897d32af6c3a956bb6f424a74c12737727038a
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 4 insertions, 0 deletions
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); |