Index: webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc |
diff --git a/webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc |
index 42f0e69e83f077f08d47e4c0f0f7ed2b1573dcbc..9267991e0b1aeb2511a8cfdbf767f0ffbdd7d184 100644 |
--- a/webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc |
+++ b/webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc |
@@ -23,7 +23,7 @@ const bool kFrameDropperOn = true; |
const bool kSpatialResizeOn = false; |
const bool kResilienceOn = false; |
const VideoCodecType kVideoCodecType[] = {kVideoCodecVP8}; |
-const bool kHwCodec = false; |
+const bool kHwCodec[] = {false}; |
const bool kUseSingleCore = true; |
// Test settings. |
@@ -45,12 +45,13 @@ const bool kVerboseLogging = true; |
class PlotVideoProcessorIntegrationTest |
: public VideoProcessorIntegrationTest, |
public ::testing::WithParamInterface< |
- ::testing::tuple<int, int, VideoCodecType>> { |
+ ::testing::tuple<int, int, VideoCodecType, bool>> { |
protected: |
PlotVideoProcessorIntegrationTest() |
: bitrate_(::testing::get<0>(GetParam())), |
framerate_(::testing::get<1>(GetParam())), |
- codec_type_(::testing::get<2>(GetParam())) {} |
+ codec_type_(::testing::get<2>(GetParam())), |
+ hw_codec_(::testing::get<3>(GetParam())) {} |
virtual ~PlotVideoProcessorIntegrationTest() {} |
@@ -67,7 +68,7 @@ class PlotVideoProcessorIntegrationTest |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams( |
- &process_settings, codec_type_, kHwCodec, kUseSingleCore, kPacketLoss, |
+ &process_settings, codec_type_, hw_codec_, kUseSingleCore, kPacketLoss, |
-1, // key_frame_interval |
1, // num_temporal_layers |
kErrorConcealmentOn, kDenoisingOn, kFrameDropperOn, kSpatialResizeOn, |
@@ -99,14 +100,15 @@ class PlotVideoProcessorIntegrationTest |
const int bitrate_; |
const int framerate_; |
const VideoCodecType codec_type_; |
+ const bool hw_codec_; |
}; |
-INSTANTIATE_TEST_CASE_P( |
- CodecSettings, |
- PlotVideoProcessorIntegrationTest, |
- ::testing::Combine(::testing::ValuesIn(kBitrates), |
- ::testing::ValuesIn(kFps), |
- ::testing::ValuesIn(kVideoCodecType))); |
+INSTANTIATE_TEST_CASE_P(CodecSettings, |
+ PlotVideoProcessorIntegrationTest, |
+ ::testing::Combine(::testing::ValuesIn(kBitrates), |
+ ::testing::ValuesIn(kFps), |
+ ::testing::ValuesIn(kVideoCodecType), |
+ ::testing::ValuesIn(kHwCodec))); |
TEST_P(PlotVideoProcessorIntegrationTest, Process128x96) { |
RunTest(128, 96, "foreman_128x96"); |