From 45af00f33bfc2b4f3784510d0562c19ac9d358a7 Mon Sep 17 00:00:00 2001 From: Sergey Silkin Date: Fri, 22 Feb 2019 08:11:43 +0000 Subject: [PATCH] Revert "Adds resource path support for video files in scenario tests." This reverts commit 8306a733f0dc45f19462268e29c90ada9f46b28e. Reason for revert: ReceivesFramesFromFileBasedStreams is flaky. Original change's description: > Adds resource path support for video files in scenario tests. > > Bug: webrtc:9510 > Change-Id: Id41a32325cc5b16b119e62fba483cec88f52975b > Reviewed-on: https://webrtc-review.googlesource.com/c/123189 > Commit-Queue: Sebastian Jansson > Reviewed-by: Ilya Nikolaevskiy > Cr-Commit-Position: refs/heads/master@{#26804} TBR=ilnik@webrtc.org,srte@webrtc.org Change-Id: I3b157a58bfaf6bcd3dfd9a9d2573a0edd3e6eeab No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9510 Reviewed-on: https://webrtc-review.googlesource.com/c/123880 Reviewed-by: Sergey Silkin Commit-Queue: Sergey Silkin Cr-Commit-Position: refs/heads/master@{#26807} --- test/scenario/BUILD.gn | 32 ------------- test/scenario/video_stream.cc | 2 +- test/scenario/video_stream_unittest.cc | 64 +------------------------- 3 files changed, 3 insertions(+), 95 deletions(-) diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn index 3f168a7e30..9c5422d527 100644 --- a/test/scenario/BUILD.gn +++ b/test/scenario/BUILD.gn @@ -21,30 +21,6 @@ rtc_source_set("column_printer") { ] } -scenario_resources = [ - "../../resources/difficult_photo_1850_1110.yuv", - "../../resources/photo_1850_1110.yuv", - "../../resources/presentation_1850_1110.yuv", - "../../resources/web_screenshot_1850_1110.yuv", -] -scenario_unittest_resources = [ "../../resources/foreman_cif.yuv" ] - -if (is_ios) { - bundle_data("scenario_resources_bundle_data") { - testonly = true - sources = scenario_resources - outputs = [ - "{{bundle_resources_dir}}/{{source_file_part}}", - ] - } - bundle_data("scenario_unittest_resources_bundle_data") { - testonly = true - sources = scenario_unittest_resources - outputs = [ - "{{bundle_resources_dir}}/{{source_file_part}}", - ] - } -} if (rtc_include_tests) { rtc_source_set("scenario") { testonly = true @@ -147,10 +123,6 @@ if (rtc_include_tests) { if (!build_with_chromium && is_clang) { suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] } - data = scenario_resources - if (is_ios) { - deps += [ ":scenario_resources_bundle_data" ] - } } rtc_source_set("scenario_unittests") { testonly = true @@ -173,10 +145,6 @@ if (rtc_include_tests) { "//testing/gmock", "//third_party/abseil-cpp/absl/memory", ] - data = scenario_unittest_resources - if (is_ios) { - deps += [ ":scenario_unittest_resources_bundle_data" ] - } } rtc_source_set("scenario_slow_tests") { testonly = true diff --git a/test/scenario/video_stream.cc b/test/scenario/video_stream.cc index 02ee327818..c50167e31b 100644 --- a/test/scenario/video_stream.cc +++ b/test/scenario/video_stream.cc @@ -286,7 +286,7 @@ std::unique_ptr CreateFrameGenerator( case Capture::kVideoFile: RTC_CHECK(source.video_file.width && source.video_file.height); return FrameGenerator::CreateFromYuvFile( - {TransformFilePath(source.video_file.name)}, source.video_file.width, + {source.video_file.name}, source.video_file.width, source.video_file.height, /*frame_repeat_count*/ 1); case Capture::kGenerateSlides: return FrameGenerator::CreateSlideGenerator( diff --git a/test/scenario/video_stream_unittest.cc b/test/scenario/video_stream_unittest.cc index 658ce072c1..df7adba50d 100644 --- a/test/scenario/video_stream_unittest.cc +++ b/test/scenario/video_stream_unittest.cc @@ -15,72 +15,12 @@ namespace webrtc { namespace test { namespace { -using Capture = VideoStreamConfig::Source::Capture; -using ContentType = VideoStreamConfig::Encoder::ContentType; using Codec = VideoStreamConfig::Encoder::Codec; using CodecImpl = VideoStreamConfig::Encoder::Implementation; } // namespace -#if defined(WEBRTC_ANDROID) -#define MAYBE_ReceivesFramesFromFileBasedStreams \ - DISABLED_ReceivesFramesFromFileBasedStreams -#else -#define MAYBE_ReceivesFramesFromFileBasedStreams \ - ReceivesFramesFromFileBasedStreams -#endif -TEST(VideoStreamTest, MAYBE_ReceivesFramesFromFileBasedStreams) { - TimeDelta kRunTime = TimeDelta::ms(500); - std::vector kFrameRates = {15, 30}; - std::deque> frame_counts(2); - frame_counts[0] = 0; - frame_counts[1] = 0; - { - Scenario s; - auto route = s.CreateRoutes(s.CreateClient("caller", CallClientConfig()), - {s.CreateSimulationNode(NetworkNodeConfig())}, - s.CreateClient("callee", CallClientConfig()), - {s.CreateSimulationNode(NetworkNodeConfig())}); - - s.CreateVideoStream(route->forward(), [&](VideoStreamConfig* c) { - c->analyzer.frame_quality_handler = [&](const VideoFrameQualityInfo&) { - frame_counts[0]++; - }; - c->source.capture = Capture::kVideoFile; - c->source.video_file.name = "foreman_cif"; - c->source.video_file.width = 352; - c->source.video_file.height = 288; - c->source.framerate = kFrameRates[0]; - c->encoder.implementation = CodecImpl::kSoftware; - c->encoder.codec = Codec::kVideoCodecVP8; - }); - s.CreateVideoStream(route->forward(), [&](VideoStreamConfig* c) { - c->analyzer.frame_quality_handler = [&](const VideoFrameQualityInfo&) { - frame_counts[1]++; - }; - c->source.capture = Capture::kImageSlides; - c->source.slides.images.crop.width = 320; - c->source.slides.images.crop.height = 240; - c->source.framerate = kFrameRates[1]; - c->encoder.implementation = CodecImpl::kSoftware; - c->encoder.codec = Codec::kVideoCodecVP9; - }); - s.RunFor(kRunTime); - } - std::vector expected_counts; - for (int fps : kFrameRates) - expected_counts.push_back( - static_cast(kRunTime.seconds() * fps * 0.8)); - - EXPECT_GE(frame_counts[0], expected_counts[0]); - EXPECT_GE(frame_counts[1], expected_counts[1]); -} - -#if defined(WEBRTC_ANDROID) -#define MAYBE_RecievesVp8SimulcastFrames DISABLED_RecievesVp8SimulcastFrames -#else -#define MAYBE_RecievesVp8SimulcastFrames RecievesVp8SimulcastFrames -#endif -TEST(VideoStreamTest, MAYBE_RecievesVp8SimulcastFrames) { +// TODO(srte): Enable after landing fix causing flakiness. +TEST(VideoStreamTest, DISABLED_RecievesVp8SimulcastFrames) { TimeDelta kRunTime = TimeDelta::ms(500); int kFrameRate = 30;