Merge "Remove CONSTRAIN_NEIGHBORING_MIN_MAX."

[libvpx] / vp9 / encoder / vp9_encodeframe.c

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 568314174d39e5173bba0c51cf6e46b807497017..6c35aa40536b8eea8a35a82b74ee39737fab92f9 100644 (file)
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -499,7 +499,8 @@ void vp9_set_vbp_thresholds(VP9_COMP *cpi, int q) {
         cpi->vbp_thresholds[0] = threshold_base;
         cpi->vbp_thresholds[1] = (5 * threshold_base) >> 2;
         cpi->vbp_thresholds[2] = threshold_base << cpi->oxcf.speed;
-        cpi->vbp_threshold_sad = 1000;
+        cpi->vbp_threshold_sad = (cpi->y_dequant[q][1] << 1) > 1000 ?
+            (cpi->y_dequant[q][1] << 1) : 1000;
       }
       cpi->vbp_bsize_min = BLOCK_16X16;
     }