diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-02-15 16:39:22 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-02-15 17:21:16 -0800 |
| commit | aa84c16da2e700101fc724cf9572e1bdc4775f21 (patch) | |
| tree | 2f63fce46d872fdcdc7a81eddd98feb80f100af0 /vp9/encoder/vp9_rdopt.c | |
| parent | ebfdaa0e0bff5d5eea17277e9e6bf2129ee1d155 (diff) | |
| download | libvpx-aa84c16da2e700101fc724cf9572e1bdc4775f21.tar libvpx-aa84c16da2e700101fc724cf9572e1bdc4775f21.tar.gz libvpx-aa84c16da2e700101fc724cf9572e1bdc4775f21.tar.bz2 libvpx-aa84c16da2e700101fc724cf9572e1bdc4775f21.zip | |
Minor cosmetic cleanups.
Change-Id: I13d8ae754827368755575dd699a087b3b11f5b16
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 60bf3cfe3..ec157961a 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2655,7 +2655,7 @@ static void rd_check_segment(VP9_COMP *cpi, MACROBLOCK *x, if (base_rd < txfm_cache[ONLY_4X4]) { txfm_cache[ONLY_4X4] = base_rd; } - if (base_rd + diff < txfm_cache[1]) { + if (base_rd + diff < txfm_cache[ALLOW_8X8]) { txfm_cache[ALLOW_8X8] = txfm_cache[ALLOW_16X16] = txfm_cache[ALLOW_32X32] = base_rd + diff; } @@ -4213,9 +4213,9 @@ void vp9_rd_pick_intra_mode_sb32(VP9_COMP *cpi, MACROBLOCK *x, int i; err = rd_pick_intra_sby_mode(cpi, x, &rate_y, &rate_y_tokenonly, - &dist_y, &y_skip, txfm_cache); + &dist_y, &y_skip, txfm_cache); rd_pick_intra_sbuv_mode(cpi, x, &rate_uv, &rate_uv_tokenonly, - &dist_uv, &uv_skip); + &dist_uv, &uv_skip); if (cpi->common.mb_no_coeff_skip && y_skip && uv_skip) { *returnrate = rate_y + rate_uv - rate_y_tokenonly - rate_uv_tokenonly + @@ -4247,9 +4247,9 @@ void vp9_rd_pick_intra_mode_sb64(VP9_COMP *cpi, MACROBLOCK *x, int i; err = rd_pick_intra_sb64y_mode(cpi, x, &rate_y, &rate_y_tokenonly, - &dist_y, &y_skip, txfm_cache); + &dist_y, &y_skip, txfm_cache); rd_pick_intra_sb64uv_mode(cpi, x, &rate_uv, &rate_uv_tokenonly, - &dist_uv, &uv_skip); + &dist_uv, &uv_skip); if (cpi->common.mb_no_coeff_skip && y_skip && uv_skip) { *returnrate = rate_y + rate_uv - rate_y_tokenonly - rate_uv_tokenonly + |