remove a variable no longer in use

The variable is introduced in commit 2e53e9e53 to make more use of
trellis quantization, but this is no longer necessary after RDMULT
was made adaptive in a number of later commits.

Change-Id: I7420522ec7723f38cf77033466c25afb405d52ae

diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c
index 9517a1d..5d52c9f 100644 (file)
--- a/vp8/encoder/encodeintra.c
+++ b/vp8/encoder/encodeintra.c
@@ -122,7 +122,7 @@ void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
 
     vp8_quantize_mbuv(x);
 
-    if (x->optimize==2 ||(x->optimize && x->rddiv > 1))
+    if (x->optimize)
         vp8_optimize_mbuv(x, rtcd);
 
     vp8_inverse_transform_mbuv(IF_RTCD(&rtcd->common->idct), &x->e_mbd);

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index fe5ec46..adbb04b 100644 (file)
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1229,7 +1229,7 @@ void vp8_set_speed_features(VP8_COMP *cpi)
     }
 
     if (cpi->sf.optimize_coefficients == 1)
-        cpi->mb.optimize = 1 + cpi->is_next_src_alt_ref;
+        cpi->mb.optimize = 1;
     else
         cpi->mb.optimize = 0;
 
@@ -1740,7 +1740,7 @@ void vp8_change_config(VP8_PTR ptr, VP8_CONFIG *oxcf)
     // YX Temp
     cpi->alt_ref_source = NULL;
     cpi->is_src_frame_alt_ref = 0;
-    cpi->is_next_src_alt_ref = 0;
+
 
 #if 0
     // Experimental RD Code
@@ -4642,7 +4642,6 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
             cm->show_frame = 0;
             cpi->source_alt_ref_pending = FALSE;   // Clear Pending altf Ref flag.
             cpi->is_src_frame_alt_ref = 0;
-            cpi->is_next_src_alt_ref = 0;
         }
     }
 #endif
@@ -4656,9 +4655,6 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon
             cpi->is_src_frame_alt_ref = cpi->alt_ref_source
                                         && (cpi->source == cpi->alt_ref_source);
 
-            cpi->is_next_src_alt_ref = cpi->alt_ref_source
-                                        && (vp8_lookahead_peek(cpi->lookahead, 0)
-                                            == cpi->alt_ref_source);
             if(cpi->is_src_frame_alt_ref)
                 cpi->alt_ref_source = NULL;
         }

diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h
index 607e57f..c476164 100644 (file)
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -285,7 +285,6 @@ typedef struct
     int source_alt_ref_active;  // an alt ref frame has been encoded and is usable
 
     int is_src_frame_alt_ref;   // source of frame to encode is an exact copy of an alt ref frame
-    int is_next_src_alt_ref;    // source of next frame to encode is an exact copy of an alt ref frame
 
     int gold_is_last; // golden frame same as last frame ( short circuit gold searches)
     int alt_is_last;  // Alt reference frame same as last ( short circuit altref search)