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

Frank Galligan committed 11 years ago

Commit 89df6d11 parent 066ed602 files · +14 −1Browse files

Unified · Split

2 files

  *  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"
     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();
+    }
   }
 }

@@ -46,7 +46,7 @@ LIBVPX_TEST_SRCS-$(CONFIG_VP9_ENCODER) += vp9_ethread_test.cc · 45 unmodified lines
46		46
47	LIBVPX_TEST_SRCS-yes += decode_test_driver.cc	47	LIBVPX_TEST_SRCS-yes += decode_test_driver.cc
48	LIBVPX_TEST_SRCS-yes += decode_test_driver.h	48	LIBVPX_TEST_SRCS-yes += decode_test_driver.h
49	LIBVPX_TEST_SRCS-yes += encode_test_driver.cc	49	LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS) += encode_test_driver.cc
50	LIBVPX_TEST_SRCS-yes += encode_test_driver.h	50	LIBVPX_TEST_SRCS-yes += encode_test_driver.h
51		51
52	## IVF writing.	52	## IVF writing.

Keyboard shortcuts