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

Unified Diff: webrtc/voice_engine/channel_proxy.cc

Issue 1505253004: Support for remote audio into tracks (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Revert unwanted VoE changes Created 5 years 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
« webrtc/audio/audio_sink.h ('K') | « webrtc/voice_engine/channel_proxy.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/channel_proxy.cc
diff --git a/webrtc/voice_engine/channel_proxy.cc b/webrtc/voice_engine/channel_proxy.cc
index 68fbf38863685c17e8803901fc5ebca9cde469f2..c4a331dccb466f51331396bdfe882d2c687ca9dd 100644
--- a/webrtc/voice_engine/channel_proxy.cc
+++ b/webrtc/voice_engine/channel_proxy.cc
@@ -10,6 +10,8 @@
#include "webrtc/voice_engine/channel_proxy.h"
+#include <utility>
+
#include "webrtc/base/checks.h"
#include "webrtc/voice_engine/channel.h"
@@ -134,6 +136,10 @@ bool ChannelProxy::SendTelephoneEventOutband(uint8_t event,
channel()->SendTelephoneEventOutband(event, duration_ms, 10, false) == 0;
}
+void ChannelProxy::SetSink(rtc::scoped_ptr<AudioSink> sink) {
the sun 2015/12/11 13:52:01 Thread check please.
tommi (sloooow) - chröme 2015/12/11 14:22:57 Done.
+ channel()->SetSink(std::move(sink));
+}
+
Channel* ChannelProxy::channel() const {
RTC_DCHECK(channel_owner_.channel());
return channel_owner_.channel();
« webrtc/audio/audio_sink.h ('K') | « webrtc/voice_engine/channel_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698