Set default encode test driver to 1 column and 1 thread.

Change-Id: I70ee538609cefad76b8ce9b225bbf8d8447aff23

diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc
index b03235b71802931ae9a27e05e2e0b14a4fdc7a58..f3d8e31daf76765e6692f7d698c5be5bfbef5bd9 100644 (file)
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include <string>
+
 #include "./vpx_config.h"
 #include "test/codec_factory.h"
 #include "test/encode_test_driver.h"
@@ -26,9 +28,20 @@ void Encoder::InitEncoder(VideoSource *video) {
     cfg_.g_h = img->d_h;
     cfg_.g_timebase = video->timebase();
     cfg_.rc_twopass_stats_in = stats_->buf();
+
+    // Default to 1 thread and 1 tile column.
+    cfg_.g_threads = 1;
     res = vpx_codec_enc_init(&encoder_, CodecInterface(), &cfg_,
                              init_flags_);
     ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();
+
+    std::string codec_name(encoder_.name);
+    if (codec_name.find("WebM Project VP9 Encoder") != std::string::npos) {
+      const int log2_tile_columns = 0;
+      res = vpx_codec_control_(&encoder_, VP9E_SET_TILE_COLUMNS,
+                               log2_tile_columns);
+      ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();
+    }
   }
 }
 

diff --git a/test/test.mk b/test/test.mk
index 342f3f09272e3f7c79712259f3a6bd480449e347..44f2ba4fd92f87bed454c29cf10961e3428b6600 100644 (file)
--- a/test/test.mk
+++ b/test/test.mk
@@ -46,7 +46,7 @@ LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += vp9_ethread_test.cc
 
 LIBVPX_TEST_SRCS-yes                   += decode_test_driver.cc
 LIBVPX_TEST_SRCS-yes                   += decode_test_driver.h
-LIBVPX_TEST_SRCS-yes                   += encode_test_driver.cc
+LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS)    += encode_test_driver.cc
 LIBVPX_TEST_SRCS-yes                   += encode_test_driver.h
 
 ## IVF writing.