7583390d1a
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}
139 lines
4.1 KiB
Plaintext
139 lines
4.1 KiB
Plaintext
/*
|
|
* 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 "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrame.h"
|
|
#import "webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h"
|
|
|
|
@implementation RTCVideoFrame {
|
|
RTCVideoRotation _rotation;
|
|
int64_t _timeStampNs;
|
|
}
|
|
|
|
@synthesize buffer = _buffer;
|
|
|
|
- (int)width {
|
|
return _buffer.width;
|
|
}
|
|
|
|
- (int)height {
|
|
return _buffer.height;
|
|
}
|
|
|
|
- (RTCVideoRotation)rotation {
|
|
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;
|
|
}
|
|
|
|
- (CVPixelBufferRef)nativeHandle {
|
|
if ([_buffer isKindOfClass:[RTCCVPixelBuffer class]]) {
|
|
return ((RTCCVPixelBuffer *)_buffer).pixelBuffer;
|
|
} else {
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
- (RTCVideoFrame *)newI420VideoFrame {
|
|
return [[RTCVideoFrame alloc] initWithBuffer:[_buffer toI420]
|
|
rotation:_rotation
|
|
timeStampNs:_timeStampNs];
|
|
}
|
|
|
|
- (instancetype)initWithPixelBuffer:(CVPixelBufferRef)pixelBuffer
|
|
rotation:(RTCVideoRotation)rotation
|
|
timeStampNs:(int64_t)timeStampNs {
|
|
return [self initWithBuffer:[[RTCCVPixelBuffer alloc] initWithPixelBuffer:pixelBuffer]
|
|
rotation:rotation
|
|
timeStampNs:timeStampNs];
|
|
}
|
|
|
|
- (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 {
|
|
RTCCVPixelBuffer *rtcPixelBuffer = [[RTCCVPixelBuffer alloc] initWithPixelBuffer:pixelBuffer
|
|
adaptedWidth:scaledWidth
|
|
adaptedHeight:scaledHeight
|
|
cropWidth:cropWidth
|
|
cropHeight:cropHeight
|
|
cropX:cropX
|
|
cropY:cropY];
|
|
return [self initWithBuffer:rtcPixelBuffer rotation:rotation timeStampNs:timeStampNs];
|
|
}
|
|
|
|
- (instancetype)initWithBuffer:(id<RTCVideoFrameBuffer>)buffer
|
|
rotation:(RTCVideoRotation)rotation
|
|
timeStampNs:(int64_t)timeStampNs {
|
|
if (self = [super init]) {
|
|
_buffer = buffer;
|
|
_rotation = rotation;
|
|
_timeStampNs = timeStampNs;
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
@end
|