Index: webrtc/api/objc/RTCVideoRendererAdapter.mm |
diff --git a/webrtc/api/objc/RTCVideoRendererAdapter.mm b/webrtc/api/objc/RTCVideoRendererAdapter.mm |
index fdaba68b9dd31e65b198a669fc3c35dcae48e073..0d1ef013df72fc3a6d8e266e7a35686f65d12340 100644 |
--- a/webrtc/api/objc/RTCVideoRendererAdapter.mm |
+++ b/webrtc/api/objc/RTCVideoRendererAdapter.mm |
@@ -15,16 +15,17 @@ |
namespace webrtc { |
-class VideoRendererAdapter : public VideoRendererInterface { |
+class VideoRendererAdapter |
+ : public rtc::VideoSinkInterface<cricket::VideoFrame> { |
public: |
VideoRendererAdapter(RTCVideoRendererAdapter* adapter) { |
adapter_ = adapter; |
size_ = CGSizeZero; |
} |
- void RenderFrame(const cricket::VideoFrame *nativeVideoFrame) override { |
+ void OnFrame(const cricket::VideoFrame& nativeVideoFrame) override { |
const cricket::VideoFrame *frame = |
- nativeVideoFrame->GetCopyWithRotationApplied(); |
+ nativeVideoFrame.GetCopyWithRotationApplied(); |
CGSize current_size = CGSizeMake(frame->GetWidth(), frame->GetHeight()); |
if (!CGSizeEqualToSize(size_, current_size)) { |
size_ = current_size; |
@@ -56,7 +57,7 @@ class VideoRendererAdapter : public VideoRendererInterface { |
return self; |
} |
-- (webrtc::VideoRendererInterface *)nativeVideoRenderer { |
+- (rtc::VideoSinkInterface<cricket::VideoFrame>*)nativeVideoRenderer { |
pthatcher1
2016/03/18 17:00:58
And here the * is the exact opposite. Shouldn't i
tkchin_webrtc
2016/03/18 19:14:16
Follow the other one, that was correct.
nisse-webrtc
2016/03/21 08:37:56
Done.
|
return _adapter.get(); |
} |