Deletes the class VideoRendererCallback.

webrtc/modules/video_render/external/video_render_external_impl.h

 /*
  *  Copyright (c) 2011 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.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_IMPL_H_
 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_IMPL_H_
 
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/video_render/i_video_render.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 
 namespace webrtc {
 
 // Class definitions
-class VideoRenderExternalImpl: IVideoRender, public VideoRenderCallback
+class VideoRenderExternalImpl: IVideoRender, public rtc::VideoSinkInterface<VideoFrame>

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

line length.

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

Done.

 {
 public:
     /*
      *   Constructor/destructor
      */
 
     VideoRenderExternalImpl(const int32_t id,
                             const VideoRenderType videoRenderType,
                             void* window, const bool fullscreen);
 
     virtual ~VideoRenderExternalImpl();
 
     virtual int32_t Init();
 
     virtual int32_t ChangeWindow(void* window);
 
     /**************************************************************************
      *
      *   Incoming Streams
      *
      ***************************************************************************/
 
-    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);
 
     virtual int32_t
             DeleteIncomingRenderStream(const uint32_t streamId);
 
     virtual int32_t
             GetIncomingRenderStreamProperties(const uint32_t streamId,
@@ skipping 51 matching lines @@
                             const uint32_t backgroundColorRef,
                             const float left, const float top,
                             const float right, const float bottom);
 
     virtual int32_t SetBitmap(const void* bitMap,
                               const uint8_t pictureId,
                               const void* colorKey, const float left,
                               const float top, const float right,
                               const float bottom);
 
-    // VideoRenderCallback
-    virtual int32_t RenderFrame(const uint32_t streamId,
-                                const VideoFrame& videoFrame);
+    // rtc::VideoSinkInterface<VideoFrame>
+    void OnFrame(const VideoFrame& videoFrame) override;
 
 private:
     CriticalSectionWrapper& _critSect;
     bool _fullscreen;
 };
 
 }  // namespace webrtc
 
 
 #endif  // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_IMPL_H_