commit e8e09d33df6d9ea0f93307fddfcfa402198b09cc
author Paul Wilkins <paulwilkins@google.com> Wed Jan 26 09:33:48 2011 -0800
committer Code Review <code-review@webmproject.org> Wed Jan 26 09:33:48 2011 -0800
tree 4fbe13ecccc5fbdc39a46ddcc81a09ab2c352491
parent 82266a1ac971c2f7b0984e717cb9353309a8ed7c
parent a3f71ccff6c514a7396a1a329194e5cda18b6825

Merge "Correction to buffer update for non-viewable frames."

vp8/encoder/onyx_if.c

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index d60bf8b..7029cde 100644
--- 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];

vp8/encoder/rdopt.c

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 3b898f1..36420aa 100644
--- 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)

vp8/vp8cx_arm.mk

diff --git a/vp8/vp8cx_arm.mk b/vp8/vp8cx_arm.mk
index 4113f23..6b624a7 100644
--- a/vp8/vp8cx_arm.mk
+++ b/vp8/vp8cx_arm.mk
@@ -60,7 +60,7 @@
 vpx_vp8_enc_asm_offsets.asm: obj_int_extract
 vpx_vp8_enc_asm_offsets.asm: $(VP8_PREFIX)encoder/arm/vpx_vp8_enc_asm_offsets.c.o
 	./obj_int_extract rvds $< $(ADS2GAS) > $@
-OBJS-yes += $(VP8_PREFIX)encoder/arm/vpx_vp7_enc_asm_offsets.c.o
+OBJS-yes += $(VP8_PREFIX)encoder/arm/vpx_vp8_enc_asm_offsets.c.o
 CLEAN-OBJS += vpx_vp8_enc_asm_offsets.asm
 $(filter %$(ASM).o,$(OBJS-yes)): vpx_vp8_enc_asm_offsets.asm
 endif