From 556270c4d9489317ab8c35a8bb0b3d58ad6b28e4 Mon Sep 17 00:00:00 2001 From: Sergey Silkin Date: Tue, 27 Feb 2018 15:18:18 +0100 Subject: [PATCH] Remove FourPeople_1280x720_30.yuv from resources for mobile builds. Uploading of the file to device causes timeouts. I removed it from resources for iOS and Android builds and disabled the test that used the file since we don't really need to run it on test bots. Bug: webrtc:8936 Change-Id: Ia5e04c4630544eca8e56826c9e89c9c9f4dcb600 Reviewed-on: https://webrtc-review.googlesource.com/58090 Reviewed-by: Rasmus Brandt Commit-Queue: Sergey Silkin Cr-Commit-Position: refs/heads/master@{#22222} --- modules/video_coding/BUILD.gn | 6 +++++- ...processor_integrationtest_parameterized.cc | 19 ++----------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index d701d2fe79..3215dab930 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -600,9 +600,13 @@ if (rtc_include_tests) { "../../resources/foreman_160x120.yuv", "../../resources/foreman_176x144.yuv", "../../resources/foreman_320x240.yuv", - "../../resources/FourPeople_1280x720_30.yuv", ] + if (!(is_ios || is_android)) { + video_coding_modules_tests_resources += + [ "../../resources/FourPeople_1280x720_30.yuv" ] + } + if (is_ios || is_mac) { bundle_data("video_coding_modules_tests_resources_bundle_data") { testonly = true diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc index 46581ebacd..292d1bbd10 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_parameterized.cc @@ -94,27 +94,12 @@ INSTANTIATE_TEST_CASE_P(CodecSettings, ::testing::ValuesIn(kVideoCodecType), ::testing::ValuesIn(kHwCodec))); -TEST_P(VideoProcessorIntegrationTestParameterized, Foreman_128x96_30) { - RunTest(128, 96, 30, "foreman_128x96"); -} - -TEST_P(VideoProcessorIntegrationTestParameterized, Foreman_160x120_30) { - RunTest(160, 120, 30, "foreman_160x120"); -} - -TEST_P(VideoProcessorIntegrationTestParameterized, Foreman_176x144_30) { - RunTest(176, 144, 30, "foreman_176x144"); -} - -TEST_P(VideoProcessorIntegrationTestParameterized, Foreman_320x240_30) { - RunTest(320, 240, 30, "foreman_320x240"); -} - TEST_P(VideoProcessorIntegrationTestParameterized, Foreman_352x288_30) { RunTest(352, 288, 30, "foreman_cif"); } -TEST_P(VideoProcessorIntegrationTestParameterized, FourPeople_1280x720_30) { +TEST_P(VideoProcessorIntegrationTestParameterized, + DISABLED_FourPeople_1280x720_30) { RunTest(1280, 720, 30, "FourPeople_1280x720_30"); }