a5f1de1e65
Reason for revert: New CL for fixing the issues Original issue's description: > Revert of Injectable Obj-C video codecs (patchset #8 id:140001 of https://codereview.webrtc.org/2966023002/ ) > > Reason for revert: > Causes no video in certain scenarios. Please come up with a test plan or unit test to prevent such problems in the future. > > Original issue's description: > > Injectable Obj-C video codecs > > > > Initial CL for this effort, with a working RTCVideoEncoder/Decoder for H264 > > (wrapping the VideoToolbox codec). > > > > Some notes / things left to do: > > - There are some hard-coded references to codec types that are supported by > > webrtc::VideoCodec, cricket::VideoCodec, webrtc::CodecSpecificInfo etc > > since we need to convert to/from these types in ObjCVideoEncoder/Decoder. > > These types would need to be more codec agnostic to avoid this. > > - Most interfaces are borrowed from the design document for injectable > > codecs in Android. Some data in the corresponding C++ classes is discarded > > when converting to the Obj-C version, since it has fewer fields. I have not > > verified whether all data that we do keep is needed, or whether we might be > > losing anything useful in these conversions. > > - Implement the VideoToolbox codec code directly in the RTCVideoEncoderH264 > > classes, instead of wrapping webrtc::H264VideoToolboxEncoder / decoder. > > Eliminates converting between ObjC/C++ types outside the ObjCVideoEncoder/ > > Decoder wrapper classes. > > - List the injected codec factory's supported codecs in the list of codecs in > > AppRTCMobile. > > > > BUG=webrtc:7924 > > R=magjed@webrtc.org > > > > Review-Url: https://codereview.webrtc.org/2966023002 . > > Cr-Commit-Position: refs/heads/master@{#18928} > > Committed:a0349c138d> > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7924 > NOTRY=true > > Review-Url: https://codereview.webrtc.org/2975963002 > Cr-Commit-Position: refs/heads/master@{#18979} > Committed:1095ada7adR=magjed@webrtc.org TBR=tkchin@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7924 Review-Url: https://codereview.webrtc.org/2981583002 . Cr-Commit-Position: refs/heads/master@{#19002}
103 lines
3.8 KiB
Objective-C
103 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;
|
|
|
|
/** Timestamp 90 kHz. */
|
|
@property(nonatomic, assign) int32_t timeStamp;
|
|
|
|
/** 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
|