Make WebRtcVideoChannel2::WebRtcVideoSendStream implement rtc::VideoRendererInterface.

talk/media/base/mediachannel.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 24 matching lines @@
 #include "talk/media/base/constants.h"
 #include "talk/media/base/streamparams.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/socket.h"
 #include "webrtc/base/window.h"
+#include "webrtc/media/base/videosinkinterface.h"

[perkj_webrtc, 2016/01/26 15:40:56]

forward declare?

[nisse-webrtc, 2016/01/28 08:24:53]

I know how to forward declare a plain class, but how do I write it when it
involves a template?

 // TODO(juberti): re-evaluate this include
 #include "talk/session/media/audiomonitor.h"
 
 namespace rtc {
 class Buffer;
 class RateLimiter;
 class Timing;
 }
 
 namespace webrtc {
 class AudioSinkInterface;
 }
 
 namespace cricket {
 
 class AudioRenderer;
 class ScreencastId;
 class VideoCapturer;
+class VideoFrame;
 class VideoRenderer;
 struct RtpHeader;
 struct VideoFormat;
 
 const int kMinRtpHeaderExtensionId = 1;
 const int kMaxRtpHeaderExtensionId = 255;
 const int kScreencastDefaultFps = 5;
 
 template <class T>
 static std::string ToStringIfSet(const char* key, const rtc::Optional<T>& val) {
@@ skipping 999 matching lines @@
   virtual bool GetSendCodec(VideoCodec* send_codec) = 0;
   // Sets the format of a specified outgoing stream.
   virtual bool SetSendStreamFormat(uint32_t ssrc,
                                    const VideoFormat& format) = 0;
   // Starts or stops transmission (and potentially capture) of local video.
   virtual bool SetSend(bool send) = 0;
   // Configure stream for sending.
   virtual bool SetVideoSend(uint32_t ssrc,
                             bool enable,
                             const VideoOptions* options) = 0;
+  // Get the VideoSink for passing frames into a video sendstream
+  virtual rtc::VideoSinkInterface<cricket::VideoFrame>* GetSink(
+      uint32_t ssrc) = 0;
   // Sets the renderer object to be used for the specified stream.
   // If SSRC is 0, the renderer is used for the 'default' stream.
   virtual bool SetRenderer(uint32_t ssrc, VideoRenderer* renderer) = 0;
   // If |ssrc| is 0, replace the default capturer (engine capturer) with
   // |capturer|. If |ssrc| is non zero create a new stream with |ssrc| as SSRC.
   virtual bool SetCapturer(uint32_t ssrc, VideoCapturer* capturer) = 0;
   // Gets quality stats for the channel.
   virtual bool GetStats(VideoMediaInfo* info) = 0;
   // Send an intra frame to the receivers.
   virtual bool SendIntraFrame() = 0;
@@ skipping 126 matching lines @@
   // Signal when the media channel is ready to send the stream. Arguments are:
   //     writable(bool)
   sigslot::signal1<bool> SignalReadyToSend;
   // Signal for notifying that the remote side has closed the DataChannel.
   sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_MEDIACHANNEL_H_