diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2013-12-06 14:46:28 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-06 14:46:28 -0800 |
| commit | dcb17eaefca3650f3ed5e2ef4e6d564d646ec519 (patch) | |
| tree | 91bb663df8e4e3e08bd04c5d4c0ebcaee05f3522 /vp9/encoder | |
| parent | b6e5bb27c9dd003f6bdb1c4b42fb75ec1ad3198d (diff) | |
| parent | f8c06fb2accc4dfad363547a752a3be210ede0f8 (diff) | |
| download | libvpx-dcb17eaefca3650f3ed5e2ef4e6d564d646ec519.tar libvpx-dcb17eaefca3650f3ed5e2ef4e6d564d646ec519.tar.gz libvpx-dcb17eaefca3650f3ed5e2ef4e6d564d646ec519.tar.bz2 libvpx-dcb17eaefca3650f3ed5e2ef4e6d564d646ec519.zip | |
Merge "Disable early exit based on distortion in lossless"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 8f995830a..8243813f0 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1640,7 +1640,8 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, } sum_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_dist); if (sum_rd < best_rd) { - int64_t stop_thresh = 2048; + int64_t stop_thresh = 4096; + int64_t stop_thresh_rd; best_rate = this_rate; best_dist = this_dist; @@ -1652,9 +1653,10 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, stop_thresh >>= 8 - (b_width_log2_lookup[bsize] + b_height_log2_lookup[bsize]); + stop_thresh_rd = RDCOST(x->rdmult, x->rddiv, 0, stop_thresh); // If obtained distortion is very small, choose current partition // and stop splitting. - if (this_dist < stop_thresh) { + if (!x->e_mbd.lossless && best_rd < stop_thresh_rd) { do_split = 0; do_rect = 0; } |