From 757146baf1fa6157ff8d34fc8e8b6c33d6f84a51 Mon Sep 17 00:00:00 2001 From: deadbeef Date: Fri, 10 Feb 2017 21:26:48 -0800 Subject: [PATCH] Remove PC factory options param from LocalAudioSource::Create. It wasn't being used at all, and there's no need to tie LocalAudioSource to PeerConnection. BUG=None Review-Url: https://codereview.webrtc.org/2682253002 Cr-Commit-Position: refs/heads/master@{#16550} --- webrtc/pc/localaudiosource.cc | 8 ++------ webrtc/pc/localaudiosource.h | 9 ++------- webrtc/pc/localaudiosource_unittest.cc | 23 ++++++++--------------- webrtc/pc/peerconnectionfactory.cc | 4 ++-- webrtc/pc/rtpsenderreceiver_unittest.cc | 3 +-- 5 files changed, 15 insertions(+), 32 deletions(-) diff --git a/webrtc/pc/localaudiosource.cc b/webrtc/pc/localaudiosource.cc index 3d79da96c5..5454cdfaae 100644 --- a/webrtc/pc/localaudiosource.cc +++ b/webrtc/pc/localaudiosource.cc @@ -21,31 +21,27 @@ using webrtc::MediaSourceInterface; namespace webrtc { rtc::scoped_refptr LocalAudioSource::Create( - const PeerConnectionFactoryInterface::Options& options, const MediaConstraintsInterface* constraints) { rtc::scoped_refptr source( new rtc::RefCountedObject()); - source->Initialize(options, constraints); + source->Initialize(constraints); return source; } rtc::scoped_refptr LocalAudioSource::Create( - const PeerConnectionFactoryInterface::Options& options, const cricket::AudioOptions* audio_options) { rtc::scoped_refptr source( new rtc::RefCountedObject()); - source->Initialize(options, audio_options); + source->Initialize(audio_options); return source; } void LocalAudioSource::Initialize( - const PeerConnectionFactoryInterface::Options& options, const MediaConstraintsInterface* constraints) { CopyConstraintsIntoAudioOptions(constraints, &options_); } void LocalAudioSource::Initialize( - const PeerConnectionFactoryInterface::Options& options, const cricket::AudioOptions* audio_options) { if (!audio_options) return; diff --git a/webrtc/pc/localaudiosource.h b/webrtc/pc/localaudiosource.h index 58e90af8ae..ffa465df3d 100644 --- a/webrtc/pc/localaudiosource.h +++ b/webrtc/pc/localaudiosource.h @@ -13,7 +13,6 @@ #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/notifier.h" -#include "webrtc/api/peerconnectioninterface.h" #include "webrtc/media/base/mediachannel.h" // LocalAudioSource implements AudioSourceInterface. @@ -27,11 +26,9 @@ class LocalAudioSource : public Notifier { public: // Creates an instance of LocalAudioSource. static rtc::scoped_refptr Create( - const PeerConnectionFactoryInterface::Options& options, const MediaConstraintsInterface* constraints); static rtc::scoped_refptr Create( - const PeerConnectionFactoryInterface::Options& options, const cricket::AudioOptions* audio_options); SourceState state() const override { return kLive; } @@ -47,10 +44,8 @@ class LocalAudioSource : public Notifier { ~LocalAudioSource() override {} private: - void Initialize(const PeerConnectionFactoryInterface::Options& options, - const MediaConstraintsInterface* constraints); - void Initialize(const PeerConnectionFactoryInterface::Options& options, - const cricket::AudioOptions* audio_options); + void Initialize(const MediaConstraintsInterface* constraints); + void Initialize(const cricket::AudioOptions* audio_options); cricket::AudioOptions options_; }; diff --git a/webrtc/pc/localaudiosource_unittest.cc b/webrtc/pc/localaudiosource_unittest.cc index 394a2eae01..eb42213a9f 100644 --- a/webrtc/pc/localaudiosource_unittest.cc +++ b/webrtc/pc/localaudiosource_unittest.cc @@ -21,7 +21,6 @@ using webrtc::LocalAudioSource; using webrtc::MediaConstraintsInterface; using webrtc::MediaSourceInterface; -using webrtc::PeerConnectionFactoryInterface; TEST(LocalAudioSourceTest, SetValidOptions) { webrtc::FakeConstraints constraints; @@ -37,8 +36,7 @@ TEST(LocalAudioSourceTest, SetValidOptions) { constraints.AddOptional(MediaConstraintsInterface::kHighpassFilter, true); rtc::scoped_refptr source = - LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(), - &constraints); + LocalAudioSource::Create(&constraints); EXPECT_EQ(rtc::Optional(false), source->options().echo_cancellation); EXPECT_EQ(rtc::Optional(true), source->options().extended_filter_aec); @@ -52,8 +50,7 @@ TEST(LocalAudioSourceTest, SetValidOptions) { TEST(LocalAudioSourceTest, OptionNotSet) { webrtc::FakeConstraints constraints; rtc::scoped_refptr source = - LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(), - &constraints); + LocalAudioSource::Create(&constraints); EXPECT_EQ(rtc::Optional(), source->options().highpass_filter); } @@ -65,8 +62,7 @@ TEST(LocalAudioSourceTest, MandatoryOverridesOptional) { MediaConstraintsInterface::kGoogEchoCancellation, true); rtc::scoped_refptr source = - LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(), - &constraints); + LocalAudioSource::Create(&constraints); EXPECT_EQ(rtc::Optional(false), source->options().echo_cancellation); } @@ -77,8 +73,7 @@ TEST(LocalAudioSourceTest, InvalidOptional) { constraints.AddOptional("invalidKey", false); rtc::scoped_refptr source = - LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(), - &constraints); + LocalAudioSource::Create(&constraints); EXPECT_EQ(MediaSourceInterface::kLive, source->state()); EXPECT_EQ(rtc::Optional(false), source->options().highpass_filter); @@ -90,8 +85,7 @@ TEST(LocalAudioSourceTest, InvalidMandatory) { constraints.AddMandatory("invalidKey", false); rtc::scoped_refptr source = - LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(), - &constraints); + LocalAudioSource::Create(&constraints); EXPECT_EQ(MediaSourceInterface::kLive, source->state()); EXPECT_EQ(rtc::Optional(false), source->options().highpass_filter); @@ -100,14 +94,13 @@ TEST(LocalAudioSourceTest, InvalidMandatory) { TEST(LocalAudioSourceTest, InitWithAudioOptions) { cricket::AudioOptions audio_options; audio_options.highpass_filter = rtc::Optional(true); - rtc::scoped_refptr source = LocalAudioSource::Create( - PeerConnectionFactoryInterface::Options(), &audio_options); + rtc::scoped_refptr source = + LocalAudioSource::Create(&audio_options); EXPECT_EQ(rtc::Optional(true), source->options().highpass_filter); } TEST(LocalAudioSourceTest, InitWithNoOptions) { rtc::scoped_refptr source = - LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(), - (cricket::AudioOptions*)nullptr); + LocalAudioSource::Create((cricket::AudioOptions*)nullptr); EXPECT_EQ(rtc::Optional(), source->options().highpass_filter); } diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc index 1de7284cfe..743f51702c 100644 --- a/webrtc/pc/peerconnectionfactory.cc +++ b/webrtc/pc/peerconnectionfactory.cc @@ -240,7 +240,7 @@ PeerConnectionFactory::CreateAudioSource( const MediaConstraintsInterface* constraints) { RTC_DCHECK(signaling_thread_->IsCurrent()); rtc::scoped_refptr source( - LocalAudioSource::Create(options_, constraints)); + LocalAudioSource::Create(constraints)); return source; } @@ -248,7 +248,7 @@ rtc::scoped_refptr PeerConnectionFactory::CreateAudioSource(const cricket::AudioOptions& options) { RTC_DCHECK(signaling_thread_->IsCurrent()); rtc::scoped_refptr source( - LocalAudioSource::Create(options_, &options)); + LocalAudioSource::Create(&options)); return source; } diff --git a/webrtc/pc/rtpsenderreceiver_unittest.cc b/webrtc/pc/rtpsenderreceiver_unittest.cc index 99380e9220..4bcbb51884 100644 --- a/webrtc/pc/rtpsenderreceiver_unittest.cc +++ b/webrtc/pc/rtpsenderreceiver_unittest.cc @@ -304,8 +304,7 @@ TEST_F(RtpSenderReceiverTest, AddAndDestroyVideoRtpReceiver) { TEST_F(RtpSenderReceiverTest, LocalAudioSourceOptionsApplied) { cricket::AudioOptions options; options.echo_cancellation = rtc::Optional(true); - auto source = LocalAudioSource::Create( - PeerConnectionFactoryInterface::Options(), &options); + auto source = LocalAudioSource::Create(&options); CreateAudioRtpSender(source.get()); EXPECT_EQ(rtc::Optional(true),