diff options
Diffstat (limited to 'vp10/encoder/rdopt.c')
| -rw-r--r-- | vp10/encoder/rdopt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c index c9ad94557..4c9b4ba29 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c @@ -1347,8 +1347,7 @@ 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[cpi->common.frame_type][mode]; + this_rate = this_rate_tokenonly + cpi->intra_uv_mode_cost[mode]; this_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_distortion); if (this_rd < best_rd) { @@ -1371,14 +1370,13 @@ static int64_t rd_sbuv_dcpred(const VP10_COMP *cpi, MACROBLOCK *x, int *rate, int *rate_tokenonly, int64_t *distortion, int *skippable, BLOCK_SIZE bsize) { - const VP10_COMMON *cm = &cpi->common; int64_t unused; x->e_mbd.mi[0]->mbmi.uv_mode = DC_PRED; 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[cm->frame_type][DC_PRED]; + *rate = *rate_tokenonly + cpi->intra_uv_mode_cost[DC_PRED]; return RDCOST(x->rdmult, x->rddiv, *rate, *distortion); } |