commit 481af67044395cd0e93261f445e9e88c72b5e668
author Yaowu Xu <yaowu@google.com> Mon Mar 27 16:46:02 2017 -0700
committer Yaowu Xu <yaowu@google.com> Tue Mar 28 17:48:00 2017 +0000
tree df2b07c04e7bebf43a5a2bf8356bbbc11cc146ff
parent f11fb88269c8b04e89f3787d263bdc3d2d8dea74

fix calls to av1_tx_block_rd_b()

Fix the calls to be compatible with the new interface introduced in a
previous commit#77368af.

Change-Id: I6944c189d2d53978250df9dee460a2ba9b8ccc83

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 67c04a1..58b3cd7 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -6832,7 +6832,6 @@
     ENTROPY_CONTEXT ctxa[2 * MAX_MIB_SIZE];
     ENTROPY_CONTEXT ctxl[2 * MAX_MIB_SIZE];
     const struct macroblockd_plane *const pd = &xd->plane[plane];
-    int coeff_ctx = 1;
     RD_STATS this_rd_stats;
     av1_init_rd_stats(&this_rd_stats);
 
@@ -6840,11 +6839,10 @@
     tx_size =
         uv_txsize_lookup[bsize][tx_size][cm->subsampling_x][cm->subsampling_y];
     av1_get_entropy_contexts(bsize, tx_size, pd, ctxa, ctxl);
-    coeff_ctx = combine_entropy_contexts(ctxa[0], ctxl[0]);
 
     av1_subtract_plane(x, bsize, plane);
     av1_tx_block_rd_b(cpi, x, tx_size, 0, 0, plane, 0,
-                      get_plane_block_size(bsize, pd), coeff_ctx,
+                      get_plane_block_size(bsize, pd), &ctxa[0], &ctxl[0],
                       &this_rd_stats);
 
     this_rate = this_rd_stats.rate;
@@ -6877,7 +6875,6 @@
     ENTROPY_CONTEXT ctxa[2 * MAX_MIB_SIZE];
     ENTROPY_CONTEXT ctxl[2 * MAX_MIB_SIZE];
     const struct macroblockd_plane *const pd = &xd->plane[0];
-    int coeff_ctx = 1;
     RD_STATS this_rd_stats;
 #endif  // CONFIG_VAR_TX
 
@@ -6890,10 +6887,8 @@
 
 #if CONFIG_VAR_TX
     av1_init_rd_stats(&this_rd_stats);
-
     av1_get_entropy_contexts(bsize, tx_size, pd, ctxa, ctxl);
-    coeff_ctx = combine_entropy_contexts(ctxa[0], ctxl[0]);
-    av1_tx_block_rd_b(cpi, x, tx_size, 0, 0, 0, 0, bsize, coeff_ctx,
+    av1_tx_block_rd_b(cpi, x, tx_size, 0, 0, 0, 0, bsize, &ctxa[0], &ctxl[0],
                       &this_rd_stats);
 
     this_rate = this_rd_stats.rate;

av1/encoder/rdopt.h

diff --git a/av1/encoder/rdopt.h b/av1/encoder/rdopt.h
index 1d21862..4017da2 100644
--- a/av1/encoder/rdopt.h
+++ b/av1/encoder/rdopt.h
@@ -185,7 +185,8 @@
 #if CONFIG_VAR_TX
 void av1_tx_block_rd_b(const AV1_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
                        int blk_row, int blk_col, int plane, int block,
-                       int plane_bsize, int coeff_ctx, RD_STATS *rd_stats);
+                       int plane_bsize, const ENTROPY_CONTEXT *a,
+                       const ENTROPY_CONTEXT *l, RD_STATS *rd_stats);
 #endif
 
 void av1_txfm_rd_in_plane_supertx(MACROBLOCK *x, const AV1_COMP *cpi, int *rate,