From: Yaowu Xu <yaowu@google.com>
Date: Tue, 10 Dec 2013 22:34:32 +0000 (-0800)
Subject: Fix a bug
X-Git-Tag: v1.4.0~2864^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0f82c6ed6ee80c4a01ff023ec5275b283400aff;p=libvpx

Fix a bug

In evaluating partition split case, Wrong partition size is used in
calling partition_plane_context(). This commit change to use the
correct sub partition size. The incorrect partition size used were
causing an ASAN error in unit test.

Change-Id: Iab695b764bc51cc61580075f2ae4001421132362
---

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 342b11a8f..5264e2f9f 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1284,7 +1284,8 @@ static void rd_use_partition(VP9_COMP *cpi,
       split_dist += dt;
       pl = partition_plane_context(cpi->above_seg_context,
                                    cpi->left_seg_context,
-                                   mi_row + y_idx, mi_col + x_idx, bsize);
+                                   mi_row + y_idx, mi_col + x_idx,
+                                   split_subsize);
       split_rate += x->partition_cost[pl][PARTITION_NONE];
     }
     pl = partition_plane_context(cpi->above_seg_context, cpi->left_seg_context,