commit 8f597628973fbc90da3041ac64a54d75ef5fb9c5
author Niels Möller <nisse@webrtc.org> Wed Mar 23 10:33:07 2016 +0100
committer Niels Möller <nisse@webrtc.org> Wed Mar 23 09:33:19 2016 +0000
tree 6726451d6438cb6d5e220943d247299c63c2ffa1
parent c8f952deaae5eccadf218bb0300ee49b50a87ce8

Delete VideoRendererInterface.

Use in chromium was deleted a few days ago.

BUG=webrtc:5426
R=magjed@webrtc.org, pbos@webrtc.org, perkj@webrtc.org, pthatcher@webrtc.org, tkchin@webrtc.org

Review URL: https://codereview.webrtc.org/1817473002 .

Cr-Commit-Position: refs/heads/master@{#12099}

talk/app/webrtc/objc/RTCVideoRendererAdapter.h

diff --git a/talk/app/webrtc/objc/RTCVideoRendererAdapter.h b/talk/app/webrtc/objc/RTCVideoRendererAdapter.h
index 7719860..117347f 100644
--- a/talk/app/webrtc/objc/RTCVideoRendererAdapter.h
+++ b/talk/app/webrtc/objc/RTCVideoRendererAdapter.h
@@ -33,7 +33,7 @@
 
 @property(nonatomic, readonly) id<RTCVideoRenderer> videoRenderer;
 @property(nonatomic, readonly)
-    webrtc::VideoRendererInterface* nativeVideoRenderer;
+    rtc::VideoSinkInterface<cricket::VideoFrame> *nativeVideoRenderer;
 
 - (instancetype)initWithVideoRenderer:(id<RTCVideoRenderer>)videoRenderer;
 

talk/app/webrtc/objc/RTCVideoRendererAdapter.mm

diff --git a/talk/app/webrtc/objc/RTCVideoRendererAdapter.mm b/talk/app/webrtc/objc/RTCVideoRendererAdapter.mm
index b0b2129..a7f7e95 100644
--- a/talk/app/webrtc/objc/RTCVideoRendererAdapter.mm
+++ b/talk/app/webrtc/objc/RTCVideoRendererAdapter.mm
@@ -36,15 +36,16 @@
 
 namespace webrtc {
 
-class RTCVideoRendererNativeAdapter : public VideoRendererInterface {
+class RTCVideoRendererNativeAdapter
+    : public rtc::VideoSinkInterface<cricket::VideoFrame> {
  public:
   RTCVideoRendererNativeAdapter(RTCVideoRendererAdapter* adapter) {
     _adapter = adapter;
     _size = CGSizeZero;
   }
 
-  void RenderFrame(const cricket::VideoFrame* videoFrame) override {
-    const cricket::VideoFrame* frame = videoFrame->GetCopyWithRotationApplied();
+  void OnFrame(const cricket::VideoFrame& videoFrame) override {
+    const cricket::VideoFrame* frame = videoFrame.GetCopyWithRotationApplied();
     CGSize currentSize = CGSizeMake(frame->GetWidth(), frame->GetHeight());
     if (!CGSizeEqualToSize(_size, currentSize)) {
       _size = currentSize;
@@ -74,7 +75,7 @@
   return self;
 }
 
-- (webrtc::VideoRendererInterface*)nativeVideoRenderer {
+- (rtc::VideoSinkInterface<cricket::VideoFrame> *)nativeVideoRenderer {
   return _adapter.get();
 }
 

talk/app/webrtc/objc/RTCVideoTrack.mm

diff --git a/talk/app/webrtc/objc/RTCVideoTrack.mm b/talk/app/webrtc/objc/RTCVideoTrack.mm
index b32f05f..877e92e 100644
--- a/talk/app/webrtc/objc/RTCVideoTrack.mm
+++ b/talk/app/webrtc/objc/RTCVideoTrack.mm
@@ -78,7 +78,7 @@
 
 - (void)dealloc {
   for (RTCVideoRendererAdapter *adapter in _adapters) {
-    self.nativeVideoTrack->RemoveRenderer(adapter.nativeVideoRenderer);
+    self.nativeVideoTrack->RemoveSink(adapter.nativeVideoRenderer);
   }
 }
 
@@ -91,7 +91,8 @@
   RTCVideoRendererAdapter* adapter =
       [[RTCVideoRendererAdapter alloc] initWithVideoRenderer:renderer];
   [_adapters addObject:adapter];
-  self.nativeVideoTrack->AddRenderer(adapter.nativeVideoRenderer);
+  self.nativeVideoTrack->AddOrUpdateSink(adapter.nativeVideoRenderer,
+                                         rtc::VideoSinkWants());
 }
 
 - (void)removeRenderer:(id<RTCVideoRenderer>)renderer {
@@ -107,7 +108,7 @@
   if (indexToRemove == NSNotFound) {
     return;
   }
-  self.nativeVideoTrack->RemoveRenderer(adapter.nativeVideoRenderer);
+  self.nativeVideoTrack->RemoveSink(adapter.nativeVideoRenderer);
   [_adapters removeObjectAtIndex:indexToRemove];
 }