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..53c6b502a40f4df09181dc4c67f0a08a3f62a82f 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,13 @@ public: |
* 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 |
@@ -154,7 +154,7 @@ public: |
*/ |
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
|
/************************************************************************** |
* |