Rename RTC_EXPORT to RTC_OBJC_EXPORT.
A new version of RTC_EXPORT will be introduced by [1] and it will be used by WebRTC native code. This CL renames the current RTC_EXPORT to RTC_OBJC_EXPORT in order to avoid to mix them. It has been decided to avoid to unify them because RTC_OBJC_EXPORT always marks symbols with default visibility, while RTC_EXPORT will do it only when COMPONENT_BUILD is defined. [1] - https://webrtc-review.googlesource.com/c/src/+/97960 is Bug: webrtc:9419 Change-Id: I56a3fc6601c72d3ad6a58f9961a00e3761dfb5da Reviewed-on: https://webrtc-review.googlesource.com/100521 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Anders Carlsson <andersc@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24754}
This commit is contained in:
committed by
Commit Bot
parent
451579389c
commit
e8d5724cc5
@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/** Implement this protocol to pass codec specific info from the encoder.
|
||||
* Corresponds to webrtc::CodecSpecificInfo.
|
||||
*/
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCCodecSpecificInfo <NSObject>
|
||||
@end
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@ typedef NS_ENUM(NSUInteger, RTCVideoContentType) {
|
||||
};
|
||||
|
||||
/** Represents an encoded frame. Corresponds to webrtc::EncodedImage. */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@interface RTCEncodedImage : NSObject
|
||||
|
||||
@property(nonatomic, strong) NSData *buffer;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/** Protocol for RTCYUVPlanarBuffers containing I420 data */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCI420Buffer <RTCYUVPlanarBuffer>
|
||||
@end
|
||||
|
||||
|
||||
@ -11,12 +11,15 @@
|
||||
#ifndef SDK_OBJC_BASE_RTCMACROS_H_
|
||||
#define SDK_OBJC_BASE_RTCMACROS_H_
|
||||
|
||||
#define RTC_EXPORT __attribute__((visibility("default")))
|
||||
#define RTC_OBJC_EXPORT __attribute__((visibility("default")))
|
||||
// TODO(mbonadei): Remove RTC_EXPORT in order to be able to land
|
||||
// https://webrtc-review.googlesource.com/c/src/+/97960.
|
||||
#define RTC_EXPORT RTC_OBJC_EXPORT
|
||||
|
||||
#if defined(__cplusplus)
|
||||
#define RTC_EXTERN extern "C" RTC_EXPORT
|
||||
#define RTC_EXTERN extern "C" RTC_OBJC_EXPORT
|
||||
#else
|
||||
#define RTC_EXTERN extern RTC_EXPORT
|
||||
#define RTC_EXTERN extern RTC_OBJC_EXPORT
|
||||
#endif
|
||||
|
||||
#ifdef __OBJC__
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/** Extension of the I420 buffer with mutable data access */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCMutableI420Buffer <RTCI420Buffer, RTCMutableYUVPlanarBuffer>
|
||||
@end
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/** Extension of the YUV planar data buffer with mutable data access */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCMutableYUVPlanarBuffer <RTCYUVPlanarBuffer>
|
||||
|
||||
@property(nonatomic, readonly) uint8_t *mutableDataY;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/** Information for header. Corresponds to webrtc::RTPFragmentationHeader. */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@interface RTCRtpFragmentationHeader : NSObject
|
||||
|
||||
@property(nonatomic, strong) NSArray<NSNumber *> *fragmentationOffset;
|
||||
|
||||
@ -16,12 +16,12 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class RTCVideoCapturer;
|
||||
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCVideoCapturerDelegate <NSObject>
|
||||
- (void)capturer:(RTCVideoCapturer *)capturer didCaptureVideoFrame:(RTCVideoFrame *)frame;
|
||||
@end
|
||||
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@interface RTCVideoCapturer : NSObject
|
||||
|
||||
@property(nonatomic, weak) id<RTCVideoCapturerDelegate> delegate;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/** Holds information to identify a codec. Corresponds to webrtc::SdpVideoFormat. */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@interface RTCVideoCodecInfo : NSObject <NSCoding>
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
typedef void (^RTCVideoDecoderCallback)(RTCVideoFrame *frame);
|
||||
|
||||
/** Protocol for decoder implementations. */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCVideoDecoder <NSObject>
|
||||
|
||||
- (void)setCallback:(RTCVideoDecoderCallback)callback;
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/** RTCVideoDecoderFactory is an Objective-C version of webrtc::VideoDecoderFactory. */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCVideoDecoderFactory <NSObject>
|
||||
|
||||
- (nullable id<RTCVideoDecoder>)createDecoder:(RTCVideoCodecInfo *)info;
|
||||
|
||||
@ -26,7 +26,7 @@ typedef BOOL (^RTCVideoEncoderCallback)(RTCEncodedImage *frame,
|
||||
RTCRtpFragmentationHeader *header);
|
||||
|
||||
/** Protocol for encoder implementations. */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCVideoEncoder <NSObject>
|
||||
|
||||
- (void)setCallback:(RTCVideoEncoderCallback)callback;
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/** RTCVideoEncoderFactory is an Objective-C version of webrtc::VideoEncoderFactory. */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCVideoEncoderFactory <NSObject>
|
||||
|
||||
- (nullable id<RTCVideoEncoder>)createEncoder:(RTCVideoCodecInfo *)info;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/** QP thresholds for encoder. Corresponds to webrtc::VideoEncoder::QpThresholds. */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@interface RTCVideoEncoderQpThresholds : NSObject
|
||||
|
||||
- (instancetype)initWithThresholdsLow:(NSInteger)low high:(NSInteger)high;
|
||||
|
||||
@ -20,7 +20,7 @@ typedef NS_ENUM(NSUInteger, RTCVideoCodecMode) {
|
||||
};
|
||||
|
||||
/** Settings for encoder. Corresponds to webrtc::VideoCodec. */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@interface RTCVideoEncoderSettings : NSObject
|
||||
|
||||
@property(nonatomic, strong) NSString *name;
|
||||
|
||||
@ -25,7 +25,7 @@ typedef NS_ENUM(NSInteger, RTCVideoRotation) {
|
||||
@protocol RTCVideoFrameBuffer;
|
||||
|
||||
// RTCVideoFrame is an ObjectiveC version of webrtc::VideoFrame.
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@interface RTCVideoFrame : NSObject
|
||||
|
||||
/** Width without rotation applied. */
|
||||
|
||||
@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
@protocol RTCI420Buffer;
|
||||
|
||||
// RTCVideoFrameBuffer is an ObjectiveC version of webrtc::VideoFrameBuffer.
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCVideoFrameBuffer <NSObject>
|
||||
|
||||
@property(nonatomic, readonly) int width;
|
||||
|
||||
@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class RTCVideoFrame;
|
||||
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCVideoRenderer <NSObject>
|
||||
|
||||
/** The size of the frame. */
|
||||
@ -30,7 +30,7 @@ RTC_EXPORT
|
||||
|
||||
@end
|
||||
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCVideoViewDelegate
|
||||
|
||||
- (void)videoView:(id<RTCVideoRenderer>)videoView didChangeVideoSize:(CGSize)size;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/** Protocol for RTCVideoFrameBuffers containing YUV planar data. */
|
||||
RTC_EXPORT
|
||||
RTC_OBJC_EXPORT
|
||||
@protocol RTCYUVPlanarBuffer <RTCVideoFrameBuffer>
|
||||
|
||||
@property(nonatomic, readonly) int chromaWidth;
|
||||
|
||||
Reference in New Issue
Block a user