diff options
Diffstat (limited to 'media/libaom/src/test/codec_factory.h')
| -rw-r--r-- | media/libaom/src/test/codec_factory.h | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/media/libaom/src/test/codec_factory.h b/media/libaom/src/test/codec_factory.h index dd99110ee6..801b8948fe 100644 --- a/media/libaom/src/test/codec_factory.h +++ b/media/libaom/src/test/codec_factory.h @@ -11,6 +11,8 @@ #ifndef AOM_TEST_CODEC_FACTORY_H_ #define AOM_TEST_CODEC_FACTORY_H_ +#include <tuple> + #include "config/aom_config.h" #include "aom/aom_decoder.h" @@ -40,11 +42,11 @@ class CodecFactory { const aom_codec_flags_t flags) const = 0; virtual Encoder *CreateEncoder(aom_codec_enc_cfg_t cfg, - const unsigned long init_flags, + const aom_codec_flags_t init_flags, TwopassStatsStore *stats) const = 0; virtual aom_codec_err_t DefaultEncoderConfig(aom_codec_enc_cfg_t *cfg, - int usage) const = 0; + unsigned int usage) const = 0; }; /* Provide CodecTestWith<n>Params classes for a variable number of parameters @@ -54,27 +56,28 @@ class CodecFactory { template <class T1> class CodecTestWithParam : public ::testing::TestWithParam< - ::testing::tuple<const libaom_test::CodecFactory *, T1> > {}; + std::tuple<const libaom_test::CodecFactory *, T1> > {}; template <class T1, class T2> class CodecTestWith2Params : public ::testing::TestWithParam< - ::testing::tuple<const libaom_test::CodecFactory *, T1, T2> > {}; + std::tuple<const libaom_test::CodecFactory *, T1, T2> > {}; template <class T1, class T2, class T3> class CodecTestWith3Params : public ::testing::TestWithParam< - ::testing::tuple<const libaom_test::CodecFactory *, T1, T2, T3> > {}; + std::tuple<const libaom_test::CodecFactory *, T1, T2, T3> > {}; template <class T1, class T2, class T3, class T4> class CodecTestWith4Params - : public ::testing::TestWithParam< ::testing::tuple< - const libaom_test::CodecFactory *, T1, T2, T3, T4> > {}; + : public ::testing::TestWithParam< + std::tuple<const libaom_test::CodecFactory *, T1, T2, T3, T4> > {}; template <class T1, class T2, class T3, class T4, class T5> class CodecTestWith5Params - : public ::testing::TestWithParam< ::testing::tuple< - const libaom_test::CodecFactory *, T1, T2, T3, T4, T5> > {}; + : public ::testing::TestWithParam< + std::tuple<const libaom_test::CodecFactory *, T1, T2, T3, T4, T5> > { +}; /* * AV1 Codec Definitions @@ -98,7 +101,7 @@ class AV1Decoder : public Decoder { class AV1Encoder : public Encoder { public: - AV1Encoder(aom_codec_enc_cfg_t cfg, const uint32_t init_flags, + AV1Encoder(aom_codec_enc_cfg_t cfg, const aom_codec_flags_t init_flags, TwopassStatsStore *stats) : Encoder(cfg, init_flags, stats) {} @@ -132,7 +135,7 @@ class AV1CodecFactory : public CodecFactory { } virtual Encoder *CreateEncoder(aom_codec_enc_cfg_t cfg, - const unsigned long init_flags, + const aom_codec_flags_t init_flags, TwopassStatsStore *stats) const { #if CONFIG_AV1_ENCODER return new AV1Encoder(cfg, init_flags, stats); @@ -145,7 +148,7 @@ class AV1CodecFactory : public CodecFactory { } virtual aom_codec_err_t DefaultEncoderConfig(aom_codec_enc_cfg_t *cfg, - int usage) const { + unsigned int usage) const { #if CONFIG_AV1_ENCODER return aom_codec_enc_config_default(aom_codec_av1_cx(), cfg, usage); #else @@ -159,7 +162,7 @@ class AV1CodecFactory : public CodecFactory { const libaom_test::AV1CodecFactory kAV1; #define AV1_INSTANTIATE_TEST_CASE(test, ...) \ - INSTANTIATE_TEST_CASE_P( \ + INSTANTIATE_TEST_SUITE_P( \ AV1, test, \ ::testing::Combine( \ ::testing::Values(static_cast<const libaom_test::CodecFactory *>( \ |