shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "cap the best quantizer for 2nd order DC"

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -3127,6 +3127,10 @@

     cm->uvdc_delta_q = 0;

     cm->uvac_delta_q = 0;

+    if(Q<4)

+    {

+        cm->y2dc_delta_q = 4-Q;

+    }

     // Set Segment specific quatizers

     mbd->segment_feature_data[MB_LVL_ALT_Q][0] = cpi->segment_feature_data[MB_LVL_ALT_Q][0];

     mbd->segment_feature_data[MB_LVL_ALT_Q][1] = cpi->segment_feature_data[MB_LVL_ALT_Q][1];

--- a/vp8/encoder/rdopt.c

+++ b/vp8/encoder/rdopt.c

@@ -243,10 +243,9 @@

             cpi->RDMULT += (cpi->RDMULT * rd_iifactor[cpi->next_iiratio]) >> 4;

     }

-    if (cpi->RDMULT < 125)

-        cpi->RDMULT = 125;

-

     cpi->mb.errorperbit = (cpi->RDMULT / 100);

+    cpi->mb.errorperbit += (cpi->mb.errorperbit==0);

+

     vp8_set_speed_features(cpi);

     if (cpi->common.simpler_lpf)

-- 

⑨