Reason for revert:
Speculative revet for breaking remoting_unittests in fyi bots.
https://build.chromium.org/p/chromium.webrtc.fyi/waterfall?builder=Win7%20Tester
Original issue's description:
> Add a flags field to video timing extension.
>
> The rtp header extension for video timing shuold have an additional
> field for signaling metadata, such as what triggered the extension for
> this particular frame. This will allow separating frames select because
> of outlier sizes from regular frames, for more accurate stats.
>
> This implementation is backwards compatible in that it can read video
> timing extensions without the new flag field, but it always sends with
> it included.
>
> BUG=webrtc:7594
>
> Review-Url: https://codereview.webrtc.org/3000753002
> Cr-Commit-Position: refs/heads/master@{#19353}
> Committed: cf5d485e14
TBR=danilchap@webrtc.org,kthelgason@webrtc.org,stefan@webrtc.org,sprang@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:7594
Review-Url: https://codereview.webrtc.org/2995953002
Cr-Commit-Position: refs/heads/master@{#19360}
184 lines
6.1 KiB
Objective-C
184 lines
6.1 KiB
Objective-C
/*
|
|
* Copyright 2017 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>
|
|
|
|
#import <WebRTC/RTCMacros.h>
|
|
|
|
@class RTCVideoFrame;
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
/** Represents an encoded frame's type. */
|
|
typedef NS_ENUM(NSUInteger, RTCFrameType) {
|
|
RTCFrameTypeEmptyFrame = 0,
|
|
RTCFrameTypeAudioFrameSpeech = 1,
|
|
RTCFrameTypeAudioFrameCN = 2,
|
|
RTCFrameTypeVideoFrameKey = 3,
|
|
RTCFrameTypeVideoFrameDelta = 4,
|
|
};
|
|
|
|
typedef NS_ENUM(NSUInteger, RTCVideoContentType) {
|
|
RTCVideoContentTypeUnspecified,
|
|
RTCVideoContentTypeScreenshare,
|
|
};
|
|
|
|
/** Represents an encoded frame. Corresponds to webrtc::EncodedImage. */
|
|
RTC_EXPORT
|
|
@interface RTCEncodedImage : NSObject
|
|
|
|
@property(nonatomic, strong) NSData *buffer;
|
|
@property(nonatomic, assign) int encodedWidth;
|
|
@property(nonatomic, assign) int encodedHeight;
|
|
@property(nonatomic, assign) uint32_t timeStamp;
|
|
@property(nonatomic, assign) long captureTimeMs;
|
|
@property(nonatomic, assign) long ntpTimeMs;
|
|
@property(nonatomic, assign) BOOL isTimingFrame;
|
|
@property(nonatomic, assign) long encodeStartMs;
|
|
@property(nonatomic, assign) long encodeFinishMs;
|
|
@property(nonatomic, assign) RTCFrameType frameType;
|
|
@property(nonatomic, assign) int rotation;
|
|
@property(nonatomic, assign) BOOL completeFrame;
|
|
@property(nonatomic, strong) NSNumber *qp;
|
|
@property(nonatomic, assign) RTCVideoContentType contentType;
|
|
|
|
@end
|
|
|
|
/** Information for header. Corresponds to webrtc::RTPFragmentationHeader. */
|
|
RTC_EXPORT
|
|
@interface RTCRtpFragmentationHeader : NSObject
|
|
|
|
@property(nonatomic, strong) NSArray<NSNumber *> *fragmentationOffset;
|
|
@property(nonatomic, strong) NSArray<NSNumber *> *fragmentationLength;
|
|
@property(nonatomic, strong) NSArray<NSNumber *> *fragmentationTimeDiff;
|
|
@property(nonatomic, strong) NSArray<NSNumber *> *fragmentationPlType;
|
|
|
|
@end
|
|
|
|
/** Implement this protocol to pass codec specific info from the encoder.
|
|
* Corresponds to webrtc::CodecSpecificInfo.
|
|
*/
|
|
RTC_EXPORT
|
|
@protocol RTCCodecSpecificInfo <NSObject>
|
|
|
|
@end
|
|
|
|
/** Class for H264 specific config. */
|
|
typedef NS_ENUM(NSUInteger, RTCH264PacketizationMode) {
|
|
RTCH264PacketizationModeNonInterleaved = 0, // Mode 1 - STAP-A, FU-A is allowed
|
|
RTCH264PacketizationModeSingleNalUnit // Mode 0 - only single NALU allowed
|
|
};
|
|
|
|
RTC_EXPORT
|
|
@interface RTCCodecSpecificInfoH264 : NSObject<RTCCodecSpecificInfo>
|
|
|
|
@property(nonatomic, assign) RTCH264PacketizationMode packetizationMode;
|
|
|
|
@end
|
|
|
|
/** Callback block for encoder. */
|
|
typedef BOOL (^RTCVideoEncoderCallback)(RTCEncodedImage *frame,
|
|
id<RTCCodecSpecificInfo> info,
|
|
RTCRtpFragmentationHeader *header);
|
|
|
|
/** Callback block for decoder. */
|
|
typedef void (^RTCVideoDecoderCallback)(RTCVideoFrame *frame);
|
|
|
|
typedef NS_ENUM(NSUInteger, RTCVideoCodecMode) {
|
|
RTCVideoCodecModeRealtimeVideo,
|
|
RTCVideoCodecModeScreensharing,
|
|
};
|
|
|
|
/** Holds information to identify a codec. Corresponds to cricket::VideoCodec. */
|
|
RTC_EXPORT
|
|
@interface RTCVideoCodecInfo : NSObject
|
|
|
|
- (instancetype)initWithPayload:(NSInteger)payload
|
|
name:(NSString *)name
|
|
parameters:(NSDictionary<NSString *, NSString *> *)parameters;
|
|
|
|
@property(nonatomic, readonly) NSInteger payload;
|
|
@property(nonatomic, readonly) NSString *name;
|
|
@property(nonatomic, readonly) NSDictionary<NSString *, NSString *> *parameters;
|
|
|
|
@end
|
|
|
|
/** Settings for encoder. Corresponds to webrtc::VideoCodec. */
|
|
RTC_EXPORT
|
|
@interface RTCVideoEncoderSettings : NSObject
|
|
|
|
@property(nonatomic, strong) NSString *name;
|
|
|
|
@property(nonatomic, assign) unsigned short width;
|
|
@property(nonatomic, assign) unsigned short height;
|
|
|
|
@property(nonatomic, assign) unsigned int startBitrate; // kilobits/sec.
|
|
@property(nonatomic, assign) unsigned int maxBitrate;
|
|
@property(nonatomic, assign) unsigned int minBitrate;
|
|
@property(nonatomic, assign) unsigned int targetBitrate;
|
|
|
|
@property(nonatomic, assign) uint32_t maxFramerate;
|
|
|
|
@property(nonatomic, assign) unsigned int qpMax;
|
|
@property(nonatomic, assign) RTCVideoCodecMode mode;
|
|
|
|
@end
|
|
|
|
/** QP thresholds for encoder. Corresponds to webrtc::VideoEncoder::QpThresholds. */
|
|
RTC_EXPORT
|
|
@interface RTCVideoEncoderQpThresholds : NSObject
|
|
|
|
- (instancetype)initWithThresholdsLow:(NSInteger)low high:(NSInteger)high;
|
|
|
|
@property(nonatomic, readonly) NSInteger low;
|
|
@property(nonatomic, readonly) NSInteger high;
|
|
|
|
@end
|
|
|
|
/** Protocol for encoder implementations. */
|
|
RTC_EXPORT
|
|
@protocol RTCVideoEncoder <NSObject>
|
|
|
|
- (void)setCallback:(RTCVideoEncoderCallback)callback;
|
|
- (NSInteger)startEncodeWithSettings:(RTCVideoEncoderSettings *)settings
|
|
numberOfCores:(int)numberOfCores;
|
|
- (NSInteger)releaseEncoder;
|
|
- (NSInteger)encode:(RTCVideoFrame *)frame
|
|
codecSpecificInfo:(id<RTCCodecSpecificInfo>)info
|
|
frameTypes:(NSArray<NSNumber *> *)frameTypes;
|
|
- (int)setBitrate:(uint32_t)bitrateKbit framerate:(uint32_t)framerate;
|
|
- (NSString *)implementationName;
|
|
|
|
/** Returns QP scaling settings for encoder. The quality scaler adjusts the resolution in order to
|
|
* keep the QP from the encoded images within the given range. Returning nil from this function
|
|
* disables quality scaling. */
|
|
- (RTCVideoEncoderQpThresholds *)scalingSettings;
|
|
|
|
@end
|
|
|
|
/** Protocol for decoder implementations. */
|
|
RTC_EXPORT
|
|
@protocol RTCVideoDecoder <NSObject>
|
|
|
|
- (void)setCallback:(RTCVideoDecoderCallback)callback;
|
|
- (NSInteger)startDecodeWithSettings:(RTCVideoEncoderSettings *)settings
|
|
numberOfCores:(int)numberOfCores;
|
|
- (NSInteger)releaseDecoder;
|
|
- (NSInteger)decode:(RTCEncodedImage *)encodedImage
|
|
missingFrames:(BOOL)missingFrames
|
|
fragmentationHeader:(RTCRtpFragmentationHeader *)fragmentationHeader
|
|
codecSpecificInfo:(__nullable id<RTCCodecSpecificInfo>)info
|
|
renderTimeMs:(int64_t)renderTimeMs;
|
|
- (NSString *)implementationName;
|
|
|
|
@end
|
|
|
|
NS_ASSUME_NONNULL_END
|