commit 4e5af96606b94b048132cbf61514fa2b12cb0edc
author Anders Carlsson <andersc@webrtc.org> Mon Sep 03 14:44:50 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Sep 03 15:06:18 2018 +0000
tree 3881eab24ec1d50af89370b7074fd011dbe80fa9
parent ec76466da27f6f5cd747137c44d4d8092a35f640

Include i420 buffers in Obj-C framework again.

These headers was lost in the cleanup CL for the Obj-C directories. This
puts them back in the framework headers.

Note that since the protocol and interface was split into two different
headers, and all public framework headers are put into a flat directory
structure, I had to rename the implementation files so they would not collide
in the framework header directory.

Bug: webrtc:9701
Change-Id: I42d4c1e02bdfa4e114575f527c4c42a19be8fb52
Reviewed-on: https://webrtc-review.googlesource.com/97330
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24539}

sdk/BUILD.gn

diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 68f3ae6..8a58a20 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -328,11 +328,11 @@
     rtc_static_library("videoframebuffer_objc") {
       visibility = [ "*" ]
       sources = [
-        "objc/api/video_frame_buffer/RTCI420Buffer+Private.h",
-        "objc/api/video_frame_buffer/RTCI420Buffer.h",
-        "objc/api/video_frame_buffer/RTCI420Buffer.mm",
-        "objc/api/video_frame_buffer/RTCMutableI420Buffer.h",
-        "objc/api/video_frame_buffer/RTCMutableI420Buffer.mm",
+        "objc/api/video_frame_buffer/RTCNativeI420Buffer+Private.h",
+        "objc/api/video_frame_buffer/RTCNativeI420Buffer.h",
+        "objc/api/video_frame_buffer/RTCNativeI420Buffer.mm",
+        "objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h",
+        "objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.mm",
         "objc/components/video_frame_buffer/RTCCVPixelBuffer.h",
         "objc/components/video_frame_buffer/RTCCVPixelBuffer.mm",
       ]
@@ -1194,8 +1194,11 @@
         common_objc_headers = [
           "objc/base/RTCCodecSpecificInfo.h",
           "objc/base/RTCEncodedImage.h",
+          "objc/base/RTCI420Buffer.h",
           "objc/base/RTCLogging.h",
           "objc/base/RTCMacros.h",
+          "objc/base/RTCMutableI420Buffer.h",
+          "objc/base/RTCMutableYUVPlanarBuffer.h",
           "objc/base/RTCRtpFragmentationHeader.h",
           "objc/base/RTCVideoCapturer.h",
           "objc/base/RTCVideoCodecInfo.h",
@@ -1208,6 +1211,7 @@
           "objc/base/RTCVideoFrame.h",
           "objc/base/RTCVideoFrameBuffer.h",
           "objc/base/RTCVideoRenderer.h",
+          "objc/base/RTCYUVPlanarBuffer.h",
           "objc/components/audio/RTCAudioSession.h",
           "objc/components/audio/RTCAudioSessionConfiguration.h",
           "objc/components/capturer/RTCCameraVideoCapturer.h",
@@ -1261,10 +1265,13 @@
           "objc/api/peerconnection/RTCCertificate.h",
           "objc/api/peerconnection/RTCVideoSource.h",
           "objc/api/peerconnection/RTCVideoTrack.h",
+          "objc/api/video_codec/RTCVideoCodecConstants.h",
           "objc/api/video_codec/RTCVideoDecoderVP8.h",
           "objc/api/video_codec/RTCVideoDecoderVP9.h",
           "objc/api/video_codec/RTCVideoEncoderVP8.h",
           "objc/api/video_codec/RTCVideoEncoderVP9.h",
+          "objc/api/video_frame_buffer/RTCNativeI420Buffer.h",
+          "objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h",
         ]
 
         if (!build_with_chromium) {
@@ -1341,8 +1348,11 @@
       mac_framework_header_files = [
         "objc/base/RTCCodecSpecificInfo.h",
         "objc/base/RTCEncodedImage.h",
+        "objc/base/RTCI420Buffer.h",
         "objc/base/RTCLogging.h",
         "objc/base/RTCMacros.h",
+        "objc/base/RTCMutableI420Buffer.h",
+        "objc/base/RTCMutableYUVPlanarBuffer.h",
         "objc/base/RTCRtpFragmentationHeader.h",
         "objc/base/RTCVideoCapturer.h",
         "objc/base/RTCVideoCodecInfo.h",
@@ -1355,6 +1365,7 @@
         "objc/base/RTCVideoFrame.h",
         "objc/base/RTCVideoFrameBuffer.h",
         "objc/base/RTCVideoRenderer.h",
+        "objc/base/RTCYUVPlanarBuffer.h",
         "objc/components/capturer/RTCCameraVideoCapturer.h",
         "objc/components/capturer/RTCFileVideoCapturer.h",
         "objc/components/renderer/metal/RTCMTLNSVideoView.h",
@@ -1408,6 +1419,8 @@
         "objc/api/video_codec/RTCVideoDecoderVP9.h",
         "objc/api/video_codec/RTCVideoEncoderVP8.h",
         "objc/api/video_codec/RTCVideoEncoderVP9.h",
+        "objc/api/video_frame_buffer/RTCNativeI420Buffer.h",
+        "objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h",
       ]
       if (!build_with_chromium) {
         mac_framework_header_files += [