diff options
author | Jon Hjelle <hjon@andyet.net> | 2016-01-11 09:47:07 -0800 |
---|---|---|
committer | Zeke Chin <tkchin@google.com> | 2016-01-11 17:47:14 +0000 |
commit | 78234956985d837ebdc16b0fc5d6cea8de9192a2 (patch) | |
tree | 85b4eaee0fd87913ed2c986a3ab35b6b9d488834 /webrtc | |
parent | fd99dea4f6b825adb648ad09f5286e1527177a17 (diff) | |
download | webrtc-78234956985d837ebdc16b0fc5d6cea8de9192a2.tar.gz |
Move RTCI420Frame to webrtc/api/objc/RTCVideoFrame with minor style changes.
BUG=
R=tkchin@webrtc.org
Review URL: https://codereview.webrtc.org/1533193003 .
Patch from Jon Hjelle <hjon@andyet.net>.
Cr-Commit-Position: refs/heads/master@{#11203}
Diffstat (limited to 'webrtc')
-rw-r--r-- | webrtc/api/BUILD.gn | 3 | ||||
-rw-r--r-- | webrtc/api/api.gyp | 3 | ||||
-rw-r--r-- | webrtc/api/objc/RTCVideoFrame+Private.h | 24 | ||||
-rw-r--r-- | webrtc/api/objc/RTCVideoFrame.h | 37 | ||||
-rw-r--r-- | webrtc/api/objc/RTCVideoFrame.mm | 79 |
5 files changed, 146 insertions, 0 deletions
diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn index 8a00e37f94..8e2853a765 100644 --- a/webrtc/api/BUILD.gn +++ b/webrtc/api/BUILD.gn @@ -32,6 +32,9 @@ if (is_ios) { "objc/RTCSessionDescription+Private.h", "objc/RTCSessionDescription.h", "objc/RTCSessionDescription.mm", + "objc/RTCVideoFrame+Private.h", + "objc/RTCVideoFrame.h", + "objc/RTCVideoFrame.mm", "objc/WebRTC-Prefix.pch", ] } diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp index 4259520330..482e62b5e1 100644 --- a/webrtc/api/api.gyp +++ b/webrtc/api/api.gyp @@ -31,6 +31,9 @@ 'objc/RTCSessionDescription+Private.h', 'objc/RTCSessionDescription.h', 'objc/RTCSessionDescription.mm', + 'objc/RTCVideoFrame+Private.h', + 'objc/RTCVideoFrame.h', + 'objc/RTCVideoFrame.mm', ], 'xcode_settings': { 'CLANG_ENABLE_OBJC_ARC': 'YES', diff --git a/webrtc/api/objc/RTCVideoFrame+Private.h b/webrtc/api/objc/RTCVideoFrame+Private.h new file mode 100644 index 0000000000..954344aee1 --- /dev/null +++ b/webrtc/api/objc/RTCVideoFrame+Private.h @@ -0,0 +1,24 @@ +/* + * 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 "RTCVideoFrame.h" + +#include "talk/media/base/videoframe.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface RTCVideoFrame () + +- (instancetype)initWithNativeFrame:(const cricket::VideoFrame *)nativeFrame + NS_DESIGNATED_INITIALIZER; + +@end + +NS_ASSUME_NONNULL_END diff --git a/webrtc/api/objc/RTCVideoFrame.h b/webrtc/api/objc/RTCVideoFrame.h new file mode 100644 index 0000000000..8ed23ba82c --- /dev/null +++ b/webrtc/api/objc/RTCVideoFrame.h @@ -0,0 +1,37 @@ +/* + * 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 <Foundation/Foundation.h> + +NS_ASSUME_NONNULL_BEGIN + +@interface RTCVideoFrame : NSObject + +/** Width without rotation applied. */ +@property(nonatomic, readonly) size_t width; + +/** Height without rotation applied. */ +@property(nonatomic, readonly) size_t height; +@property(nonatomic, readonly) size_t chromaWidth; +@property(nonatomic, readonly) size_t chromaHeight; +@property(nonatomic, readonly) size_t chromaSize; +// These can return NULL if the object is not backed by a buffer. +@property(nonatomic, readonly, nullable) const uint8_t *yPlane; +@property(nonatomic, readonly, nullable) const uint8_t *uPlane; +@property(nonatomic, readonly, nullable) const uint8_t *vPlane; +@property(nonatomic, readonly) int32_t yPitch; +@property(nonatomic, readonly) int32_t uPitch; +@property(nonatomic, readonly) int32_t vPitch; + +- (instancetype)init NS_UNAVAILABLE; + +@end + +NS_ASSUME_NONNULL_END diff --git a/webrtc/api/objc/RTCVideoFrame.mm b/webrtc/api/objc/RTCVideoFrame.mm new file mode 100644 index 0000000000..db2d07ba31 --- /dev/null +++ b/webrtc/api/objc/RTCVideoFrame.mm @@ -0,0 +1,79 @@ +/* + * 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 "RTCVideoFrame.h" + +#include "webrtc/base/scoped_ptr.h" + +#import "webrtc/api/objc/RTCVideoFrame+Private.h" + +@implementation RTCVideoFrame { + rtc::scoped_ptr<cricket::VideoFrame> _videoFrame; +} + +- (size_t)width { + return _videoFrame->GetWidth(); +} + +- (size_t)height { + return _videoFrame->GetHeight(); +} + +- (size_t)chromaWidth { + return _videoFrame->GetChromaWidth(); +} + +- (size_t)chromaHeight { + return _videoFrame->GetChromaHeight(); +} + +- (size_t)chromaSize { + return _videoFrame->GetChromaSize(); +} + +- (const uint8_t *)yPlane { + const cricket::VideoFrame *const_frame = _videoFrame.get(); + return const_frame->GetYPlane(); +} + +- (const uint8_t *)uPlane { + const cricket::VideoFrame *const_frame = _videoFrame.get(); + return const_frame->GetUPlane(); +} + +- (const uint8_t *)vPlane { + const cricket::VideoFrame *const_frame = _videoFrame.get(); + return const_frame->GetVPlane(); +} + +- (int32_t)yPitch { + return _videoFrame->GetYPitch(); +} + +- (int32_t)uPitch { + return _videoFrame->GetUPitch(); +} + +- (int32_t)vPitch { + return _videoFrame->GetVPitch(); +} + +#pragma mark - Private + +- (instancetype)initWithNativeFrame:(const cricket::VideoFrame *)nativeFrame { + if (self = [super init]) { + // Keep a shallow copy of the video frame. The underlying frame buffer is + // not copied. + _videoFrame.reset(nativeFrame->Copy()); + } + return self; +} + +@end |