diff options
| author | Hui Su <huisu@google.com> | 2015-11-07 00:22:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-07 00:22:50 +0000 |
| commit | 908fbabe4ed6dc057a9d16ef5e9d575d57bd76be (patch) | |
| tree | e0ad89bcc2bd957920457319f4901fc6a4518aa2 /vp10/encoder/rdopt.c | |
| parent | eba14ddbe7e7b69803dab770ba25ae2ba75c65e2 (diff) | |
| parent | 6ab6ac450b29ea21411072297bafb9a78a78291d (diff) | |
| download | libvpx-908fbabe4ed6dc057a9d16ef5e9d575d57bd76be.tar libvpx-908fbabe4ed6dc057a9d16ef5e9d575d57bd76be.tar.gz libvpx-908fbabe4ed6dc057a9d16ef5e9d575d57bd76be.tar.bz2 libvpx-908fbabe4ed6dc057a9d16ef5e9d575d57bd76be.zip | |
Merge "Use accurate bit cost for uv_mode in UV intra mode RD selection"
Diffstat (limited to 'vp10/encoder/rdopt.c')
| -rw-r--r-- | vp10/encoder/rdopt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index cecc59c8f..8ba211017 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c @@ -1369,7 +1369,8 @@ static int64_t rd_pick_intra_sbuv_mode(VP10_COMP *cpi, MACROBLOCK *x, if (!super_block_uvrd(cpi, x, &this_rate_tokenonly, &this_distortion, &s, &this_sse, bsize, best_rd)) continue; - this_rate = this_rate_tokenonly + cpi->intra_uv_mode_cost[mode]; + this_rate = this_rate_tokenonly + + cpi->intra_uv_mode_cost[xd->mi[0]->mbmi.mode][mode]; this_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_distortion); if (this_rd < best_rd) { @@ -1398,7 +1399,8 @@ static int64_t rd_sbuv_dcpred(const VP10_COMP *cpi, MACROBLOCK *x, memset(x->skip_txfm, SKIP_TXFM_NONE, sizeof(x->skip_txfm)); super_block_uvrd(cpi, x, rate_tokenonly, distortion, skippable, &unused, bsize, INT64_MAX); - *rate = *rate_tokenonly + cpi->intra_uv_mode_cost[DC_PRED]; + *rate = *rate_tokenonly + + cpi->intra_uv_mode_cost[x->e_mbd.mi[0]->mbmi.mode][DC_PRED]; return RDCOST(x->rdmult, x->rddiv, *rate, *distortion); } |