| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebM project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 #include <climits> | 10 #include <climits> |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 } | 101 } |
| 102 | 102 |
| 103 using std::tr1::make_tuple; | 103 using std::tr1::make_tuple; |
| 104 | 104 |
| 105 #define VP9_FACTORY \ | 105 #define VP9_FACTORY \ |
| 106 static_cast<const libvpx_test::CodecFactory*> (&libvpx_test::kVP9) | 106 static_cast<const libvpx_test::CodecFactory*> (&libvpx_test::kVP9) |
| 107 | 107 |
| 108 VP9_INSTANTIATE_TEST_CASE( | 108 VP9_INSTANTIATE_TEST_CASE( |
| 109 CpuSpeedTest, | 109 CpuSpeedTest, |
| 110 ::testing::Values(::libvpx_test::kTwoPassGood), | 110 ::testing::Values(::libvpx_test::kTwoPassGood), |
| 111 ::testing::Range(0, 3)); | 111 ::testing::Range(0, 5)); |
| 112 } // namespace | 112 } // namespace |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 23440041:
Libvpx: Pull from upstream (Closed)
Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/