From 5d3cfd9c5e0902d50253ab41feabbe1a95db6c34 Mon Sep 17 00:00:00 2001 From: zztkm Date: Tue, 17 Dec 2024 18:29:27 +0900 Subject: [PATCH 1/6] =?UTF-8?q?OfferMessage=20=E3=82=92=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdk/channel/signaling/message/Catalog.kt | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 index 42639e75..cca512e5 100644 --- 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 @@ -111,15 +111,31 @@ data class RedirectMessage( data class OfferMessage( @SerializedName("type") val type: String = "offer", @SerializedName("sdp") val sdp: String, + @SerializedName("version") val version: String, + + @SerializedName("multistream") val multistream: Boolean, + @SerializedName("simulcast") val simulcast: Boolean, + @SerializedName("simulcast_multicodec") val simulcastMulticodec: Boolean, + @SerializedName("spotlight") val spotlight: Boolean, + + @SerializedName("channel_id") val channelId: String, @SerializedName("client_id") val clientId: String, @SerializedName("bundle_id") val bundleId: String? = null, @SerializedName("connection_id") val connectionId: String, - @SerializedName("simulcast") val simulcast: Boolean = false, + @SerializedName("session_id") val sessionId: String?, + @SerializedName("metadata") val metadata: Any?, @SerializedName("config") val config: OfferConfig? = null, @SerializedName("mid") val mid: Map? = null, @SerializedName("encodings") val encodings: List?, - @SerializedName("data_channels") val dataChannels: List>? = null + @SerializedName("data_channels") val dataChannels: List>? = null, + + @SerializedName("audio") val audio: Boolean?, + @SerializedName("audio_codec_type") val audioCodecType: String?, + @SerializedName("audio_bit_rate") val audioBitRate: Int?, + @SerializedName("video") val video: Boolean?, + @SerializedName("video_codec_type") val videoCodecType: String?, + @SerializedName("video_bit_rate") val videoBitRate: Int?, ) data class SwitchedMessage( From 8ea31dfef8509e1e4f67cae6f9e63f330cd75a06 Mon Sep 17 00:00:00 2001 From: zztkm Date: Wed, 18 Dec 2024 11:20:17 +0900 Subject: [PATCH 2/6] =?UTF-8?q?CHANGES=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index b9733b75..934aab42 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,21 @@ - [UPDATE] libwebrtc を 131.6778.4.0 に上げる - @miosakuma @zztkm +- [UPDATE] OfferMessage に項目を追加する + - 追加した項目 + - `version` + - `multistream` + - `simulcast_multicodec` + - `spotlight` + - `channel_id` + - `session_id` + - `audio` + - `audio_codec_type` + - `audio_bit_rate` + - `video` + - `video_codec_type` + - `video_bit_rate` + - @zztkm - [UPDATE] SoraForwardingFilterOption 型の引数を Sora での 2025 年 12 月の廃止に向けて非推奨にする - 今後はリスト形式の転送フィルター設定を利用してもらう - 非推奨になるクラス From c3b4b6b902254297df48f24674c9d9e3c3f089a0 Mon Sep 17 00:00:00 2001 From: zztkm Date: Wed, 18 Dec 2024 14:27:37 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=8A=E3=83=AB=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdk/channel/signaling/message/Catalog.kt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 index cca512e5..366f67eb 100644 --- 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 @@ -111,18 +111,18 @@ data class RedirectMessage( data class OfferMessage( @SerializedName("type") val type: String = "offer", @SerializedName("sdp") val sdp: String, - @SerializedName("version") val version: String, + @SerializedName("version") val version: String? = null, - @SerializedName("multistream") val multistream: Boolean, + @SerializedName("multistream") val multistream: Boolean? = null, @SerializedName("simulcast") val simulcast: Boolean, - @SerializedName("simulcast_multicodec") val simulcastMulticodec: Boolean, - @SerializedName("spotlight") val spotlight: Boolean, + @SerializedName("simulcast_multicodec") val simulcastMulticodec: Boolean? = null, + @SerializedName("spotlight") val spotlight: Boolean? = null, - @SerializedName("channel_id") val channelId: String, + @SerializedName("channel_id") val channelId: String? = null, @SerializedName("client_id") val clientId: String, @SerializedName("bundle_id") val bundleId: String? = null, @SerializedName("connection_id") val connectionId: String, - @SerializedName("session_id") val sessionId: String?, + @SerializedName("session_id") val sessionId: String? = null, @SerializedName("metadata") val metadata: Any?, @SerializedName("config") val config: OfferConfig? = null, @@ -130,12 +130,12 @@ data class OfferMessage( @SerializedName("encodings") val encodings: List?, @SerializedName("data_channels") val dataChannels: List>? = null, - @SerializedName("audio") val audio: Boolean?, - @SerializedName("audio_codec_type") val audioCodecType: String?, - @SerializedName("audio_bit_rate") val audioBitRate: Int?, - @SerializedName("video") val video: Boolean?, - @SerializedName("video_codec_type") val videoCodecType: String?, - @SerializedName("video_bit_rate") val videoBitRate: Int?, + @SerializedName("audio") val audio: Boolean? = null, + @SerializedName("audio_codec_type") val audioCodecType: String? = null, + @SerializedName("audio_bit_rate") val audioBitRate: Int? = null, + @SerializedName("video") val video: Boolean? = null, + @SerializedName("video_codec_type") val videoCodecType: String? = null, + @SerializedName("video_bit_rate") val videoBitRate: Int? = null, ) data class SwitchedMessage( From f6b6bf93f61fec3d481f4fd4cf52e1c7cc168a33 Mon Sep 17 00:00:00 2001 From: zztkm <33755694+zztkm@users.noreply.github.com> Date: Wed, 18 Dec 2024 14:35:25 +0900 Subject: [PATCH 4/6] Update sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/Catalog.kt Co-authored-by: miosakuma <78420745+miosakuma@users.noreply.github.com> --- .../jp/shiguredo/sora/sdk/channel/signaling/message/Catalog.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 366f67eb..77234031 100644 --- 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 @@ -114,7 +114,7 @@ data class OfferMessage( @SerializedName("version") val version: String? = null, @SerializedName("multistream") val multistream: Boolean? = null, - @SerializedName("simulcast") val simulcast: Boolean, + @SerializedName("simulcast") val simulcast: Boolean = false, @SerializedName("simulcast_multicodec") val simulcastMulticodec: Boolean? = null, @SerializedName("spotlight") val spotlight: Boolean? = null, From e63d94b1299f0dca47be7161542263bf8b638c9a Mon Sep 17 00:00:00 2001 From: zztkm Date: Wed, 18 Dec 2024 14:54:30 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=9F=E8=A3=85=E6=99=82=E3=81=AE?= =?UTF-8?q?=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88=E3=82=92=E3=82=B3=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shiguredo/sora/sdk/channel/signaling/message/Catalog.kt | 5 +++++ 1 file changed, 5 insertions(+) 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 index 366f67eb..37574f43 100644 --- 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,3 +1,8 @@ +/** + * Signaling メッセージのデータクラスを定義します。 + * + * NOTE: 後方互換性を考慮して、項目を追加するときはオプショナルで定義するようにしてください。 + */ package jp.shiguredo.sora.sdk.channel.signaling.message import com.google.gson.annotations.SerializedName From 93d2843ca98e5e3f98c78903946df143a3f933bc Mon Sep 17 00:00:00 2001 From: zztkm Date: Wed, 18 Dec 2024 15:19:23 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sora/sdk/channel/signaling/message/Catalog.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 index 737fe106..067bcc6f 100644 --- 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,13 +1,10 @@ -/** - * Signaling メッセージのデータクラスを定義します。 - * - * NOTE: 後方互換性を考慮して、項目を追加するときはオプショナルで定義するようにしてください。 - */ package jp.shiguredo.sora.sdk.channel.signaling.message import com.google.gson.annotations.SerializedName import jp.shiguredo.sora.sdk.util.SDKInfo +// NOTE: 後方互換性を考慮して、項目を追加するときはオプショナルで定義するようにしてください。 + data class MessageCommonPart( @SerializedName("type") val type: String? )