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

Include i420 buffers in Obj-C framework again.

Browse Source 
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}
This commit is contained in:
Anders Carlsson
2018-09-03 14:44:50 +02:00
committed by Commit Bot
parent ec76466da2
commit 4e5af96606
19 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sdk/BUILD.gn
View File

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

4
sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#import "api/video_frame_buffer/RTCI420Buffer.h" #import "api/video_frame_buffer/RTCNativeI420Buffer.h"
#import "api/video_frame_buffer/RTCMutableI420Buffer.h" #import "api/video_frame_buffer/RTCNativeMutableI420Buffer.h"
#import "base/RTCI420Buffer.h" #import "base/RTCI420Buffer.h"
#import "base/RTCMutableI420Buffer.h" #import "base/RTCMutableI420Buffer.h"
#import "base/RTCMutableYUVPlanarBuffer.h" #import "base/RTCMutableYUVPlanarBuffer.h"

2
sdk/objc/api/RTCVideoRendererAdapter.mm
View File

@ -9,9 +9,7 @@
*/ */
#import "RTCVideoRendererAdapter+Private.h" #import "RTCVideoRendererAdapter+Private.h"
#import "api/video_frame_buffer/RTCI420Buffer+Private.h"
#import "base/RTCVideoFrame.h" #import "base/RTCVideoFrame.h"
#import "base/RTCVideoFrameBuffer.h"
#include <memory> #include <memory>

2
sdk/objc/api/video_codec/RTCVideoCodecConstants.h
View File

@ -10,7 +10,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "base/RTCMacros.h" #import "RTCMacros.h"
RTC_EXPORT extern NSString *const kRTCVideoCodecVp8Name; RTC_EXPORT extern NSString *const kRTCVideoCodecVp8Name;
RTC_EXPORT extern NSString *const kRTCVideoCodecVp9Name; RTC_EXPORT extern NSString *const kRTCVideoCodecVp9Name;

2
sdk/objc/api/video_frame_buffer/RTCI420Buffer+Private.h → sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer+Private.h
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#import "RTCI420Buffer.h" #import "RTCNativeI420Buffer.h"
#include "api/video/i420_buffer.h" #include "api/video/i420_buffer.h"

6
sdk/objc/api/video_frame_buffer/RTCI420Buffer.h → sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.h
View File

@ -10,14 +10,14 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import "base/RTCI420Buffer.h" #import "RTCI420Buffer.h"
#import "base/RTCMacros.h" #import "RTCMacros.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
/** RTCI420Buffer implements the RTCI420Buffer protocol */ /** RTCI420Buffer implements the RTCI420Buffer protocol */
RTC_EXPORT RTC_EXPORT
@interface RTCI420Buffer : NSObject <RTCI420Buffer> @interface RTCI420Buffer : NSObject<RTCI420Buffer>
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

2
sdk/objc/api/video_frame_buffer/RTCI420Buffer.mm → sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#import "RTCI420Buffer+Private.h" #import "RTCNativeI420Buffer+Private.h"
#include "api/video/i420_buffer.h" #include "api/video/i420_buffer.h"

8
sdk/objc/api/video_frame_buffer/RTCMutableI420Buffer.h → sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.h
View File

@ -10,15 +10,15 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import "RTCI420Buffer.h" #import "RTCMacros.h"
#import "base/RTCMacros.h" #import "RTCMutableI420Buffer.h"
#import "base/RTCMutableI420Buffer.h" #import "RTCNativeI420Buffer.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
/** Mutable version of RTCI420Buffer */ /** Mutable version of RTCI420Buffer */
RTC_EXPORT RTC_EXPORT
@interface RTCMutableI420Buffer : RTCI420Buffer <RTCMutableI420Buffer> @interface RTCMutableI420Buffer : RTCI420Buffer<RTCMutableI420Buffer>
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

4
sdk/objc/api/video_frame_buffer/RTCMutableI420Buffer.mm → sdk/objc/api/video_frame_buffer/RTCNativeMutableI420Buffer.mm
View File

@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#import "RTCMutableI420Buffer.h" #import "RTCNativeMutableI420Buffer.h"
#import "RTCI420Buffer+Private.h" #import "RTCNativeI420Buffer+Private.h"
#include "api/video/i420_buffer.h" #include "api/video/i420_buffer.h"

1
sdk/objc/base/RTCI420Buffer.h
View File

@ -15,6 +15,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
/** Protocol for RTCYUVPlanarBuffers containing I420 data */ /** Protocol for RTCYUVPlanarBuffers containing I420 data */
RTC_EXPORT
@protocol RTCI420Buffer <RTCYUVPlanarBuffer> @protocol RTCI420Buffer <RTCYUVPlanarBuffer>
@end @end

1
sdk/objc/base/RTCMutableI420Buffer.h
View File

@ -16,6 +16,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
/** Extension of the I420 buffer with mutable data access */ /** Extension of the I420 buffer with mutable data access */
RTC_EXPORT
@protocol RTCMutableI420Buffer <RTCI420Buffer, RTCMutableYUVPlanarBuffer> @protocol RTCMutableI420Buffer <RTCI420Buffer, RTCMutableYUVPlanarBuffer>
@end @end

1
sdk/objc/base/RTCMutableYUVPlanarBuffer.h
View File

@ -15,6 +15,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
/** Extension of the YUV planar data buffer with mutable data access */ /** Extension of the YUV planar data buffer with mutable data access */
RTC_EXPORT
@protocol RTCMutableYUVPlanarBuffer <RTCYUVPlanarBuffer> @protocol RTCMutableYUVPlanarBuffer <RTCYUVPlanarBuffer>
@property(nonatomic, readonly) uint8_t *mutableDataY; @property(nonatomic, readonly) uint8_t *mutableDataY;

1
sdk/objc/base/RTCYUVPlanarBuffer.h
View File

@ -16,6 +16,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
/** Protocol for RTCVideoFrameBuffers containing YUV planar data. */ /** Protocol for RTCVideoFrameBuffers containing YUV planar data. */
RTC_EXPORT
@protocol RTCYUVPlanarBuffer <RTCVideoFrameBuffer> @protocol RTCYUVPlanarBuffer <RTCVideoFrameBuffer>
@property(nonatomic, readonly) int chromaWidth; @property(nonatomic, readonly) int chromaWidth;

2
sdk/objc/components/video_frame_buffer/RTCCVPixelBuffer.mm
View File

@ -10,7 +10,7 @@
#import "RTCCVPixelBuffer.h" #import "RTCCVPixelBuffer.h"
#import "api/video_frame_buffer/RTCMutableI420Buffer.h" #import "api/video_frame_buffer/RTCNativeMutableI420Buffer.h"
#include "common_video/libyuv/include/webrtc_libyuv.h" #include "common_video/libyuv/include/webrtc_libyuv.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"

2
sdk/objc/native/src/objc_frame_buffer.mm
View File

@ -11,7 +11,7 @@
#include "sdk/objc/native/src/objc_frame_buffer.h" #include "sdk/objc/native/src/objc_frame_buffer.h"
#import "base/RTCVideoFrameBuffer.h" #import "base/RTCVideoFrameBuffer.h"
#import "sdk/objc/api/video_frame_buffer/RTCI420Buffer+Private.h" #import "sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer+Private.h"
namespace webrtc { namespace webrtc {

1
sdk/objc/native/src/objc_video_encoder_factory.mm
View File

@ -21,7 +21,6 @@
#import "sdk/objc/api/peerconnection/RTCVideoEncoderSettings+Private.h" #import "sdk/objc/api/peerconnection/RTCVideoEncoderSettings+Private.h"
#import "sdk/objc/api/video_codec/RTCVideoCodecConstants.h" #import "sdk/objc/api/video_codec/RTCVideoCodecConstants.h"
#import "sdk/objc/api/video_codec/RTCWrappedNativeVideoEncoder.h" #import "sdk/objc/api/video_codec/RTCWrappedNativeVideoEncoder.h"
#import "sdk/objc/api/video_frame_buffer/RTCI420Buffer+Private.h"
#import "sdk/objc/helpers/NSString+StdString.h" #import "sdk/objc/helpers/NSString+StdString.h"
#include "api/video/video_frame.h" #include "api/video/video_frame.h"

2
sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm
View File

@ -13,7 +13,7 @@
#include "sdk/objc/native/src/objc_video_track_source.h" #include "sdk/objc/native/src/objc_video_track_source.h"
#import "api/video_frame_buffer/RTCI420Buffer+Private.h" #import "api/video_frame_buffer/RTCNativeI420Buffer+Private.h"
#import "base/RTCVideoFrame.h" #import "base/RTCVideoFrame.h"
#import "base/RTCVideoFrameBuffer.h" #import "base/RTCVideoFrameBuffer.h"
#import "components/video_frame_buffer/RTCCVPixelBuffer.h" #import "components/video_frame_buffer/RTCCVPixelBuffer.h"

2
sdk/objc/unittests/RTCCVPixelBuffer_xctest.mm
View File

@ -13,7 +13,7 @@
#import "components/video_frame_buffer/RTCCVPixelBuffer.h" #import "components/video_frame_buffer/RTCCVPixelBuffer.h"
#import "api/video_frame_buffer/RTCI420Buffer+Private.h" #import "api/video_frame_buffer/RTCNativeI420Buffer+Private.h"
#import "base/RTCVideoFrame.h" #import "base/RTCVideoFrame.h"
#import "base/RTCVideoFrameBuffer.h" #import "base/RTCVideoFrameBuffer.h"
#import "frame_buffer_helpers.h" #import "frame_buffer_helpers.h"

2
sdk/objc/unittests/RTCMTLVideoView_xctest.m
View File

@ -16,7 +16,7 @@
#import "components/renderer/metal/RTCMTLVideoView.h" #import "components/renderer/metal/RTCMTLVideoView.h"
#import "api/video_frame_buffer/RTCI420Buffer.h" #import "api/video_frame_buffer/RTCNativeI420Buffer.h"
#import "base/RTCVideoFrameBuffer.h" #import "base/RTCVideoFrameBuffer.h"
#import "components/renderer/metal/RTCMTLNV12Renderer.h" #import "components/renderer/metal/RTCMTLNV12Renderer.h"
#import "components/video_frame_buffer/RTCCVPixelBuffer.h" #import "components/video_frame_buffer/RTCCVPixelBuffer.h"