| Index: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| index a3718a00f4c1a0bc942982894829394bc01b3093..b818fa50d21d98f6ab6be6e37384da211ea0cef9 100644
|
| --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| @@ -46,10 +46,8 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) {
|
| // Metrics for rate control.
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 2, 60, 20, 10, 20, 0, 1);
|
| - ProcessFramesAndVerify(quality_metrics,
|
| - rate_profile,
|
| - process_settings,
|
| - rc_metrics);
|
| + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| #endif // defined(WEBRTC_VIDEOPROCESSOR_H264_TESTS)
|
| @@ -78,7 +76,7 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) {
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| // VP9: Run with 5% packet loss and fixed bitrate. Quality should be a bit
|
| @@ -100,7 +98,7 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLossVP9) {
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| // VP9: Run with no packet loss, with varying bitrate (3 rate updates):
|
| @@ -128,7 +126,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
|
| SetRateControlMetrics(rc_metrics, 1, 2, 0, 20, 20, 60, 0, 0);
|
| SetRateControlMetrics(rc_metrics, 2, 0, 0, 25, 20, 40, 0, 0);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| // VP9: Run with no packet loss, with an update (decrease) in frame rate.
|
| @@ -161,7 +159,7 @@ TEST_F(VideoProcessorIntegrationTest,
|
| SetRateControlMetrics(rc_metrics, 1, 10, 0, 40, 10, 30, 0, 0);
|
| SetRateControlMetrics(rc_metrics, 2, 5, 0, 30, 5, 20, 0, 0);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| // VP9: Run with no packet loss and denoiser on. One key frame (first frame).
|
| @@ -182,7 +180,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| // Run with no packet loss, at low bitrate.
|
| @@ -207,7 +205,7 @@ TEST_F(VideoProcessorIntegrationTest,
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 228, 70, 160, 15, 80, 1, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| // TODO(marpan): Add temporal layer test for VP9, once changes are in
|
| @@ -235,7 +233,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessZeroPacketLoss) {
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| // VP8: Run with 5% packet loss and fixed bitrate. Quality should be a bit
|
| @@ -257,7 +255,7 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLoss) {
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| // VP8: Run with 10% packet loss and fixed bitrate. Quality should be lower.
|
| @@ -279,7 +277,7 @@ TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) {
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| #endif // !defined(WEBRTC_IOS)
|
| @@ -325,7 +323,7 @@ TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP8) {
|
| SetRateControlMetrics(rc_metrics, 1, 0, 0, 25, 20, 10, 0, 0);
|
| SetRateControlMetrics(rc_metrics, 2, 0, 0, 25, 15, 10, 0, 0);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| // VP8: Run with no packet loss, with an update (decrease) in frame rate.
|
| @@ -366,7 +364,7 @@ TEST_F(VideoProcessorIntegrationTest,
|
| SetRateControlMetrics(rc_metrics, 1, 10, 0, 25, 10, 35, 0, 0);
|
| SetRateControlMetrics(rc_metrics, 2, 0, 0, 20, 10, 15, 0, 0);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
|
|
| // VP8: Run with no packet loss, with 3 temporal layers, with a rate update in
|
| @@ -401,7 +399,7 @@ TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossTemporalLayersVP8) {
|
| SetRateControlMetrics(rc_metrics, 0, 0, 20, 30, 10, 10, 0, 1);
|
| SetRateControlMetrics(rc_metrics, 1, 0, 0, 30, 15, 10, 0, 0);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics);
|
| + rc_metrics, nullptr /* visualization_params */);
|
| }
|
| } // namespace test
|
| } // namespace webrtc
|
|
|