shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix multithread encode test"

--- a/test/encode_test_driver.cc

+++ b/test/encode_test_driver.cc

@@ -29,8 +29,6 @@

     cfg_.g_timebase = video->timebase();

     cfg_.rc_twopass_stats_in = stats_->buf();

-    // Default to 1 thread.

-    cfg_.g_threads = 1;

     res = vpx_codec_enc_init(&encoder_, CodecInterface(), &cfg_,

                              init_flags_);

     ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();

--- a/test/encode_test_driver.h

+++ b/test/encode_test_driver.h

@@ -183,7 +183,10 @@

  protected:

   explicit EncoderTest(const CodecFactory *codec)

       : codec_(codec), abort_(false), init_flags_(0), frame_flags_(0),

-        last_pts_(0) {}

+        last_pts_(0) {

+    // Default to 1 thread.

+    cfg_.g_threads = 1;

+  }

   virtual ~EncoderTest() {}