From: Alex Converse <aconverse@google.com>
Date: Thu, 5 Mar 2015 19:47:21 +0000 (-0800)
Subject: Call encoder control before running ethread test.
X-Git-Tag: v1.4.0~81^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=587a0b3ef9b191d294d2447a7a918d43bd082db4;p=libvpx

Call encoder control before running ethread test.

The first value of video->frame() is 15 because of the source range used.

Change-Id: I219c287b500fa376160d6dcfb937092e577ec959
---

diff --git a/test/vp9_ethread_test.cc b/test/vp9_ethread_test.cc
index ea1e0d79f..91135de11 100644
--- a/test/vp9_ethread_test.cc
+++ b/test/vp9_ethread_test.cc
@@ -24,6 +24,7 @@ class VP9EncoderThreadTest
  protected:
   VP9EncoderThreadTest()
       : EncoderTest(GET_PARAM(0)),
+        encoder_initialized_(false),
         tiles_(2),
         encoding_mode_(GET_PARAM(1)),
         set_cpu_used_(GET_PARAM(2)) {
@@ -57,9 +58,13 @@ class VP9EncoderThreadTest
     cfg_.rc_min_quantizer = 0;
   }
 
+  virtual void BeginPassHook(unsigned int /*pass*/) {
+    encoder_initialized_ = false;
+  }
+
   virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
                                   ::libvpx_test::Encoder *encoder) {
-    if (video->frame() == 0) {
+    if (!encoder_initialized_) {
       // Encode 4 column tiles.
       encoder->Control(VP9E_SET_TILE_COLUMNS, tiles_);
       encoder->Control(VP8E_SET_CPUUSED, set_cpu_used_);
@@ -71,6 +76,7 @@ class VP9EncoderThreadTest
       } else {
         encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 0);
       }
+      encoder_initialized_ = true;
     }
   }
 
@@ -90,6 +96,7 @@ class VP9EncoderThreadTest
     }
   }
 
+  bool encoder_initialized_;
   int tiles_;
   ::libvpx_test::TestMode encoding_mode_;
   int set_cpu_used_;