From 973c20d2a99c2e6d289588b35b3de0be902de427 Mon Sep 17 00:00:00 2001 From: voluntas Date: Thu, 23 Jan 2020 21:54:47 +0900 Subject: [PATCH 01/13] 2019 -> 2020 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b4ad0565..ffbd5d92 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Xcode と Swift のバージョンによっては、 CocoaPods で取得でき Apache License 2.0 ``` -Copyright 2017-2019, Shiguredo Inc. and Masashi Ono (akisute) +Copyright 2017-2020, Shiguredo Inc. and Masashi Ono (akisute) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From a074a19df83fb810f993100796d76b8c63a2de1d Mon Sep 17 00:00:00 2001 From: voluntas Date: Mon, 17 Feb 2020 10:45:00 +0900 Subject: [PATCH 02/13] =?UTF-8?q?Discord=20=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ffbd5d92..b63821ad 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,16 @@ Sora iOS SDK は [WebRTC SFU Sora](https://sora.shiguredo.jp) の iOS クライ We check PRs or Issues only when written in JAPANESE. In other languages, we won't be able to deal with them. Thank you for your understanding. -## サポートについて +## Discord -Sora iOS SDK に関する質問・要望・バグなどの報告は Issues の利用をお願いします。 +https://discord.gg/Ac9fJ9S + +Sora iOS SDK に関する質問・要望などの報告は Disocrd へお願いします。 + +バグに関してはまず Discord へお願いします。 ただし、 Sora のライセンス契約の有無に関わらず、 Issue への応答時間と問題の解決を保証しませんのでご了承ください。 -Sora iOS SDK に対する有償のサポートについては現在提供しておりません。 +Sora iOS SDK に対する有償のサポートについては提供しておりません。 ## システム条件 From 46f69cd6695b428bddeb9d989133e8db2de7e86c Mon Sep 17 00:00:00 2001 From: SUZUKI Tetsuya Date: Sat, 22 Feb 2020 21:36:46 +0900 Subject: [PATCH 03/13] =?UTF-8?q?onRemoveMediaChannel=20=E3=82=92=E5=91=BC?= =?UTF-8?q?=E3=81=B6=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sora/Sora.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sora/Sora.swift b/Sora/Sora.swift index c5c2e3a9..03b2a386 100644 --- a/Sora/Sora.swift +++ b/Sora/Sora.swift @@ -149,7 +149,7 @@ public final class Sora { if mediaChannels.contains(mediaChannel) { Logger.debug(type: .sora, message: "remove media channel") mediaChannels.remove(mediaChannel) - handlers.onAddMediaChannel?(mediaChannel) + handlers.onRemoveMediaChannel?(mediaChannel) } } } From 2fc78cc2cb05d2e7d22ea328d0edb1d98fb6cb22 Mon Sep 17 00:00:00 2001 From: SUZUKI Tetsuya Date: Sat, 22 Feb 2020 21:46:36 +0900 Subject: [PATCH 04/13] =?UTF-8?q?=E3=83=91=E3=83=83=E3=83=81=E9=81=A9?= =?UTF-8?q?=E7=94=A8=E6=B8=88=E3=81=BF=E3=81=AE=20libwebrtc=20=E3=82=92?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile b/Podfile index 63919099..899aaedd 100644 --- a/Podfile +++ b/Podfile @@ -5,6 +5,6 @@ platform :ios, '10.0' target 'Sora' do use_frameworks! - pod 'WebRTC', '79.5.0' + pod 'WebRTC', '79.5.0-shiguredo' pod 'Starscream', '3.1.1' end From 3e83c8beaa8f40db3e3e1f424dd97138aa03dc62 Mon Sep 17 00:00:00 2001 From: NAKAI Ryosuke Date: Mon, 24 Feb 2020 12:40:16 +0900 Subject: [PATCH 05/13] =?UTF-8?q?THANKS=20=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- THANKS | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 THANKS diff --git a/README.md b/README.md index b63821ad..0d84057f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Sora iOS SDK -[![CircleCI branch](https://img.shields.io/circleci/project/github/shiguredo/sora-ios-sdk/develop.svg)](https://github.com/shiguredo/sora-ios-sdk) +[![CircleCI branch](https://img.shields.io/circleci/project/github/shiguredo/sora-ios-sdk/develop.svg)](https://github.com/shiguredo/sora-ios-sdk) [![GitHub tag](https://img.shields.io/github/tag/shiguredo/sora-ios-sdk.svg)](https://github.com/shiguredo/sora-ios-sdk) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) @@ -19,7 +19,7 @@ https://discord.gg/Ac9fJ9S Sora iOS SDK に関する質問・要望などの報告は Disocrd へお願いします。 -バグに関してはまず Discord へお願いします。 +バグに関してはまず Discord へお願いします。 ただし、 Sora のライセンス契約の有無に関わらず、 Issue への応答時間と問題の解決を保証しませんのでご了承ください。 Sora iOS SDK に対する有償のサポートについては提供しておりません。 @@ -58,7 +58,7 @@ Xcode と Swift のバージョンによっては、 CocoaPods で取得でき Apache License 2.0 ``` -Copyright 2017-2020, Shiguredo Inc. and Masashi Ono (akisute) +Copyright 2017-2020, Shiguredo Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/THANKS b/THANKS new file mode 100644 index 00000000..3899c964 --- /dev/null +++ b/THANKS @@ -0,0 +1,4 @@ +以下の人が Sora iOS SDK に貢献しています: + +akisute + From 14e5a82098837a0363f753249a09eadcb009b059 Mon Sep 17 00:00:00 2001 From: NAKAI Ryosuke Date: Mon, 24 Feb 2020 12:42:14 +0900 Subject: [PATCH 06/13] =?UTF-8?q?THANKS=20=E3=81=AB=E8=B2=A2=E7=8C=AE?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=8F=E3=82=8C=E3=81=9F=E4=BA=BA=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- THANKS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/THANKS b/THANKS index 3899c964..ddfd9353 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,9 @@ 以下の人が Sora iOS SDK に貢献しています: akisute - +daihase +m-yoshimo +FromAtom +hkk +tamiyoshi-naka +soudegesu From 451616adec98ecd7189d6cd4251d8bc539c1ea69 Mon Sep 17 00:00:00 2001 From: SUZUKI Tetsuya Date: Mon, 24 Feb 2020 15:55:42 +0900 Subject: [PATCH 07/13] =?UTF-8?q?=E9=85=8D=E4=BF=A1=E6=99=82=E3=81=AE?= =?UTF-8?q?=E3=81=BF=E3=83=9E=E3=82=A4=E3=82=AF=E3=82=92=E5=88=9D=E6=9C=9F?= =?UTF-8?q?=E5=8C=96=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sora/PeerChannel.swift | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Sora/PeerChannel.swift b/Sora/PeerChannel.swift index 9acf31cb..cc2cbe09 100644 --- a/Sora/PeerChannel.swift +++ b/Sora/PeerChannel.swift @@ -444,8 +444,10 @@ class BasicPeerChannelContext: NSObject, RTCPeerConnectionDelegate { var onConnectHandler: ((Error?) -> Void)? - private var lock: Lock + var isAudioInputInitialized: Bool = false + private var lock: Lock + init(channel: BasicPeerChannel) { self.channel = channel lock = Lock() @@ -610,6 +612,27 @@ class BasicPeerChannelContext: NSObject, RTCPeerConnectionDelegate { } } + if configuration.audioEnabled { + if !isAudioInputInitialized { + Logger.debug(type: .peerChannel, + message: "audio input is already initialized") + } else { + Logger.debug(type: .peerChannel, + message: "initialize audio input") + RTCAudioSession.sharedInstance().initializeInput { error in + if let error = error { + Logger.debug(type: .peerChannel, + message: "failed to initialize audio input => \(error.localizedDescription)") + return + } + + Logger.debug(type: .peerChannel, + message: "audio input is initialized") + } + isAudioInputInitialized = true + } + } + if let track = stream.nativeVideoTrack { nativeChannel.add(track, streamIds: [stream.nativeStream.streamId]) From 89a11f3c70fc32be8a6c9384102badcdd291f6ee Mon Sep 17 00:00:00 2001 From: SUZUKI Tetsuya Date: Mon, 24 Feb 2020 15:55:55 +0900 Subject: [PATCH 08/13] =?UTF-8?q?=E3=83=AD=E3=82=B0=E5=87=BA=E5=8A=9B?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sora/PeerChannel.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Sora/PeerChannel.swift b/Sora/PeerChannel.swift index cc2cbe09..3708d949 100644 --- a/Sora/PeerChannel.swift +++ b/Sora/PeerChannel.swift @@ -598,6 +598,8 @@ class BasicPeerChannelContext: NSObject, RTCPeerConnectionDelegate { if configuration.videoEnabled { switch configuration.videoCapturerDevice { case .camera(let settings): + Logger.debug(type: .peerChannel, + message: "initialize video capture device") // カメラが指定されている場合は、接続処理と同時にデフォルトのCameraVideoCapturerを使用してキャプチャを開始する if CameraVideoCapturer.shared.isRunning { CameraVideoCapturer.shared.stop() From 7e622c2f3992c57cf91b78a2c41e58f029086de8 Mon Sep 17 00:00:00 2001 From: SUZUKI Tetsuya Date: Tue, 25 Feb 2020 15:47:41 +0900 Subject: [PATCH 09/13] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 57073f92..2edf3c90 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,18 @@ - FIX - バグ修正 + +## 2020.2 + +### CHANGE + +- 受信時にマイクのパーミッションを要求しないようにした + +### FIX + +- ``Sora.remove(mediaChannel:)`` 実行時に ``onRemoveMediaChannel`` が呼ばれない事象を修正した + + ## 2020.1 本バージョンよりバージョン表記を「リリース年.リリース回数」に変更した。 From 7f5c95094120077870f146c74f69525436499b59 Mon Sep 17 00:00:00 2001 From: SUZUKI Tetsuya Date: Tue, 25 Feb 2020 15:48:01 +0900 Subject: [PATCH 10/13] =?UTF-8?q?Podspec=20=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sora.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sora.podspec b/Sora.podspec index f6893118..be176dde 100644 --- a/Sora.podspec +++ b/Sora.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Sora" - s.version = "2020.1" + s.version = "2020.2" s.summary = "Sora iOS SDK" s.description = <<-DESC A library to develop Sora client applications. @@ -16,6 +16,6 @@ Pod::Spec.new do |s| s.source_files = "Sora/**/*.swift" s.resources = ['Sora/info.json', 'Sora/*.xib'] s.prepare_command = 'sh Sora/info.sh' - s.dependency "WebRTC", "79.5.0" + s.dependency "WebRTC", "79.5.0-shiguredo" s.dependency "Starscream", "3.1.1" end From 60b093b4ec73e6f4482afaf159f9696a77f9ef52 Mon Sep 17 00:00:00 2001 From: SUZUKI Tetsuya Date: Tue, 25 Feb 2020 15:48:35 +0900 Subject: [PATCH 11/13] =?UTF-8?q?=E8=A8=98=E8=BC=89=E9=A0=86=E5=BA=8F?= =?UTF-8?q?=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E8=A8=98=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- THANKS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THANKS b/THANKS index ddfd9353..062627e1 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -以下の人が Sora iOS SDK に貢献しています: +以下の人が Sora iOS SDK に貢献しています (アルファベット順) : akisute daihase From 6fa81f544ff223553ab932fe9ffd0d8f15400c93 Mon Sep 17 00:00:00 2001 From: SUZUKI Tetsuya Date: Tue, 25 Feb 2020 15:48:55 +0900 Subject: [PATCH 12/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- THANKS | 1 + 1 file changed, 1 insertion(+) diff --git a/THANKS b/THANKS index 062627e1..7e435adb 100644 --- a/THANKS +++ b/THANKS @@ -6,4 +6,5 @@ m-yoshimo FromAtom hkk tamiyoshi-naka +tsuba-h soudegesu From 4c8a03999857e1083cca347645a65670103aff97 Mon Sep 17 00:00:00 2001 From: SUZUKI Tetsuya Date: Tue, 25 Feb 2020 16:25:42 +0900 Subject: [PATCH 13/13] =?UTF-8?q?Xcode:=20Identity=20=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E4=B8=8A=E3=81=92?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sora.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj index e454668c..a6a0ea77 100644 --- a/Sora.xcodeproj/project.pbxproj +++ b/Sora.xcodeproj/project.pbxproj @@ -568,7 +568,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 2020.1; + MARKETING_VERSION = 2020.2; PRODUCT_BUNDLE_IDENTIFIER = jp.shiguredo.sora.ios.sdk.Sora; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "";