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

Unified Diff: talk/session/media/channel.h

Issue 1505253004: Support for remote audio into tracks (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add thread check, Remove bits_per_sample and use int16_t. 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
Index: talk/session/media/channel.h
diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h
index 11409548e3fa1bee8d4b82c68cca88c2e9870eaa..917137c883084ec185057e3335bb6c10224778b0 100644
--- a/talk/session/media/channel.h
+++ b/talk/session/media/channel.h
@@ -38,8 +38,6 @@
#include "talk/media/base/mediaengine.h"
#include "talk/media/base/streamparams.h"
#include "talk/media/base/videocapturer.h"
-#include "webrtc/p2p/base/transportcontroller.h"
-#include "webrtc/p2p/client/socketmonitor.h"
#include "talk/session/media/audiomonitor.h"
#include "talk/session/media/bundlefilter.h"
#include "talk/session/media/mediamonitor.h"
@@ -51,6 +49,8 @@
#include "webrtc/base/network.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/window.h"
+#include "webrtc/p2p/base/transportcontroller.h"
+#include "webrtc/p2p/client/socketmonitor.h"
namespace cricket {
@@ -367,6 +367,9 @@ class VoiceChannel : public BaseChannel {
// event 0-9, *, #, A-D.
bool InsertDtmf(uint32_t ssrc, int event_code, int duration);
bool SetOutputVolume(uint32_t ssrc, double volume);
+ void SetRawAudioSink(uint32_t ssrc,
+ rtc::scoped_ptr<webrtc::AudioSinkInterface> sink);
the sun 2015/12/11 16:32:05 This file should forward declare AudioSinkInterfac
tommi (sloooow) - chröme 2015/12/11 17:51:18 Added fwd decl. Just so that I'm not misunderstan
the sun 2015/12/11 19:46:28 The inclusion of AudioSinkInterface must have been
+
// Get statistics about the current media session.
bool GetStats(VoiceMediaInfo* stats);

Powered by Google App Engine
This is Rietveld 408576698