60.9.18252 release

WebRTC.framework/Headers/RTCAudioSource.h

@@ -20,11 +20,11 @@ RTC_EXPORT
 
 - (instancetype)init NS_UNAVAILABLE;
 
-// Sets the volume for the RTCMediaSource. |volume] is a gain value in the range
+// Sets the volume for the RTCMediaSource. |volume| is a gain value in the range
 // [0, 10].
-// Temporary fix to be able to modify volume of remote audio tracks
-// TODO: property stays here temporarily until a proper volume-api is avaialble
-// on the surface exposed by webrtc
+// Temporary fix to be able to modify volume of remote audio tracks.
+// TODO(kthelgason): Property stays here temporarily until a proper volume-api
+// is available on the surface exposed by webrtc.
 @property(nonatomic, assign) double volume;
 
 @end

WebRTC.framework/Headers/RTCCameraVideoCapturer.h

@@ -0,0 +1,40 @@
+/*
+ *  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>
+#import <WebRTC/RTCVideoCapturer.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+RTC_EXPORT
+// Camera capture that implements RTCVideoCapturer. Delivers frames to a RTCVideoCapturerDelegate
+// (usually RTCVideoSource).
+@interface RTCCameraVideoCapturer : RTCVideoCapturer
+
+// Capture session that is used for capturing. Valid from initialization to dealloc.
+@property(readonly, nonatomic) AVCaptureSession *captureSession;
+
+// Returns list of available capture devices that support video capture.
++ (NSArray<AVCaptureDevice *> *)captureDevices;
+// Returns list of formats that are supported by this class for this device.
++ (NSArray<AVCaptureDeviceFormat *> *)supportedFormatsForDevice:(AVCaptureDevice *)device;
+
+// Starts and stops the capture session asynchronously.
+- (void)startCaptureWithDevice:(AVCaptureDevice *)device
+                        format:(AVCaptureDeviceFormat *)format
+                           fps:(NSInteger)fps;
+// Stops the capture session asynchronously.
+- (void)stopCapture;
+
+@end
+
+NS_ASSUME_NONNULL_END

WebRTC.framework/Headers/RTCConfiguration.h

@@ -109,7 +109,7 @@ RTC_EXPORT
  */
 @property(nonatomic, copy, nullable) NSNumber *iceCheckMinInterval;
 
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
+- (instancetype)init;
 
 @end
 

WebRTC.framework/Headers/RTCDispatcher.h

@@ -37,4 +37,9 @@ RTC_EXPORT
 + (void)dispatchAsyncOnType:(RTCDispatcherQueueType)dispatchType
                       block:(dispatch_block_t)block;
 
+/** Returns YES if run on queue for the dispatchType otherwise NO.
+ *  Useful for asserting that a method is run on a correct queue.
+ */
++ (BOOL)isOnQueueForType:(RTCDispatcherQueueType)dispatchType;
+
 @end

WebRTC.framework/Headers/RTCFieldTrials.h

@@ -19,6 +19,7 @@ RTC_EXTERN NSString * const kRTCFieldTrialFlexFec03AdvertisedKey;
 RTC_EXTERN NSString * const kRTCFieldTrialFlexFec03Key;
 RTC_EXTERN NSString * const kRTCFieldTrialImprovedBitrateEstimateKey;
 RTC_EXTERN NSString * const kRTCFieldTrialH264HighProfileKey;
+RTC_EXTERN NSString * const kRTCFieldTrialMinimizeResamplingOnMobileKey;
 
 /** The valid value for field trials above. */
 RTC_EXTERN NSString * const kRTCFieldTrialEnabledValue;

WebRTC.framework/Headers/RTCMTLVideoView.h

@@ -12,16 +12,25 @@
 
 #import "WebRTC/RTCVideoRenderer.h"
 
+// Check if metal is supported in WebRTC.
+// NOTE: Currently arm64 == Metal.
+#if defined(__aarch64__)
+#define RTC_SUPPORTS_METAL
+#endif
+
 NS_ASSUME_NONNULL_BEGIN
-RTC_EXPORT
 
 /**
  * RTCMTLVideoView is thin wrapper around MTKView.
  *
  * It has id<RTCVideoRenderer> property that renders video frames in the view's
  * bounds using Metal.
+ * NOTE: always check if metal is available on the running device via
+ * RTC_SUPPORTS_METAL macro before initializing this class.
  */
 NS_CLASS_AVAILABLE_IOS(9)
+
+RTC_EXPORT
 @interface RTCMTLVideoView : UIView <RTCVideoRenderer>
 
 @end

WebRTC.framework/Headers/RTCPeerConnection.h

@@ -123,6 +123,7 @@ RTC_EXPORT
 @property(nonatomic, readonly) RTCSignalingState signalingState;
 @property(nonatomic, readonly) RTCIceConnectionState iceConnectionState;
 @property(nonatomic, readonly) RTCIceGatheringState iceGatheringState;
+@property(nonatomic, readonly, copy) RTCConfiguration *configuration;
 
 /** Gets all RTCRtpSenders associated with this peer connection.
  *  Note: reading this property returns different instances of RTCRtpSender.

WebRTC.framework/Headers/RTCPeerConnectionFactory.h

@@ -46,6 +46,11 @@ RTC_EXPORT
 - (RTCAVFoundationVideoSource *)avFoundationVideoSourceWithConstraints:
     (nullable RTCMediaConstraints *)constraints;
 
+/** Initialize a generic RTCVideoSource. The RTCVideoSource should be passed to a RTCVideoCapturer
+ *  implementation, e.g. RTCCameraVideoCapturer, in order to produce frames.
+ */
+- (RTCVideoSource *)videoSource;
+
 /** Initialize an RTCVideoTrack with a source and an id. */
 - (RTCVideoTrack *)videoTrackWithSource:(RTCVideoSource *)source
                                 trackId:(NSString *)trackId;

WebRTC.framework/Headers/RTCVideoCapturer.h

@@ -0,0 +1,31 @@
+/*
+ *  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 <WebRTC/RTCVideoFrame.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class RTCVideoCapturer;
+
+RTC_EXPORT
+@protocol RTCVideoCapturerDelegate <NSObject>
+- (void)capturer:(RTCVideoCapturer *)capturer didCaptureVideoFrame:(RTCVideoFrame *)frame;
+@end
+
+RTC_EXPORT
+@interface RTCVideoCapturer : NSObject
+
+@property(nonatomic, readonly, weak) id<RTCVideoCapturerDelegate> delegate;
+
+- (instancetype)initWithDelegate:(id<RTCVideoCapturerDelegate>)delegate;
+
+@end
+
+NS_ASSUME_NONNULL_END

WebRTC.framework/Headers/RTCVideoSource.h

@@ -12,14 +12,26 @@
 
 #import <WebRTC/RTCMacros.h>
 #import <WebRTC/RTCMediaSource.h>
+#import <WebRTC/RTCVideoCapturer.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 RTC_EXPORT
-@interface RTCVideoSource : RTCMediaSource
+
+@interface RTCVideoSource : RTCMediaSource <RTCVideoCapturerDelegate>
 
 - (instancetype)init NS_UNAVAILABLE;
 
+/**
+ * Calling this function will cause frames to be scaled down to the
+ * requested resolution. Also, frames will be cropped to match the
+ * requested aspect ratio, and frames will be dropped to match the
+ * requested fps. The requested aspect ratio is orientation agnostic and
+ * will be adjusted to maintain the input orientation, so it doesn't
+ * matter if e.g. 1280x720 or 720x1280 is requested.
+ */
+- (void)adaptOutputFormatToWidth:(int)width height:(int)height fps:(int)fps;
+
 @end
 
 NS_ASSUME_NONNULL_END

WebRTC.framework/Headers/UIDevice+RTCDevice.h

@@ -59,5 +59,6 @@ typedef NS_ENUM(NSInteger, RTCDeviceType) {
 
 + (RTCDeviceType)deviceType;
 + (NSString *)stringForDeviceType:(RTCDeviceType)deviceType;
++ (BOOL)isIOS9OrLater;
 
 @end

WebRTC.framework/Headers/WebRTC.h

@@ -11,6 +11,7 @@
 #import <WebRTC/RTCAVFoundationVideoSource.h>
 #import <WebRTC/RTCAudioSource.h>
 #import <WebRTC/RTCAudioTrack.h>
+#import <WebRTC/RTCCameraVideoCapturer.h>
 #if TARGET_OS_IPHONE
 #import <WebRTC/RTCCameraPreviewView.h>
 #endif
@@ -20,6 +21,7 @@
 #import <WebRTC/RTCDispatcher.h>
 #if TARGET_OS_IPHONE
 #import <WebRTC/RTCEAGLVideoView.h>
+#import <WebRTC/RTCMTLVideoView.h>
 #endif
 #import <WebRTC/RTCFieldTrials.h>
 #import <WebRTC/RTCFileLogger.h>
@@ -34,7 +36,6 @@
 #import <WebRTC/RTCMediaStreamTrack.h>
 #import <WebRTC/RTCMetrics.h>
 #import <WebRTC/RTCMetricsSampleInfo.h>
-#import <WebRTC/RTCMTLVideoView.h>
 #import <WebRTC/RTCPeerConnection.h>
 #import <WebRTC/RTCPeerConnectionFactory.h>
 #import <WebRTC/RTCRtpCodecParameters.h>