Support for remote audio into tracks

talk/media/base/mediachannel.h

Index: talk/media/base/mediachannel.h
diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h
index fe223bba0418d27454aae73cb6b3dc2be3df392a..92cfb34bd130acf392024bdb71822b7d560c4b09 100644
--- a/talk/media/base/mediachannel.h
+++ b/talk/media/base/mediachannel.h
@@ -31,9 +31,11 @@
 #include <string>
 #include <vector>
 
+#include "talk/media/base/audiorenderer.h"

[tommi (sloooow) - chröme, 2015/12/11 17:51:18]

also reverted this change

[the sun, 2015/12/11 19:46:28]

Acknowledged.

 #include "talk/media/base/codec.h"
 #include "talk/media/base/constants.h"
 #include "talk/media/base/streamparams.h"
+#include "webrtc/audio/audio_sink.h"

[the sun, 2015/12/11 16:32:04]

forward declare instead?

[tommi (sloooow) - chröme, 2015/12/11 17:51:18]

Done.
(be warned that about 10 more file were added to the CL with a +1 line)

[the sun, 2015/12/11 19:46:28]

Ah, oh. Hmm. Well, that didn't turn out too well then. Is that because anyone
including a file declaring a interface with a by-value scoped_ptr will need to
know the full declaration of AudioSinkInterface? In that case, I guess this was
correct originally and should be changed back. Sorry.

The reason I brought it up was that you used a forward declaration in the
webrtc/audio_receive_stream.h, so I figured it would work and should be
consistent. Again, sorry, please revert.

[tommi, 2015/12/12 00:33:11]

This didn't make sense to me either, so I went through the files again and
realized that there was a missing include in fakemediaengine.h.  All of the
implementation there is inline and I was sure I had added an include there, but
alas that was what was causing all of this.  So I've reverted the includes I
added but kept the fwd decl like you asked and also fixed other places where
there was no implementation in the header.

 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/dscp.h"
@@ -53,7 +55,6 @@ class Timing;
 
 namespace cricket {
 
-class AudioRenderer;
 struct RtpHeader;
 class ScreencastId;
 struct VideoFormat;
@@ -1028,6 +1029,10 @@ class VoiceMediaChannel : public MediaChannel {
   virtual bool InsertDtmf(uint32_t ssrc, int event, int duration) = 0;
   // Gets quality stats for the channel.
   virtual bool GetStats(VoiceMediaInfo* info) = 0;
+
+  virtual void SetRawAudioSink(
+      uint32_t ssrc,
+      rtc::scoped_ptr<webrtc::AudioSinkInterface> sink) = 0;
 };
 
 struct VideoSendParameters : RtpSendParameters<VideoCodec, VideoOptions> {