Skip to content

Commit e0e3805

Browse files
authored
Merge pull request #455 from akilude/m75
updated webrtc lib to m75
2 parents d01d683 + 8a2063e commit e0e3805

File tree

88 files changed

+1189
-583
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1189
-583
lines changed

lib/WebRTC.framework/Headers/RTCAudioSession.h

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

14-
#import <WebRTC/RTCMacros.h>
14+
#import "RTCMacros.h"
1515

1616
NS_ASSUME_NONNULL_BEGIN
1717

@@ -27,7 +27,7 @@ extern NSInteger const kRTCAudioSessionErrorConfiguration;
2727
// Surfaces AVAudioSession events. WebRTC will listen directly for notifications
2828
// from AVAudioSession and handle them before calling these delegate methods,
2929
// at which point applications can perform additional processing if required.
30-
RTC_EXPORT
30+
RTC_OBJC_EXPORT
3131
@protocol RTCAudioSessionDelegate <NSObject>
3232

3333
@optional
@@ -102,7 +102,7 @@ RTC_EXPORT
102102
* activation state has changed outside of RTCAudioSession. The current known use
103103
* case of this is when CallKit activates the audio session for the application
104104
*/
105-
RTC_EXPORT
105+
RTC_OBJC_EXPORT
106106
@protocol RTCAudioSessionActivationDelegate <NSObject>
107107

108108
/** Called when the audio session is activated outside of the app by iOS. */
@@ -120,7 +120,7 @@ RTC_EXPORT
120120
* RTCAudioSession also coordinates activation so that the audio session is
121121
* activated only once. See |setActive:error:|.
122122
*/
123-
RTC_EXPORT
123+
RTC_OBJC_EXPORT
124124
@interface RTCAudioSession : NSObject <RTCAudioSessionActivationDelegate>
125125

126126
/** Convenience property to access the AVAudioSession singleton. Callers should

lib/WebRTC.framework/Headers/RTCAudioSessionConfiguration.h

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

14-
#import "WebRTC/RTCMacros.h"
14+
#import "RTCMacros.h"
1515

1616
NS_ASSUME_NONNULL_BEGIN
1717

18-
extern const int kRTCAudioSessionPreferredNumberOfChannels;
19-
extern const double kRTCAudioSessionHighPerformanceSampleRate;
20-
extern const double kRTCAudioSessionLowComplexitySampleRate;
21-
extern const double kRTCAudioSessionHighPerformanceIOBufferDuration;
22-
extern const double kRTCAudioSessionLowComplexityIOBufferDuration;
18+
RTC_EXTERN const int kRTCAudioSessionPreferredNumberOfChannels;
19+
RTC_EXTERN const double kRTCAudioSessionHighPerformanceSampleRate;
20+
RTC_EXTERN const double kRTCAudioSessionLowComplexitySampleRate;
21+
RTC_EXTERN const double kRTCAudioSessionHighPerformanceIOBufferDuration;
22+
RTC_EXTERN const double kRTCAudioSessionLowComplexityIOBufferDuration;
2323

2424
// Struct to hold configuration values.
25-
RTC_EXPORT
25+
RTC_OBJC_EXPORT
2626
@interface RTCAudioSessionConfiguration : NSObject
2727

2828
@property(nonatomic, strong) NSString *category;

lib/WebRTC.framework/Headers/RTCAudioSource.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
#import <Foundation/Foundation.h>
1212

13-
#import <WebRTC/RTCMacros.h>
14-
#import <WebRTC/RTCMediaSource.h>
13+
#import "RTCMacros.h"
14+
#import "RTCMediaSource.h"
1515

1616
NS_ASSUME_NONNULL_BEGIN
1717

18-
RTC_EXPORT
18+
RTC_OBJC_EXPORT
1919
@interface RTCAudioSource : RTCMediaSource
2020

2121
- (instancetype)init NS_UNAVAILABLE;

lib/WebRTC.framework/Headers/RTCAudioTrack.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#import <WebRTC/RTCMacros.h>
12-
#import <WebRTC/RTCMediaStreamTrack.h>
11+
#import "RTCMacros.h"
12+
#import "RTCMediaStreamTrack.h"
1313

1414
NS_ASSUME_NONNULL_BEGIN
1515

1616
@class RTCAudioSource;
1717

18-
RTC_EXPORT
18+
RTC_OBJC_EXPORT
1919
@interface RTCAudioTrack : RTCMediaStreamTrack
2020

2121
- (instancetype)init NS_UNAVAILABLE;
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* Copyright 2018 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+
#import <AVFoundation/AVFoundation.h>
12+
13+
#import "RTCMacros.h"
14+
#import "RTCVideoFrameBuffer.h"
15+
16+
NS_ASSUME_NONNULL_BEGIN
17+
18+
/** RTCVideoFrameBuffer containing a CVPixelBufferRef */
19+
RTC_OBJC_EXPORT
20+
@interface RTCCVPixelBuffer : NSObject <RTCVideoFrameBuffer>
21+
22+
@property(nonatomic, readonly) CVPixelBufferRef pixelBuffer;
23+
@property(nonatomic, readonly) int cropX;
24+
@property(nonatomic, readonly) int cropY;
25+
@property(nonatomic, readonly) int cropWidth;
26+
@property(nonatomic, readonly) int cropHeight;
27+
28+
+ (NSSet<NSNumber *> *)supportedPixelFormats;
29+
30+
- (instancetype)initWithPixelBuffer:(CVPixelBufferRef)pixelBuffer;
31+
- (instancetype)initWithPixelBuffer:(CVPixelBufferRef)pixelBuffer
32+
adaptedWidth:(int)adaptedWidth
33+
adaptedHeight:(int)adaptedHeight
34+
cropWidth:(int)cropWidth
35+
cropHeight:(int)cropHeight
36+
cropX:(int)cropX
37+
cropY:(int)cropY;
38+
39+
- (BOOL)requiresCropping;
40+
- (BOOL)requiresScalingToWidth:(int)width height:(int)height;
41+
- (int)bufferSizeForCroppingAndScalingToWidth:(int)width height:(int)height;
42+
43+
/** The minimum size of the |tmpBuffer| must be the number of bytes returned from the
44+
* bufferSizeForCroppingAndScalingToWidth:height: method.
45+
* If that size is 0, the |tmpBuffer| may be nil.
46+
*/
47+
- (BOOL)cropAndScaleTo:(CVPixelBufferRef)outputPixelBuffer
48+
withTempBuffer:(nullable uint8_t *)tmpBuffer;
49+
50+
@end
51+
52+
NS_ASSUME_NONNULL_END

lib/WebRTC.framework/Headers/RTCCallbackLogger.h

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,29 @@
1010

1111
#import <Foundation/Foundation.h>
1212

13-
#import <WebRTC/RTCLogging.h>
14-
#import <WebRTC/RTCMacros.h>
13+
#import "RTCLogging.h"
14+
#import "RTCMacros.h"
1515

1616
NS_ASSUME_NONNULL_BEGIN
1717

18+
typedef void (^RTCCallbackLoggerMessageHandler)(NSString *message);
19+
typedef void (^RTCCallbackLoggerMessageAndSeverityHandler)(NSString *message,
20+
RTCLoggingSeverity severity);
21+
1822
// This class intercepts WebRTC logs and forwards them to a registered block.
1923
// This class is not threadsafe.
20-
RTC_EXPORT
24+
RTC_OBJC_EXPORT
2125
@interface RTCCallbackLogger : NSObject
2226

2327
// The severity level to capture. The default is kRTCLoggingSeverityInfo.
2428
@property(nonatomic, assign) RTCLoggingSeverity severity;
2529

26-
// The callback will be called on the same thread that does the logging, so
27-
// if the logging callback can be slow it may be a good idea to implement
28-
// dispatching to some other queue.
29-
- (void)start:(nullable void (^)(NSString*))callback;
30+
// The callback handler will be called on the same thread that does the
31+
// logging, so if the logging callback can be slow it may be a good idea
32+
// to implement dispatching to some other queue.
33+
- (void)start:(nullable RTCCallbackLoggerMessageHandler)handler;
34+
- (void)startWithMessageAndSeverityHandler:
35+
(nullable RTCCallbackLoggerMessageAndSeverityHandler)handler;
3036

3137
- (void)stop;
3238

lib/WebRTC.framework/Headers/RTCCameraPreviewView.h

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

14-
#import <WebRTC/RTCMacros.h>
14+
#import "RTCMacros.h"
1515

1616
@class AVCaptureSession;
1717

1818
/** RTCCameraPreviewView is a view that renders local video from an
1919
* AVCaptureSession.
2020
*/
21-
RTC_EXPORT
21+
RTC_OBJC_EXPORT
2222
@interface RTCCameraPreviewView : UIView
2323

2424
/** The capture session being rendered in the view. Capture session

lib/WebRTC.framework/Headers/RTCCameraVideoCapturer.h

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

14-
#import <WebRTC/RTCMacros.h>
15-
#import <WebRTC/RTCVideoCapturer.h>
14+
#import "RTCMacros.h"
15+
#import "RTCVideoCapturer.h"
1616

1717
NS_ASSUME_NONNULL_BEGIN
1818

19-
RTC_EXPORT
19+
RTC_OBJC_EXPORT
2020
// Camera capture that implements RTCVideoCapturer. Delivers frames to a RTCVideoCapturerDelegate
2121
// (usually RTCVideoSource).
2222
NS_EXTENSION_UNAVAILABLE_IOS("Camera not available in app extensions.")
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright 2018 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+
#import <Foundation/Foundation.h>
12+
13+
#import "RTCMacros.h"
14+
15+
NS_ASSUME_NONNULL_BEGIN
16+
17+
RTC_OBJC_EXPORT
18+
@interface RTCCertificate : NSObject <NSCopying>
19+
20+
/** Private key in PEM. */
21+
@property(nonatomic, readonly, copy) NSString *private_key;
22+
23+
/** Public key in an x509 cert encoded in PEM. */
24+
@property(nonatomic, readonly, copy) NSString *certificate;
25+
26+
/**
27+
* Initialize an RTCCertificate with PEM strings for private_key and certificate.
28+
*/
29+
- (instancetype)initWithPrivateKey:(NSString *)private_key
30+
certificate:(NSString *)certificate NS_DESIGNATED_INITIALIZER;
31+
32+
- (instancetype)init NS_UNAVAILABLE;
33+
34+
/** Generate a new certificate for 're' use.
35+
*
36+
* Optional dictionary of parameters. Defaults to KeyType ECDSA if none are
37+
* provided.
38+
* - name: "ECDSA" or "RSASSA-PKCS1-v1_5"
39+
*/
40+
+ (nullable RTCCertificate *)generateCertificateWithParams:(NSDictionary *)params;
41+
42+
@end
43+
44+
NS_ASSUME_NONNULL_END
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright 2017 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+
#import <Foundation/Foundation.h>
12+
13+
#import "RTCMacros.h"
14+
15+
NS_ASSUME_NONNULL_BEGIN
16+
17+
/** Implement this protocol to pass codec specific info from the encoder.
18+
* Corresponds to webrtc::CodecSpecificInfo.
19+
*/
20+
RTC_OBJC_EXPORT
21+
@protocol RTCCodecSpecificInfo <NSObject>
22+
@end
23+
24+
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)