Delete deprecated CreateAudioSource method, with constraints.
Bug: webrtc:9239
Change-Id: I5025b7fd103247e0426ceabedc1216a4f0f0ab34
Reviewed-on: https://webrtc-review.googlesource.com/76560
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23501}diff --git a/pc/localaudiosource.cc b/pc/localaudiosource.cc
index 5c86dd3..b2fdd4d 100644
--- a/pc/localaudiosource.cc
+++ b/pc/localaudiosource.cc
@@ -12,23 +12,13 @@
#include <vector>
-#include "api/mediaconstraintsinterface.h"
#include "media/base/mediaengine.h"
-using webrtc::MediaConstraintsInterface;
using webrtc::MediaSourceInterface;
namespace webrtc {
rtc::scoped_refptr<LocalAudioSource> LocalAudioSource::Create(
- const MediaConstraintsInterface* constraints) {
- rtc::scoped_refptr<LocalAudioSource> source(
- new rtc::RefCountedObject<LocalAudioSource>());
- source->Initialize(constraints);
- return source;
-}
-
-rtc::scoped_refptr<LocalAudioSource> LocalAudioSource::Create(
const cricket::AudioOptions* audio_options) {
rtc::scoped_refptr<LocalAudioSource> source(
new rtc::RefCountedObject<LocalAudioSource>());
@@ -37,11 +27,6 @@
}
void LocalAudioSource::Initialize(
- const MediaConstraintsInterface* constraints) {
- CopyConstraintsIntoAudioOptions(constraints, &options_);
-}
-
-void LocalAudioSource::Initialize(
const cricket::AudioOptions* audio_options) {
if (!audio_options)
return;
diff --git a/pc/localaudiosource.h b/pc/localaudiosource.h
index cd17330..c5f6530 100644
--- a/pc/localaudiosource.h
+++ b/pc/localaudiosource.h
@@ -20,15 +20,10 @@
namespace webrtc {
-class MediaConstraintsInterface;
-
class LocalAudioSource : public Notifier<AudioSourceInterface> {
public:
// Creates an instance of LocalAudioSource.
static rtc::scoped_refptr<LocalAudioSource> Create(
- const MediaConstraintsInterface* constraints);
-
- static rtc::scoped_refptr<LocalAudioSource> Create(
const cricket::AudioOptions* audio_options);
SourceState state() const override { return kLive; }
@@ -44,7 +39,6 @@
~LocalAudioSource() override {}
private:
- void Initialize(const MediaConstraintsInterface* constraints);
void Initialize(const cricket::AudioOptions* audio_options);
cricket::AudioOptions options_;
diff --git a/pc/localaudiosource_unittest.cc b/pc/localaudiosource_unittest.cc
index bf566c6..b2d87ae 100644
--- a/pc/localaudiosource_unittest.cc
+++ b/pc/localaudiosource_unittest.cc
@@ -22,75 +22,6 @@
using webrtc::MediaConstraintsInterface;
using webrtc::MediaSourceInterface;
-TEST(LocalAudioSourceTest, SetValidOptions) {
- webrtc::FakeConstraints constraints;
- constraints.AddMandatory(
- MediaConstraintsInterface::kGoogEchoCancellation, false);
- constraints.AddOptional(
- MediaConstraintsInterface::kExtendedFilterEchoCancellation, true);
- constraints.AddOptional(MediaConstraintsInterface::kDAEchoCancellation, true);
- constraints.AddOptional(MediaConstraintsInterface::kAutoGainControl, true);
- constraints.AddOptional(
- MediaConstraintsInterface::kExperimentalAutoGainControl, true);
- constraints.AddMandatory(MediaConstraintsInterface::kNoiseSuppression, false);
- constraints.AddOptional(MediaConstraintsInterface::kHighpassFilter, true);
-
- rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create(&constraints);
-
- EXPECT_EQ(false, source->options().echo_cancellation);
- EXPECT_EQ(true, source->options().extended_filter_aec);
- EXPECT_EQ(true, source->options().delay_agnostic_aec);
- EXPECT_EQ(true, source->options().auto_gain_control);
- EXPECT_EQ(true, source->options().experimental_agc);
- EXPECT_EQ(false, source->options().noise_suppression);
- EXPECT_EQ(true, source->options().highpass_filter);
-}
-
-TEST(LocalAudioSourceTest, OptionNotSet) {
- webrtc::FakeConstraints constraints;
- rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create(&constraints);
- EXPECT_EQ(rtc::nullopt, source->options().highpass_filter);
-}
-
-TEST(LocalAudioSourceTest, MandatoryOverridesOptional) {
- webrtc::FakeConstraints constraints;
- constraints.AddMandatory(
- MediaConstraintsInterface::kGoogEchoCancellation, false);
- constraints.AddOptional(
- MediaConstraintsInterface::kGoogEchoCancellation, true);
-
- rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create(&constraints);
-
- EXPECT_EQ(false, source->options().echo_cancellation);
-}
-
-TEST(LocalAudioSourceTest, InvalidOptional) {
- webrtc::FakeConstraints constraints;
- constraints.AddOptional(MediaConstraintsInterface::kHighpassFilter, false);
- constraints.AddOptional("invalidKey", false);
-
- rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create(&constraints);
-
- EXPECT_EQ(MediaSourceInterface::kLive, source->state());
- EXPECT_EQ(false, source->options().highpass_filter);
-}
-
-TEST(LocalAudioSourceTest, InvalidMandatory) {
- webrtc::FakeConstraints constraints;
- constraints.AddMandatory(MediaConstraintsInterface::kHighpassFilter, false);
- constraints.AddMandatory("invalidKey", false);
-
- rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create(&constraints);
-
- EXPECT_EQ(MediaSourceInterface::kLive, source->state());
- EXPECT_EQ(false, source->options().highpass_filter);
-}
-
TEST(LocalAudioSourceTest, InitWithAudioOptions) {
cricket::AudioOptions audio_options;
audio_options.highpass_filter = true;
@@ -101,6 +32,6 @@
TEST(LocalAudioSourceTest, InitWithNoOptions) {
rtc::scoped_refptr<LocalAudioSource> source =
- LocalAudioSource::Create((cricket::AudioOptions*)nullptr);
+ LocalAudioSource::Create(nullptr);
EXPECT_EQ(rtc::nullopt, source->options().highpass_filter);
}
diff --git a/pc/peerconnection_integrationtest.cc b/pc/peerconnection_integrationtest.cc
index ec7f5c1..ecd84d1 100644
--- a/pc/peerconnection_integrationtest.cc
+++ b/pc/peerconnection_integrationtest.cc
@@ -321,11 +321,11 @@
}
rtc::scoped_refptr<webrtc::AudioTrackInterface> CreateLocalAudioTrack() {
- FakeConstraints constraints;
+ cricket::AudioOptions options;
// Disable highpass filter so that we can get all the test audio frames.
- constraints.AddMandatory(MediaConstraintsInterface::kHighpassFilter, false);
+ options.highpass_filter = false;
rtc::scoped_refptr<webrtc::AudioSourceInterface> source =
- peer_connection_factory_->CreateAudioSource(&constraints);
+ peer_connection_factory_->CreateAudioSource(options);
// TODO(perkj): Test audio source when it is implemented. Currently audio
// always use the default input.
return peer_connection_factory_->CreateAudioTrack(rtc::CreateRandomUuid(),
diff --git a/pc/peerconnectionendtoend_unittest.cc b/pc/peerconnectionendtoend_unittest.cc
index 2f5631a..727fa2c 100644
--- a/pc/peerconnectionendtoend_unittest.cc
+++ b/pc/peerconnectionendtoend_unittest.cc
@@ -105,18 +105,18 @@
}
void GetAndAddUserMedia() {
- FakeConstraints audio_constraints;
+ cricket::AudioOptions audio_options;
FakeConstraints video_constraints;
- GetAndAddUserMedia(true, audio_constraints, true, video_constraints);
+ GetAndAddUserMedia(true, audio_options, true, video_constraints);
}
void GetAndAddUserMedia(bool audio,
- const FakeConstraints& audio_constraints,
+ const cricket::AudioOptions& audio_options,
bool video,
const FakeConstraints& video_constraints) {
- caller_->GetAndAddUserMedia(audio, audio_constraints,
+ caller_->GetAndAddUserMedia(audio, audio_options,
video, video_constraints);
- callee_->GetAndAddUserMedia(audio, audio_constraints,
+ callee_->GetAndAddUserMedia(audio, audio_options,
video, video_constraints);
}
diff --git a/pc/peerconnectionfactory.cc b/pc/peerconnectionfactory.cc
index c9fa223..78a46b8 100644
--- a/pc/peerconnectionfactory.cc
+++ b/pc/peerconnectionfactory.cc
@@ -232,15 +232,6 @@
}
rtc::scoped_refptr<AudioSourceInterface>
-PeerConnectionFactory::CreateAudioSource(
- const MediaConstraintsInterface* constraints) {
- RTC_DCHECK(signaling_thread_->IsCurrent());
- rtc::scoped_refptr<LocalAudioSource> source(
- LocalAudioSource::Create(constraints));
- return source;
-}
-
-rtc::scoped_refptr<AudioSourceInterface>
PeerConnectionFactory::CreateAudioSource(const cricket::AudioOptions& options) {
RTC_DCHECK(signaling_thread_->IsCurrent());
rtc::scoped_refptr<LocalAudioSource> source(
diff --git a/pc/peerconnectionfactory.h b/pc/peerconnectionfactory.h
index bce1e4c..67f726a 100644
--- a/pc/peerconnectionfactory.h
+++ b/pc/peerconnectionfactory.h
@@ -67,9 +67,6 @@
rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
const cricket::AudioOptions& options) override;
- // Deprecated, use version without constraints.
- rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
- const MediaConstraintsInterface* constraints) override;
rtc::scoped_refptr<VideoTrackSourceInterface> CreateVideoSource(
std::unique_ptr<cricket::VideoCapturer> capturer) override;
diff --git a/pc/rtcstats_integrationtest.cc b/pc/rtcstats_integrationtest.cc
index 627a05b..8f7f978 100644
--- a/pc/rtcstats_integrationtest.cc
+++ b/pc/rtcstats_integrationtest.cc
@@ -118,9 +118,9 @@
PeerConnectionTestWrapper::Connect(caller_.get(), callee_.get());
// Get user media for audio and video
- caller_->GetAndAddUserMedia(true, FakeConstraints(),
+ caller_->GetAndAddUserMedia(true, cricket::AudioOptions(),
true, FakeConstraints());
- callee_->GetAndAddUserMedia(true, FakeConstraints(),
+ callee_->GetAndAddUserMedia(true, cricket::AudioOptions(),
true, FakeConstraints());
// Create data channels
diff --git a/pc/test/peerconnectiontestwrapper.cc b/pc/test/peerconnectiontestwrapper.cc
index 569a9cc..3c227b8 100644
--- a/pc/test/peerconnectiontestwrapper.cc
+++ b/pc/test/peerconnectiontestwrapper.cc
@@ -251,10 +251,10 @@
}
void PeerConnectionTestWrapper::GetAndAddUserMedia(
- bool audio, const webrtc::FakeConstraints& audio_constraints,
+ bool audio, const cricket::AudioOptions& audio_options,
bool video, const webrtc::FakeConstraints& video_constraints) {
rtc::scoped_refptr<webrtc::MediaStreamInterface> stream =
- GetUserMedia(audio, audio_constraints, video, video_constraints);
+ GetUserMedia(audio, audio_options, video, video_constraints);
for (auto audio_track : stream->GetAudioTracks()) {
EXPECT_TRUE(peer_connection_->AddTrack(audio_track, {stream->id()}).ok());
}
@@ -264,21 +264,20 @@
}
rtc::scoped_refptr<webrtc::MediaStreamInterface>
- PeerConnectionTestWrapper::GetUserMedia(
- bool audio, const webrtc::FakeConstraints& audio_constraints,
- bool video, const webrtc::FakeConstraints& video_constraints) {
+PeerConnectionTestWrapper::GetUserMedia(
+ bool audio, const cricket::AudioOptions& audio_options,
+ bool video, const webrtc::FakeConstraints& video_constraints) {
std::string stream_id =
kStreamIdBase + rtc::ToString(num_get_user_media_calls_++);
rtc::scoped_refptr<webrtc::MediaStreamInterface> stream =
peer_connection_factory_->CreateLocalMediaStream(stream_id);
if (audio) {
- FakeConstraints constraints = audio_constraints;
+ cricket::AudioOptions options = audio_options;
// Disable highpass filter so that we can get all the test audio frames.
- constraints.AddMandatory(
- MediaConstraintsInterface::kHighpassFilter, false);
+ options.highpass_filter = false;
rtc::scoped_refptr<webrtc::AudioSourceInterface> source =
- peer_connection_factory_->CreateAudioSource(&constraints);
+ peer_connection_factory_->CreateAudioSource(options);
rtc::scoped_refptr<webrtc::AudioTrackInterface> audio_track(
peer_connection_factory_->CreateAudioTrack(kAudioTrackLabelBase,
source));
diff --git a/pc/test/peerconnectiontestwrapper.h b/pc/test/peerconnectiontestwrapper.h
index 4d15244..a923b58 100644
--- a/pc/test/peerconnectiontestwrapper.h
+++ b/pc/test/peerconnectiontestwrapper.h
@@ -77,7 +77,7 @@
void WaitForAudio();
void WaitForVideo();
void GetAndAddUserMedia(
- bool audio, const webrtc::FakeConstraints& audio_constraints,
+ bool audio, const cricket::AudioOptions& audio_options,
bool video, const webrtc::FakeConstraints& video_constraints);
// sigslots
@@ -96,7 +96,7 @@
bool CheckForAudio();
bool CheckForVideo();
rtc::scoped_refptr<webrtc::MediaStreamInterface> GetUserMedia(
- bool audio, const webrtc::FakeConstraints& audio_constraints,
+ bool audio, const cricket::AudioOptions& audio_options,
bool video, const webrtc::FakeConstraints& video_constraints);
std::string name_;
