Skip to content

Commit 7801f9f

Browse files
Merge pull request #1101 from QuickBlox/update_QuickbloxWebRTC_framework_v2.7.2
QuickbloxWebRTC framework v2.7.2
2 parents 42bafd9 + 7d56314 commit 7801f9f

File tree

8 files changed

+65
-13
lines changed

8 files changed

+65
-13
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Copyright 2016 The WebRTC Project Authors. All rights reserved.
3+
*
4+
* Use of this source code is governed by a BSD-style license
5+
* that can be found in the LICENSE file in the root of the source
6+
* tree. An additional intellectual property rights grant can be found
7+
* in the file PATENTS. All contributing project authors may
8+
* be found in the AUTHORS file in the root of the source tree.
9+
*/
10+
11+
#ifndef SDK_OBJC_FRAMEWORK_HEADERS_WEBRTC_RTCMACROS_H_
12+
#define SDK_OBJC_FRAMEWORK_HEADERS_WEBRTC_RTCMACROS_H_
13+
14+
#define RTC_EXPORT __attribute__((visibility("default")))
15+
16+
#if defined(__cplusplus)
17+
#define RTC_EXTERN extern "C" RTC_EXPORT
18+
#else
19+
#define RTC_EXTERN extern RTC_EXPORT
20+
#endif
21+
22+
#ifdef __OBJC__
23+
#define RTC_FWD_DECL_OBJC_CLASS(classname) @class classname
24+
#else
25+
#define RTC_FWD_DECL_OBJC_CLASS(classname) typedef struct objc_object classname
26+
#endif
27+
28+
#endif // SDK_OBJC_FRAMEWORK_HEADERS_WEBRTC_RTCMACROS_H_

Framework/QuickbloxWebRTC.framework/Headers/RTCVideoFrame.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@
1111
#import <AVFoundation/AVFoundation.h>
1212
#import <Foundation/Foundation.h>
1313

14+
#import "RTCMacros.h"
15+
1416
#import "QBRTCTypes.h"
1517

1618
NS_ASSUME_NONNULL_BEGIN
1719

1820
@protocol RTCVideoFrameBuffer;
1921

2022
// RTCVideoFrame is an ObjectiveC version of webrtc::VideoFrame.
21-
__attribute__((visibility("default")))
23+
RTC_EXPORT
2224
@interface RTCVideoFrame : NSObject
2325

2426
/** Width without rotation applied. */
@@ -37,15 +39,15 @@ __attribute__((visibility("default")))
3739
@property(nonatomic, readonly) id<RTCVideoFrameBuffer> buffer;
3840

3941
- (instancetype)init NS_UNAVAILABLE;
40-
- (instancetype)new NS_UNAVAILABLE;
42+
- (instancetype) new NS_UNAVAILABLE;
4143

4244
/** Initialize an RTCVideoFrame from a pixel buffer, rotation, and timestamp.
4345
* Deprecated - initialize with a RTCCVPixelBuffer instead
4446
*/
4547
- (instancetype)initWithPixelBuffer:(CVPixelBufferRef)pixelBuffer
4648
rotation:(QBRTCVideoRotation)rotation
4749
timeStampNs:(int64_t)timeStampNs
48-
DEPRECATED_MSG_ATTRIBUTE("use initWithBuffer instead");
50+
DEPRECATED_MSG_ATTRIBUTE("use initWithBuffer instead");
4951

5052
/** Initialize an RTCVideoFrame from a pixel buffer combined with cropping and
5153
* scaling. Cropping will be applied first on the pixel buffer, followed by
@@ -60,7 +62,7 @@ DEPRECATED_MSG_ATTRIBUTE("use initWithBuffer instead");
6062
cropY:(int)cropY
6163
rotation:(QBRTCVideoRotation)rotation
6264
timeStampNs:(int64_t)timeStampNs
63-
DEPRECATED_MSG_ATTRIBUTE("use initWithBuffer instead");
65+
DEPRECATED_MSG_ATTRIBUTE("use initWithBuffer instead");
6466

6567
/** Initialize an RTCVideoFrame from a frame buffer, rotation, and timestamp.
6668
*/

Framework/QuickbloxWebRTC.framework/Headers/RTCVideoFrameBuffer.h

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
2+
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
33
*
44
* Use of this source code is governed by a BSD-style license
55
* that can be found in the LICENSE file in the root of the source
@@ -9,13 +9,14 @@
99
*/
1010

1111
#import <AVFoundation/AVFoundation.h>
12+
#import "RTCMacros.h"
1213

1314
NS_ASSUME_NONNULL_BEGIN
1415

1516
@protocol RTCI420Buffer;
1617

1718
// RTCVideoFrameBuffer is an ObjectiveC version of webrtc::VideoFrameBuffer.
18-
__attribute__((visibility("default")))
19+
RTC_EXPORT
1920
@protocol RTCVideoFrameBuffer <NSObject>
2021

2122
@property(nonatomic, readonly) int width;
@@ -37,6 +38,11 @@ __attribute__((visibility("default")))
3738
@property(nonatomic, readonly) int strideU;
3839
@property(nonatomic, readonly) int strideV;
3940

41+
- (instancetype)initWithWidth:(int)width
42+
height:(int)height
43+
dataY:(const uint8_t *)dataY
44+
dataU:(const uint8_t *)dataU
45+
dataV:(const uint8_t *)dataV;
4046
- (instancetype)initWithWidth:(int)width height:(int)height;
4147
- (instancetype)initWithWidth:(int)width
4248
height:(int)height
@@ -64,12 +70,14 @@ __attribute__((visibility("default")))
6470
@end
6571

6672
/** RTCVideoFrameBuffer containing a CVPixelBufferRef */
67-
__attribute__((visibility("default")))
73+
RTC_EXPORT
6874
@interface RTCCVPixelBuffer : NSObject <RTCVideoFrameBuffer>
6975

7076
@property(nonatomic, readonly) CVPixelBufferRef pixelBuffer;
7177
@property(nonatomic, readonly) int cropX;
7278
@property(nonatomic, readonly) int cropY;
79+
@property(nonatomic, readonly) int cropWidth;
80+
@property(nonatomic, readonly) int cropHeight;
7381

7482
+ (NSSet<NSNumber *> *)supportedPixelFormats;
7583

@@ -85,20 +93,23 @@ __attribute__((visibility("default")))
8593
- (BOOL)requiresCropping;
8694
- (BOOL)requiresScalingToWidth:(int)width height:(int)height;
8795
- (int)bufferSizeForCroppingAndScalingToWidth:(int)width height:(int)height;
96+
8897
/** The minimum size of the |tmpBuffer| must be the number of bytes returned from the
8998
* bufferSizeForCroppingAndScalingToWidth:height: method.
99+
* If that size is 0, the |tmpBuffer| may be nil.
90100
*/
91-
- (BOOL)cropAndScaleTo:(CVPixelBufferRef)outputPixelBuffer withTempBuffer:(uint8_t *)tmpBuffer;
101+
- (BOOL)cropAndScaleTo:(CVPixelBufferRef)outputPixelBuffer
102+
withTempBuffer:(nullable uint8_t *)tmpBuffer;
92103

93104
@end
94105

95106
/** RTCI420Buffer implements the RTCI420Buffer protocol */
96-
__attribute__((visibility("default")))
107+
RTC_EXPORT
97108
@interface RTCI420Buffer : NSObject <RTCI420Buffer>
98109
@end
99110

100111
/** Mutable version of RTCI420Buffer */
101-
__attribute__((visibility("default")))
112+
RTC_EXPORT
102113
@interface RTCMutableI420Buffer : RTCI420Buffer <RTCMutableI420Buffer>
103114
@end
104115

Framework/QuickbloxWebRTC.framework/Headers/RTCVideoRenderer.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313
#import <UIKit/UIKit.h>
1414
#endif
1515

16+
#import "RTCMacros.h"
17+
1618
NS_ASSUME_NONNULL_BEGIN
1719

1820
@class RTCVideoFrame;
1921

20-
__attribute__((visibility("default")))
22+
RTC_EXPORT
2123
@protocol RTCVideoRenderer <NSObject>
2224

2325
/** The size of the frame. */
@@ -28,4 +30,11 @@ __attribute__((visibility("default")))
2830

2931
@end
3032

33+
RTC_EXPORT
34+
@protocol RTCVideoViewDelegate
35+
36+
- (void)videoView:(id<RTCVideoRenderer>)videoView didChangeVideoSize:(CGSize)size;
37+
38+
@end
39+
3140
NS_ASSUME_NONNULL_END
1 Byte
Binary file not shown.
Binary file not shown.

sample-conference-videochat/sample-conference-videochat.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,6 +1036,7 @@
10361036
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
10371037
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10381038
DEVELOPMENT_TEAM = 8885H5G2YX;
1039+
ENABLE_BITCODE = NO;
10391040
FRAMEWORK_SEARCH_PATHS = (
10401041
"$(inherited)",
10411042
"\"$(SRCROOT)/../Framework\"",
@@ -1073,6 +1074,7 @@
10731074
CODE_SIGN_IDENTITY = "iPhone Developer";
10741075
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
10751076
DEVELOPMENT_TEAM = 8885H5G2YX;
1077+
ENABLE_BITCODE = NO;
10761078
FRAMEWORK_SEARCH_PATHS = (
10771079
"$(inherited)",
10781080
"\"$(SRCROOT)/../Framework\"",

sample-videochat-webrtc/sample-videochat-webrtc.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@
11951195
CODE_SIGN_STYLE = Automatic;
11961196
DEBUG_INFORMATION_FORMAT = dwarf;
11971197
DEVELOPMENT_TEAM = 8885H5G2YX;
1198-
ENABLE_BITCODE = YES;
1198+
ENABLE_BITCODE = NO;
11991199
FRAMEWORK_SEARCH_PATHS = (
12001200
"$(inherited)",
12011201
"\"$(SRCROOT)/../Framework\"",
@@ -1238,7 +1238,7 @@
12381238
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
12391239
CODE_SIGN_STYLE = Automatic;
12401240
DEVELOPMENT_TEAM = 8885H5G2YX;
1241-
ENABLE_BITCODE = YES;
1241+
ENABLE_BITCODE = NO;
12421242
FRAMEWORK_SEARCH_PATHS = (
12431243
"$(inherited)",
12441244
"\"$(SRCROOT)/../Framework\"",

0 commit comments

Comments
 (0)