From 449888ef999af46c53c388da8aa43a5b251b78cc Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Tue, 18 Jun 2019 09:01:29 +0200 Subject: [PATCH] Cleanup of resources from removed remote bitrate estimate test framework. Bug: webrtc:9883 Change-Id: Id18133a021b3a064b00f0f99b5f30ebb92e89067 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140945 Commit-Queue: Sebastian Jansson Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#28305} --- BUILD.gn | 4 ---- modules/BUILD.gn | 11 ----------- modules/remote_bitrate_estimator/BUILD.gn | 14 -------------- resources/sprint-downlink.rx.sha1 | 1 - resources/sprint-uplink.rx.sha1 | 1 - resources/synthetic-trace.rx.sha1 | 1 - resources/tmobile-downlink.rx.sha1 | 1 - resources/tmobile-uplink.rx.sha1 | 1 - resources/verizon3g-downlink.rx.sha1 | 1 - resources/verizon3g-uplink.rx.sha1 | 1 - resources/verizon4g-downlink.rx.sha1 | 1 - resources/verizon4g-uplink.rx.sha1 | 1 - 12 files changed, 38 deletions(-) delete mode 100644 resources/sprint-downlink.rx.sha1 delete mode 100644 resources/sprint-uplink.rx.sha1 delete mode 100644 resources/synthetic-trace.rx.sha1 delete mode 100644 resources/tmobile-downlink.rx.sha1 delete mode 100644 resources/tmobile-uplink.rx.sha1 delete mode 100644 resources/verizon3g-downlink.rx.sha1 delete mode 100644 resources/verizon3g-uplink.rx.sha1 delete mode 100644 resources/verizon4g-downlink.rx.sha1 delete mode 100644 resources/verizon4g-uplink.rx.sha1 diff --git a/BUILD.gn b/BUILD.gn index 00a4932e05..aaf60ebcd4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -52,7 +52,6 @@ if (!build_with_chromium) { "modules:modules_unittests", "modules/audio_coding:audio_coding_tests", "modules/audio_processing:audio_processing_tests", - "modules/remote_bitrate_estimator:bwe_simulations_tests", "modules/rtp_rtcp:test_packet_masks_metrics", "modules/video_capture:video_capture_internal_impl", "pc:peerconnection_unittests", @@ -580,11 +579,9 @@ if (rtc_include_tests) { "resources/ConferenceMotion_1280_720_50.yuv", "resources/difficult_photo_1850_1110.yuv", "resources/foreman_cif.yuv", - "resources/google-wifi-3mbps.rx", "resources/paris_qcif.yuv", "resources/photo_1850_1110.yuv", "resources/presentation_1850_1110.yuv", - "resources/verizon4g-downlink.rx", "resources/voice_engine/audio_long16.pcm", "resources/web_screenshot_1850_1110.yuv", ] @@ -606,7 +603,6 @@ if (rtc_include_tests) { "call:call_perf_tests", "modules/audio_coding:audio_coding_perf_tests", "modules/audio_processing:audio_processing_perf_tests", - "modules/remote_bitrate_estimator:remote_bitrate_estimator_perf_tests", "pc:peerconnection_perf_tests", "test:test_main", "video:video_full_stack_tests", diff --git a/modules/BUILD.gn b/modules/BUILD.gn index 197b543f27..d1ceb224b1 100644 --- a/modules/BUILD.gn +++ b/modules/BUILD.gn @@ -119,8 +119,6 @@ if (rtc_include_tests) { } modules_unittests_resources = [ - "../resources/att-downlink.rx", - "../resources/att-uplink.rx", "../resources/audio_coding/neteq_opus.rtp", "../resources/audio_coding/neteq_opus_dtx.rtp", "../resources/audio_coding/neteq_universal_new.rtp", @@ -210,15 +208,6 @@ if (rtc_include_tests) { "../resources/short_mixed_mono_48.pcm", "../resources/short_mixed_stereo_48.dat", "../resources/short_mixed_stereo_48.pcm", - "../resources/sprint-downlink.rx", - "../resources/sprint-uplink.rx", - "../resources/synthetic-trace.rx", - "../resources/tmobile-downlink.rx", - "../resources/tmobile-uplink.rx", - "../resources/verizon3g-downlink.rx", - "../resources/verizon3g-uplink.rx", - "../resources/verizon4g-downlink.rx", - "../resources/verizon4g-uplink.rx", "../resources/voice_engine/audio_tiny48.wav", ] if (is_ios) { diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn index b4fe0d5b97..65b46ba9c8 100644 --- a/modules/remote_bitrate_estimator/BUILD.gn +++ b/modules/remote_bitrate_estimator/BUILD.gn @@ -80,11 +80,6 @@ if (!build_with_chromium) { } if (rtc_include_tests) { - # TODO(srte): Remove this target when the dependency in root BUILD.gn is removed. - rtc_source_set("remote_bitrate_estimator_perf_tests") { - testonly = true - } - rtc_source_set("remote_bitrate_estimator_unittests") { testonly = true @@ -114,13 +109,4 @@ if (rtc_include_tests) { "../rtp_rtcp:rtp_rtcp_format", ] } - - # TODO(srte): Remove this target when the dependency in root BUILD.gn is removed. - rtc_test("bwe_simulations_tests") { - testonly = true - deps = [ - "../../test:test_main", - "//testing/gtest", - ] - } } diff --git a/resources/sprint-downlink.rx.sha1 b/resources/sprint-downlink.rx.sha1 deleted file mode 100644 index 946840f39f..0000000000 --- a/resources/sprint-downlink.rx.sha1 +++ /dev/null @@ -1 +0,0 @@ -fd7ea55f4009359a78928af5c43e84b2b4101f50 \ No newline at end of file diff --git a/resources/sprint-uplink.rx.sha1 b/resources/sprint-uplink.rx.sha1 deleted file mode 100644 index 6165ad27f4..0000000000 --- a/resources/sprint-uplink.rx.sha1 +++ /dev/null @@ -1 +0,0 @@ -46ac4f207c9437b1c4a35c3e398da65354f49742 \ No newline at end of file diff --git a/resources/synthetic-trace.rx.sha1 b/resources/synthetic-trace.rx.sha1 deleted file mode 100644 index 12f4417ccd..0000000000 --- a/resources/synthetic-trace.rx.sha1 +++ /dev/null @@ -1 +0,0 @@ -72c5686ceebec94c9388ba9869d98caaf3a8b4a9 \ No newline at end of file diff --git a/resources/tmobile-downlink.rx.sha1 b/resources/tmobile-downlink.rx.sha1 deleted file mode 100644 index 9d5981a806..0000000000 --- a/resources/tmobile-downlink.rx.sha1 +++ /dev/null @@ -1 +0,0 @@ -1998229c3ded7222faa4fcb85d1237ef54766c58 \ No newline at end of file diff --git a/resources/tmobile-uplink.rx.sha1 b/resources/tmobile-uplink.rx.sha1 deleted file mode 100644 index 1a226379bd..0000000000 --- a/resources/tmobile-uplink.rx.sha1 +++ /dev/null @@ -1 +0,0 @@ -13acfb4cf4240e298d8e5f22e76125574848831e \ No newline at end of file diff --git a/resources/verizon3g-downlink.rx.sha1 b/resources/verizon3g-downlink.rx.sha1 deleted file mode 100644 index 215beb798b..0000000000 --- a/resources/verizon3g-downlink.rx.sha1 +++ /dev/null @@ -1 +0,0 @@ -f35cb94b893912b5312eb74c63d36b65426576e0 \ No newline at end of file diff --git a/resources/verizon3g-uplink.rx.sha1 b/resources/verizon3g-uplink.rx.sha1 deleted file mode 100644 index 55f6330dcf..0000000000 --- a/resources/verizon3g-uplink.rx.sha1 +++ /dev/null @@ -1 +0,0 @@ -87d02bc510eac4b8b4a2453687c6b49f39aa481c \ No newline at end of file diff --git a/resources/verizon4g-downlink.rx.sha1 b/resources/verizon4g-downlink.rx.sha1 deleted file mode 100644 index c09d0ad02d..0000000000 --- a/resources/verizon4g-downlink.rx.sha1 +++ /dev/null @@ -1 +0,0 @@ -07716dffe2905abde0ae7bec475106e476bc9b25 \ No newline at end of file diff --git a/resources/verizon4g-uplink.rx.sha1 b/resources/verizon4g-uplink.rx.sha1 deleted file mode 100644 index 8ad9afb841..0000000000 --- a/resources/verizon4g-uplink.rx.sha1 +++ /dev/null @@ -1 +0,0 @@ -2d32cd78d75549a5d0795bb9fbe35a00663f949a \ No newline at end of file