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}
This commit is contained in:
@ -32,6 +32,9 @@ if (is_ios) {
|
|||||||
"objc/RTCSessionDescription+Private.h",
|
"objc/RTCSessionDescription+Private.h",
|
||||||
"objc/RTCSessionDescription.h",
|
"objc/RTCSessionDescription.h",
|
||||||
"objc/RTCSessionDescription.mm",
|
"objc/RTCSessionDescription.mm",
|
||||||
|
"objc/RTCVideoFrame+Private.h",
|
||||||
|
"objc/RTCVideoFrame.h",
|
||||||
|
"objc/RTCVideoFrame.mm",
|
||||||
"objc/WebRTC-Prefix.pch",
|
"objc/WebRTC-Prefix.pch",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -31,6 +31,9 @@
|
|||||||
'objc/RTCSessionDescription+Private.h',
|
'objc/RTCSessionDescription+Private.h',
|
||||||
'objc/RTCSessionDescription.h',
|
'objc/RTCSessionDescription.h',
|
||||||
'objc/RTCSessionDescription.mm',
|
'objc/RTCSessionDescription.mm',
|
||||||
|
'objc/RTCVideoFrame+Private.h',
|
||||||
|
'objc/RTCVideoFrame.h',
|
||||||
|
'objc/RTCVideoFrame.mm',
|
||||||
],
|
],
|
||||||
'xcode_settings': {
|
'xcode_settings': {
|
||||||
'CLANG_ENABLE_OBJC_ARC': 'YES',
|
'CLANG_ENABLE_OBJC_ARC': 'YES',
|
||||||
|
24
webrtc/api/objc/RTCVideoFrame+Private.h
Normal file
24
webrtc/api/objc/RTCVideoFrame+Private.h
Normal file
@ -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
|
37
webrtc/api/objc/RTCVideoFrame.h
Normal file
37
webrtc/api/objc/RTCVideoFrame.h
Normal file
@ -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
|
79
webrtc/api/objc/RTCVideoFrame.mm
Normal file
79
webrtc/api/objc/RTCVideoFrame.mm
Normal file
@ -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
|
Reference in New Issue
Block a user