Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scaleResolutionDownTo を追加する #144

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+9 −0
Open

scaleResolutionDownTo を追加する #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d18361
scaleResolutionDownTo を追加する
zztkm Dec 19, 2024
eeef9c8
不要なスペースを削除する
zztkm Dec 19, 2024
14788bb
変数名修正
zztkm Dec 19, 2024
ff3d192
libwebrtc に値を渡すようにする
zztkm Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
- ConnectMessage に `forwardingFilters` を追加する
- クラスそのものに変更はないが `MessageConverter.buildConnectMessage` に `forwardingFiltersOption` を追加する
- @zztkm
- [ADD] サイマルキャストの映像のエンコーディングパラメーター `scaleResolutionDownTo` を追加する
- @zztkm
- [FIX] SoraMediaChannel のコンストラクタで `signalingMetadata` と `signalingNotifyMetadata` に Map オブジェクトを指定した場合、null を持つフィールドが connect メッセージ送信時に省略されてしまう問題を修正
- `signalingMetadata` と `signalingNotifyMetadata` に設定する情報はユーザが任意に設定する項目であり value 値が null の情報も送信できるようにする必要がある
- Gson は JSON シリアライズ時、デフォルトで null フィールドを無視するので、null を持つフィールドは省略される
Expand Down
1 change: 1 addition & 0 deletions sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/rtc/PeerChannel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ class PeerChannelImpl(
offerEncoding.maxBitrate?.also { senderEncoding.maxBitrateBps = it }
offerEncoding.maxFramerate?.also { senderEncoding.maxFramerate = it.toInt() }
offerEncoding.scaleResolutionDownBy?.also { senderEncoding.scaleResolutionDownBy = it }
offerEncoding.scaleResolutionDownTo?.also { senderEncoding.scaleResolutionDownTo = it }
offerEncoding.scalabilityMode?.also { senderEncoding.scalabilityMode = it }
}

Expand Down
6 changes: 6 additions & 0 deletions sora-android-sdk/src/main/kotlin/jp/shiguredo/sora/sdk/channel/signaling/message/Catalog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,18 @@ data class OfferConfig(
@SerializedName("iceTransportPolicy") val iceTransportPolicy: String
)

data class ScaleResolutionDownTo(
@SerializedName("maxWidth") var maxWidth: Int,
@SerializedName("maxHeight") var maxHeight: Int
)

data class Encoding(
@SerializedName("rid") val rid: String?,
@SerializedName("active") val active: Boolean?,
@SerializedName("maxBitrate") val maxBitrate: Int?,
@SerializedName("maxFramerate") val maxFramerate: Double?,
@SerializedName("scaleResolutionDownBy") val scaleResolutionDownBy: Double?,
@SerializedName("scaleResolutionDownTo") val scaleResolutionDownTo: ScaleResolutionDownTo?,
@SerializedName("scalabilityMode") val scalabilityMode: String?
)

Expand Down
Loading