diff options
| author | Frank Galligan <fgalligan@google.com> | 2015-04-14 15:01:56 -0700 |
|---|---|---|
| committer | Frank Galligan <fgalligan@google.com> | 2015-04-16 14:20:18 -0700 |
| commit | 45f9ee263f1c0dc4fb0f7b48de3449f50b748472 (patch) | |
| tree | d38f14ba3fb22681ae6c2cb6e829ca1fba812caa | |
| parent | 3701dcc5c15bd6a182addfb2ff10941f87d4f414 (diff) | |
| download | libvpx-45f9ee263f1c0dc4fb0f7b48de3449f50b748472.tar libvpx-45f9ee263f1c0dc4fb0f7b48de3449f50b748472.tar.gz libvpx-45f9ee263f1c0dc4fb0f7b48de3449f50b748472.tar.bz2 libvpx-45f9ee263f1c0dc4fb0f7b48de3449f50b748472.zip | |
Fix multithread encode test
The multithread encode test was never actually setting more than
one thread.
Change-Id: Ie7a3b7b138e88344c943bffd544cf2b4aab866a9
| -rw-r--r-- | test/encode_test_driver.cc | 2 | ||||
| -rw-r--r-- | 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 bdd71c6fe..ff39f1afa 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 7b7dd3160..e16cf9cdd 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() {} |