From e731a2ed980ff1c7735d94061ea34fac1207d858 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Tue, 2 Jul 2019 10:08:17 +0200 Subject: [PATCH] Remove check on supported profile in favor of expilict disabling Bug: webrtc:10138 Change-Id: I7a258ac992f774e4453092175e51e0033b29d4e0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144244 Reviewed-by: Ilya Nikolaevskiy Reviewed-by: Mirko Bonadei Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#28441} --- video/pc_full_stack_tests.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/video/pc_full_stack_tests.cc b/video/pc_full_stack_tests.cc index fade2bd62c..ea8d4066e2 100644 --- a/video/pc_full_stack_tests.cc +++ b/video/pc_full_stack_tests.cc @@ -167,16 +167,16 @@ TEST_P(PCGenericDescriptorTest, ForemanCifPlr5Vp9) { fixture->Run(std::move(run_params)); } -TEST(PCFullStackTest, GeneratorWithoutPacketLossVp9Profile2) { - bool profile_2_is_supported = false; - for (const auto& codec : SupportedVP9Codecs()) { - if (ParseSdpForVP9Profile(codec.parameters) - .value_or(VP9Profile::kProfile0) == VP9Profile::kProfile2) { - profile_2_is_supported = true; - } - } - if (!profile_2_is_supported) - return; +// VP9 2nd profile isn't supported on android arm and arm 64. +#if defined(WEBRTC_ANDROID) && \ + (defined(WEBRTC_ARCH_ARM64) || defined(WEBRTC_ARCH_ARM)) +#define MAYBE_GeneratorWithoutPacketLossVp9Profile2 \ + DISABLED_GeneratorWithoutPacketLossVp9Profile2 +#else +#define MAYBE_GeneratorWithoutPacketLossVp9Profile2 \ + GeneratorWithoutPacketLossVp9Profile2 +#endif +TEST(PCFullStackTest, MAYBE_GeneratorWithoutPacketLossVp9Profile2) { std::unique_ptr network_emulation_manager = CreateNetworkEmulationManager(); auto fixture = CreateTestFixture(