Index: webrtc/modules/video_render/video_render.h |
diff --git a/webrtc/modules/video_render/video_render.h b/webrtc/modules/video_render/video_render.h |
index 84c9536e35cac7984c1ddbe814b16471f454946f..9d2982b7c0dd40e594a4cde97946649b890fd8c2 100644 |
--- a/webrtc/modules/video_render/video_render.h |
+++ b/webrtc/modules/video_render/video_render.h |
@@ -91,7 +91,7 @@ public: |
* |
* 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, |
@@ -108,13 +108,15 @@ public: |
* Add incoming render callback, used for external rendering |
* |
* streamID - id of the stream the callback is used for |
- * renderObject - the VideoRenderCallback to use for this stream, NULL to remove |
+ * renderObject - the rtc::VideoSinkInterface<VideoFrame> to use |
+ * for this stream, NULL to remove |
* |
* Return - callback class to use for delivering new frames to render. |
*/ |
virtual int32_t |
- AddExternalRenderCallback(const uint32_t streamId, |
- VideoRenderCallback* renderObject) = 0; |
+ AddExternalRenderCallback( |
+ const uint32_t streamId, |
+ rtc::VideoSinkInterface<VideoFrame>* renderObject) = 0; |
/* |
* Get the porperties for an incoming render stream |
@@ -153,8 +155,9 @@ public: |
* to the renderer. To be used for external rendering. |
*/ |
virtual int32_t |
- RegisterRawFrameCallback(const uint32_t streamId, |
- VideoRenderCallback* callbackObj) = 0; |
+ RegisterRawFrameCallback( |
+ const uint32_t streamId, |
+ rtc::VideoSinkInterface<VideoFrame>* callbackObj) = 0; |
/************************************************************************** |
* |