From 45f9ee263f1c0dc4fb0f7b48de3449f50b748472 Mon Sep 17 00:00:00 2001 From: Frank Galligan Date: Tue, 14 Apr 2015 15:01:56 -0700 Subject: [PATCH] Fix multithread encode test The multithread encode test was never actually setting more than one thread. Change-Id: Ie7a3b7b138e88344c943bffd544cf2b4aab866a9 --- test/encode_test_driver.cc | 2 -- test/encode_test_driver.h | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc index bdd71c6..ff39f1a 100644 --- a/test/encode_test_driver.cc +++ b/test/encode_test_driver.cc @@ -29,8 +29,6 @@ void Encoder::InitEncoder(VideoSource *video) { 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(); diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h index 7b7dd31..e16cf9c 100644 --- a/test/encode_test_driver.h +++ b/test/encode_test_driver.h @@ -183,7 +183,10 @@ class EncoderTest { 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() {} -- 2.7.4