diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-01-26 09:27:11 -0800 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-01-26 09:27:11 -0800 |
| commit | 82266a1ac971c2f7b0984e717cb9353309a8ed7c (patch) | |
| tree | 395917498db0675a8e5a18c7e83351763e40d025 | |
| parent | be3e0ff7c3f62fdebbef232907fd0082c11c4ed1 (diff) | |
| parent | 999e155f55f07238e9900d4ec25ff4ac311a5f92 (diff) | |
| download | libvpx-82266a1ac971c2f7b0984e717cb9353309a8ed7c.tar libvpx-82266a1ac971c2f7b0984e717cb9353309a8ed7c.tar.gz libvpx-82266a1ac971c2f7b0984e717cb9353309a8ed7c.tar.bz2 libvpx-82266a1ac971c2f7b0984e717cb9353309a8ed7c.zip | |
Merge "cap the best quantizer for 2nd order DC"
| -rw-r--r-- | vp8/encoder/onyx_if.c | 4 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 900785364..77cec7373 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -3127,6 +3127,10 @@ static void set_quantizer(VP8_COMP *cpi, int Q) 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]; diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 3b898f1b2..36420aad1 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -243,10 +243,9 @@ void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue) 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) |