OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
723 SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1); | 723 SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1); |
724 ProcessFramesAndVerify(quality_metrics, | 724 ProcessFramesAndVerify(quality_metrics, |
725 rate_profile, | 725 rate_profile, |
726 process_settings, | 726 process_settings, |
727 rc_metrics); | 727 rc_metrics); |
728 } | 728 } |
729 | 729 |
730 // Run with no packet loss, at low bitrate. | 730 // Run with no packet loss, at low bitrate. |
731 // spatial_resize is on, so expect one resize during the sequence, | 731 // spatial_resize is on, so expect one resize during the sequence, |
732 // resize happens on delta frame. Expect only one key frame (first frame). | 732 // resize happens on delta frame. Expect only one key frame (first frame). |
733 TEST_F(VideoProcessorIntegrationTest, | 733 TEST_F(VideoProcessorIntegrationTest, ProcessNoLossSpatialResizeFrameDropVP9) { |
734 DISABLED_ProcessNoLossSpatialResizeFrameDropVP9) { | |
735 config_.networking_config.packet_loss_probability = 0; | 734 config_.networking_config.packet_loss_probability = 0; |
736 // Bitrate and frame rate profile. | 735 // Bitrate and frame rate profile. |
737 RateProfile rate_profile; | 736 RateProfile rate_profile; |
738 SetRateProfilePars(&rate_profile, 0, 50, 30, 0); | 737 SetRateProfilePars(&rate_profile, 0, 90, 30, 0); |
stefan-webrtc
2015/10/22 09:44:14
I don't fully understand this change. Could you ex
marpan
2015/10/23 15:57:10
resize logic was changed to allow for 3/4 resizing
| |
739 rate_profile.frame_index_rate_update[1] = kNbrFramesLong + 1; | 738 rate_profile.frame_index_rate_update[1] = kNbrFramesLong + 1; |
740 rate_profile.num_frames = kNbrFramesLong; | 739 rate_profile.num_frames = kNbrFramesLong; |
741 // Codec/network settings. | 740 // Codec/network settings. |
742 CodecConfigPars process_settings; | 741 CodecConfigPars process_settings; |
743 SetCodecParameters(&process_settings, kVideoCodecVP9, 0.0f, -1, | 742 SetCodecParameters(&process_settings, kVideoCodecVP9, 0.0f, -1, |
744 1, false, false, true, true); | 743 1, false, false, true, true); |
745 // Metrics for expected quality. | 744 // Metrics for expected quality. |
746 QualityMetrics quality_metrics; | 745 QualityMetrics quality_metrics; |
747 SetQualityMetrics(&quality_metrics, 25.0, 13.0, 0.70, 0.40); | 746 SetQualityMetrics(&quality_metrics, 25.0, 13.0, 0.70, 0.40); |
748 // Metrics for rate control. | 747 // Metrics for rate control. |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
955 // Metrics for rate control. | 954 // Metrics for rate control. |
956 RateControlMetrics rc_metrics[2]; | 955 RateControlMetrics rc_metrics[2]; |
957 SetRateControlMetrics(rc_metrics, 0, 0, 20, 30, 10, 10, 0, 1); | 956 SetRateControlMetrics(rc_metrics, 0, 0, 20, 30, 10, 10, 0, 1); |
958 SetRateControlMetrics(rc_metrics, 1, 0, 0, 30, 15, 10, 0, 0); | 957 SetRateControlMetrics(rc_metrics, 1, 0, 0, 30, 15, 10, 0, 0); |
959 ProcessFramesAndVerify(quality_metrics, | 958 ProcessFramesAndVerify(quality_metrics, |
960 rate_profile, | 959 rate_profile, |
961 process_settings, | 960 process_settings, |
962 rc_metrics); | 961 rc_metrics); |
963 } | 962 } |
964 } // namespace webrtc | 963 } // namespace webrtc |
OLD | NEW |