commit 8f3db5f22e2f400f50f1ea050d17fe9bbbb272fe
author Jingning Han <jingning@google.com> Wed Dec 03 11:34:42 2014 -0800
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Wed Dec 03 11:34:42 2014 -0800
tree e8dac692e3f623cede8964909d3c20147b4d5b95
parent 228ec17ff2d05ff5ab21701ccd9bfd12223b51f9
parent a8d8c0f633cac1784091f85b9b098ec45bffead6

Merge "Remove unused ONE_LOOP entry from speed feature"

vp9/encoder/vp9_bitstream.c

diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index 2520a45..4d88fb5 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -613,7 +613,6 @@
       return;
     }
 
-    case ONE_LOOP:
     case ONE_LOOP_REDUCED: {
       int updates = 0;
       int noupdates_before_first = 0;

vp9/encoder/vp9_speed_features.h

diff --git a/vp9/encoder/vp9_speed_features.h b/vp9/encoder/vp9_speed_features.h
index 26bd683..c2cfd62 100644
--- a/vp9/encoder/vp9_speed_features.h
+++ b/vp9/encoder/vp9_speed_features.h
@@ -163,12 +163,9 @@
   // before the final run.
   TWO_LOOP = 0,
 
-  // No dry run conducted.
-  ONE_LOOP = 1,
-
   // No dry run, also only half the coef contexts and bands are updated.
   // The rest are not updated at all.
-  ONE_LOOP_REDUCED = 2
+  ONE_LOOP_REDUCED = 1
 } FAST_COEFF_UPDATE;
 
 typedef struct MV_SPEED_FEATURES {