Delete obsolete cricket::VideoFrame methods.
GetWidth and GetHeight (renamed to width and height),
GetNativeHandle (replaced by video_frame_buffer()->native_handle).
TBR=tkchin@webrtc.org (trivial changes to objc RTCVideoFrame and VideoRendererAdapter)
BUG=webrtc:5682
Review-Url: https://codereview.webrtc.org/1990063005
Cr-Commit-Position: refs/heads/master@{#12822}
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm b/webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm
index 1fb2695..872f6be 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm
@@ -83,12 +83,13 @@
}
- (CVPixelBufferRef)nativeHandle {
- return static_cast<CVPixelBufferRef>(_videoFrame->GetNativeHandle());
+ return static_cast<CVPixelBufferRef>(
+ _videoFrame->video_frame_buffer()->native_handle());
}
- (void)convertBufferIfNeeded {
if (!_i420Buffer) {
- if (_videoFrame->GetNativeHandle()) {
+ if (_videoFrame->video_frame_buffer()->native_handle()) {
// Convert to I420.
_i420Buffer = _videoFrame->video_frame_buffer()->NativeToI420Buffer();
} else {
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCVideoRendererAdapter.mm b/webrtc/sdk/objc/Framework/Classes/RTCVideoRendererAdapter.mm
index 4976ba9..d810095 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCVideoRendererAdapter.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCVideoRendererAdapter.mm
@@ -32,7 +32,7 @@
// I420 buffer for rotation before calling the rotation method otherwise
// it will hit a DCHECK.
if (nativeVideoFrame.rotation() != webrtc::kVideoRotation_0 &&
- nativeVideoFrame.GetNativeHandle()) {
+ nativeVideoFrame.video_frame_buffer()->native_handle()) {
rtc::scoped_refptr<webrtc::VideoFrameBuffer> i420Buffer =
nativeVideoFrame.video_frame_buffer()->NativeToI420Buffer();
std::unique_ptr<cricket::VideoFrame> cpuFrame(