Support for remote audio into tracks

talk/media/base/fakemediaengine.h

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 17 matching lines @@
 #ifndef TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_
 #define TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "talk/media/base/audiorenderer.h"
+#include "talk/media/base/audiorenderer.h"

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

one too many

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

Acknowledged.

 #include "talk/media/base/mediaengine.h"
 #include "talk/media/base/rtputils.h"
 #include "talk/media/base/streamparams.h"
-#include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/stringutils.h"
+#include "webrtc/p2p/base/sessiondescription.h"
 
 namespace cricket {
 
 class FakeMediaEngine;
 class FakeVideoEngine;
 class FakeVoiceEngine;
 
 // A common helper class that handles sending and receiving RTP/RTCP packets.
 template <class Base> class RtpHelper : public Base {
  public:
@@ skipping 285 matching lines @@
   }
   bool GetOutputVolume(uint32_t ssrc, double* volume) {
     if (output_scalings_.find(ssrc) == output_scalings_.end())
       return false;
     *volume = output_scalings_[ssrc];
     return true;
   }
 
   virtual bool GetStats(VoiceMediaInfo* info) { return false; }
 
+  virtual void SetRawAudioSink(
+      uint32_t ssrc,
+      rtc::scoped_ptr<webrtc::AudioSinkInterface> sink) {
+    sink_ = std::move(sink);

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

If you're doing tests in a separate CL, can you skip adding this infrastructure
until then?

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

This runs in existing tests.  The code isn't _completely_ without test coverage
:)  Anything that tests a remote track, runs through most of these layers. 
Audio is even sent to the track.  However, there isn't a test that tests the
libjingle interfaces (basically verifying that audio comes out of
AudioTrackSinkInterface).

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

Ah, thanks for explaining. I hadn't looked at the upper libjingle layers in too
much detail.

+  }
+
  private:
   class VoiceChannelAudioSink : public AudioRenderer::Sink {
    public:
     explicit VoiceChannelAudioSink(AudioRenderer* renderer)
         : renderer_(renderer) {
       renderer_->SetSink(this);
     }
     virtual ~VoiceChannelAudioSink() {
       if (renderer_) {
         renderer_->SetSink(NULL);
@@ skipping 52 matching lines @@
   }
 
   FakeVoiceEngine* engine_;
   std::vector<AudioCodec> recv_codecs_;
   std::vector<AudioCodec> send_codecs_;
   std::map<uint32_t, double> output_scalings_;
   std::vector<DtmfInfo> dtmf_info_queue_;
   int time_since_last_typing_;
   AudioOptions options_;
   std::map<uint32_t, VoiceChannelAudioSink*> local_renderers_;
+  rtc::scoped_ptr<webrtc::AudioSinkInterface> sink_;
 };
 
 // A helper function to compare the FakeVoiceMediaChannel::DtmfInfo.
 inline bool CompareDtmfInfo(const FakeVoiceMediaChannel::DtmfInfo& info,
                             uint32_t ssrc,
                             int event_code,
                             int duration) {
   return (info.duration == duration && info.event_code == event_code &&
           info.ssrc == ssrc);
 }
@@ skipping 511 matching lines @@
 
  private:
   std::vector<FakeDataMediaChannel*> channels_;
   std::vector<DataCodec> data_codecs_;
   DataChannelType last_channel_type_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_