| 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 21 matching lines...) Expand all Loading... |
| 32 config_.filename = "foreman_cif"; | 32 config_.filename = "foreman_cif"; |
| 33 config_.input_filename = ResourcePath(config_.filename, "yuv"); | 33 config_.input_filename = ResourcePath(config_.filename, "yuv"); |
| 34 config_.output_filename = | 34 config_.output_filename = |
| 35 TempFilename(OutputPath(), "videoprocessor_integrationtest_mediacodec"); | 35 TempFilename(OutputPath(), "videoprocessor_integrationtest_mediacodec"); |
| 36 config_.verbose = false; | 36 config_.verbose = false; |
| 37 config_.hw_encoder = true; | 37 config_.hw_encoder = true; |
| 38 config_.hw_decoder = true; | 38 config_.hw_decoder = true; |
| 39 } | 39 } |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 TEST_F(VideoProcessorIntegrationTestMediaCodec, DISABLED_ForemanCif500kbpsVp8) { | 42 TEST_F(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsVp8) { |
| 43 SetCodecSettings(&config_, kVideoCodecVP8, 1, false, false, false, false, | 43 SetCodecSettings(&config_, kVideoCodecVP8, 1, false, false, false, false, |
| 44 false, 352, 288); | 44 false, 352, 288); |
| 45 | 45 |
| 46 RateProfile rate_profile; | 46 RateProfile rate_profile; |
| 47 SetRateProfile(&rate_profile, 0, 500, 30, 0); // Start below |low_kbps|. | 47 SetRateProfile(&rate_profile, 0, 500, 30, 0); // Start below |low_kbps|. |
| 48 rate_profile.frame_index_rate_update[1] = kForemanNumFrames + 1; | 48 rate_profile.frame_index_rate_update[1] = kForemanNumFrames + 1; |
| 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(20, 95, 22, 11, 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, 14.0, 0.86, 0.39); |
| 58 | 58 |
| 59 ProcessFramesAndMaybeVerify(rate_profile, &rc_thresholds, &quality_thresholds, | 59 ProcessFramesAndMaybeVerify(rate_profile, &rc_thresholds, &quality_thresholds, |
| 60 kNoVisualizationParams); | 60 kNoVisualizationParams); |
| 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 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 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, &quality_thresholds, |
| 92 kNoVisualizationParams); | 92 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 |