zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove PC factory options param from LocalAudioSource::Create.

Browse Source 
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}
This commit is contained in:
deadbeef
2017-02-10 21:26:48 -08:00
committed by Commit bot
parent 3f35e484f8
commit 757146baf1
5 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/pc/localaudiosource.cc
View File

@ -21,31 +21,27 @@ using webrtc::MediaSourceInterface;
namespace webrtc {
rtc::scoped_refptr<LocalAudioSource> LocalAudioSource::Create(
const PeerConnectionFactoryInterface::Options& options,
const MediaConstraintsInterface* constraints) {
rtc::scoped_refptr<LocalAudioSource> source(
new rtc::RefCountedObject<LocalAudioSource>());
source->Initialize(options, constraints);
source->Initialize(constraints);
return source;
}
rtc::scoped_refptr<LocalAudioSource> LocalAudioSource::Create(
const PeerConnectionFactoryInterface::Options& options,
const cricket::AudioOptions* audio_options) {
rtc::scoped_refptr<LocalAudioSource> source(
new rtc::RefCountedObject<LocalAudioSource>());
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;

9
webrtc/pc/localaudiosource.h
View File

@ -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<AudioSourceInterface> {
public:
// Creates an instance of LocalAudioSource.
static rtc::scoped_refptr<LocalAudioSource> Create(
const PeerConnectionFactoryInterface::Options& options,
const MediaConstraintsInterface* constraints);
static rtc::scoped_refptr<LocalAudioSource> Create(
const PeerConnectionFactoryInterface::Options& options,
const cricket::AudioOptions* audio_options);
SourceState state() const override { return kLive; }
@ -47,10 +44,8 @@ class LocalAudioSource : public Notifier<AudioSourceInterface> {
~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_;
};

23
webrtc/pc/localaudiosource_unittest.cc
View File

@ -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<LocalAudioSource> source =
LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(),
&constraints);
LocalAudioSource::Create(&constraints);
EXPECT_EQ(rtc::Optional<bool>(false), source->options().echo_cancellation);
EXPECT_EQ(rtc::Optional<bool>(true), source->options().extended_filter_aec);
@ -52,8 +50,7 @@ TEST(LocalAudioSourceTest, SetValidOptions) {
TEST(LocalAudioSourceTest, OptionNotSet) {
webrtc::FakeConstraints constraints;
rtc::scoped_refptr<LocalAudioSource> source =
LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(),
&constraints);
LocalAudioSource::Create(&constraints);
EXPECT_EQ(rtc::Optional<bool>(), source->options().highpass_filter);
}
@ -65,8 +62,7 @@ TEST(LocalAudioSourceTest, MandatoryOverridesOptional) {
MediaConstraintsInterface::kGoogEchoCancellation, true);
rtc::scoped_refptr<LocalAudioSource> source =
LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(),
&constraints);
LocalAudioSource::Create(&constraints);
EXPECT_EQ(rtc::Optional<bool>(false), source->options().echo_cancellation);
}
@ -77,8 +73,7 @@ TEST(LocalAudioSourceTest, InvalidOptional) {
constraints.AddOptional("invalidKey", false);
rtc::scoped_refptr<LocalAudioSource> source =
LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(),
&constraints);
LocalAudioSource::Create(&constraints);
EXPECT_EQ(MediaSourceInterface::kLive, source->state());
EXPECT_EQ(rtc::Optional<bool>(false), source->options().highpass_filter);
@ -90,8 +85,7 @@ TEST(LocalAudioSourceTest, InvalidMandatory) {
constraints.AddMandatory("invalidKey", false);
rtc::scoped_refptr<LocalAudioSource> source =
LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(),
&constraints);
LocalAudioSource::Create(&constraints);
EXPECT_EQ(MediaSourceInterface::kLive, source->state());
EXPECT_EQ(rtc::Optional<bool>(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<bool>(true);
rtc::scoped_refptr<LocalAudioSource> source = LocalAudioSource::Create(
PeerConnectionFactoryInterface::Options(), &audio_options);
rtc::scoped_refptr<LocalAudioSource> source =
LocalAudioSource::Create(&audio_options);
EXPECT_EQ(rtc::Optional<bool>(true), source->options().highpass_filter);
}
TEST(LocalAudioSourceTest, InitWithNoOptions) {
rtc::scoped_refptr<LocalAudioSource> source =
LocalAudioSource::Create(PeerConnectionFactoryInterface::Options(),
(cricket::AudioOptions*)nullptr);
LocalAudioSource::Create((cricket::AudioOptions*)nullptr);
EXPECT_EQ(rtc::Optional<bool>(), source->options().highpass_filter);
}

4
webrtc/pc/peerconnectionfactory.cc
View File

@ -240,7 +240,7 @@ PeerConnectionFactory::CreateAudioSource(
const MediaConstraintsInterface* constraints) {
RTC_DCHECK(signaling_thread_->IsCurrent());
rtc::scoped_refptr<LocalAudioSource> source(
LocalAudioSource::Create(options_, constraints));
LocalAudioSource::Create(constraints));
return source;
}
@ -248,7 +248,7 @@ rtc::scoped_refptr<AudioSourceInterface>
PeerConnectionFactory::CreateAudioSource(const cricket::AudioOptions& options) {
RTC_DCHECK(signaling_thread_->IsCurrent());
rtc::scoped_refptr<LocalAudioSource> source(
LocalAudioSource::Create(options_, &options));
LocalAudioSource::Create(&options));
return source;
}

3
webrtc/pc/rtpsenderreceiver_unittest.cc
View File

@ -304,8 +304,7 @@ TEST_F(RtpSenderReceiverTest, AddAndDestroyVideoRtpReceiver) {
TEST_F(RtpSenderReceiverTest, LocalAudioSourceOptionsApplied) {
cricket::AudioOptions options;
options.echo_cancellation = rtc::Optional<bool>(true);
auto source = LocalAudioSource::Create(
PeerConnectionFactoryInterface::Options(), &options);
auto source = LocalAudioSource::Create(&options);
CreateAudioRtpSender(source.get());
EXPECT_EQ(rtc::Optional<bool>(true),