Commit 481af670 authored by Yaowu Xu's avatar Yaowu Xu
Browse files

fix calls to av1_tx_block_rd_b()

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

Change-Id: I6944c189d2d53978250df9dee460a2ba9b8ccc83
parent f11fb882
......@@ -6832,7 +6832,6 @@ static void rd_supertx_sb(const AV1_COMP *const cpi, ThreadData *td,
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 @@ static void rd_supertx_sb(const AV1_COMP *const cpi, ThreadData *td,
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 @@ static void rd_supertx_sb(const AV1_COMP *const cpi, ThreadData *td,
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 @@ static void rd_supertx_sb(const AV1_COMP *const cpi, ThreadData *td,
#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;
......
......@@ -185,7 +185,8 @@ void av1_check_ncobmc_rd(const struct AV1_COMP *cpi, struct macroblock *x,
#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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment