diff options
| author | Jingning Han <jingning@google.com> | 2014-07-25 15:57:35 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-25 15:57:35 -0700 |
| commit | ac1f06188d880ca9316205efbb2012da9b6bb4e3 (patch) | |
| tree | 149f0c858594f26ad0cb7b8dcb8dda1bdc02c8c1 /vp9/encoder | |
| parent | 0c103eb21173c52e9c07a7e7c4d5ef9af981fde6 (diff) | |
| parent | 84af0486f91faa897202a39d2f77687dd420ced6 (diff) | |
| download | libvpx-ac1f06188d880ca9316205efbb2012da9b6bb4e3.tar libvpx-ac1f06188d880ca9316205efbb2012da9b6bb4e3.tar.gz libvpx-ac1f06188d880ca9316205efbb2012da9b6bb4e3.tar.bz2 libvpx-ac1f06188d880ca9316205efbb2012da9b6bb4e3.zip | |
Merge "Fix rd_pick_partition search loop for 4x4 blocks"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index f6c21510d..584bcb8f5 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2015,17 +2015,10 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, ctx->mic.mbmi.interp_filter; rd_pick_sb_modes(cpi, tile, mi_row, mi_col, &sum_rate, &sum_dist, subsize, pc_tree->leaf_split[0], best_rd, 0); - if (sum_rate == INT_MAX) { + if (sum_rate == INT_MAX) sum_rd = INT64_MAX; - } else { + else sum_rd = RDCOST(x->rdmult, x->rddiv, sum_rate, sum_dist); - if (sum_rd < best_rd) { - update_state(cpi, pc_tree->leaf_split[0], mi_row, mi_col, subsize, 0); - encode_superblock(cpi, tp, 0, mi_row, mi_col, subsize, - pc_tree->leaf_split[0]); - update_partition_context(xd, mi_row, mi_col, subsize, bsize); - } - } } else { for (i = 0; i < 4 && sum_rd < best_rd; ++i) { const int x_idx = (i & 1) * mi_step; |