Some fixes on context size for the 128x128 expt

Change-Id: I56f050502e3a750ce74b196d033b780218df2c1f

diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c
index 7cdb2c66a972984ba88330886625d1e445eaae3f..2179ba42d1d9a06d3ab82534687857487fc6cd90 100644 (file)
--- a/vp9/encoder/vp9_rd.c
+++ b/vp9/encoder/vp9_rd.c
@@ -478,8 +478,8 @@ void vp9_model_rd_from_var_lapndz(unsigned int var, unsigned int n,
 
 void vp9_get_entropy_contexts(BLOCK_SIZE bsize, TX_SIZE tx_size,
                               const struct macroblockd_plane *pd,
-                              ENTROPY_CONTEXT t_above[16],
-                              ENTROPY_CONTEXT t_left[16]) {
+                              ENTROPY_CONTEXT t_above[(CODING_UNIT_SIZE >> 2)],
+                              ENTROPY_CONTEXT t_left[(CODING_UNIT_SIZE >> 2)]) {
   const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
   const int num_4x4_w = num_4x4_blocks_wide_lookup[plane_bsize];
   const int num_4x4_h = num_4x4_blocks_high_lookup[plane_bsize];

diff --git a/vp9/encoder/vp9_rd.h b/vp9/encoder/vp9_rd.h
index daabc41514f30ec4485b86f704f5231fe80c7e10..485da2b353056119686484bb9a84bdbb544877d6 100644 (file)
--- a/vp9/encoder/vp9_rd.h
+++ b/vp9/encoder/vp9_rd.h
@@ -422,8 +422,8 @@ void vp9_init_me_luts();
 
 void vp9_get_entropy_contexts(BLOCK_SIZE bsize, TX_SIZE tx_size,
                               const struct macroblockd_plane *pd,
-                              ENTROPY_CONTEXT t_above[16],
-                              ENTROPY_CONTEXT t_left[16]);
+                              ENTROPY_CONTEXT t_above[(CODING_UNIT_SIZE >> 2)],
+                              ENTROPY_CONTEXT t_left[(CODING_UNIT_SIZE >> 2)]);
 
 void vp9_set_rd_speed_thresholds(struct VP9_COMP *cpi);
 

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index edbd6aabd8cf42b7d5c8f3531c1c2fcd7751d0cd..16835ce51571a0004b197e3126fa37442e658e54 100644 (file)
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -121,8 +121,8 @@ typedef struct {
 
 struct rdcost_block_args {
   MACROBLOCK *x;
-  ENTROPY_CONTEXT t_above[16];
-  ENTROPY_CONTEXT t_left[16];
+  ENTROPY_CONTEXT t_above[(CODING_UNIT_SIZE >> 2)];
+  ENTROPY_CONTEXT t_left[(CODING_UNIT_SIZE >> 2)];
   int rate;
   int64_t dist;
   int64_t sse;