Merge branch 'release/1.2.0'

shiguredo · Sep 15, 2017 · 5f477bd · 5f477bd
2 parents c1e1fc5 + fa6cd2a
commit 5f477bd
Show file tree

Hide file tree

Showing 25 changed files with 362 additions and 134 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,33 @@
 - FIX
     - バグ修正
 
+## 1.2.0
+
+### CHANGE
+
+- WebRTC M60 に対応した
+- Bitcode に対応した
+- スナップショットに対応した
+- リンクするフレームワークに SDWebImage.framework を追加した
+- API: Event.EventType: 次のケースを追加した
+    - ``case Snapshot``
+- API: MediaOption: 次のプロパティを追加した
+    - ``var snapshotEnabled``
+- API: SignalingEventHandlers: 次のメソッドを追加した
+    - ``func onSnapshot(handler: (SignalingSnapshot) -> Void)``
+- API: SignalingSnapshot: 追加した
+- API: Snapshot: 追加した
+- API: VideoFrame
+    - ``var width``: ``Int32`` -> ``Int``
+    - ``var height``: ``Int32`` -> ``Int``
+    - ``var timestamp``: ``CMTime`` -> ``CMTime?``
+- API: VideoFrameHandle: 次のプロパティ名を変更した
+    - ``case webRTC`` -> ``case WebRTC``
+- API: VideoFrameHandle: 次のプロパティを追加した
+    - ``case snapshot``
+- API: VideoView: スナップショットの描画に対応した
+- API: ConnectionController: スナップショットの項目を追加した
+
 ## 1.1.0
 
 ### CHANGE

diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,4 @@
-github "shiguredo/sora-webrtc-ios" "59.1.4"
+github "shiguredo/sora-webrtc-ios" "60.9.1"
 github "shiguredo/SocketRocket" "0.5.1-carthage.1"
 github "shiguredo/unbox" "2.5.0"
+github "shiguredo/SDWebImage" "4.0.0"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,4 @@
+github "shiguredo/SDWebImage" "4.0.0"
 github "shiguredo/SocketRocket" "0.5.1-carthage.1"
-github "shiguredo/sora-webrtc-ios" "59.1.4"
+github "shiguredo/sora-webrtc-ios" "60.9.1"
 github "shiguredo/unbox" "2.5.0"
diff --git a/README.md b/README.md
@@ -13,7 +13,6 @@ Sora iOS SDK は [WebRTC SFU Sora](https://sora.shiguredo.jp) の iOS クライ
 - Xcode 8.3.3 以降
 - Swift 3.1
 - Carthage 0.23.0 以降
-- WebRTC M59
 - WebRTC SFU Sora 17.06 以降
 
 ## サンプル
@@ -43,12 +42,9 @@ Sora iOS SDK に対する有償のサポートについては現在提供して
 
 ### 2.0
 
-- スナップショット機能に対応する
+**2017 年 9 月末リリース予定**
+
+- スクリーンシェア機能
 - パブリッシャーに渡す映像の編集と加工に対応する
 - パブリッシャーに任意の映像を渡せるようにする
 
-### 1.2
-
-- IPv6 に対応する
-- WebRTC.Framework を M60 にアップデートする
-
diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj
@@ -18,10 +18,12 @@
 		9145A5901F0CB093002D6EC6 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9145A58F1F0CB093002D6EC6 /* Utilities.swift */; };
 		91545C0B1EA7AAA900523AAE /* BitRateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91545C0A1EA7AAA900523AAE /* BitRateViewController.swift */; };
 		91577A031D85CB1700A5AF9F /* MediaConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91577A021D85CB1700A5AF9F /* MediaConnection.swift */; };
+		9161BB401F2B31C200569748 /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9161BB3F1F2B31C200569748 /* SDWebImage.framework */; };
 		91705B801DED66D300D79306 /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 918201901D58668E00178E2B /* WebRTC.framework */; };
 		91715A7B1D5DB3B50004C995 /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 918201901D58668E00178E2B /* WebRTC.framework */; };
 		91715A851D5DF2570004C995 /* WebRTC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 918201901D58668E00178E2B /* WebRTC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		91715A861D5DF25B0004C995 /* SocketRocket.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 918201911D58668E00178E2B /* SocketRocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		917EF3461F160B9E00756DF2 /* Snapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 917EF3451F160B9E00756DF2 /* Snapshot.swift */; };
 		918201941D58668E00178E2B /* SocketRocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 918201911D58668E00178E2B /* SocketRocket.framework */; };
 		918A6DF71DA4DDC800028E3E /* Unbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 918A6DF61DA4DDC800028E3E /* Unbox.framework */; };
 		91A2FD551E25421B0081ADF9 /* PeerConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91A2FD541E25421B0081ADF9 /* PeerConnection.swift */; };
@@ -81,6 +83,8 @@
 		9145A58F1F0CB093002D6EC6 /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = "<group>"; };
 		91545C0A1EA7AAA900523AAE /* BitRateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BitRateViewController.swift; sourceTree = "<group>"; };
 		91577A021D85CB1700A5AF9F /* MediaConnection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaConnection.swift; sourceTree = "<group>"; };
+		9161BB3F1F2B31C200569748 /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = Carthage/Build/iOS/SDWebImage.framework; sourceTree = "<group>"; };
+		917EF3451F160B9E00756DF2 /* Snapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Snapshot.swift; sourceTree = "<group>"; };
 		918201901D58668E00178E2B /* WebRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebRTC.framework; path = Carthage/Build/iOS/WebRTC.framework; sourceTree = "<group>"; };
 		918201911D58668E00178E2B /* SocketRocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SocketRocket.framework; path = Carthage/Build/iOS/SocketRocket.framework; sourceTree = "<group>"; };
 		918A6DF61DA4DDC800028E3E /* Unbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Unbox.framework; path = Carthage/Build/iOS/Unbox.framework; sourceTree = "<group>"; };
@@ -114,6 +118,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9161BB401F2B31C200569748 /* SDWebImage.framework in Frameworks */,
 				918201941D58668E00178E2B /* SocketRocket.framework in Frameworks */,
 				918A6DF71DA4DDC800028E3E /* Unbox.framework in Frameworks */,
 				91705B801DED66D300D79306 /* WebRTC.framework in Frameworks */,
@@ -135,6 +140,7 @@
 		9182018E1D58667600178E2B /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				9161BB3F1F2B31C200569748 /* SDWebImage.framework */,
 				918201911D58668E00178E2B /* SocketRocket.framework */,
 				918A6DF61DA4DDC800028E3E /* Unbox.framework */,
 				918201901D58668E00178E2B /* WebRTC.framework */,
@@ -196,6 +202,7 @@
 				91192F731D598E4600F92D78 /* Message.swift */,
 				91A2FD541E25421B0081ADF9 /* PeerConnection.swift */,
 				91FD95741DCA06F700047BA9 /* RTCExtensions.swift */,
+				917EF3451F160B9E00756DF2 /* Snapshot.swift */,
 				9145A58F1F0CB093002D6EC6 /* Utilities.swift */,
 				91FA6F201D93CA9800D38DB4 /* VideoFrame.swift */,
 				91B1D6451D75E11F00112A4E /* VideoRenderer.swift */,
@@ -341,6 +348,7 @@
 				91577A031D85CB1700A5AF9F /* MediaConnection.swift in Sources */,
 				91DD141E1DC872F1005881C2 /* Event.swift in Sources */,
 				91E098841D799389004CF024 /* MediaStream.swift in Sources */,
+				917EF3461F160B9E00756DF2 /* Snapshot.swift in Sources */,
 				9139343A1DD9D9A2002F3F6A /* EventHandlers.swift in Sources */,
 				9138B4D01E655728006A76FB /* BuildInfo.swift in Sources */,
 				91B1D6461D75E11F00112A4E /* VideoRenderer.swift in Sources */,
@@ -495,7 +503,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -526,7 +534,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_BITCODE = NO;
+				ENABLE_BITCODE = YES;
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/Sora/ConnectionController/AudioCodecViewController.swift b/Sora/ConnectionController/AudioCodecViewController.swift
@@ -14,11 +14,8 @@ class AudioCodecViewController: UITableViewController {
         [(.default, self.defaultCell), (.Opus, self.OpusCell), (.PCMU, self.PCMUCell)]
 
 
-    var connectionController: ConnectionController? {
-        get {
-            return (navigationController as! ConnectionNavigationController?)?
-                .connectionController
-        }
+    var connectionController: ConnectionController {
+        get { return ConnectionController.shared }
     }
 
     override func viewDidLoad() {
@@ -27,7 +24,7 @@ class AudioCodecViewController: UITableViewController {
 
     override func willMove(toParentViewController parent: UIViewController?) {
         if parent == nil {
-            connectionController?.audioCodec = selectedCodec
+            connectionController.audioCodec = selectedCodec
         }
     }
 

diff --git a/Sora/ConnectionController/BitRateViewController.swift b/Sora/ConnectionController/BitRateViewController.swift
@@ -18,10 +18,7 @@ class BitRateViewController: UITableViewController {
         [nil, 100, 300, 500, 800, 1000, 1500, 2000, 2500, 3000, 5000]
 
     var connectionController: ConnectionController {
-        get {
-            return (navigationController as! ConnectionNavigationController?)!
-                .connectionController
-        }
+        get { return ConnectionController.shared }
     }
 
     var allValueCells: [UITableViewCell] {

diff --git a/Sora/ConnectionController/ConnectionController.storyboard b/Sora/ConnectionController/ConnectionController.storyboard
@@ -506,12 +506,40 @@
                                             <segue destination="7ng-h1-EHi" kind="show" id="AVN-bg-3wh"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="xJN-Xu-XTA">
+                                        <rect key="frame" x="0.0" y="955" width="320" height="52"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" contentMode="center" tableViewCell="xJN-Xu-XTA" id="cDT-0B-Bb0">
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="51.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable Snapshot" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HQW-Xf-qwH">
+                                                    <rect key="frame" x="20" y="16" width="129" height="21"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NSY-tg-o8w">
+                                                    <rect key="frame" x="243" y="11" width="51" height="31"/>
+                                                    <connections>
+                                                        <action selector="switchSnapshotEnabled:" destination="1nR-he-y4W" eventType="valueChanged" id="XLB-Uv-GwZ"/>
+                                                    </connections>
+                                                </switch>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="HQW-Xf-qwH" firstAttribute="leading" secondItem="cDT-0B-Bb0" secondAttribute="leadingMargin" constant="12" id="JD0-5T-oG2"/>
+                                                <constraint firstItem="NSY-tg-o8w" firstAttribute="centerY" secondItem="cDT-0B-Bb0" secondAttribute="centerY" id="PkX-oa-RBQ"/>
+                                                <constraint firstItem="HQW-Xf-qwH" firstAttribute="centerY" secondItem="cDT-0B-Bb0" secondAttribute="centerY" id="X5T-2o-Afm"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="NSY-tg-o8w" secondAttribute="trailing" constant="20" id="f9v-M1-JeE"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
                                 </cells>
                             </tableViewSection>
                             <tableViewSection headerTitle=" Audio" id="2GC-Ls-yf7">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="2HA-gi-nJ0">
-                                        <rect key="frame" x="0.0" y="1011" width="320" height="52"/>
+                                        <rect key="frame" x="0.0" y="1063" width="320" height="52"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2HA-gi-nJ0" id="xNc-sW-e67">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="51.5"/>
@@ -540,7 +568,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="fZ7-UR-oy0">
-                                        <rect key="frame" x="0.0" y="1063" width="320" height="52"/>
+                                        <rect key="frame" x="0.0" y="1115" width="320" height="52"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fZ7-UR-oy0" id="BY6-yi-eUQ">
                                             <rect key="frame" x="0.0" y="0.0" width="287" height="51.5"/>
@@ -579,7 +607,7 @@
                             <tableViewSection headerTitle="Build Info" id="Wxg-Vb-2Gi">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="ZzL-Eh-yuA">
-                                        <rect key="frame" x="0.0" y="1171" width="320" height="52"/>
+                                        <rect key="frame" x="0.0" y="1223" width="320" height="52"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZzL-Eh-yuA" id="EK4-tb-R6f">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="51.5"/>
@@ -611,7 +639,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="yUi-lD-Bfy">
-                                        <rect key="frame" x="0.0" y="1223" width="320" height="52"/>
+                                        <rect key="frame" x="0.0" y="1275" width="320" height="52"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yUi-lD-Bfy" id="AmS-zH-uRa">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="51.5"/>
@@ -684,6 +712,8 @@
                         <outlet property="enableMicrophoneSwitch" destination="265-Jb-c3B" id="svu-Qi-euo"/>
                         <outlet property="enableMultistreamLabel" destination="crp-wV-AgE" id="rxQ-I9-5gk"/>
                         <outlet property="enableMultistreamSwitch" destination="BHD-gB-4yj" id="AkU-fU-Kda"/>
+                        <outlet property="enableSnapshotLabel" destination="HQW-Xf-qwH" id="Dui-dE-F6A"/>
+                        <outlet property="enableSnapshotSwitch" destination="NSY-tg-o8w" id="YQ0-ec-KPo"/>
                         <outlet property="enableVideoLabel" destination="dL5-RL-3Ec" id="Krh-w8-9JJ"/>
                         <outlet property="enableVideoSwitch" destination="if8-Ug-MaX" id="sda-fd-33g"/>
                         <outlet property="enableWebSocketSSLLabel" destination="EXc-lo-yz9" id="iC0-br-cGz"/>