diff options
Diffstat (limited to 'media/libaom/src/test/superframe_test.cc')
| -rw-r--r-- | media/libaom/src/test/superframe_test.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/media/libaom/src/test/superframe_test.cc b/media/libaom/src/test/superframe_test.cc index 7be18f72a..024a18b97 100644 --- a/media/libaom/src/test/superframe_test.cc +++ b/media/libaom/src/test/superframe_test.cc @@ -10,6 +10,7 @@ */ #include <climits> +#include <tuple> #include <vector> #include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "test/codec_factory.h" @@ -23,7 +24,7 @@ const int kTestMode = 0; const int kTileCols = 1; const int kTileRows = 2; -typedef ::testing::tuple<libaom_test::TestMode, int, int> SuperframeTestParam; +typedef std::tuple<libaom_test::TestMode, int, int> SuperframeTestParam; class SuperframeTest : public ::libaom_test::CodecTestWithParam<SuperframeTestParam>, @@ -35,17 +36,17 @@ class SuperframeTest virtual void SetUp() { InitializeConfig(); const SuperframeTestParam input = GET_PARAM(1); - const libaom_test::TestMode mode = ::testing::get<kTestMode>(input); + const libaom_test::TestMode mode = std::get<kTestMode>(input); SetMode(mode); sf_count_ = 0; sf_count_max_ = INT_MAX; - n_tile_cols_ = ::testing::get<kTileCols>(input); - n_tile_rows_ = ::testing::get<kTileRows>(input); + n_tile_cols_ = std::get<kTileCols>(input); + n_tile_rows_ = std::get<kTileRows>(input); } virtual void PreEncodeFrameHook(libaom_test::VideoSource *video, libaom_test::Encoder *encoder) { - if (video->frame() == 1) { + if (video->frame() == 0) { encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1); encoder->Control(AOME_SET_CPUUSED, 2); encoder->Control(AV1E_SET_TILE_COLUMNS, n_tile_cols_); |