e5960ce737
This reverts commit 1cfeb435427a2fa677a495e34c882096efc193d0. Reason for revert: Fix unit test Original change's description: > Revert "Revert "Revert "Support more formats in RTCVideoFrame""" > > This reverts commit 7583390d1a3a7c4e9a77da0d77250abac0c34d1d. > > Reason for revert: Breaks unit tests > > Original change's description: > > Revert "Revert "Support more formats in RTCVideoFrame"" > > > > This reverts commit 0789dab2cbd1617e94d7300e375163d42345f3d4. > > > > Reason for revert: Include obc_corevideoframebuffer target > > > > Original change's description: > > > Revert "Support more formats in RTCVideoFrame" > > > > > > This reverts commit bd2220a9c496ef2e8567b68d4be9435a110bdc34. > > > > > > Reason for revert: Broke external clients > > > > > > Original change's description: > > > > Support more formats in RTCVideoFrame > > > > > > > > Implement Obj-C version of webrtc::VideoFrameBuffer and use that in > > > > RTCVideoFrame. > > > > > > > > Bug: webrtc:7785 > > > > Change-Id: I49f42bcf451dd6769b3a79a65fe7b400dce22677 > > > > Reviewed-on: https://chromium-review.googlesource.com/536773 > > > > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > > > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > > > Cr-Commit-Position: refs/heads/master@{#18691} > > > > > > TBR=magjed@webrtc.org,andersc@webrtc.org > > > > > > Change-Id: Id765dd9543ed0613a6b2de108b268c3501025fcd > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: webrtc:7785 > > > Reviewed-on: https://chromium-review.googlesource.com/542837 > > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#18697} > > > > TBR=magjed@webrtc.org,andersc@webrtc.org > > > > Change-Id: I1ef5313b4a6c56eb8c7fd02d95db62c4e3c00255 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:7785 > > Reviewed-on: https://chromium-review.googlesource.com/542838 > > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#18716} > > TBR=magjed@webrtc.org,andersc@webrtc.org > > Change-Id: Id12f33698eb02041607cb9a5c54f37f01bfac5b1 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:7785 > Reviewed-on: https://chromium-review.googlesource.com/544840 > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#18718} TBR=magjed@webrtc.org,andersc@webrtc.org Change-Id: I184303ecba8db91ef7de709f982a295a2efe92eb Bug: webrtc:7785 Reviewed-on: https://chromium-review.googlesource.com/544841 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Anders Carlsson <andersc@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18731}
100 lines
3.3 KiB
Objective-C
100 lines
3.3 KiB
Objective-C
/*
|
|
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#import <AVFoundation/AVFoundation.h>
|
|
#import <WebRTC/RTCMacros.h>
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
@protocol RTCI420Buffer;
|
|
|
|
// RTCVideoFrameBuffer is an ObjectiveC version of webrtc::VideoFrameBuffer.
|
|
RTC_EXPORT
|
|
@protocol RTCVideoFrameBuffer <NSObject>
|
|
|
|
@property(nonatomic, readonly) int width;
|
|
@property(nonatomic, readonly) int height;
|
|
|
|
- (id<RTCI420Buffer>)toI420;
|
|
|
|
@end
|
|
|
|
/** Protocol for RTCVideoFrameBuffers containing YUV planar data. */
|
|
@protocol RTCYUVPlanarBuffer <RTCVideoFrameBuffer>
|
|
|
|
@property(nonatomic, readonly) int chromaWidth;
|
|
@property(nonatomic, readonly) int chromaHeight;
|
|
@property(nonatomic, readonly) const uint8_t *dataY;
|
|
@property(nonatomic, readonly) const uint8_t *dataU;
|
|
@property(nonatomic, readonly) const uint8_t *dataV;
|
|
@property(nonatomic, readonly) int strideY;
|
|
@property(nonatomic, readonly) int strideU;
|
|
@property(nonatomic, readonly) int strideV;
|
|
|
|
- (instancetype)initWithWidth:(int)width height:(int)height;
|
|
- (instancetype)initWithWidth:(int)width
|
|
height:(int)height
|
|
strideY:(int)strideY
|
|
strideU:(int)strideU
|
|
strideV:(int)strideV;
|
|
|
|
@end
|
|
|
|
/** Extension of the YUV planar data buffer with mutable data access */
|
|
@protocol RTCMutableYUVPlanarBuffer <RTCYUVPlanarBuffer>
|
|
|
|
@property(nonatomic, readonly) uint8_t *mutableDataY;
|
|
@property(nonatomic, readonly) uint8_t *mutableDataU;
|
|
@property(nonatomic, readonly) uint8_t *mutableDataV;
|
|
|
|
@end
|
|
|
|
/** Protocol for RTCYUVPlanarBuffers containing I420 data */
|
|
@protocol RTCI420Buffer <RTCYUVPlanarBuffer>
|
|
@end
|
|
|
|
/** Extension of the I420 buffer with mutable data access */
|
|
@protocol RTCMutableI420Buffer <RTCI420Buffer, RTCMutableYUVPlanarBuffer>
|
|
@end
|
|
|
|
/** RTCVideoFrameBuffer containing a CVPixelBufferRef */
|
|
@interface RTCCVPixelBuffer : NSObject <RTCVideoFrameBuffer>
|
|
|
|
@property(nonatomic, readonly) CVPixelBufferRef pixelBuffer;
|
|
|
|
- (instancetype)initWithPixelBuffer:(CVPixelBufferRef)pixelBuffer;
|
|
- (instancetype)initWithPixelBuffer:(CVPixelBufferRef)pixelBuffer
|
|
adaptedWidth:(int)adaptedWidth
|
|
adaptedHeight:(int)adaptedHeight
|
|
cropWidth:(int)cropWidth
|
|
cropHeight:(int)cropHeight
|
|
cropX:(int)cropX
|
|
cropY:(int)cropY;
|
|
|
|
- (BOOL)requiresCropping;
|
|
- (BOOL)requiresScalingToWidth:(int)width height:(int)height;
|
|
- (int)bufferSizeForCroppingAndScalingToWidth:(int)width height:(int)height;
|
|
/** The minimum size of the |tmpBuffer| must be the number of bytes returned from the
|
|
* bufferSizeForCroppingAndScalingToWidth:height: method.
|
|
*/
|
|
- (BOOL)cropAndScaleTo:(CVPixelBufferRef)outputPixelBuffer withTempBuffer:(uint8_t *)tmpBuffer;
|
|
|
|
@end
|
|
|
|
/** RTCI420Buffer implements the RTCI420Buffer protocol */
|
|
@interface RTCI420Buffer : NSObject <RTCI420Buffer>
|
|
@end
|
|
|
|
/** Mutable version of RTCI420Buffer */
|
|
@interface RTCMutableI420Buffer : RTCI420Buffer <RTCMutableI420Buffer>
|
|
@end
|
|
|
|
NS_ASSUME_NONNULL_END
|