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}
diff --git a/webrtc/api/objc/RTCVideoRendererAdapter+Private.h b/webrtc/api/objc/RTCVideoRendererAdapter+Private.h
index c181b9b..f0e0c6c 100644
--- a/webrtc/api/objc/RTCVideoRendererAdapter+Private.h
+++ b/webrtc/api/objc/RTCVideoRendererAdapter+Private.h
@@ -26,12 +26,12 @@
@property(nonatomic, readonly) id<RTCVideoRenderer> videoRenderer;
/**
- * The native VideoRendererInterface surface exposed by this adapter. Calls made
+ * The native VideoSinkInterface surface exposed by this adapter. Calls made
* to this interface will be adapted and passed to the RTCVideoRenderer supplied
* during construction. This pointer is unsafe and owned by this class.
*/
@property(nonatomic, readonly)
- webrtc::VideoRendererInterface *nativeVideoRenderer;
+ rtc::VideoSinkInterface<cricket::VideoFrame> *nativeVideoRenderer;
/** Initialize an RTCVideoRendererAdapter with an RTCVideoRenderer. */
- (instancetype)initWithNativeRenderer:(id<RTCVideoRenderer>)videoRenderer
diff --git a/webrtc/api/objc/RTCVideoRendererAdapter.h b/webrtc/api/objc/RTCVideoRendererAdapter.h
index 434a61b..b0b6f04 100644
--- a/webrtc/api/objc/RTCVideoRendererAdapter.h
+++ b/webrtc/api/objc/RTCVideoRendererAdapter.h
@@ -13,8 +13,8 @@
NS_ASSUME_NONNULL_BEGIN
/*
- * Creates a webrtc::VideoRendererInterface surface for an RTCVideoRenderer. The
- * webrtc::VideoRendererInterface is used by WebRTC rendering code - this
+ * Creates a rtc::VideoSinkInterface surface for an RTCVideoRenderer. The
+ * rtc::VideoSinkInterface is used by WebRTC rendering code - this
* adapter adapts calls made to that interface to the RTCVideoRenderer supplied
* during construction.
*/
diff --git a/webrtc/api/objc/RTCVideoRendererAdapter.mm b/webrtc/api/objc/RTCVideoRendererAdapter.mm
index fdaba68..c4f1ed8 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 @@
return self;
}
-- (webrtc::VideoRendererInterface *)nativeVideoRenderer {
+- (rtc::VideoSinkInterface<cricket::VideoFrame> *)nativeVideoRenderer {
return _adapter.get();
}
diff --git a/webrtc/api/objc/RTCVideoTrack.mm b/webrtc/api/objc/RTCVideoTrack.mm
index 5834af7..a32ea7b 100644
--- a/webrtc/api/objc/RTCVideoTrack.mm
+++ b/webrtc/api/objc/RTCVideoTrack.mm
@@ -52,7 +52,7 @@
- (void)dealloc {
for (RTCVideoRendererAdapter *adapter in _adapters) {
- self.nativeVideoTrack->RemoveRenderer(adapter.nativeVideoRenderer);
+ self.nativeVideoTrack->RemoveSink(adapter.nativeVideoRenderer);
}
}
@@ -79,7 +79,8 @@
RTCVideoRendererAdapter* adapter =
[[RTCVideoRendererAdapter alloc] initWithNativeRenderer:renderer];
[_adapters addObject:adapter];
- self.nativeVideoTrack->AddRenderer(adapter.nativeVideoRenderer);
+ self.nativeVideoTrack->AddOrUpdateSink(adapter.nativeVideoRenderer,
+ rtc::VideoSinkWants());
}
- (void)removeRenderer:(id<RTCVideoRenderer>)renderer {
@@ -97,7 +98,7 @@
}
RTCVideoRendererAdapter *adapterToRemove =
[_adapters objectAtIndex:indexToRemove];
- self.nativeVideoTrack->RemoveRenderer(adapterToRemove.nativeVideoRenderer);
+ self.nativeVideoTrack->RemoveSink(adapterToRemove.nativeVideoRenderer);
[_adapters removeObjectAtIndex:indexToRemove];
}