From 9d9962aec92c0a8f01b95956b277e50aa261d867 Mon Sep 17 00:00:00 2001 From: Debargha Mukherjee Date: Fri, 13 Nov 2015 07:06:19 -0800 Subject: [PATCH] Some fixes on context size for the 128x128 expt Change-Id: I56f050502e3a750ce74b196d033b780218df2c1f --- vp9/encoder/vp9_rd.c | 4 ++-- vp9/encoder/vp9_rd.h | 4 ++-- vp9/encoder/vp9_rdopt.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c index 7cdb2c66a..2179ba42d 100644 --- 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 daabc4151..485da2b35 100644 --- 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 edbd6aabd..16835ce51 100644 --- 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; -- 2.40.0