zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove |hw_encoder| and |hw_decoder| from VideoCodecTestFixture::Config.

Browse Source 
Only used for output filename nowadays. Previously, it was used for
selecting the codec implementation. That is now done by injecting
the appropriate codec factory.

Bug: webrtc:9317
Change-Id: Ia2bf28f7df165fb65410ecd1f5d646ee6604e1be
Reviewed-on: https://webrtc-review.googlesource.com/c/106023
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25204}
This commit is contained in:
Rasmus Brandt
2018-10-16 09:14:04 +02:00
committed by Commit Bot
parent f907c49722
commit 2d0c68744c
7 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/video_coding/codecs/test/videocodec_test_parameterized.cc
View File

@ -20,7 +20,6 @@ namespace {
// Loop variables.
const size_t kBitrates[] = {500};
const VideoCodecType kVideoCodecType[] = {kVideoCodecVP8};
const bool kHwCodec[] = {false};
// Codec settings.
const int kNumSpatialLayers = 1;
@ -39,12 +38,11 @@ const int kNumFrames = 30;
class VideoCodecTestParameterized
: public ::testing::Test,
public ::testing::WithParamInterface<
::testing::tuple<size_t, VideoCodecType, bool>> {
::testing::tuple<size_t, VideoCodecType>> {
protected:
VideoCodecTestParameterized()
: bitrate_(::testing::get<0>(GetParam())),
codec_type_(::testing::get<1>(GetParam())),
hw_codec_(::testing::get<2>(GetParam())) {}
codec_type_(::testing::get<1>(GetParam())) {}
~VideoCodecTestParameterized() override = default;
void RunTest(size_t width,
@ -56,8 +54,6 @@ class VideoCodecTestParameterized
config.filepath = ResourcePath(filename, "yuv");
config.use_single_core = kUseSingleCore;
config.measure_cpu = kMeasureCpu;
config.hw_encoder = hw_codec_;
config.hw_decoder = hw_codec_;
config.num_frames = kNumFrames;
const size_t num_simulcast_streams =
@ -80,14 +76,13 @@ class VideoCodecTestParameterized
std::unique_ptr<VideoCodecTestFixture> fixture_;
const size_t bitrate_;
const VideoCodecType codec_type_;
const bool hw_codec_;
};
INSTANTIATE_TEST_CASE_P(CodecSettings,
VideoCodecTestParameterized,
::testing::Combine(::testing::ValuesIn(kBitrates),
::testing::ValuesIn(kVideoCodecType),
::testing::ValuesIn(kHwCodec)));
INSTANTIATE_TEST_CASE_P(
CodecSettings,
VideoCodecTestParameterized,
::testing::Combine(::testing::ValuesIn(kBitrates),
::testing::ValuesIn(kVideoCodecType)));
TEST_P(VideoCodecTestParameterized, Foreman_352x288_30) {
RunTest(352, 288, 30, "foreman_cif");