Merge branch 'release/1.2.4'

CHANGES.md

@@ -9,6 +9,20 @@
 - FIX
     - バグ修正
 
+## 1.2.4
+
+### CHANGE
+
+- armv7 に対応した
+
+- API: MediaOption を struct に変更した
+
+- API: ConnectionController: ロールとストリーム種別の選択制限を削除した
+
+### FIX
+
+- API: マルチストリーム時、配信者のストリームが二重に生成されてしまう現象を修正した
+
 ## 1.2.3
 
 ### CHANGE

Cartfile

@@ -1,4 +1,4 @@
-github "shiguredo/sora-webrtc-ios" "60.9.1"
+github "shiguredo/sora-webrtc-ios" "60.9.2"
 github "shiguredo/SocketRocket" "0.5.1-carthage.1"
 github "shiguredo/unbox" "2.5.0"
 github "shiguredo/SDWebImage" "4.0.0"

Cartfile.resolved

@@ -1,4 +1,4 @@
 github "shiguredo/SDWebImage" "4.0.0"
 github "shiguredo/SocketRocket" "0.5.1-carthage.1"
-github "shiguredo/sora-webrtc-ios" "60.9.1"
+github "shiguredo/sora-webrtc-ios" "60.9.2"
 github "shiguredo/unbox" "2.5.0"

README.md

@@ -9,6 +9,7 @@ Sora iOS SDK は [WebRTC SFU Sora](https://sora.shiguredo.jp) の iOS クライ
 ## システム条件
 
 - iOS 10.0 以降 (シミュレーターは非対応)
+- アーキテクチャ arm64, armv7
 - Mac OS X 10.12.5 以降
 - Xcode 8.3.3 以降
 - Swift 3.1

Sora.xcodeproj/project.pbxproj

@@ -397,6 +397,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					arm64,
+					armv7,
+				);
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -438,9 +442,10 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PROVISIONING_PROFILE = "49e345ee-1e24-4cef-9228-9df5fc1f7525";
 				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = arm64;
+				VALID_ARCHS = "arm64 armv7";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -450,6 +455,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					arm64,
+					armv7,
+				);
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -482,12 +491,14 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = NO;
 				PROVISIONING_PROFILE = "49e345ee-1e24-4cef-9228-9df5fc1f7525";
 				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
-				VALID_ARCHS = arm64;
+				VALID_ARCHS = "arm64 armv7";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -520,7 +531,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
-				VALID_ARCHS = arm64;
+				VALID_ARCHS = "arm64 armv7";
 			};
 			name = Debug;
 		};
@@ -550,7 +561,7 @@
 				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 3.0;
-				VALID_ARCHS = arm64;
+				VALID_ARCHS = "arm64 armv7";
 			};
 			name = Release;
 		};

Sora/ConnectionController/ConnectionController.swift

@@ -19,11 +19,6 @@ public class ConnectionController: UIViewController {
         }
     }
 
-    public enum StreamType {
-        case single
-        case multiple
-    }
-
     public class Request {
 
         public var URL: URL
@@ -105,30 +100,19 @@ public class ConnectionController: UIViewController {
     public var audioEnabled: Bool = true
     public var audioCodec: AudioCodec? = .default
 
-    public var availableRoles: [Role] = [.publisher, .subscriber]
-    public var availableStreamTypes: [StreamType] = [.single, .multiple]
     public var userDefaultsSuiteName: String? = "jp.shiguredo.SoraConnectionController"
 
     public var userDefaults: UserDefaults? {
         get { return UserDefaults(suiteName: userDefaultsSuiteName) }
     }
 
-    var tupleOfAvailableStreamTypes: (Bool, Bool) {
-        get {
-            return (availableStreamTypes.contains(.single),
-                    availableStreamTypes.contains(.multiple))
-        }
-    }
-
     // MARK: Initialization
 
     public init(WebSocketSSLEnabled: Bool = true,
                 host: String? = nil,
                 port: Int? = nil,
                 signalingPath: String? = "signaling",
                 channelId: String? = nil,
-                availableRoles: [Role]? = nil,
-                availableStreamTypes: [StreamType]? = nil,
                 userDefaultsSuiteName: String? = nil,
                 useUserDefaults: Bool = true) {
         super.init(nibName: nil, bundle: nil)
@@ -150,12 +134,6 @@ public class ConnectionController: UIViewController {
         self.port = port
         self.signalingPath = signalingPath
         self.channelId = channelId
-        if let roles = availableRoles {
-            self.availableRoles = roles
-        }
-        if let streamTypes = availableStreamTypes {
-            self.availableStreamTypes = streamTypes
-        }
         self.userDefaultsSuiteName = userDefaultsSuiteName
 
         if useUserDefaults {

Sora/ConnectionController/ConnectionViewController.swift

@@ -302,19 +302,6 @@ class ConnectionViewController: UITableViewController {
 
         updateControls()
 
-        switch shared.tupleOfAvailableStreamTypes {
-        case (true, true), (false, false):
-            break
-        case (true, false):
-            enableMultistreamLabel.textColor = UIColor.lightGray
-            enableMultistreamSwitch.isOn = false
-            enableMultistreamSwitch.isEnabled = false
-        case (false, true):
-            enableMultistreamLabel.textColor = UIColor.lightGray
-            enableMultistreamSwitch.isOn = true
-            enableMultistreamSwitch.isEnabled = false
-        }
-
         // build info
         if let version = BuildInfo.WebRTCVersion {
             WebRTCVersionValueLabel.text = version
@@ -384,6 +371,7 @@ class ConnectionViewController: UITableViewController {
         let labels: [UILabel] = [
             enableWebSocketSSLLabel, hostLabel, portLabel,
             signalingPathLabel, channelIdLabel, roleLabel,
+            enableMultistreamLabel,
             enableVideoLabel, videoCodecLabel,
             bitRateLabel, enableSnapshotLabel,
             enableAudioLabel, audioCodecLabel,
@@ -392,12 +380,6 @@ class ConnectionViewController: UITableViewController {
             label.isEnabled = isEnabled
         }
 
-        switch shared.tupleOfAvailableStreamTypes {
-        case (true, false), (false, true):
-            enableMultistreamLabel.isEnabled = false
-        default:
-            enableMultistreamLabel.isEnabled = true
-        }
 
         let fields: [UITextField] = [hostTextField,
                                      portTextField,

Sora/ConnectionController/RoleViewController.swift

@@ -26,16 +26,8 @@ class RoleViewController: UITableViewController {
         didSet {
             for comp in components {
                 comp.cell.accessoryType = .none
-                if connectionController.availableRoles.contains(comp.role) {
-                    comp.label.textColor = UIColor.black
-                    comp.cell.isUserInteractionEnabled = true
-                    if selectedRoles.contains(comp.role) {
-                        comp.cell.accessoryType = .checkmark
-                    }
-                } else {
-                    comp.label.textColor = UIColor.lightGray
-                    comp.cell.isUserInteractionEnabled = false
-                }
+                comp.label.textColor = UIColor.lightGray
+                comp.cell.isUserInteractionEnabled = false
             }
         }
     }

Sora/MediaCapturer.swift

@@ -3,22 +3,24 @@ import WebRTC
 
 class MediaCapturer {
 
+    public var mediaOption: MediaOption?
     public var videoCaptureTrack: RTCVideoTrack
     public var videoCaptureSource: RTCAVFoundationVideoSource
     public var audioCaptureTrack: RTCAudioTrack
     public var cameraVideoCapturer: RTCCameraVideoCapturer?
 
     init(factory: RTCPeerConnectionFactory, mediaOption: MediaOption?) {
+        self.mediaOption = mediaOption
         videoCaptureSource = factory
             .avFoundationVideoSource(with:
                 mediaOption?.videoCaptureSourceMediaConstraints ??
                     MediaOption.defaultMediaConstraints)
         videoCaptureTrack = factory
             .videoTrack(with: videoCaptureSource,
-                        trackId: mediaOption?.videoCaptureTrackId ??
+                        trackId: self.mediaOption?.videoCaptureTrackId ??
                             MediaOption.createCaptureTrackId())
         audioCaptureTrack = factory
-            .audioTrack(withTrackId: mediaOption?.audioCaptureTrackId ??
+            .audioTrack(withTrackId: self.mediaOption?.audioCaptureTrackId ??
                 MediaOption.createCaptureTrackId())
     }
 

Sora/MediaOption.swift

@@ -18,7 +18,7 @@ public enum AudioCodec {
 
 }
 
-public class MediaOption {
+public struct MediaOption {
 
     public var videoCodec: VideoCodec = .default
     public var audioCodec: AudioCodec = .default

Sora/Message.swift

@@ -208,9 +208,9 @@ struct SignalingConnect {
 
         // スナップショットの設定
         if mediaOption.snapshotEnabled {
-            mediaOption.videoCodec = .VP8
-            mediaOption.videoEnabled = true
-            mediaOption.audioEnabled = true
+            self.mediaOption.videoCodec = .VP8
+            self.mediaOption.videoEnabled = true
+            self.mediaOption.audioEnabled = true
         }
     }
 

Sora/PeerConnection.swift

@@ -997,11 +997,10 @@ class PeerConnectionContext: NSObject, SRWebSocketDelegate, RTCPeerConnectionDel
                 return
             }
 
-            peerConnectionEventHandlers?.onAddStreamHandler?(nativePeerConnection, stream)
-            nativePeerConnection.add(stream)
             let wrap = MediaStream(peerConnection: peerConnection!,
                                    nativeMediaStream: stream)
             peerConnection!.mediaConnection!.addMediaStream(wrap)
+            peerConnectionEventHandlers?.onAddStreamHandler?(nativePeerConnection, stream)
 
         }
     }
@@ -1015,10 +1014,9 @@ class PeerConnectionContext: NSObject, SRWebSocketDelegate, RTCPeerConnectionDel
             break
 
         default:
+            peerConnection?.mediaConnection?.removeMediaStream(stream.streamId)
             peerConnectionEventHandlers?
                 .onRemoveStreamHandler?(nativePeerConnection, stream)
-            nativePeerConnection.remove(stream)
-            peerConnection?.mediaConnection?.removeMediaStream(stream.streamId)
         }
     }