Deletes the class VideoRendererCallback.

webrtc/modules/video_render/video_render.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 73 matching lines @@
      *
      *   streamID    - id of the stream to add
      *   zOrder      - relative render order for the streams, 0 = on top
      *   left        - position of the stream in the window, [0.0f, 1.0f]
      *   top         - position of the stream in the window, [0.0f, 1.0f]
      *   right       - position of the stream in the window, [0.0f, 1.0f]
      *   bottom      - position of the stream in the window, [0.0f, 1.0f]
      *
      *   Return      - callback class to use for delivering new frames to render.
      */
-    virtual VideoRenderCallback
+    virtual rtc::VideoSinkInterface<VideoFrame>
             * AddIncomingRenderStream(const uint32_t streamId,
                                       const uint32_t zOrder,
                                       const float left, const float top,
                                       const float right, const float bottom) = 0;
     /*
      *   Delete incoming render stream
      *
      *   streamID    - id of the stream to add
      */
     virtual int32_t
             DeleteIncomingRenderStream(const uint32_t streamId) = 0;
 
     /*
      *   Add incoming render callback, used for external rendering
      *
      *   streamID     - id of the stream the callback is used for

[perkj_webrtc, 2016/03/31 05:11:58]

line length

-     *   renderObject - the VideoRenderCallback to use for this stream, NULL to remove
+     *   renderObject - the rtc::VideoSinkInterface<VideoFrame> to use for this stream, NULL to remove

[perkj_webrtc, 2016/03/31 05:11:58]

line length

[nisse-webrtc, 2016/03/31 07:07:20]

Done. (All in this file).

      *
      *   Return      - callback class to use for delivering new frames to render.
      */
     virtual int32_t
             AddExternalRenderCallback(const uint32_t streamId,
-                                      VideoRenderCallback* renderObject) = 0;
+                                      rtc::VideoSinkInterface<VideoFrame>* renderObject) = 0;

[perkj_webrtc, 2016/03/31 05:11:58]

line length

 
     /*
      *   Get the porperties for an incoming render stream
      *
      *   streamID    - [in] id of the stream to get properties for
      *   zOrder      - [out] relative render order for the streams, 0 = on top
      *   left        - [out] position of the stream in the window, [0.0f, 1.0f]
      *   top         - [out] position of the stream in the window, [0.0f, 1.0f]
      *   right       - [out] position of the stream in the window, [0.0f, 1.0f]
      *   bottom      - [out] position of the stream in the window, [0.0f, 1.0f]
@@ skipping 19 matching lines @@
      */
     virtual bool
             HasIncomingRenderStream(const uint32_t streamId) const = 0;
 
     /*
      *   Registers a callback to get raw images in the same time as sent
      *   to the renderer. To be used for external rendering.
      */
     virtual int32_t
             RegisterRawFrameCallback(const uint32_t streamId,
-                                     VideoRenderCallback* callbackObj) = 0;
+                                     rtc::VideoSinkInterface<VideoFrame>* callbackObj) = 0;

[perkj_webrtc, 2016/03/31 05:11:58]

line length

 
     /**************************************************************************
      *
      *   Start/Stop
      *
      ***************************************************************************/
 
     /*
      *   Starts rendering the specified stream
      */
@@ skipping 91 matching lines @@
 
     /*
      * Set a timout image. The image is rendered if no videoframe has been delivered
      */
     virtual int32_t SetTimeoutImage(const uint32_t streamId,
                                     const VideoFrame& videoFrame,
                                     const uint32_t timeout) = 0;
 };
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_H_