| 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..a73d13290da53f88e0bb16d516c1d5a81f38b4fe 100644
|
| --- a/webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc
|
| +++ b/webrtc/modules/video_coding/codecs/test/plot_videoprocessor_integrationtest.cc
|
| @@ -29,8 +29,6 @@ const bool kErrorConcealmentOn = false;
|
| const bool kSpatialResizeOn = false;
|
| const bool kFrameDropperOn = false;
|
|
|
| -// Test settings.
|
| -const bool kBatchMode = true;
|
| const bool kVerboseLogging = true;
|
| const float kPacketLoss = 0.0f;
|
| const VisualizationParams kVisualizationParams = {
|
| @@ -38,7 +36,7 @@ const VisualizationParams kVisualizationParams = {
|
| false, // save_decoded_y4m
|
| };
|
|
|
| -const int kNumFrames = 299;
|
| +const int kNumFrames = 300;
|
|
|
| } // namespace
|
|
|
| @@ -58,7 +56,12 @@ class PlotVideoProcessorIntegrationTest
|
| int height,
|
| int framerate,
|
| const std::string& filename) {
|
| - // Bitrate and frame rate profile.
|
| + SetTestConfig(&config_, hw_codec_, kUseSingleCore, kPacketLoss, filename,
|
| + kVerboseLogging);
|
| + SetCodecSettings(&config_, codec_type_, kNumTemporalLayers,
|
| + kErrorConcealmentOn, kDenoisingOn, kFrameDropperOn,
|
| + kSpatialResizeOn, kResilienceOn, width, height);
|
| +
|
| RateProfile rate_profile;
|
| SetRateProfile(&rate_profile,
|
| 0, // update_index
|
| @@ -67,34 +70,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_;
|
|
|