| 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 79d75c903bedadba4407be60e8a1de507e180441..3df258a64d27a46a4a67eb1af2d3cb5610503d80 100644
|
| --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
|
| @@ -84,7 +84,9 @@ struct RateControlMetrics {
|
| // Sequence used is foreman (CIF): may be better to use VGA for resize test.
|
| const int kCIFWidth = 352;
|
| const int kCIFHeight = 288;
|
| +#if !defined(WEBRTC_IOS)
|
| const int kNbrFramesShort = 100; // Some tests are run for shorter sequence.
|
| +#endif
|
| const int kNbrFramesLong = 299;
|
|
|
| // Parameters from VP8 wrapper, which control target size of key frames.
|
| @@ -621,6 +623,9 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) {
|
|
|
| #endif // defined(WEBRTC_VIDEOPROCESSOR_H264_TESTS)
|
|
|
| +// Fails on iOS. See webrtc:4755.
|
| +#if !defined(WEBRTC_IOS)
|
| +
|
| // VP9: Run with no packet loss and fixed bitrate. Quality should be very high.
|
| // One key frame (first frame only) in sequence. Setting |key_frame_interval|
|
| // to -1 below means no periodic key frames in test.
|
| @@ -842,6 +847,8 @@ TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) {
|
| rc_metrics);
|
| }
|
|
|
| +#endif // !defined(WEBRTC_IOS)
|
| +
|
| // The tests below are currently disabled for Android. For ARM, the encoder
|
| // uses |cpu_speed| = 12, as opposed to default |cpu_speed| <= 6 for x86,
|
| // which leads to significantly different quality. The quality and rate control
|
| @@ -855,7 +862,8 @@ TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) {
|
| // low to high to medium. Check that quality and encoder response to the new
|
| // target rate/per-frame bandwidth (for each rate update) is within limits.
|
| // One key frame (first frame only) in sequence.
|
| -#if defined(WEBRTC_ANDROID)
|
| +// Too slow to finish before timeout on iOS. See webrtc:4755.
|
| +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
|
| #define MAYBE_ProcessNoLossChangeBitRateVP8 \
|
| DISABLED_ProcessNoLossChangeBitRateVP8
|
| #else
|
| @@ -892,7 +900,8 @@ TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP8) {
|
| // for the rate control metrics can be lower. One key frame (first frame only).
|
| // Note: quality after update should be higher but we currently compute quality
|
| // metrics averaged over whole sequence run.
|
| -#if defined(WEBRTC_ANDROID)
|
| +// Too slow to finish before timeout on iOS. See webrtc:4755.
|
| +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
|
| #define MAYBE_ProcessNoLossChangeFrameRateFrameDropVP8 \
|
| DISABLED_ProcessNoLossChangeFrameRateFrameDropVP8
|
| #else
|
| @@ -927,7 +936,8 @@ TEST_F(VideoProcessorIntegrationTest,
|
|
|
| // Run with no packet loss, at low bitrate. During this time we should've
|
| // resized once. Expect 2 key frames generated (first and one for resize).
|
| -#if defined(WEBRTC_ANDROID)
|
| +// Too slow to finish before timeout on iOS. See webrtc:4755.
|
| +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
|
| #define MAYBE_ProcessNoLossSpatialResizeFrameDropVP8 \
|
| DISABLED_ProcessNoLossSpatialResizeFrameDropVP8
|
| #else
|
| @@ -961,7 +971,8 @@ TEST_F(VideoProcessorIntegrationTest,
|
| // encoding rate mismatch are applied to each layer.
|
| // No dropped frames in this test, and internal spatial resizer is off.
|
| // One key frame (first frame only) in sequence, so no spatial resizing.
|
| -#if defined(WEBRTC_ANDROID)
|
| +// Too slow to finish before timeout on iOS. See webrtc:4755.
|
| +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
|
| #define MAYBE_ProcessNoLossTemporalLayersVP8 \
|
| DISABLED_ProcessNoLossTemporalLayersVP8
|
| #else
|
|
|