| 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 7445c9291c79c6f173050ec855accbd58a4c0ded..cb2315db3d2bce72819a933a77071d9150681e90 100644
|
| --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| @@ -43,8 +43,10 @@
|
| // 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, nullptr /* visualization_params */);
|
| + ProcessFramesAndVerify(quality_metrics,
|
| + rate_profile,
|
| + process_settings,
|
| + rc_metrics);
|
| }
|
|
|
| #endif // defined(WEBRTC_VIDEOPROCESSOR_H264_TESTS)
|
| @@ -73,7 +75,7 @@
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| // VP9: Run with 5% packet loss and fixed bitrate. Quality should be a bit
|
| @@ -95,7 +97,7 @@
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| // VP9: Run with no packet loss, with varying bitrate (3 rate updates):
|
| @@ -123,7 +125,7 @@
|
| 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, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| // VP9: Run with no packet loss, with an update (decrease) in frame rate.
|
| @@ -156,7 +158,7 @@
|
| 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, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| // VP9: Run with no packet loss and denoiser on. One key frame (first frame).
|
| @@ -177,7 +179,7 @@
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| // Run with no packet loss, at low bitrate.
|
| @@ -202,7 +204,7 @@
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 228, 70, 160, 15, 80, 1, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| // TODO(marpan): Add temporal layer test for VP9, once changes are in
|
| @@ -230,7 +232,7 @@
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| // VP8: Run with 5% packet loss and fixed bitrate. Quality should be a bit
|
| @@ -252,7 +254,7 @@
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| // VP8: Run with 10% packet loss and fixed bitrate. Quality should be lower.
|
| @@ -274,7 +276,7 @@
|
| RateControlMetrics rc_metrics[1];
|
| SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1);
|
| ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings,
|
| - rc_metrics, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| #endif // !defined(WEBRTC_IOS)
|
| @@ -320,7 +322,7 @@
|
| 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, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| // VP8: Run with no packet loss, with an update (decrease) in frame rate.
|
| @@ -361,7 +363,7 @@
|
| 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, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
|
|
| // VP8: Run with no packet loss, with 3 temporal layers, with a rate update in
|
| @@ -396,7 +398,7 @@
|
| 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, nullptr /* visualization_params */);
|
| + rc_metrics);
|
| }
|
| } // namespace test
|
| } // namespace webrtc
|
|
|