Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: webrtc/audio/audio_receive_stream.cc

Issue 1991233004: Moved creation of AudioDecoderFactory to inside PeerConnectionFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-3
Patch Set: Parental Advisory: Explicit Content Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/audio/DEPS ('k') | webrtc/audio/audio_receive_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/audio/audio_receive_stream.cc
diff --git a/webrtc/audio/audio_receive_stream.cc b/webrtc/audio/audio_receive_stream.cc
index e391df471ed8c83ff228bacdc36b0db11da91a5f..c6c9b30b2a29e294de3f63b8028d5292762e658f 100644
--- a/webrtc/audio/audio_receive_stream.cc
+++ b/webrtc/audio/audio_receive_stream.cc
@@ -94,6 +94,15 @@ AudioReceiveStream::AudioReceiveStream(
channel_proxy_ = voe_impl->GetChannelProxy(config_.voe_channel_id);
channel_proxy_->SetLocalSSRC(config.rtp.local_ssrc);
+ // TODO(ossu): This is where we'd like to set the decoder factory to
+ // use. However, since it needs to be included when constructing Channel, we
+ // cannot do that until we're able to move Channel ownership into the
+ // Audio{Send,Receive}Streams. The best we can do is check that we're not
+ // trying to use two different factories using the different interfaces.
+ RTC_CHECK(config.decoder_factory);
+ RTC_CHECK_EQ(config.decoder_factory,
+ channel_proxy_->GetAudioDecoderFactory());
+
channel_proxy_->RegisterExternalTransport(config.rtcp_send_transport);
for (const auto& extension : config.rtp.extensions) {
« no previous file with comments | « webrtc/audio/DEPS ('k') | webrtc/audio/audio_receive_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698