diff options
| author | Hui Su <huisu@google.com> | 2018-09-11 02:18:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-11 02:18:18 +0000 |
| commit | 6665540ed20b7ed665237e6b19e66cfaadd0a6c4 (patch) | |
| tree | c5c883e2518f03497a9541108ff51079f0216281 /vp9 | |
| parent | 96e1c6b7ce910ed4b7c79069a9d55307bd6dd257 (diff) | |
| parent | d4600d4a640e9d7485cadafb40391f7ce0ecac0b (diff) | |
| download | libvpx-6665540ed20b7ed665237e6b19e66cfaadd0a6c4.tar libvpx-6665540ed20b7ed665237e6b19e66cfaadd0a6c4.tar.gz libvpx-6665540ed20b7ed665237e6b19e66cfaadd0a6c4.tar.bz2 libvpx-6665540ed20b7ed665237e6b19e66cfaadd0a6c4.zip | |
Merge "Refactor block_rd_txfm()"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 025c5f8e4..1f1cd40d8 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -701,17 +701,18 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col, blk_row, blk_col, plane_bsize, tx_bsize); dist = (int64_t)tmp * 16; } - } else if (max_txsize_lookup[plane_bsize] == tx_size) { - if (x->skip_txfm[(plane << 2) + (block >> (tx_size << 1))] == - SKIP_TXFM_NONE) { + } else { + int skip_txfm_flag = SKIP_TXFM_NONE; + if (max_txsize_lookup[plane_bsize] == tx_size) + skip_txfm_flag = x->skip_txfm[(plane << 2) + (block >> (tx_size << 1))]; + if (skip_txfm_flag == SKIP_TXFM_NONE) { // full forward transform and quantization vp9_xform_quant(x, plane, block, blk_row, blk_col, plane_bsize, tx_size); if (x->block_qcoeff_opt) vp9_optimize_b(x, plane, block, tx_size, coeff_ctx); dist_block(args->cpi, x, plane, plane_bsize, block, blk_row, blk_col, tx_size, &dist, &sse); - } else if (x->skip_txfm[(plane << 2) + (block >> (tx_size << 1))] == - SKIP_TXFM_AC_ONLY) { + } else if (skip_txfm_flag == SKIP_TXFM_AC_ONLY) { // compute DC coefficient tran_low_t *const coeff = BLOCK_OFFSET(x->plane[plane].coeff, block); tran_low_t *const dqcoeff = BLOCK_OFFSET(xd->plane[plane].dqcoeff, block); @@ -738,13 +739,6 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col, sse = x->bsse[(plane << 2) + (block >> (tx_size << 1))] << 4; dist = sse; } - } else { - // full forward transform and quantization - vp9_xform_quant(x, plane, block, blk_row, blk_col, plane_bsize, tx_size); - if (x->block_qcoeff_opt) - vp9_optimize_b(x, plane, block, tx_size, coeff_ctx); - dist_block(args->cpi, x, plane, plane_bsize, block, blk_row, blk_col, - tx_size, &dist, &sse); } rd = RDCOST(x->rdmult, x->rddiv, 0, dist); |