Merge branch 'mkirk/webrtc-m68'

Build/iOS/WebRTC.framework/Headers/RTCAudioSession.h

@@ -84,6 +84,20 @@ RTC_EXPORT
 - (void)audioSession:(RTCAudioSession *)audioSession
     didDetectPlayoutGlitch:(int64_t)totalNumberOfGlitches;
 
+/** Called when the audio session is about to change the active state.
+ */
+- (void)audioSession:(RTCAudioSession *)audioSession willSetActive:(BOOL)active;
+
+/** Called after the audio session sucessfully changed the active state.
+ */
+- (void)audioSession:(RTCAudioSession *)audioSession didSetActive:(BOOL)active;
+
+/** Called after the audio session failed to change the active state.
+ */
+- (void)audioSession:(RTCAudioSession *)audioSession
+    failedToSetActive:(BOOL)active
+                error:(NSError *)error;
+
 @end
 
 /** This is a protocol used to inform RTCAudioSession when the audio session

Build/iOS/WebRTC.framework/Headers/RTCConfiguration.h

@@ -65,7 +65,6 @@ typedef NS_ENUM(NSInteger, RTCEncryptionKeyType) {
 
 /** Represents the chosen SDP semantics for the RTCPeerConnection. */
 typedef NS_ENUM(NSInteger, RTCSdpSemantics) {
-  RTCSdpSemanticsDefault,
   RTCSdpSemanticsPlanB,
   RTCSdpSemanticsUnifiedPlan,
 };
@@ -155,14 +154,11 @@ RTC_EXPORT
  *  will also cause RTCPeerConnection to ignore all but the first a=ssrc lines
  *  that form a Plan B stream.
  *
- *  For users who only send at most one audio and one video track, this
- *  choice does not matter and should be left as Default.
- *
  *  For users who wish to send multiple audio/video streams and need to stay
- *  interoperable with legacy WebRTC implementations, specify PlanB.
+ *  interoperable with legacy WebRTC implementations or use legacy APIs,
+ *  specify PlanB.
  *
- *  For users who wish to send multiple audio/video streams and/or wish to
- *  use the new RTCRtpTransceiver API, specify UnifiedPlan.
+ *  For all other users, specify UnifiedPlan.
  */
 @property(nonatomic, assign) RTCSdpSemantics sdpSemantics;
 

Build/iOS/WebRTC.framework/Headers/RTCEAGLVideoView.h

@@ -18,11 +18,9 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @class RTCEAGLVideoView;
-RTC_EXPORT
-@protocol RTCEAGLVideoViewDelegate
-
-- (void)videoView:(RTCEAGLVideoView *)videoView didChangeVideoSize:(CGSize)size;
 
+RTC_EXPORT
+@protocol RTCEAGLVideoViewDelegate<RTCVideoViewDelegate>
 @end
 
 /**
@@ -32,7 +30,7 @@ RTC_EXPORT
 RTC_EXPORT
 @interface RTCEAGLVideoView : UIView <RTCVideoRenderer>
 
-@property(nonatomic, weak) id<RTCEAGLVideoViewDelegate> delegate;
+@property(nonatomic, weak) id<RTCVideoViewDelegate> delegate;
 
 - (instancetype)initWithFrame:(CGRect)frame
                        shader:(id<RTCVideoViewShading>)shader NS_DESIGNATED_INITIALIZER;

Build/iOS/WebRTC.framework/Headers/RTCMTLVideoView.h

@@ -33,5 +33,10 @@ NS_CLASS_AVAILABLE_IOS(9)
 RTC_EXPORT
 @interface RTCMTLVideoView : UIView <RTCVideoRenderer>
 
+@property(nonatomic, weak) id<RTCVideoViewDelegate> delegate;
+
+- (void)setVideoContentMode:(UIViewContentMode)mode;
+
 @end
+
 NS_ASSUME_NONNULL_END

Build/iOS/WebRTC.framework/Headers/RTCRtpCodecParameters.h

@@ -63,6 +63,9 @@ RTC_EXPORT
  **/
 @property(nonatomic, readonly, nullable) NSNumber *numChannels;
 
+/** The "format specific parameters" field from the "a=fmtp" line in the SDP */
+@property(nonatomic, readonly, nonnull) NSDictionary *parameters;
+
 - (instancetype)init NS_DESIGNATED_INITIALIZER;
 
 @end

Build/iOS/WebRTC.framework/Headers/RTCRtpParameters.h

@@ -19,6 +19,9 @@ NS_ASSUME_NONNULL_BEGIN
 RTC_EXPORT
 @interface RTCRtpParameters : NSObject
 
+/** A unique identifier for the last set of parameters applied. */
+@property(nonatomic, copy) NSString *transactionId;
+
 /** The currently active encodings in the order of preference. */
 @property(nonatomic, copy) NSArray<RTCRtpEncodingParameters *> *encodings;
 

Build/iOS/WebRTC.framework/Headers/RTCVideoCodec.h

@@ -20,6 +20,8 @@ RTC_EXPORT extern NSString *const kRTCVideoCodecVp9Name;
 RTC_EXPORT extern NSString *const kRTCVideoCodecH264Name;
 RTC_EXPORT extern NSString *const kRTCLevel31ConstrainedHigh;
 RTC_EXPORT extern NSString *const kRTCLevel31ConstrainedBaseline;
+RTC_EXPORT extern NSString *const kRTCMaxSupportedH264ProfileLevelConstrainedHigh;
+RTC_EXPORT extern NSString *const kRTCMaxSupportedH264ProfileLevelConstrainedBaseline;
 
 /** Represents an encoded frame's type. */
 typedef NS_ENUM(NSUInteger, RTCFrameType) {
@@ -88,7 +90,7 @@ typedef NS_ENUM(NSUInteger, RTCVideoCodecMode) {
   RTCVideoCodecModeScreensharing,
 };
 
-/** Holds information to identify a codec. Corresponds to cricket::VideoCodec. */
+/** Holds information to identify a codec. Corresponds to webrtc::SdpVideoFormat. */
 RTC_EXPORT
 @interface RTCVideoCodecInfo : NSObject <NSCoding>
 
@@ -171,7 +173,6 @@ RTC_EXPORT
 - (NSInteger)releaseDecoder;
 - (NSInteger)decode:(RTCEncodedImage *)encodedImage
           missingFrames:(BOOL)missingFrames
-    fragmentationHeader:(RTCRtpFragmentationHeader *)fragmentationHeader
       codecSpecificInfo:(nullable id<RTCCodecSpecificInfo>)info
            renderTimeMs:(int64_t)renderTimeMs;
 - (NSString *)implementationName;

Build/iOS/WebRTC.framework/Headers/RTCVideoFrameBuffer.h

@@ -38,6 +38,11 @@ RTC_EXPORT
 @property(nonatomic, readonly) int strideU;
 @property(nonatomic, readonly) int strideV;
 
+- (instancetype)initWithWidth:(int)width
+                       height:(int)height
+                        dataY:(const uint8_t *)dataY
+                        dataU:(const uint8_t *)dataU
+                        dataV:(const uint8_t *)dataV;
 - (instancetype)initWithWidth:(int)width height:(int)height;
 - (instancetype)initWithWidth:(int)width
                        height:(int)height

Build/iOS/WebRTC.framework/Headers/RTCVideoRenderer.h

@@ -30,4 +30,11 @@ RTC_EXPORT
 
 @end
 
+RTC_EXPORT
+@protocol RTCVideoViewDelegate
+
+- (void)videoView:(id<RTCVideoRenderer>)videoView didChangeVideoSize:(CGSize)size;
+
+@end
+
 NS_ASSUME_NONNULL_END

Build/iOS/WebRTC.framework/Headers/UIDevice+RTCDevice.h

@@ -30,6 +30,7 @@ typedef NS_ENUM(NSInteger, RTCDeviceType) {
   RTCDeviceTypeIPhone6SPlus,
   RTCDeviceTypeIPhone7,
   RTCDeviceTypeIPhone7Plus,
+  RTCDeviceTypeIPhoneSE,
   RTCDeviceTypeIPhone8,
   RTCDeviceTypeIPhone8Plus,
   RTCDeviceTypeIPhoneX,
@@ -38,6 +39,7 @@ typedef NS_ENUM(NSInteger, RTCDeviceType) {
   RTCDeviceTypeIPodTouch3G,
   RTCDeviceTypeIPodTouch4G,
   RTCDeviceTypeIPodTouch5G,
+  RTCDeviceTypeIPodTouch6G,
   RTCDeviceTypeIPad,
   RTCDeviceTypeIPad2Wifi,
   RTCDeviceTypeIPad2GSM,
@@ -52,10 +54,21 @@ typedef NS_ENUM(NSInteger, RTCDeviceType) {
   RTCDeviceTypeIPad4Wifi,
   RTCDeviceTypeIPad4GSM,
   RTCDeviceTypeIPad4GSM_CDMA,
+  RTCDeviceTypeIPad5,
+  RTCDeviceTypeIPad6,
   RTCDeviceTypeIPadAirWifi,
   RTCDeviceTypeIPadAirCellular,
+  RTCDeviceTypeIPadAirWifiCellular,
+  RTCDeviceTypeIPadAir2,
   RTCDeviceTypeIPadMini2GWifi,
   RTCDeviceTypeIPadMini2GCellular,
+  RTCDeviceTypeIPadMini2GWifiCellular,
+  RTCDeviceTypeIPadMini3,
+  RTCDeviceTypeIPadMini4,
+  RTCDeviceTypeIPadPro9Inch,
+  RTCDeviceTypeIPadPro12Inch,
+  RTCDeviceTypeIPadPro12Inch2,
+  RTCDeviceTypeIPadPro10Inch,
   RTCDeviceTypeSimulatori386,
   RTCDeviceTypeSimulatorx86_64,
 };

Build/iOS/WebRTC.framework/LICENSE.md

@@ -948,6 +948,42 @@ support library is itself covered by the above license.
 
 ```
 
+# rnnoise
+```
+Copyright (c) 2017, Mozilla
+Copyright (c) 2007-2017, Jean-Marc Valin
+Copyright (c) 2005-2017, Xiph.Org Foundation
+Copyright (c) 2003-2004, Mark Borgerding
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.Org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+```
+
 # usrsctp
 ```
 (Copied from the COPYRIGHT file of

Build/iOS/WebRTC.framework/build_env.txt

@@ -3,13 +3,13 @@
 To track down potential future issues, we log some of our build environment details.
 
 webrtc git branch:
-(HEAD detached at 89c6af1578)
+(HEAD detached at 202c6e9519)
 
 webrtc git sha:
-89c6af1578dd6ed086fd144fdd19ae5fa7183435
+202c6e951949a913609151ebce91ff4437d8c4f1
 
 build_script git sha:
-5b38e45b49501ff760a69ff1bf7d6c5a07459b58
+e799057d050b88545b625de79770a4c6186accc7
 
 xcodebuild -version:
 Xcode 9.4.1
@@ -31,5 +31,5 @@ ProductVersion:	10.13.5
 BuildVersion:	17F77
 
 hostname:
-android-d80e0eba8b3d160
+oak.local