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

AudioSource allows implementations to return settings

Browse Source 
So far the code assumed that there is only one implementation of AudioSourceInterface: LocalAudioSource.
That is not true. This change allows custom implementations to still set options (such as audio network adaptation) on the source.

Long term solution should include refactoring options so that they are passed to peer connection or call object, and not be defined on audio source.


Bug: webrtc:9719
Change-Id: Ic3b92219502bc73a964adbbb9c5cd7156aa382e1
Reviewed-on: https://webrtc-review.googlesource.com/c/110681
Commit-Queue: Peter Slatala <psla@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25626}
This commit is contained in:
Piotr (Peter) Slatala
2018-11-13 07:57:07 -08:00
committed by Commit Bot
parent bc4cf89d91
commit 95ca6e1692
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/mediastreaminterface.cc
View File

@ -30,4 +30,8 @@ AudioTrackInterface::GetAudioProcessor() {
return nullptr;
}
const cricket::AudioOptions AudioSourceInterface::options() const {
return {};
}
} // namespace webrtc

6
api/mediastreaminterface.h
View File

@ -23,6 +23,7 @@
#include <vector>
#include "absl/types/optional.h"
#include "api/audio_options.h"
#include "api/video/video_frame.h"
#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
@ -207,6 +208,11 @@ class AudioSourceInterface : public MediaSourceInterface {
// TODO(tommi): Make pure virtual.
virtual void AddSink(AudioTrackSinkInterface* sink) {}
virtual void RemoveSink(AudioTrackSinkInterface* sink) {}
// Returns options for the AudioSource.
// (for some of the settings this approach is broken, e.g. setting
// audio network adaptation on the source is the wrong layer of abstraction).
virtual const cricket::AudioOptions options() const;
};
// Interface of the audio processor used by the audio track to collect

2
pc/localaudiosource.h
View File

@ -29,7 +29,7 @@ class LocalAudioSource : public Notifier<AudioSourceInterface> {
SourceState state() const override { return kLive; }
bool remote() const override { return false; }
virtual const cricket::AudioOptions& options() const { return options_; }
const cricket::AudioOptions options() const override { return options_; }
void AddSink(AudioTrackSinkInterface* sink) override {}
void RemoveSink(AudioTrackSinkInterface* sink) override {}

4
pc/rtpsender.cc
View File

@ -405,9 +405,7 @@ void AudioRtpSender::SetAudioSend() {
// options since it is also applied to all streams/channels, local or remote.
if (track_->enabled() && track_->GetSource() &&
!track_->GetSource()->remote()) {
// TODO(xians): Remove this static_cast since we should be able to connect
// a remote audio track to a peer connection.
options = static_cast<LocalAudioSource*>(track_->GetSource())->options();
options = track_->GetSource()->options();
}
#endif