Merge branch 'release/2.4.0'

shiguredo · Aug 16, 2019 · a0d0719 · a0d0719
2 parents 756d4bf + d2ce2f5
commit a0d0719
Show file tree

Hide file tree

Showing 26 changed files with 1,418 additions and 936 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,68 @@
 - FIX
     - バグ修正
 
+## 2.4.0
+
+### CHANGE
+
+- システム条件を更新した
+
+  - Xcode 10.3
+
+- WebRTC M76 に対応した
+
+- サイマルキャスト機能に対応した
+
+- スポットライト機能に対応した
+
+- VAD 機能を削除した
+
+- 音声ビットレートの指定に対応した
+
+- シグナリングのメタデータに対応した
+
+- API: `Configuration`: `audioBitRate` プロパティを追加した
+
+- API: `Configuration`: `maxNumberOfSpeakers` プロパティを削除した
+
+- API: `Configuration`: `simulcastEnabled` プロパティを追加した
+
+- API: `Configuration`: `simulcastQuality` プロパティを追加した
+
+- API: `Configuration`: `spotlight` プロパティを追加した
+
+- API: `SimulcastQuality`: 追加した
+
+- API: シグナリングに関する API の名前を変更した
+
+  - `SignalingMessage` -> `Signaling`
+  - `SignalingNotificationEventType` -> `SignalingNotifyEventType`
+  - `SignalingConnectMessage` -> `SignalingConnect`
+  - `SignalingOfferMessage` -> `SignalingOffer`
+  - `SignalingOfferMessage.Configuration` -> `SignalingOffer.Configuration`
+  - `SignalingPongMessage` -> `SignalingPong`
+  - `SignalingPushMessage` -> `SignalingPush`
+
+- API: `SignalingAnswer`: 追加した
+
+- API: `SignalingCandidate`: 追加した
+
+- API: `SignalingClientMetadata`: 追加した
+
+- API: `SignalingMetadata`: 追加した
+
+- API: `SignalingNotifyConnection`: 追加した
+
+- API: `SignalingNotifyNetworkStatus`: 追加した
+
+- API: `SignalingNotifySpotlightChanged`: 追加した
+
+- API: `SignalingOffer.Encoding`: 追加した
+
+- API: `SignalingUpdate`: 追加した
+
+- API: `Signaling`: 追加した
+
 ## 2.3.2
 
 ### CHANGE

diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "shiguredo/sora-webrtc-ios" "66.8.0"
+github "shiguredo/sora-webrtc-ios" "76.3.0"
 github "shiguredo/SocketRocket" "0.5.1-carthage.1"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
 github "shiguredo/SocketRocket" "0.5.1-carthage.1"
-github "shiguredo/sora-webrtc-ios" "66.8.0"
+github "shiguredo/sora-webrtc-ios" "76.3.0"
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Sora iOS SDK に対する有償のサポートについては現在提供して
 - iOS 10.0 以降
 - アーキテクチャ arm64, armv7 (シミュレーターは非対応)
 - macOS 10.14.4 以降
-- Xcode 10.2
+- Xcode 10.3
 - Swift 5.0
 - Carthage 0.33.0 以降、または CocoaPods 1.6.1 以降
 - WebRTC SFU Sora 19.04.0 以降

diff --git a/Sora.podspec b/Sora.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Sora"
-  s.version      = "2.3.2"
+  s.version      = "2.4.0"
   s.summary      = "Sora iOS SDK"
   s.description  = <<-DESC
                    A library to develop Sora client applications.
@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files  = "Carthage/Build/iOS/Sora.framework/Headers/*.h"
   s.frameworks = "SocketRocket"
   s.vendored_frameworks = "Carthage/Build/iOS/Sora.framework"
-  s.dependency "WebRTC", "66.8.0"
+  s.dependency "WebRTC", "76.3.0"
   s.dependency "SocketRocket", "0.5.1"
 end
diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj
@@ -13,14 +13,14 @@
 		910EABE61F4FF88B00D81213 /* NativePeerChannelFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 910EABE51F4FF88B00D81213 /* NativePeerChannelFactory.swift */; };
 		9128A4A91F2A6CB100AC6B1E /* MediaStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9128A4A81F2A6CB100AC6B1E /* MediaStream.swift */; };
 		9138B4D01E655728006A76FB /* WebRTCInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9138B4CF1E655728006A76FB /* WebRTCInfo.swift */; };
+		913C895A226EFC61001B2569 /* Signaling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 913C8959226EFC61001B2569 /* Signaling.swift */; };
 		9141AB641F4204C0007C4D1C /* ConnectionTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9141AB631F4204C0007C4D1C /* ConnectionTimer.swift */; };
 		9145A5901F0CB093002D6EC6 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9145A58F1F0CB093002D6EC6 /* Utilities.swift */; };
 		915344121FE96F750083762B /* SoraError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 915344111FE96F750083762B /* SoraError.swift */; };
 		91554F431F179CFD00403C39 /* WebSocketChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91554F421F179CFD00403C39 /* WebSocketChannel.swift */; };
 		915CEC901F821A90006E45E2 /* CameraVideoCapturer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 915CEC8F1F821A90006E45E2 /* CameraVideoCapturer.swift */; };
 		916134DD1F7B5EFF00ABDDAF /* AspectRatio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9174A88E1F7395CA00D586C4 /* AspectRatio.swift */; };
 		91629BF21F8E5099001193D0 /* Array+Base.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91629BF11F8E5098001193D0 /* Array+Base.swift */; };
-		9163401B1F74F1F300303516 /* RTCPeerConnection+SessionDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9163401A1F74F1F300303516 /* RTCPeerConnection+SessionDescription.swift */; };
 		91672C791F78F7FC002300E7 /* WebRTCConfigration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91672C781F78F7FC002300E7 /* WebRTCConfigration.swift */; };
 		916BBF721F19EF5800846166 /* ICECandidate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 916BBF711F19EF5800846166 /* ICECandidate.swift */; };
 		91705B801DED66D300D79306 /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 918201901D58668E00178E2B /* WebRTC.framework */; };
@@ -48,7 +48,6 @@
 		91C7B0991D54636A006F5FA2 /* SoraTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91C7B0981D54636A006F5FA2 /* SoraTests.swift */; };
 		91CD2A4A1F288A6A00D039D1 /* Sora.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91CD2A491F288A6A00D039D1 /* Sora.swift */; };
 		91FA6F211D93CA9800D38DB4 /* VideoFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91FA6F201D93CA9800D38DB4 /* VideoFrame.swift */; };
-		91FAB3EC1F29130700EDF53C /* SignalingMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91FAB3EB1F29130700EDF53C /* SignalingMessage.swift */; };
 		91FD95751DCA06F700047BA9 /* RTC+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91FD95741DCA06F700047BA9 /* RTC+Description.swift */; };
 		C5D3C7421F7CEB18004660F5 /* VideoCapturerDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5D3C7411F7CEB18004660F5 /* VideoCapturerDevice.swift */; };
 /* End PBXBuildFile section */
@@ -82,13 +81,13 @@
 		910EABE51F4FF88B00D81213 /* NativePeerChannelFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativePeerChannelFactory.swift; sourceTree = "<group>"; };
 		9128A4A81F2A6CB100AC6B1E /* MediaStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaStream.swift; sourceTree = "<group>"; };
 		9138B4CF1E655728006A76FB /* WebRTCInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebRTCInfo.swift; sourceTree = "<group>"; };
+		913C8959226EFC61001B2569 /* Signaling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Signaling.swift; sourceTree = "<group>"; };
 		9141AB631F4204C0007C4D1C /* ConnectionTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionTimer.swift; sourceTree = "<group>"; };
 		9145A58F1F0CB093002D6EC6 /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = "<group>"; };
 		915344111FE96F750083762B /* SoraError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoraError.swift; sourceTree = "<group>"; };
 		91554F421F179CFD00403C39 /* WebSocketChannel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebSocketChannel.swift; sourceTree = "<group>"; };
 		915CEC8F1F821A90006E45E2 /* CameraVideoCapturer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraVideoCapturer.swift; sourceTree = "<group>"; };
 		91629BF11F8E5098001193D0 /* Array+Base.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Base.swift"; sourceTree = "<group>"; };
-		9163401A1F74F1F300303516 /* RTCPeerConnection+SessionDescription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RTCPeerConnection+SessionDescription.swift"; sourceTree = "<group>"; };
 		91672C781F78F7FC002300E7 /* WebRTCConfigration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebRTCConfigration.swift; sourceTree = "<group>"; };
 		916BBF711F19EF5800846166 /* ICECandidate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICECandidate.swift; sourceTree = "<group>"; };
 		9173595D1F2CCEBF00806F8B /* Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
@@ -120,7 +119,6 @@
 		91C7B0A81D5463EA006F5FA2 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
 		91CD2A491F288A6A00D039D1 /* Sora.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sora.swift; sourceTree = "<group>"; };
 		91FA6F201D93CA9800D38DB4 /* VideoFrame.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoFrame.swift; sourceTree = "<group>"; };
-		91FAB3EB1F29130700EDF53C /* SignalingMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignalingMessage.swift; sourceTree = "<group>"; };
 		91FD95741DCA06F700047BA9 /* RTC+Description.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "RTC+Description.swift"; sourceTree = "<group>"; };
 		C5D3C7411F7CEB18004660F5 /* VideoCapturerDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoCapturerDevice.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -162,7 +160,6 @@
 			children = (
 				91629BF11F8E5098001193D0 /* Array+Base.swift */,
 				91FD95741DCA06F700047BA9 /* RTC+Description.swift */,
-				9163401A1F74F1F300303516 /* RTCPeerConnection+SessionDescription.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -209,8 +206,8 @@
 				91A19B8B1F19366B00A76852 /* PeerChannel.swift */,
 				9174A8901F73F89400D586C4 /* Role.swift */,
 				91BD9488204536D9006ED524 /* SDKInfo.swift */,
+				913C8959226EFC61001B2569 /* Signaling.swift */,
 				91A19B891F19366000A76852 /* SignalingChannel.swift */,
-				91FAB3EB1F29130700EDF53C /* SignalingMessage.swift */,
 				91CD2A491F288A6A00D039D1 /* Sora.swift */,
 				915344111FE96F750083762B /* SoraError.swift */,
 				9174A8981F73F9A200D586C4 /* TLSSecurityPolicy.swift */,
@@ -374,7 +371,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "sh $SRCROOT/Sora/info.sh > $SRCROOT/Sora/info.json";
+			shellScript = "sh $SRCROOT/Sora/info.sh > $SRCROOT/Sora/info.json\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -386,8 +383,6 @@
 				91554F431F179CFD00403C39 /* WebSocketChannel.swift in Sources */,
 				91756E221F90ADE900B70C53 /* PeerChannel.swift in Sources */,
 				91A19B8E1F19367700A76852 /* MediaChannel.swift in Sources */,
-				91FAB3EC1F29130700EDF53C /* SignalingMessage.swift in Sources */,
-				9163401B1F74F1F300303516 /* RTCPeerConnection+SessionDescription.swift in Sources */,
 				915CEC901F821A90006E45E2 /* CameraVideoCapturer.swift in Sources */,
 				91672C791F78F7FC002300E7 /* WebRTCConfigration.swift in Sources */,
 				9174A89B1F73F9EE00D586C4 /* CameraPosition.swift in Sources */,
@@ -401,6 +396,7 @@
 				9174A8971F73F93B00D586C4 /* ICETransportPolicy.swift in Sources */,
 				91B1D6461D75E11F00112A4E /* VideoRenderer.swift in Sources */,
 				9177FF9C1F2E2D1600B4FA1A /* VideoCapturer.swift in Sources */,
+				913C895A226EFC61001B2569 /* Signaling.swift in Sources */,
 				91BD9489204536D9006ED524 /* SDKInfo.swift in Sources */,
 				91FD95751DCA06F700047BA9 /* RTC+Description.swift in Sources */,
 				91CD2A4A1F288A6A00D039D1 /* Sora.swift in Sources */,

diff --git a/Sora/AspectRatio.swift b/Sora/AspectRatio.swift
@@ -26,7 +26,8 @@ public enum AspectRatio {
 }
 
 private var aspectRatioTable: PairTable<String, AspectRatio> =
-    PairTable(pairs: [("standard", .standard),
+    PairTable(name: "AspectRatio",
+              pairs: [("standard", .standard),
                       ("wide", .wide)])
 
 /// :nodoc:

diff --git a/Sora/AudioCodec.swift b/Sora/AudioCodec.swift
@@ -1,7 +1,8 @@
 import Foundation
 
 private let descriptionTable: PairTable<String, AudioCodec> =
-    PairTable(pairs: [("default", .default),
+    PairTable(name: "AudioCodec",
+              pairs: [("default", .default),
                       ("OPUS", .opus),
                       ("PCMU", .pcmu)])
 

diff --git a/Sora/CameraPosition.swift b/Sora/CameraPosition.swift
@@ -1,7 +1,8 @@
 import Foundation
 
 private var descriptionTable: PairTable<String, CameraPosition> =
-    PairTable(pairs: [("front", .front),
+    PairTable(name: "CameraPosition",
+              pairs: [("front", .front),
                       ("back", .back)])
 
 /**

diff --git a/Sora/CameraVideoCapturer.swift b/Sora/CameraVideoCapturer.swift
@@ -340,7 +340,8 @@ extension CameraVideoCapturer.Settings: Codable {
 }
 
 private var resolutionTable: PairTable<String, CameraVideoCapturer.Settings.Resolution> =
-    PairTable(pairs: [("qvga240p", .qvga240p),
+    PairTable(name: "CameraVideoCapturer.Settings.Resolution",
+              pairs: [("qvga240p", .qvga240p),
                       ("vga480p", .vga480p),
                       ("hd720p", .hd720p),
                       ("hd1080p", .hd1080p)])