From b856dc15564ba793a40c82d4f00682e7c097eed2 Mon Sep 17 00:00:00 2001 From: Andrey Logvin Date: Thu, 7 May 2020 14:17:52 +0000 Subject: [PATCH] Remove VideoGeneratorType from pc framework test api. VideoGeneratorType wasn't deleted in https://webrtc-review.googlesource.com/c/src/+/174541 Bug: webrtc:11534 Change-Id: I3e631240dc0b28a53e62b65e3dd094b5773fac2c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174721 Reviewed-by: Artem Titov Reviewed-by: Karl Wiberg Commit-Queue: Andrey Logvin Cr-Commit-Position: refs/heads/master@{#31228} --- api/test/peerconnection_quality_test_fixture.h | 2 -- test/pc/e2e/media/media_helper.cc | 2 -- test/pc/e2e/peer_configurer.cc | 2 -- test/pc/e2e/peer_connection_quality_test.h | 2 -- video/pc_full_stack_tests.cc | 2 -- 5 files changed, 10 deletions(-) diff --git a/api/test/peerconnection_quality_test_fixture.h b/api/test/peerconnection_quality_test_fixture.h index 7a17284284..20ca065052 100644 --- a/api/test/peerconnection_quality_test_fixture.h +++ b/api/test/peerconnection_quality_test_fixture.h @@ -117,8 +117,6 @@ class PeerConnectionE2EQualityTestFixture { std::vector slides_yuv_file_names; }; - enum VideoGeneratorType { kDefault, kI420A, kI010 }; - // Config for Vp8 simulcast or Vp9 SVC testing. // // SVC support is limited: diff --git a/test/pc/e2e/media/media_helper.cc b/test/pc/e2e/media/media_helper.cc index ebe1571fe4..e41c58a213 100644 --- a/test/pc/e2e/media/media_helper.cc +++ b/test/pc/e2e/media/media_helper.cc @@ -26,8 +26,6 @@ using VideoConfig = ::webrtc::webrtc_pc_e2e::PeerConnectionE2EQualityTestFixture::VideoConfig; using AudioConfig = ::webrtc::webrtc_pc_e2e::PeerConnectionE2EQualityTestFixture::AudioConfig; -using VideoGeneratorType = ::webrtc::webrtc_pc_e2e:: - PeerConnectionE2EQualityTestFixture::VideoGeneratorType; } // namespace diff --git a/test/pc/e2e/peer_configurer.cc b/test/pc/e2e/peer_configurer.cc index 0bbbda70ef..d1d5b7f8d7 100644 --- a/test/pc/e2e/peer_configurer.cc +++ b/test/pc/e2e/peer_configurer.cc @@ -23,8 +23,6 @@ namespace { using AudioConfig = PeerConnectionE2EQualityTestFixture::AudioConfig; using VideoConfig = PeerConnectionE2EQualityTestFixture::VideoConfig; using RunParams = PeerConnectionE2EQualityTestFixture::RunParams; -using VideoGeneratorType = - PeerConnectionE2EQualityTestFixture::VideoGeneratorType; using VideoCodecConfig = PeerConnectionE2EQualityTestFixture::VideoCodecConfig; // List of default names of generic participants according to diff --git a/test/pc/e2e/peer_connection_quality_test.h b/test/pc/e2e/peer_connection_quality_test.h index bbc3d8a1f2..2eb7e708c6 100644 --- a/test/pc/e2e/peer_connection_quality_test.h +++ b/test/pc/e2e/peer_connection_quality_test.h @@ -41,8 +41,6 @@ namespace webrtc_pc_e2e { class PeerConnectionE2EQualityTest : public PeerConnectionE2EQualityTestFixture { public: - using VideoGeneratorType = - PeerConnectionE2EQualityTestFixture::VideoGeneratorType; using RunParams = PeerConnectionE2EQualityTestFixture::RunParams; using VideoConfig = PeerConnectionE2EQualityTestFixture::VideoConfig; using VideoSimulcastConfig = diff --git a/video/pc_full_stack_tests.cc b/video/pc_full_stack_tests.cc index dc61680694..4ec382ef54 100644 --- a/video/pc_full_stack_tests.cc +++ b/video/pc_full_stack_tests.cc @@ -38,8 +38,6 @@ using VideoConfig = webrtc_pc_e2e::PeerConnectionE2EQualityTestFixture::VideoConfig; using AudioConfig = webrtc_pc_e2e::PeerConnectionE2EQualityTestFixture::AudioConfig; -using VideoGeneratorType = - webrtc_pc_e2e::PeerConnectionE2EQualityTestFixture::VideoGeneratorType; using ScreenShareConfig = webrtc_pc_e2e::PeerConnectionE2EQualityTestFixture::ScreenShareConfig; using VideoSimulcastConfig =