diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index a321f32b4e..8c56078c70 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -754,7 +754,6 @@ if (rtc_include_tests) { "codecs/multiplex/test/multiplex_adapter_unittest.cc", "codecs/test/video_encoder_decoder_instantiation_tests.cc", "codecs/test/videocodec_test_libvpx.cc", - "codecs/test/videocodec_test_parameterized.cc", "codecs/vp8/test/mock_libvpx_interface.h", "codecs/vp8/test/vp8_impl_unittest.cc", "codecs/vp9/test/vp9_impl_unittest.cc", diff --git a/modules/video_coding/codecs/test/videocodec_test_parameterized.cc b/modules/video_coding/codecs/test/videocodec_test_parameterized.cc deleted file mode 100644 index c96b132485..0000000000 --- a/modules/video_coding/codecs/test/videocodec_test_parameterized.cc +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#include "api/test/create_videocodec_test_fixture.h" -#include "test/gtest.h" -#include "test/testsupport/file_utils.h" - -namespace webrtc { -namespace test { - -namespace { - -// Loop variables. -const size_t kBitrates[] = {500}; -const VideoCodecType kVideoCodecType[] = {kVideoCodecVP8}; - -// Codec settings. -const int kNumSpatialLayers = 1; -const int kNumTemporalLayers = 1; -const bool kDenoisingOn = false; -const bool kSpatialResizeOn = false; -const bool kFrameDropperOn = false; - -// Test settings. -const bool kUseSingleCore = false; -const bool kMeasureCpu = false; -const int kNumFrames = 30; -} // namespace - -// Tests for plotting statistics from logs. -class VideoCodecTestParameterized - : public ::testing::Test, - public ::testing::WithParamInterface< - ::testing::tuple> { - protected: - VideoCodecTestParameterized() - : bitrate_(::testing::get<0>(GetParam())), - codec_type_(::testing::get<1>(GetParam())) {} - ~VideoCodecTestParameterized() override = default; - - void RunTest(size_t width, - size_t height, - size_t framerate, - const std::string& filename) { - VideoCodecTestFixture::Config config; - config.filename = filename; - config.filepath = ResourcePath(filename, "yuv"); - config.use_single_core = kUseSingleCore; - config.measure_cpu = kMeasureCpu; - config.num_frames = kNumFrames; - - const size_t num_simulcast_streams = - codec_type_ == kVideoCodecVP8 ? kNumSpatialLayers : 1; - const size_t num_spatial_layers = - codec_type_ == kVideoCodecVP9 ? kNumSpatialLayers : 1; - - const std::string codec_name = CodecTypeToPayloadString(codec_type_); - config.SetCodecSettings(codec_name, num_simulcast_streams, - num_spatial_layers, kNumTemporalLayers, - kDenoisingOn, kFrameDropperOn, kSpatialResizeOn, - width, height); - - std::vector rate_profiles = {{bitrate_, framerate, 0}}; - - fixture_ = CreateVideoCodecTestFixture(config); - fixture_->RunTest(rate_profiles, nullptr, nullptr, nullptr); - } - std::unique_ptr fixture_; - const size_t bitrate_; - const VideoCodecType codec_type_; -}; - -INSTANTIATE_TEST_SUITE_P( - CodecSettings, - VideoCodecTestParameterized, - ::testing::Combine(::testing::ValuesIn(kBitrates), - ::testing::ValuesIn(kVideoCodecType))); - -TEST_P(VideoCodecTestParameterized, Foreman_352x288_30) { - RunTest(352, 288, 30, "foreman_cif"); -} - -TEST_P(VideoCodecTestParameterized, DISABLED_FourPeople_1280x720_30) { - RunTest(1280, 720, 30, "FourPeople_1280x720_30"); -} - -} // namespace test -} // namespace webrtc