From: Dmitry Kovalev <dkovalev@google.com>
Date: Wed, 15 Jan 2014 01:53:32 +0000 (-0800)
Subject: Fixing invalid block width/height calculation.
X-Git-Tag: v1.4.0~2674
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=433e5ea0e8817b1066c59757727fb2a0d6f12fd6;p=libvpx

Fixing invalid block width/height calculation.

Change-Id: Ieaeb53902ce0ffd5b1b27a92583e98abfa791433
---

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index b46e80891..359a29bfa 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -464,8 +464,8 @@ static void model_rd_for_sb_y_tx(VP9_COMP *cpi, BLOCK_SIZE bsize,
   BLOCK_SIZE bs;
   struct macroblock_plane *const p = &x->plane[0];
   struct macroblockd_plane *const pd = &xd->plane[0];
-  const int width = 4 << num_4x4_blocks_wide_lookup[bsize];
-  const int height = 4 << num_4x4_blocks_high_lookup[bsize];
+  const int width = 4 * num_4x4_blocks_wide_lookup[bsize];
+  const int height = 4 * num_4x4_blocks_high_lookup[bsize];
   int rate_sum = 0;
   int64_t dist_sum = 0;
   const int t = 4 << tx_size;