| 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 88f5b0e3f8d1c234da80cc97c02acd453257631c..5e23614e028fe3b920ca12281400e4e60fff5082 100644
|
| --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| @@ -13,6 +13,13 @@
|
| namespace webrtc {
|
| namespace test {
|
|
|
| +namespace {
|
| +
|
| +// In these correctness tests, we only consider SW codecs.
|
| +const bool kNoHwCodec = false;
|
| +
|
| +} // namespace
|
| +
|
| #if defined(WEBRTC_VIDEOPROCESSOR_H264_TESTS)
|
|
|
| // H264: Run with no packet loss and fixed bitrate. Quality should be very high.
|
| @@ -28,8 +35,8 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) {
|
| rate_profile.num_frames = kNbrFramesShort;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecH264, 0.0f, -1, 1, false,
|
| - false, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecH264, kNoHwCodec, 0.0f, -1,
|
| + 1, false, false, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 35.0, 25.0, 0.93, 0.70);
|
| @@ -59,8 +66,8 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) {
|
| rate_profile.num_frames = kNbrFramesShort;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP9, 0.0f, -1, 1, false,
|
| - false, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP9, kNoHwCodec, 0.0f, -1, 1,
|
| + false, false, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 37.0, 36.0, 0.93, 0.92);
|
| @@ -81,8 +88,8 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLossVP9) {
|
| rate_profile.num_frames = kNbrFramesShort;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP9, 0.05f, -1, 1, false,
|
| - false, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP9, kNoHwCodec, 0.05f, -1,
|
| + 1, false, false, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 17.0, 14.0, 0.45, 0.36);
|
| @@ -107,8 +114,8 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
|
| rate_profile.num_frames = kNbrFramesLong;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP9, 0.0f, -1, 1, false,
|
| - false, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP9, kNoHwCodec, 0.0f, -1, 1,
|
| + false, false, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 35.5, 30.0, 0.90, 0.85);
|
| @@ -140,8 +147,8 @@ TEST_F(VideoProcessorIntegrationTest,
|
| rate_profile.num_frames = kNbrFramesLong;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP9, 0.0f, -1, 1, false,
|
| - false, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP9, kNoHwCodec, 0.0f, -1, 1,
|
| + false, false, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 31.5, 18.0, 0.80, 0.43);
|
| @@ -163,8 +170,8 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
|
| rate_profile.num_frames = kNbrFramesShort;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP9, 0.0f, -1, 1, false,
|
| - true, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP9, kNoHwCodec, 0.0f, -1, 1,
|
| + false, true, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 36.8, 35.8, 0.92, 0.91);
|
| @@ -188,8 +195,8 @@ TEST_F(VideoProcessorIntegrationTest,
|
| rate_profile.num_frames = kNbrFramesLong;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP9, 0.0f, -1, 1, false,
|
| - false, true, true);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP9, kNoHwCodec, 0.0f, -1, 1,
|
| + false, false, true, true);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 24.0, 13.0, 0.65, 0.37);
|
| @@ -216,8 +223,8 @@ TEST_F(VideoProcessorIntegrationTest, ProcessZeroPacketLoss) {
|
| rate_profile.num_frames = kNbrFramesShort;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP8, 0.0f, -1, 1, false,
|
| - true, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP8, kNoHwCodec, 0.0f, -1, 1,
|
| + false, true, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 34.95, 33.0, 0.90, 0.89);
|
| @@ -238,8 +245,8 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLoss) {
|
| rate_profile.num_frames = kNbrFramesShort;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP8, 0.05f, -1, 1, false,
|
| - true, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP8, kNoHwCodec, 0.05f, -1,
|
| + 1, false, true, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 20.0, 16.0, 0.60, 0.40);
|
| @@ -260,8 +267,8 @@ TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) {
|
| rate_profile.num_frames = kNbrFramesShort;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP8, 0.1f, -1, 1, false,
|
| - true, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP8, kNoHwCodec, 0.1f, -1, 1,
|
| + false, true, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 19.0, 16.0, 0.50, 0.35);
|
| @@ -304,8 +311,8 @@ TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP8) {
|
| rate_profile.num_frames = kNbrFramesLong;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP8, 0.0f, -1, 1, false,
|
| - true, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP8, kNoHwCodec, 0.0f, -1, 1,
|
| + false, true, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 34.0, 32.0, 0.85, 0.80);
|
| @@ -345,8 +352,8 @@ TEST_F(VideoProcessorIntegrationTest,
|
| rate_profile.num_frames = kNbrFramesLong;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP8, 0.0f, -1, 1, false,
|
| - true, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP8, kNoHwCodec, 0.0f, -1, 1,
|
| + false, true, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 31.0, 22.0, 0.80, 0.65);
|
| @@ -381,8 +388,8 @@ TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossTemporalLayersVP8) {
|
| rate_profile.num_frames = kNbrFramesLong;
|
| // Codec/network settings.
|
| CodecConfigPars process_settings;
|
| - SetCodecParameters(&process_settings, kVideoCodecVP8, 0.0f, -1, 3, false,
|
| - true, true, false);
|
| + SetCodecParameters(&process_settings, kVideoCodecVP8, kNoHwCodec, 0.0f, -1, 3,
|
| + false, true, true, false);
|
| // Metrics for expected quality.
|
| QualityMetrics quality_metrics;
|
| SetQualityMetrics(&quality_metrics, 32.5, 30.0, 0.85, 0.80);
|
|
|