zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete VideoRendererInterface.

Browse Source 
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}
This commit is contained in:
Niels Möller
2016-03-23 10:33:07 +01:00
parent c8f952deaa
commit 8f59762897
17 changed files with 55 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/api/objc/RTCVideoRendererAdapter+Private.h
View File

@ -26,12 +26,12 @@ NS_ASSUME_NONNULL_BEGIN
@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

4
webrtc/api/objc/RTCVideoRendererAdapter.h
View File

@ -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.
*/

9
webrtc/api/objc/RTCVideoRendererAdapter.mm
View File

@ -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 {
return _adapter.get();
}

7
webrtc/api/objc/RTCVideoTrack.mm
View File

@ -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];
}