OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2017 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
49 rate_profile.num_frames = kForemanNumFrames; | 49 rate_profile.num_frames = kForemanNumFrames; |
50 | 50 |
51 // The thresholds below may have to be tweaked to let even poor MediaCodec | 51 // The thresholds below may have to be tweaked to let even poor MediaCodec |
52 // implementations pass. If this test fails on the bots, disable it and | 52 // implementations pass. If this test fails on the bots, disable it and |
53 // ping brandtr@. | 53 // ping brandtr@. |
54 std::vector<RateControlThresholds> rc_thresholds; | 54 std::vector<RateControlThresholds> rc_thresholds; |
55 AddRateControlThresholds(5, 95, 20, 10, 10, 0, 1, &rc_thresholds); | 55 AddRateControlThresholds(5, 95, 20, 10, 10, 0, 1, &rc_thresholds); |
56 | 56 |
57 QualityThresholds quality_thresholds(30.0, 15.0, 0.90, 0.40); | 57 QualityThresholds quality_thresholds(30.0, 15.0, 0.90, 0.40); |
58 | 58 |
59 ProcessFramesAndMaybeVerify(rate_profile, &rc_thresholds, &quality_thresholds, | 59 ProcessFramesAndMaybeVerify(rate_profile, &rc_thresholds, |
60 kNoVisualizationParams); | 60 &quality_thresholds, nullptr, kNoVisualizationParams); |
hbos
2017/09/25 16:13:41
nit: There should be 2 more spaces in the indentat
ssilkin
2017/09/26 09:17:52
Done.
| |
61 } | 61 } |
62 | 62 |
63 TEST_F(VideoProcessorIntegrationTestMediaCodec, | 63 TEST_F(VideoProcessorIntegrationTestMediaCodec, |
64 Foreman240p100kbpsVp8WithForcedSwFallback) { | 64 Foreman240p100kbpsVp8WithForcedSwFallback) { |
65 ScopedFieldTrials override_field_trials( | 65 ScopedFieldTrials override_field_trials( |
66 "WebRTC-VP8-Forced-Fallback-Encoder/Enabled-150,175,10000,1/"); | 66 "WebRTC-VP8-Forced-Fallback-Encoder/Enabled-150,175,10000,1/"); |
67 | 67 |
68 config_.filename = "foreman_320x240"; | 68 config_.filename = "foreman_320x240"; |
69 config_.input_filename = ResourcePath(config_.filename, "yuv"); | 69 config_.input_filename = ResourcePath(config_.filename, "yuv"); |
70 config_.sw_fallback_encoder = true; | 70 config_.sw_fallback_encoder = true; |
(...skipping 10 matching lines...) Expand all Loading... | |
81 // The thresholds below may have to be tweaked to let even poor MediaCodec | 81 // The thresholds below may have to be tweaked to let even poor MediaCodec |
82 // implementations pass. If this test fails on the bots, disable it and | 82 // implementations pass. If this test fails on the bots, disable it and |
83 // ping brandtr@. | 83 // ping brandtr@. |
84 std::vector<RateControlThresholds> rc_thresholds; | 84 std::vector<RateControlThresholds> rc_thresholds; |
85 AddRateControlThresholds(0, 50, 75, 70, 10, 0, 1, &rc_thresholds); | 85 AddRateControlThresholds(0, 50, 75, 70, 10, 0, 1, &rc_thresholds); |
86 AddRateControlThresholds(0, 50, 25, 12, 60, 0, 1, &rc_thresholds); | 86 AddRateControlThresholds(0, 50, 25, 12, 60, 0, 1, &rc_thresholds); |
87 AddRateControlThresholds(0, 65, 15, 5, 5, 0, 1, &rc_thresholds); | 87 AddRateControlThresholds(0, 65, 15, 5, 5, 0, 1, &rc_thresholds); |
88 | 88 |
89 QualityThresholds quality_thresholds(33.0, 30.0, 0.90, 0.85); | 89 QualityThresholds quality_thresholds(33.0, 30.0, 0.90, 0.85); |
90 | 90 |
91 ProcessFramesAndMaybeVerify(rate_profile, &rc_thresholds, &quality_thresholds, | 91 ProcessFramesAndMaybeVerify(rate_profile, &rc_thresholds, |
92 kNoVisualizationParams); | 92 &quality_thresholds, nullptr, kNoVisualizationParams); |
93 } | 93 } |
94 | 94 |
95 #endif // defined(WEBRTC_ANDROID) | 95 #endif // defined(WEBRTC_ANDROID) |
96 | 96 |
97 } // namespace test | 97 } // namespace test |
98 } // namespace webrtc | 98 } // namespace webrtc |
OLD | NEW |