Deletes the class VideoRendererCallback.

webrtc/modules/video_render/video_render_internal_impl.cc

Index: webrtc/modules/video_render/video_render_internal_impl.cc
diff --git a/webrtc/modules/video_render/video_render_internal_impl.cc b/webrtc/modules/video_render/video_render_internal_impl.cc
index 2090fce5f86869a5e84bc258448074c0cb3e14d5..3cb5cf072dc55d14590bbc85a52db3cbfdefa7cb 100644
--- a/webrtc/modules/video_render/video_render_internal_impl.cc
+++ b/webrtc/modules/video_render/video_render_internal_impl.cc
@@ -380,7 +380,7 @@ uint32_t ModuleVideoRenderImpl::GetIncomingFrameRate(const uint32_t streamId) {
   return it->second->IncomingRate();
 }
 
-VideoRenderCallback*
+rtc::VideoSinkInterface<VideoFrame>*
 ModuleVideoRenderImpl::AddIncomingRenderStream(const uint32_t streamId,
                                                const uint32_t zOrder,
                                                const float left,
@@ -404,7 +404,7 @@ ModuleVideoRenderImpl::AddIncomingRenderStream(const uint32_t streamId,
         return NULL;
     }
 
-    VideoRenderCallback* ptrRenderCallback =
+    rtc::VideoSinkInterface<VideoFrame>* ptrRenderCallback =
             _ptrRenderer->AddIncomingRenderStream(streamId, zOrder, left, top,
                                                   right, bottom);
     if (ptrRenderCallback == NULL)
@@ -417,9 +417,9 @@ ModuleVideoRenderImpl::AddIncomingRenderStream(const uint32_t streamId,
 
     // Create platform independant code
     IncomingVideoStream* ptrIncomingStream =
-        new IncomingVideoStream(streamId, false);
+        new IncomingVideoStream(false);
     ptrIncomingStream->SetRenderCallback(ptrRenderCallback);
-    VideoRenderCallback* moduleCallback = ptrIncomingStream->ModuleCallback();
+    rtc::VideoSinkInterface<VideoFrame>* moduleCallback = ptrIncomingStream->ModuleCallback();

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

line length

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

Done.

 
     // Store the stream
     _streamRenderMap[streamId] = ptrIncomingStream;
@@ -458,7 +458,7 @@ int32_t ModuleVideoRenderImpl::DeleteIncomingRenderStream(
 
 int32_t ModuleVideoRenderImpl::AddExternalRenderCallback(
     const uint32_t streamId,
-    VideoRenderCallback* renderObject) {
+    rtc::VideoSinkInterface<VideoFrame>* renderObject) {
     CriticalSectionScoped cs(&_moduleCrit);
 
     IncomingVideoStreamMap::iterator item = _streamRenderMap.find(streamId);
@@ -516,7 +516,7 @@ bool ModuleVideoRenderImpl::HasIncomingRenderStream(
 
 int32_t ModuleVideoRenderImpl::RegisterRawFrameCallback(
     const uint32_t streamId,
-    VideoRenderCallback* callbackObj) {
+    rtc::VideoSinkInterface<VideoFrame>* callbackObj) {
   return -1;
 }