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 6c0e1254fcaded68b1259d844dfcbd31d480886d..bcc40e78b36789e0cd26a1a07cec9fee6dce6079 100644 |
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc |
@@ -208,6 +208,8 @@ class VideoProcessorIntegrationTest: public testing::Test { |
num_temporal_layers_; |
config_.codec_settings->codecSpecific.VP9.frameDroppingOn = |
frame_dropper_on_; |
+ config_.codec_settings->codecSpecific.VP9.automaticResizeOn = |
+ spatial_resize_on_; |
config_.codec_settings->codecSpecific.VP9.keyFrameInterval = |
kBaseKeyFrameInterval; |
break; |
@@ -726,6 +728,32 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) { |
rc_metrics); |
} |
+// Run with no packet loss, at low bitrate. |
+// |spatial_resizei| is on, so expect one resize during the sequence, |
stefan-webrtc
2015/09/03 12:27:52
spatial_resize
mflodman
2015/09/03 12:40:26
Remove 'i' in "spatial_resizei".
marpan
2015/09/04 21:45:45
Done.
|
+// resize happens on delta frame (only first frame is key frame). |
+TEST_F(VideoProcessorIntegrationTest, ProcessNoLossSpatialResizeFrameDropVP9) { |
+ config_.networking_config.packet_loss_probability = 0; |
+ // Bitrate and frame rate profile. |
+ RateProfile rate_profile; |
+ SetRateProfilePars(&rate_profile, 0, 50, 30, 0); |
+ rate_profile.frame_index_rate_update[1] = kNbrFramesLong + 1; |
+ rate_profile.num_frames = kNbrFramesLong; |
+ // Codec/network settings. |
+ CodecConfigPars process_settings; |
+ SetCodecParameters(&process_settings, kVideoCodecVP9, 0.0f, -1, |
+ 1, false, false, true, true); |
+ // Metrics for expected quality. |
+ QualityMetrics quality_metrics; |
+ SetQualityMetrics(&quality_metrics, 25.0, 13.0, 0.70, 0.40); |
+ // Metrics for rate control. |
+ RateControlMetrics rc_metrics[1]; |
+ SetRateControlMetrics(rc_metrics, 0, 160, 70, 120, 10, 80, 1); |
+ ProcessFramesAndVerify(quality_metrics, |
+ rate_profile, |
+ process_settings, |
+ rc_metrics); |
stefan-webrtc
2015/09/03 12:27:52
Is there any way to actually verify that only the
marpan
2015/09/04 21:45:45
Done. Added that for all the tests.
|
+} |
+ |
// TODO(marpan): Add temporal layer test for VP9, once changes are in |
// vp9 wrapper for this. |