Enable more VideoCodecTests on iOS.
Bug: webrtc:4755
Change-Id: I403834dbe04cc3899847eb10e5595a24e6001507
Reviewed-on: https://webrtc-review.googlesource.com/76602
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23273}diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index a35c410..b6a334a 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -647,7 +647,7 @@
"../../resources/foreman_480x272.yuv",
]
}
- if (!(is_ios || is_android)) {
+ if (!is_android) {
video_coding_modules_tests_resources += [
"../../resources/FourPeople_1280x720_30.yuv",
"../../resources/ConferenceMotion_1280_720_50.yuv",
diff --git a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
index 10ab8af..fb1dfb5 100644
--- a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
@@ -26,9 +26,7 @@
// Codec settings.
const int kCifWidth = 352;
const int kCifHeight = 288;
-#if !defined(WEBRTC_IOS)
const int kNumFramesShort = 100;
-#endif
const int kNumFramesLong = 300;
const size_t kBitrateRdPerfKbps[] = {100, 200, 300, 400, 500, 600,
700, 800, 1000, 1250, 1400, 1600,
@@ -88,9 +86,6 @@
}
} // namespace
-// Fails on iOS. See webrtc:4755.
-#if !defined(WEBRTC_IOS)
-
#if !defined(RTC_DISABLE_VP9)
TEST(VideoCodecTestLibvpx, HighBitrateVP9) {
auto config = CreateTestConfig();
@@ -231,8 +226,6 @@
nullptr);
}
-#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
@@ -242,7 +235,7 @@
// disabled on Android. Some quality parameter in the above test has been
// adjusted to also pass for |cpu_speed| <= 12.
-// Too slow to finish before timeout on iOS. See webrtc:4755.
+// TODO(webrtc:9267): Fails on iOS
#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
#define MAYBE_ChangeBitrateVP8 DISABLED_ChangeBitrateVP8
#else
@@ -277,7 +270,7 @@
nullptr);
}
-// Too slow to finish before timeout on iOS. See webrtc:4755.
+// TODO(webrtc:9267): Fails on iOS
#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
#define MAYBE_ChangeFramerateVP8 DISABLED_ChangeFramerateVP8
#else
@@ -318,8 +311,7 @@
nullptr);
}
-// Too slow to finish before timeout on iOS. See webrtc:4755.
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+#if defined(WEBRTC_ANDROID)
#define MAYBE_TemporalLayersVP8 DISABLED_TemporalLayersVP8
#else
#define MAYBE_TemporalLayersVP8 TemporalLayersVP8
@@ -354,7 +346,7 @@
nullptr);
}
-// Might be too slow on mobile platforms.
+// TODO(webrtc:9267): Fails on iOS
#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
#define MAYBE_MultiresVP8 DISABLED_MultiresVP8
#else
@@ -381,8 +373,7 @@
nullptr);
}
-// Might be too slow on mobile platforms.
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+#if defined(WEBRTC_ANDROID)
#define MAYBE_SimulcastVP8 DISABLED_SimulcastVP8
#else
#define MAYBE_SimulcastVP8 SimulcastVP8
@@ -409,8 +400,7 @@
nullptr);
}
-// Might be too slow on mobile platforms.
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+#if defined(WEBRTC_ANDROID)
#define MAYBE_SvcVP9 DISABLED_SvcVP9
#else
#define MAYBE_SvcVP9 SvcVP9
