Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Unified Diff: webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc

Issue 2741953002: Step #4: Run VideoProcessor integration test batch mode on task queue. (Closed)
Patch Set: tommi comments 1: Add thread safety annotations. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 bd12b684b88b6a06a315aded76b41d78469ff0cf..e0b3538ad05996a9892b6d6ff5f0ad4803b6244e 100644
--- a/webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc
+++ b/webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc
@@ -22,7 +22,7 @@ const bool kDenoisingOn = false;
const bool kFrameDropperOn = true;
const bool kSpatialResizeOn = false;
const VideoCodecType kVideoCodecType[] = {kVideoCodecVP8};
-const bool kHwCodec = false;
+const bool kHwCodec[] = {false};
const bool kUseSingleCore = true;
// Test settings.
@@ -44,12 +44,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() {}
@@ -66,7 +67,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,
@@ -98,14 +99,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");

Powered by Google App Engine
This is Rietveld 408576698