Merge branch 'hotfix/2021.1.1'

shiguredo · Jul 1, 2021 · 1846078 · 1846078
2 parents cd4a1b7 + bdc85cb
commit 1846078
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 33 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,13 @@
 - FIX
     - バグ修正
 
+## 2021.1.1
+
+- [FIX] Sora への接続時に simulcast_rid を指定するとエラーになる現象を修正する
+  - @enm10k
+- [CHANGE] enum class SimulcastRid の定義を `jp.shiguredo.sora.sdk.channel.signaling.message` から `jp.shiguredo.sora.sdk.channel.option.SoraVideoOption` に移動する
+  - @enm10k
+
 ## 2021.1
 
 - [CHANGE] SoraAudioOption.Codec から PCMU を外す

diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraMediaOption.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraMediaOption.kt
@@ -1,7 +1,6 @@
 package jp.shiguredo.sora.sdk.channel.option
 
 import jp.shiguredo.sora.sdk.Sora
-import jp.shiguredo.sora.sdk.channel.signaling.message.SimulcastRid
 import org.webrtc.*
 
 /**
@@ -20,7 +19,7 @@ class SoraMediaOption {
     internal var multistreamEnabled     = false
     internal var spotlightOption: SoraSpotlightOption? = null
     internal var simulcastEnabled       = false
-    internal var simulcastRid: SimulcastRid? = null
+    internal var simulcastRid: SoraVideoOption.SimulcastRid? = null
 
     internal val spotlightEnabled: Boolean
         get() = spotlightOption != null
@@ -80,7 +79,7 @@ class SoraMediaOption {
     /**
      * サイマルキャスト機能を有効にします。
      */
-    fun enableSimulcast(rid: SimulcastRid? = null) {
+    fun enableSimulcast(rid: SoraVideoOption.SimulcastRid? = null) {
         simulcastEnabled = true
         simulcastRid = rid
     }

diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraSpotlightOption.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraSpotlightOption.kt
@@ -1,7 +1,5 @@
 package jp.shiguredo.sora.sdk.channel.option
 
-import jp.shiguredo.sora.sdk.channel.signaling.message.SimulcastRid
-
 /**
  * スポットライト機能のオプションです。
  */
@@ -10,7 +8,7 @@ class SoraSpotlightOption {
     /**
      * サイマルキャストの rid
      */
-    var simulcastRid: SimulcastRid? = null
+    var simulcastRid: SoraVideoOption.SimulcastRid? = null
 
     /**
      * スポットライト機能のアクティブな配信数を指定します

diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraVideoOption.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraVideoOption.kt
@@ -88,4 +88,22 @@ class SoraVideoOption {
 
     }
 
+    enum class SimulcastRid(private val value: String) {
+        /**
+         * r0
+         */
+        R0("r0"),
+
+        /**
+         * r1
+         */
+        R1("r1"),
+
+        /**
+         * r2
+         */
+        R2("r2");
+
+        override fun toString(): String = value
+    }
 }
diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/Catalog.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/Catalog.kt
@@ -1,8 +1,6 @@
 package jp.shiguredo.sora.sdk.channel.signaling.message
 
-import android.os.Build
 import com.google.gson.annotations.SerializedName
-import jp.shiguredo.sora.sdk.BuildConfig
 import jp.shiguredo.sora.sdk.util.SDKInfo
 
 data class MessageCommonPart(
@@ -31,7 +29,7 @@ data class ConnectMessage(
         @SerializedName("spotlight")   var spotlight:               Any? = null,
         @SerializedName("spotlight_number") var spotlightNumber: Int? = null,
         @SerializedName("simulcast")   var simulcast:               Boolean? = false,
-        @SerializedName("simulcast_rid") var simulcastRid: SimulcastRid? = null,
+        @SerializedName("simulcast_rid") var simulcastRid: String? = null,
         @SerializedName("video")       var video:                   Any? = null,
         @SerializedName("audio")       var audio:                   Any? = null,
         @SerializedName("sora_client") val soraClient:              String = SDKInfo.sdkInfo(),
@@ -63,29 +61,6 @@ data class OpusParams(
         @SerializedName("usedtx")          var usedtx:          Boolean? = null
 )
 
-/**
- * サイマルキャストの rid
- */
-enum class SimulcastRid(val value: String) {
-
-    /**
-     * r0
-     */
-    R0("r0"),
-
-    /**
-     * r1
-     */
-    R1("r1"),
-
-    /**
-     * r2
-     */
-    R2("r2");
-
-    override fun toString(): String = value
-}
-
 data class IceServer(
         @SerializedName("urls")       val urls:       List<String>,
         @SerializedName("credential") val credential: String,

diff --git a/...d-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/MessageConverter.kt b/...d-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/MessageConverter.kt
@@ -92,7 +92,7 @@ class MessageConverter {
 
             if (mediaOption.simulcastEnabled) {
                 msg.simulcast = mediaOption.simulcastEnabled
-                msg.simulcastRid = mediaOption.simulcastRid
+                msg.simulcastRid = mediaOption.simulcastRid?.toString()
             }
 
             val jsonMsg = gson.toJson(msg)