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 7a127c904f73ef4e5077c070ea09bf6dc3dbffe3..7ea594e5c1baab029c48b2c9308138ac8a066b8f 100644 |
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
@@ -21,6 +21,9 @@ const bool kHwCodec = false; |
// Only allow encoder/decoder to use single core, for predictability. |
const bool kUseSingleCore = true; |
+// Default codec setting is on. |
+const bool kResilienceOn = true; |
+ |
} // namespace |
#if defined(WEBRTC_VIDEOPROCESSOR_H264_TESTS) |
@@ -39,7 +42,7 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecH264, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 1, false, false, true, false); |
+ 0.0f, -1, 1, false, false, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 35.0, 25.0, 0.93, 0.70); |
@@ -68,7 +71,7 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 1, false, false, true, false); |
+ 0.0f, -1, 1, false, false, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 37.0, 36.0, 0.93, 0.92); |
@@ -90,7 +93,7 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLossVP9) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore, |
- 0.05f, -1, 1, false, false, true, false); |
+ 0.05f, -1, 1, false, false, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 17.0, 14.0, 0.45, 0.36); |
@@ -116,7 +119,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 1, false, false, true, false); |
+ 0.0f, -1, 1, false, false, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 35.5, 30.0, 0.90, 0.85); |
@@ -149,7 +152,7 @@ TEST_F(VideoProcessorIntegrationTest, |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 1, false, false, true, false); |
+ 0.0f, -1, 1, false, false, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 31.5, 18.0, 0.80, 0.43); |
@@ -172,7 +175,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 1, false, true, true, false); |
+ 0.0f, -1, 1, false, true, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 36.8, 35.8, 0.92, 0.91); |
@@ -197,7 +200,7 @@ TEST_F(VideoProcessorIntegrationTest, |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP9, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 1, false, false, true, true); |
+ 0.0f, -1, 1, false, false, true, true, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 24.0, 13.0, 0.65, 0.37); |
@@ -225,7 +228,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessZeroPacketLoss) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 1, false, true, true, false); |
+ 0.0f, -1, 1, false, true, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 34.95, 33.0, 0.90, 0.89); |
@@ -247,7 +250,7 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLoss) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore, |
- 0.05f, -1, 1, false, true, true, false); |
+ 0.05f, -1, 1, false, true, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 20.0, 16.0, 0.60, 0.40); |
@@ -269,7 +272,7 @@ TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore, |
- 0.1f, -1, 1, false, true, true, false); |
+ 0.1f, -1, 1, false, true, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 19.0, 16.0, 0.50, 0.35); |
@@ -293,8 +296,9 @@ TEST_F(VideoProcessorIntegrationTest, ProcessInBatchMode) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 1, false, true, true, false, 352, 288, "foreman_cif", |
- false /* verbose_logging */, true /* batch_mode */); |
+ 0.0f, -1, 1, false, true, true, false, kResilienceOn, 352, 288, |
+ "foreman_cif", false /* verbose_logging */, |
+ true /* batch_mode */); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 34.95, 33.0, 0.90, 0.89); |
@@ -338,7 +342,7 @@ TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP8) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 1, false, true, true, false); |
+ 0.0f, -1, 1, false, true, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 34.0, 32.0, 0.85, 0.80); |
@@ -379,7 +383,7 @@ TEST_F(VideoProcessorIntegrationTest, |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 1, false, true, true, false); |
+ 0.0f, -1, 1, false, true, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 31.0, 22.0, 0.80, 0.65); |
@@ -415,7 +419,7 @@ TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossTemporalLayersVP8) { |
// Codec/network settings. |
CodecParams process_settings; |
SetCodecParams(&process_settings, kVideoCodecVP8, kHwCodec, kUseSingleCore, |
- 0.0f, -1, 3, false, true, true, false); |
+ 0.0f, -1, 3, false, true, true, false, kResilienceOn); |
// Thresholds for expected quality. |
QualityThresholds quality_thresholds; |
SetQualityThresholds(&quality_thresholds, 32.5, 30.0, 0.85, 0.80); |