Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libvpx / source / libvpx / test / cpu_speed_test.cc

diff --git a/src/third_party/libvpx/source/libvpx/test/cpu_speed_test.cc b/src/third_party/libvpx/source/libvpx/test/cpu_speed_test.cc
index c92e723..be651b4 100644 (file)
--- a/src/third_party/libvpx/source/libvpx/test/cpu_speed_test.cc
+++ b/src/third_party/libvpx/source/libvpx/test/cpu_speed_test.cc
@@ -22,6 +22,7 @@ class CpuSpeedTest : public ::libvpx_test::EncoderTest,
         libvpx_test::TestMode, int> {
  protected:
   CpuSpeedTest() : EncoderTest(GET_PARAM(0)) {}
+  virtual ~CpuSpeedTest() {}
 
   virtual void SetUp() {
     InitializeConfig();
@@ -79,7 +80,7 @@ TEST_P(CpuSpeedTest, TestEncodeHighBitrate) {
   cfg_.rc_min_quantizer = 0;
 
   ::libvpx_test::I420VideoSource video("hantro_odd.yuv", 208, 144, 30, 1, 0,
-                                       40);
+                                       20);
 
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
 }
@@ -95,7 +96,7 @@ TEST_P(CpuSpeedTest, TestLowBitrate) {
   cfg_.rc_min_quantizer = 40;
 
   ::libvpx_test::I420VideoSource video("hantro_odd.yuv", 208, 144, 30, 1, 0,
-                                       40);
+                                       20);
 
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
 }
@@ -107,6 +108,6 @@ using std::tr1::make_tuple;
 
 VP9_INSTANTIATE_TEST_CASE(
     CpuSpeedTest,
-    ::testing::Values(::libvpx_test::kTwoPassGood),
-    ::testing::Range(0, 5));
+    ::testing::Values(::libvpx_test::kTwoPassGood, ::libvpx_test::kOnePassGood),
+    ::testing::Range(0, 8));
 }  // namespace