From 2eba22570def70cf11c741e84b04e179113834ea Mon Sep 17 00:00:00 2001 From: kbetl-dlb <107930816+kbetl-dlb@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:35:38 +0200 Subject: [PATCH] Add MIXER_MIX participant type (android + RN) (#284) * Add MIXER_MIX participant type (android + RN) * Update documentation --- android/build.gradle | 2 +- .../sdk/comms/reactnative/mapper/ParticipantMapper.kt | 1 + docs/enums/internal.ParticipantType.md | 9 +++++++++ src/services/conference/models.ts | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 1424a136..e3fcba7e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -66,7 +66,7 @@ dependencies { implementation "androidx.appcompat:appcompat:1.1.0" implementation "androidx.annotation:annotation:1.1.0" - implementation "io.dolby:sdk:[3.10.1,3.11)" + implementation "io.dolby:sdk:[3.11.0, 3.12)" testImplementation("junit:junit:${JUNIT_VERSION}") testImplementation("org.powermock:powermock-api-mockito2:${POWERMOCK_VERSION}") diff --git a/android/src/main/java/io/dolby/sdk/comms/reactnative/mapper/ParticipantMapper.kt b/android/src/main/java/io/dolby/sdk/comms/reactnative/mapper/ParticipantMapper.kt index 0cf1cc7f..cd9de12f 100644 --- a/android/src/main/java/io/dolby/sdk/comms/reactnative/mapper/ParticipantMapper.kt +++ b/android/src/main/java/io/dolby/sdk/comms/reactnative/mapper/ParticipantMapper.kt @@ -76,6 +76,7 @@ class ParticipantMapper { private fun toRNParticipantType(participantType: ParticipantType) = when (participantType) { ParticipantType.USER -> "USER" ParticipantType.LISTENER -> "LISTENER" + ParticipantType.MIXER_MIX -> "MIXER_MIX" ParticipantType.SPEAKER, ParticipantType.PSTN, ParticipantType.MIXER, diff --git a/docs/enums/internal.ParticipantType.md b/docs/enums/internal.ParticipantType.md index 6930479a..242b781e 100644 --- a/docs/enums/internal.ParticipantType.md +++ b/docs/enums/internal.ParticipantType.md @@ -10,6 +10,7 @@ The ParticipantTypes enum gathers the possible types of conference participants. - [LISTENER](internal.ParticipantType.md#listener) - [USER](internal.ParticipantType.md#user) +- [MIXER\_MIX](internal.ParticipantType.md#mixer_mix) - [UNKNOWN](internal.ParticipantType.md#unknown) ## Enumeration Members @@ -30,6 +31,14 @@ A participant who can send and receive audio and video during the conference. ___ +### MIXER\_MIX + +• **MIXER\_MIX** = ``"MIXER_MIX"`` + +A special participant responsible for mixing video and sending one mixed video stream from a conference to each participant who joined the conference as a mixed listener. This type is available in SDK 3.11 and later. + +___ + ### UNKNOWN • **UNKNOWN** = ``"UNKNOWN"`` diff --git a/src/services/conference/models.ts b/src/services/conference/models.ts index 8aeab247..09e618ff 100644 --- a/src/services/conference/models.ts +++ b/src/services/conference/models.ts @@ -220,6 +220,8 @@ export enum ParticipantType { LISTENER = 'LISTENER', /** A participant who can send and receive audio and video during the conference. */ USER = 'USER', + /** A special participant responsible for mixing video and sending one mixed video stream from a conference to each participant who joined the conference as a mixed listener. This type is available in SDK 3.11 and later. */ + MIXER_MIX = 'MIXER_MIX', /** Any other type that is unsupported in react-native. */ UNKNOWN = 'UNKNOWN', }