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

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

Issue 3008543002: Make rate control and quality thresholds optional in VideoProcessorIntegrationTest. (Closed)
Patch Set: asapersson comments 1. Created 3 years, 4 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
« no previous file with comments | « no previous file | webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4aeed569a40e6f7d6baa68d07e1c4cc49e77308c..198bb8a68270e95cb1c117577a7ed658c85ca020 100644
--- a/webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc
+++ b/webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc
@@ -58,7 +58,12 @@ class PlotVideoProcessorIntegrationTest
int height,
int framerate,
const std::string& filename) {
- // Bitrate and frame rate profile.
+ SetTestConfig(&config_, hw_codec_, kUseSingleCore, kPacketLoss, filename,
+ kVerboseLogging, kBatchMode);
+ SetCodecSettings(&config_, codec_type_, kNumTemporalLayers,
+ kErrorConcealmentOn, kDenoisingOn, kFrameDropperOn,
+ kSpatialResizeOn, kResilienceOn, width, height);
+
RateProfile rate_profile;
SetRateProfile(&rate_profile,
0, // update_index
@@ -67,34 +72,8 @@ class PlotVideoProcessorIntegrationTest
rate_profile.frame_index_rate_update[1] = kNumFrames + 1;
rate_profile.num_frames = kNumFrames;
- // Codec/network settings.
- SetTestConfig(&config_, hw_codec_, kUseSingleCore, kPacketLoss, filename,
- kVerboseLogging, kBatchMode);
- SetCodecSettings(&config_, codec_type_, kNumTemporalLayers,
- kErrorConcealmentOn, kDenoisingOn, kFrameDropperOn,
- kSpatialResizeOn, kResilienceOn, width, height);
-
- // Use default thresholds for quality (PSNR and SSIM).
- QualityThresholds quality_thresholds;
-
- // Use very loose thresholds for rate control, so even poor HW codecs will
- // pass the requirements.
- RateControlThresholds rc_thresholds[1];
- // clang-format off
- SetRateControlThresholds(
- rc_thresholds,
- 0, // update_index
- kNumFrames + 1, // max_num_dropped_frames
- 10000, // max_key_frame_size_mismatch
- 10000, // max_delta_frame_size_mismatch
- 10000, // max_encoding_rate_mismatch
- kNumFrames + 1, // max_time_hit_target
- 0, // num_spatial_resizes
- 1); // num_key_frames
- // clang-format on
-
- ProcessFramesAndVerify(quality_thresholds, rate_profile, rc_thresholds,
- &kVisualizationParams);
+ ProcessFramesAndMaybeVerify(rate_profile, nullptr, nullptr,
+ &kVisualizationParams);
}
const int bitrate_;
« no previous file with comments | « no previous file | webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698