Support for remote audio into tracks

talk/app/webrtc/rtpsenderreceiver_unittest.cc

Index: talk/app/webrtc/rtpsenderreceiver_unittest.cc
diff --git a/talk/app/webrtc/rtpsenderreceiver_unittest.cc b/talk/app/webrtc/rtpsenderreceiver_unittest.cc
index c9871864bd5618548c89efbdbb354c455868355f..3f61504cae36509b4c20fe3803e4c6f1354dec18 100644
--- a/talk/app/webrtc/rtpsenderreceiver_unittest.cc
+++ b/talk/app/webrtc/rtpsenderreceiver_unittest.cc
@@ -26,10 +26,12 @@
  */
 
 #include <string>
+#include <utility>
 
 #include "talk/app/webrtc/audiotrack.h"
 #include "talk/app/webrtc/mediastream.h"
 #include "talk/app/webrtc/remoteaudiosource.h"
+#include "talk/app/webrtc/remoteaudiotrack.h"
 #include "talk/app/webrtc/rtpreceiver.h"
 #include "talk/app/webrtc/rtpsender.h"
 #include "talk/app/webrtc/streamcollection.h"
@@ -57,7 +59,8 @@ namespace webrtc {
 // Helper class to test RtpSender/RtpReceiver.
 class MockAudioProvider : public AudioProviderInterface {
  public:
-  virtual ~MockAudioProvider() {}
+  ~MockAudioProvider() override {}
+
   MOCK_METHOD2(SetAudioPlayout,
                void(uint32_t ssrc,
                     bool enable));
@@ -67,6 +70,14 @@ class MockAudioProvider : public AudioProviderInterface {
                     const cricket::AudioOptions& options,
                     cricket::AudioRenderer* renderer));
   MOCK_METHOD2(SetAudioPlayoutVolume, void(uint32_t ssrc, double volume));
+
+  void SetRawAudioSink(uint32_t,

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

No. You just turned the mock into a fake. Please add a MOCK_METHOD2 for
SetRawAudioSink and make the appropriate ON_CALL or EXPECT_CALL setup in the
test.

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

There is some functionality here though and it's the one that applies to all the
test below.  The lifetime guarantees that come with setting the sink is
basically what this does.  So, it depends on what 'fake' means, but this is not
a no-op.

The mock macros do currently not work with this type of owner passing, so using
MOCK_METHOD2 does not work.  However, I could add a new method that can be
mocked for the sake of doing something with the sink.  It would look something
like:

void SetRawAudioSink(uint32_t ssrc, rtc::scoped_ptr<AudioSinkInterface> sink)
override {
  SetRawAudioSink(ssrc, &sink);
}

MOCK_METHOD2(SetRawAudioSink, void(uint32_t ssrc,
rtc::scoped_ptr<AudioSinkInterface>* sink));

In order to take ownership of the object and move it into a local, some gtest
macro magic is required. I currently don't see any WithArg() handling of
arguments in this code and figured it would make it unnecessarily complex.

So, in this case all the tests need the same functionality, MOCK doesn't work,
jumping through several gtest hoops is required to get the same functionality as
MockAudioProvider provides now (lifetime guarantees), so I took the easy way
out.

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

Does it work to add in SetUp() or CreateAudioRtpSender something like:
    EXPECT_CALL(audio_provider_, SetRawAudioSink(kSsrc, _))
        .WillOnce(Invoke([this](uint32_t ssrc,
rtc::scoped_ptr<AudioSinkInterface> sink) {
          sink_ = std::move(sink);
        }));
and keep the sink_ in the test class? Is it a problem with how the scoped_ptr is
forwarded to the lambda?

If that doesn't work I guess your chosen solution is the best trade off.

+                       rtc::scoped_ptr<AudioSinkInterface> sink) override {
+    sink_ = std::move(sink);
+  }
+
+ private:
+  rtc::scoped_ptr<AudioSinkInterface> sink_;
 };
 
 // Helper class to test RtpSender/RtpReceiver.
@@ -151,8 +162,8 @@ class RtpSenderReceiverTest : public testing::Test {
   }
 
   void CreateAudioRtpReceiver() {
-    audio_track_ =
-        AudioTrack::Create(kAudioTrackId, RemoteAudioSource::Create().get());
+    audio_track_ = RemoteAudioTrack::Create(
+        kAudioTrackId, RemoteAudioSource::Create(kAudioSsrc, NULL));
     EXPECT_TRUE(stream_->AddTrack(audio_track_));
     EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, true));
     audio_rtp_receiver_ = new AudioRtpReceiver(stream_->GetAudioTracks()[0],