From 139cf382230ec7b8b9a90c1fd106bd8d3f0d4a0c Mon Sep 17 00:00:00 2001
From: magjed <magjed@webrtc.org>
Date: Mon, 21 Aug 2017 07:31:26 -0700
Subject: [PATCH] ObjC: Remove RTCVideoFrame I420 functions

Access to I420 data should be done on an RTCI420Buffer that can be
accessed through the toI420 method, and not on an RTCVideoFrame
directly.

BUG=webrtc:7785

Review-Url: https://codereview.webrtc.org/2997453002
Cr-Commit-Position: refs/heads/master@{#19431}
---
 .../Classes/PeerConnection/RTCVideoFrame.mm   | 48 -------------------
 .../Framework/Headers/WebRTC/RTCVideoFrame.h  | 13 -----
 2 files changed, 61 deletions(-)

diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm
index a160a04fbb..cf4216e825 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm
@@ -31,54 +31,6 @@
   return _rotation;
 }
 
-- (const uint8_t *)dataY {
-  if ([_buffer conformsToProtocol:@protocol(RTCI420Buffer)]) {
-    return ((id<RTCI420Buffer>)_buffer).dataY;
-  } else {
-    return nullptr;
-  }
-}
-
-- (const uint8_t *)dataU {
-  if ([_buffer conformsToProtocol:@protocol(RTCI420Buffer)]) {
-    return ((id<RTCI420Buffer>)_buffer).dataU;
-  } else {
-    return nullptr;
-  }
-}
-
-- (const uint8_t *)dataV {
-  if ([_buffer conformsToProtocol:@protocol(RTCI420Buffer)]) {
-    return ((id<RTCI420Buffer>)_buffer).dataV;
-  } else {
-    return nullptr;
-  }
-}
-
-- (int)strideY {
-  if ([_buffer conformsToProtocol:@protocol(RTCI420Buffer)]) {
-    return ((id<RTCI420Buffer>)_buffer).strideY;
-  } else {
-    return 0;
-  }
-}
-
-- (int)strideU {
-  if ([_buffer conformsToProtocol:@protocol(RTCI420Buffer)]) {
-    return ((id<RTCI420Buffer>)_buffer).strideU;
-  } else {
-    return 0;
-  }
-}
-
-- (int)strideV {
-  if ([_buffer conformsToProtocol:@protocol(RTCI420Buffer)]) {
-    return ((id<RTCI420Buffer>)_buffer).strideV;
-  } else {
-    return 0;
-  }
-}
-
 - (int64_t)timeStampNs {
   return _timeStampNs;
 }
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h
index bb7baf6243..dcc4c6e7b5 100644
--- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h
+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h
@@ -34,19 +34,6 @@ RTC_EXPORT
 /** Height without rotation applied. */
 @property(nonatomic, readonly) int height;
 @property(nonatomic, readonly) RTCVideoRotation rotation;
-/** Accessing YUV data should only be done for I420 frames, i.e. if nativeHandle
- *  is null. It is always possible to get such a frame by calling
- *  newI420VideoFrame.
- */
-@property(nonatomic, readonly, nullable)
-    const uint8_t *dataY DEPRECATED_MSG_ATTRIBUTE("use [buffer toI420]");
-@property(nonatomic, readonly, nullable)
-    const uint8_t *dataU DEPRECATED_MSG_ATTRIBUTE("use [buffer toI420]");
-@property(nonatomic, readonly, nullable)
-    const uint8_t *dataV DEPRECATED_MSG_ATTRIBUTE("use [buffer toI420]");
-@property(nonatomic, readonly) int strideY DEPRECATED_MSG_ATTRIBUTE("use [buffer toI420]");
-@property(nonatomic, readonly) int strideU DEPRECATED_MSG_ATTRIBUTE("use [buffer toI420]");
-@property(nonatomic, readonly) int strideV DEPRECATED_MSG_ATTRIBUTE("use [buffer toI420]");
 
 /** Timestamp in nanoseconds. */
 @property(nonatomic, readonly) int64_t timeStampNs;