diff options
| author | Adrian Grange <agrange@google.com> | 2013-08-02 11:36:46 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-02 11:36:46 -0700 |
| commit | 075b11f004fae83f57231be4c4b419090c5e12e6 (patch) | |
| tree | 58470c87c129d252173ed563d51c46160f555e08 /vp9/encoder/vp9_rdopt.c | |
| parent | 8ff58093f0b651b2130cd178cc727489a6648d84 (diff) | |
| parent | 5271d478928cc0cf66b1fbbed1fca2bdc0abe5e9 (diff) | |
| download | libvpx-075b11f004fae83f57231be4c4b419090c5e12e6.tar libvpx-075b11f004fae83f57231be4c4b419090c5e12e6.tar.gz libvpx-075b11f004fae83f57231be4c4b419090c5e12e6.tar.bz2 libvpx-075b11f004fae83f57231be4c4b419090c5e12e6.zip | |
Merge "Changed name of rd_pick_intra4x4mby_modes"
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 3b4bfa901..fb3358e06 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1306,9 +1306,12 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib, return best_rd; } -static int64_t rd_pick_intra4x4mby_modes(VP9_COMP *cpi, MACROBLOCK *mb, - int *Rate, int *rate_y, - int64_t *Distortion, int64_t best_rd) { +static int64_t rd_pick_intra_sub_8x8_y_mode(VP9_COMP * const cpi, + MACROBLOCK * const mb, + int * const rate, + int * const rate_y, + int64_t * const distortion, + int64_t best_rd) { int i, j; MACROBLOCKD *const xd = &mb->e_mbd; BLOCK_SIZE_TYPE bsize = xd->mode_info_context->mbmi.sb_type; @@ -1316,7 +1319,7 @@ static int64_t rd_pick_intra4x4mby_modes(VP9_COMP *cpi, MACROBLOCK *mb, int num_4x4_blocks_high = num_4x4_blocks_high_lookup[bsize]; int idx, idy; int cost = 0; - int64_t distortion = 0; + int64_t total_distortion = 0; int tot_rate_y = 0; int64_t total_rd = 0; ENTROPY_CONTEXT t_above[4], t_left[4]; @@ -1354,7 +1357,7 @@ static int64_t rd_pick_intra4x4mby_modes(VP9_COMP *cpi, MACROBLOCK *mb, total_rd += this_rd; cost += r; - distortion += d; + total_distortion += d; tot_rate_y += ry; mic->bmi[i].as_mode = best_mode; @@ -1368,12 +1371,12 @@ static int64_t rd_pick_intra4x4mby_modes(VP9_COMP *cpi, MACROBLOCK *mb, } } - *Rate = cost; + *rate = cost; *rate_y = tot_rate_y; - *Distortion = distortion; + *distortion = total_distortion; xd->mode_info_context->mbmi.mode = mic->bmi[3].as_mode; - return RDCOST(mb->rdmult, mb->rddiv, cost, distortion); + return RDCOST(mb->rdmult, mb->rddiv, cost, total_distortion); } static int64_t rd_pick_intra_sby_mode(VP9_COMP *cpi, MACROBLOCK *x, @@ -3150,8 +3153,8 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, &dist_uv, &uv_skip, bsize); } else { y_skip = 0; - if (rd_pick_intra4x4mby_modes(cpi, x, &rate_y, &rate_y_tokenonly, - &dist_y, best_rd) >= best_rd) { + if (rd_pick_intra_sub_8x8_y_mode(cpi, x, &rate_y, &rate_y_tokenonly, + &dist_y, best_rd) >= best_rd) { *returnrate = INT_MAX; return; } @@ -3502,9 +3505,10 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, continue; */ + // I4X4_PRED is only considered for block sizes less than 8x8. mbmi->txfm_size = TX_4X4; - if (rd_pick_intra4x4mby_modes(cpi, x, &rate, &rate_y, - &distortion_y, best_rd) >= best_rd) + if (rd_pick_intra_sub_8x8_y_mode(cpi, x, &rate, &rate_y, + &distortion_y, best_rd) >= best_rd) continue; rate2 += rate; rate2 += intra_cost_penalty; |