summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2013-07-22 12:08:22 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-07-22 12:08:22 -0700
commit416f315e82d97b83d4d12dad90fa82b5bdb7c66f (patch)
tree5eb34af28b00d7e43fefabb26482aeb460d1970b
parenta5a9f5f7f3d0c83767952f514470273e3bcba2bc (diff)
parentc725502bf32b0df223aaf179a828360433606a1c (diff)
downloadlibvpx-416f315e82d97b83d4d12dad90fa82b5bdb7c66f.tar
libvpx-416f315e82d97b83d4d12dad90fa82b5bdb7c66f.tar.gz
libvpx-416f315e82d97b83d4d12dad90fa82b5bdb7c66f.tar.bz2
libvpx-416f315e82d97b83d4d12dad90fa82b5bdb7c66f.zip
Merge "Skip buffer update in sub8x8 rd loop"
-rw-r--r--vp9/encoder/vp9_rdopt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index bd991397b..775e10745 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2189,6 +2189,8 @@ static int64_t rd_pick_best_mbsegmentation(VP9_COMP *cpi, MACROBLOCK *x,
rd_check_segment_txsize(cpi, x, bsi_buf, filter_idx, seg_mvs, mi_row, mi_col);
+ if (bsi.segment_rd > best_rd)
+ return INT64_MAX;
/* set it to the best */
for (i = 0; i < 4; i++) {
mode_idx = inter_mode_offset(bsi->modes[i]);