Merge branch 'release/2024.1.0'

shiguredo · Mar 19, 2024 · 5a712c3 · 5a712c3
2 parents 90066cd + ad2dfdf
commit 5a712c3
Show file tree

Hide file tree

Showing 10 changed files with 486 additions and 436 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -9,5 +9,6 @@
     "group:recommended",
     "group:allNonMajor",
     "schedule:weekly"
-  ]
-}
+  ],
+  "enabled": false
+}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,12 +16,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '18'
           cache: 'gradle'
       - name: Copy gradle.properties
         run: cp gradle.properties.example gradle.properties

diff --git a/CHANGES.md b/CHANGES.md
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Sora Android SDK
 
 [![Release](https://jitpack.io/v/shiguredo/sora-android-sdk.svg)](https://jitpack.io/#shiguredo/sora-android-sdk)
-[![libwebrtc](https://img.shields.io/badge/libwebrtc-115.5790-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/5790)
+[![libwebrtc](https://img.shields.io/badge/libwebrtc-121.6167-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/6167)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/shiguredo/sora-android-sdk.svg)](https://github.com/shiguredo/sora-android-sdk.svg)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
@@ -21,8 +21,8 @@ Please read https://github.com/shiguredo/oss before use.
 ## システム条件
 
 - Android 5 以降 (エミュレーターでの動作は保証しません)
-- Android Studio 2022.2.1 以降
-- WebRTC SFU Sora 2023.1.0 以降
+- Android Studio 2023.2.1 以降
+- WebRTC SFU Sora 2023.2.0 以降
 
 ## サンプル
 

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'org.jetbrains.dokka'
 
 buildscript {
     ext.kotlin_version = '1.8.10'
-    ext.libwebrtc_version = '115.5790.8.0'
+    ext.libwebrtc_version = '121.6167.4.0'
 
     ext.dokka_version = '1.8.10'
 

diff --git a/sora-android-sdk/build.gradle b/sora-android-sdk/build.gradle
@@ -13,7 +13,6 @@ android {
         minSdkVersion 21
         targetSdkVersion 32
 
-        buildConfigField("String", "VERSION_NAME", "\"${grgit.describe()}\"")
         buildConfigField("String", "REVISION", "\"${grgit.head().abbreviatedId}\"")
         buildConfigField("String", "LIBWEBRTC_VERSION", "\"${libwebrtc_version}\"")
     }
@@ -32,8 +31,8 @@ android {
         release {
         }
         compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_7
-            targetCompatibility JavaVersion.VERSION_1_7
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
         }
     }
 

diff --git a/...id-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraForwardingFilterOption.kt b/...id-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/option/SoraForwardingFilterOption.kt
@@ -3,15 +3,19 @@ package jp.shiguredo.sora.sdk.channel.option
 /**
  * 転送フィルター機能の設定を表すクラスです。
  *
- * @param action フィルター適用時の挙動
- * @param rules フィルターの適用ルール
+ * @param action 転送フィルター適用時の挙動
+ * @param rules 転送フィルターの適用ルール
+ * @param version 転送フィルターのバージョン
+ * @param metadata 転送フィルターのメタデータ
  */
 class SoraForwardingFilterOption(
-    val action: Action,
-    val rules: List<List<Rule>>
+    val action: Action? = null,
+    val rules: List<List<Rule>>,
+    val version: String? = null,
+    val metadata: Any? = null
 ) {
     /**
-     * フィルター適用時の挙動を表します。
+     * 転送フィルター適用時の挙動を表します。
      */
     enum class Action {
         /** block */
@@ -22,19 +26,19 @@ class SoraForwardingFilterOption(
     }
 
     /**
-     * フィルターの適用ルールを表します。
+     * 転送フィルターの適用ルールを表します。
      *
-     * @param field フィルター対象のフィールド
-     * @param operator フィルターの演算子
-     * @param values フィルターの値
+     * @param field 転送フィルター対象のフィールド
+     * @param operator 転送フィルターの演算子
+     * @param values 転送フィルターの値
      */
     class Rule(
         val field: Field,
         val operator: Operator,
         val values: List<String>
     ) {
         /**
-         * フィルター対象のフィールドを表します。
+         * 転送フィルター対象のフィールドを表します。
          */
         enum class Field {
             /** connection_id */
@@ -48,7 +52,7 @@ class SoraForwardingFilterOption(
         }
 
         /**
-         * フィルターの演算子を表します。
+         * 転送フィルターの演算子を表します。
          */
         enum class Operator {
             /** is_in */
@@ -62,7 +66,7 @@ class SoraForwardingFilterOption(
     internal val signaling: Any
         get() {
             return mapOf(
-                "action" to action.name.lowercase(),
+                "action" to (action?.name?.lowercase() ?: null),
                 "rules" to rules.map { outerRule ->
                     outerRule.map { rule ->
                         mapOf(
@@ -71,7 +75,9 @@ class SoraForwardingFilterOption(
                             "values" to rule.values
                         )
                     }
-                }
+                },
+                "version" to version,
+                "metadata" to metadata
             )
         }
 }
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
@@ -13,6 +13,8 @@ class SoraVideoOption {
     enum class Codec {
         /** H.264 */
         H264,
+        /** H.265 */
+        H265,
         /** VP8 */
         VP8,
         /** VP9 */
@@ -43,6 +45,8 @@ class SoraVideoOption {
                 val QVGA = Point(320, 240)
                 /** VGA   640x480 */
                 val VGA = Point(640, 480)
+                /** qHD   960x540 */
+                val qHD = Point(960, 540)
                 /** HD    1280x720 */
                 val HD = Point(1280, 720)
                 /** FHD   1920x1080 */
@@ -73,6 +77,8 @@ class SoraVideoOption {
                 val QVGA = Point(240, 320)
                 /** VGA   480x640 */
                 val VGA = Point(480, 640)
+                /** qHD   540x960 */
+                val qHD = Point(540, 960)
                 /** HD    720x1280 */
                 val HD = Point(720, 1280)
                 /** FHD   1080x1920 */

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
@@ -163,27 +163,31 @@ data class NotificationMessage(
     @SerializedName("type") val type: String = "notify",
     @SerializedName("event_type") val eventType: String,
     @SerializedName("role") val role: String?,
-    @SerializedName("client_id") val clientId: String,
+    @SerializedName("session_id") val sessionId: String?,
+    @SerializedName("client_id") val clientId: String?,
     @SerializedName("bundle_id") val bundleId: String?,
     @SerializedName("connection_id") val connectionId: String?,
     @SerializedName("audio") val audio: Boolean?,
     @SerializedName("video") val video: Boolean?,
     @SerializedName("metadata") val metadata: Any?,
-    @Deprecated("metadata_list は将来の Sora のリリースでフィールド名を data に変更する予定です。")
-    @SerializedName("metadata_list") val metadataList: Any?,
     @SerializedName("minutes") val connectionTime: Long?,
     @SerializedName("channel_connections") val numberOfConnections: Int?,
     @SerializedName("channel_sendrecv_connections") val numberOfSendrecvConnections: Int?,
     @SerializedName("channel_sendonly_connections") val numberOfSendonlyConnections: Int?,
     @SerializedName("channel_recvonly_connections") val numberOfRecvonlyConnections: Int?,
     @SerializedName("unstable_level") val unstableLevel: Int?,
-    @SerializedName("channel_id") val channelId: String?,
     @SerializedName("spotlight_id") val spotlightId: String?,
     @SerializedName("fixed") val fixed: Boolean?,
     @SerializedName("authn_metadata") val authnMetadata: Any?,
     @SerializedName("authz_metadata") val authzMetadata: Any?,
     @SerializedName("data") val data: Any?,
     @SerializedName("turn_transport_type") val turnTransportType: String?,
+    @SerializedName("kind") val kind: String?,
+    @SerializedName("destination_connection_id") val destinationConnectionId: String?,
+    @SerializedName("source_connection_id") val sourceConnectionId: String?,
+    @SerializedName("recv_connection_id") val recvConnectionId: String?,
+    @SerializedName("send_connection_id") val sendConnectionId: String?,
+    @SerializedName("stream_id") val streamId: String?,
 )
 
 data class DisconnectMessage(

diff --git a/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/util/SDKInfo.kt b/sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/util/SDKInfo.kt
@@ -5,12 +5,11 @@ import jp.shiguredo.sora.sdk.BuildConfig
 import org.webrtc.WebrtcBuildVersion
 
 class SDKInfo {
-
     companion object {
+        const val version = "2024.1.0"
 
         fun sdkInfo(): String {
-            return "Sora Android SDK " + BuildConfig.VERSION_NAME +
-                " (" + BuildConfig.REVISION + ")"
+            return "Sora Android SDK $version (${BuildConfig.REVISION})"
         }
 
         fun libwebrtcInfo(): String {