Anders Carlsson e5960ce737 Revert "Revert "Revert "Revert "Support more formats in RTCVideoFrame""""
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}
2017-06-23 10:59:41 +00:00

100 lines
3.8 KiB
Objective-C

/*
* Copyright 2015 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 <Foundation/Foundation.h>
#import <WebRTC/RTCMacros.h>
NS_ASSUME_NONNULL_BEGIN
typedef NS_ENUM(NSInteger, RTCVideoRotation) {
RTCVideoRotation_0 = 0,
RTCVideoRotation_90 = 90,
RTCVideoRotation_180 = 180,
RTCVideoRotation_270 = 270,
};
@protocol RTCVideoFrameBuffer;
// RTCVideoFrame is an ObjectiveC version of webrtc::VideoFrame.
RTC_EXPORT
@interface RTCVideoFrame : NSObject
/** Width without rotation applied. */
@property(nonatomic, readonly) int width;
/** 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;
/** The native handle should be a pixel buffer on iOS. */
@property(nonatomic, readonly)
CVPixelBufferRef nativeHandle DEPRECATED_MSG_ATTRIBUTE("use buffer instead");
@property(nonatomic, readonly) id<RTCVideoFrameBuffer> buffer;
- (instancetype)init NS_UNAVAILABLE;
- (instancetype)new NS_UNAVAILABLE;
/** Initialize an RTCVideoFrame from a pixel buffer, rotation, and timestamp.
* Deprecated - initialize with a RTCCVPixelBuffer instead
*/
- (instancetype)initWithPixelBuffer:(CVPixelBufferRef)pixelBuffer
rotation:(RTCVideoRotation)rotation
timeStampNs:(int64_t)timeStampNs
DEPRECATED_MSG_ATTRIBUTE("use initWithBuffer instead");
/** Initialize an RTCVideoFrame from a pixel buffer combined with cropping and
* scaling. Cropping will be applied first on the pixel buffer, followed by
* scaling to the final resolution of scaledWidth x scaledHeight.
*/
- (instancetype)initWithPixelBuffer:(CVPixelBufferRef)pixelBuffer
scaledWidth:(int)scaledWidth
scaledHeight:(int)scaledHeight
cropWidth:(int)cropWidth
cropHeight:(int)cropHeight
cropX:(int)cropX
cropY:(int)cropY
rotation:(RTCVideoRotation)rotation
timeStampNs:(int64_t)timeStampNs
DEPRECATED_MSG_ATTRIBUTE("use initWithBuffer instead");
/** Initialize an RTCVideoFrame from a frame buffer, rotation, and timestamp.
*/
- (instancetype)initWithBuffer:(id<RTCVideoFrameBuffer>)frameBuffer
rotation:(RTCVideoRotation)rotation
timeStampNs:(int64_t)timeStampNs;
/** Return a frame that is guaranteed to be I420, i.e. it is possible to access
* the YUV data on it.
*/
- (RTCVideoFrame *)newI420VideoFrame;
@end
NS_ASSUME_NONNULL_END