Merge pull request #405 from DolbyIO/release/3.10.0-beta.1

Release/3.10.0 beta.1

Author: graduad

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 3.10.0-beta.1
+
+### Features
+
+- Introduced the ability to change the [capture mode](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/LocalAudio/setCaptureMode.html) in non-Dolby Voice conferences and use either the [Standard](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/AudioCaptureMode.html#standard) or [Unprocessed](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/AudioCaptureMode.html#unprocessed) mode.
+
+- Introduced a new [voiceFont](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/AudioCaptureOptions/voicefont.html) property to [AudioCaptureOptions](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/AudioCaptureOptions-class.html) that is supported in the [Standard](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/AudioCaptureMode.html#standard) audio capture mode. [Voice fonts](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/AudioCaptureOptions/voicefont.html) allow participants to modify their voices in real time to improve social interaction in entertainment scenarios. For more information about this feature, see the [Using Voice Fonts](https://docs.dolby.io/interactivity/docs/guides-using-voice-fonts) guide.
+
+- Introduced a new [preview](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/LocalAudio/preview.html) service that allows the local participant to test different capture modes and voice fonts before a conference. The service records the participant's audio and plays it back. Before playing the recorded audio, set the [captureMode](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/LocalAudio/setCaptureMode.html) to a preferred setting that you wish to try.
+
+- Introduced a new [updateParticipantInfo](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/SessionService/updateParticipantInfo.html) method that lets participants modify their names and avatars while they are in a conference.
+
+- The SDK now supports receiving two shared screens in one conference.
+
+### Changes
+
+Changed the default value of the audio capture mode in non-Dolby Voice conferences to [Standard](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/AudioCaptureMode.html#standard) with [high](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/NoiseReduction.html#high) noise reduction. This setting optimizes captured audio for speech by aggressively removing non-speech content. If you want to transmit non-stationary background sounds to a conference and create a more natural audio experience, you can set noise reduction to [low](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/NoiseReduction.html#low), which offers a similar experience as the default setting in previous releases. If you wish to transmit non-voice audio to a conference as well and use input device setting without any processing, use the [Unprocessed](https://api-references.dolby.io/comms-sdk-flutter/dolbyio_comms_sdk_flutter/AudioCaptureMode.html#unprocessed) mode.
+
 ## 3.8.3
 
 ### Bug Fixes

android/build.gradle

@@ -3,7 +3,7 @@ version '1.0-SNAPSHOT'
 
 buildscript {
     ext.kotlin_version = '1.7.10'
-    ext.voxeet_sdk_version = "3.8.+"
+    ext.voxeet_sdk_version = "3.10.0"
     ext.dagger_version = "2.40.5"
     repositories {
         google()
@@ -78,7 +78,7 @@ android {
 dependencies {
     // uncomment this to gradle sync for android plugin in android studio, comment again before build
 //    implementation files("$flutterRoot/bin/cache/artifacts/engine/android-arm64-release/flutter.jar")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     def useMockSDK = project.properties.containsKey("useMockSDK") ? project.properties.get("useMockSDK") : false
     if (useMockSDK) {
         implementation project(":dolbyMock")

android/gradle.properties

@@ -1,2 +1,2 @@
-COMMS_SDK_VERSION="3.8.3"
+COMMS_SDK_VERSION="3.10.0-beta.1"
 COMPONENT_NAME="flutter-sdk"

android/src/main/kotlin/io/dolby/comms/sdk/flutter/DolbyioCommsSdkFlutterPlugin.kt

@@ -14,6 +14,7 @@ import io.dolby.comms.sdk.flutter.module.NotificationServiceNativeModule
 import io.dolby.comms.sdk.flutter.module.RecordingServiceNativeModule
 import io.dolby.comms.sdk.flutter.module.SessionServiceNativeModule
 import io.dolby.comms.sdk.flutter.module.VideoPresentationServiceModule
+import io.dolby.comms.sdk.flutter.module.audio.AudioPreviewNativeModule
 import io.dolby.comms.sdk.flutter.module.audio.LocalAudioNativeModule
 import io.dolby.comms.sdk.flutter.module.audio.RemoteAudioNativeModule
 import io.dolby.comms.sdk.flutter.module.video.LocalVideoNativeModule
@@ -28,6 +29,7 @@ import io.flutter.embedding.engine.plugins.lifecycle.FlutterLifecycleAdapter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
+import org.webrtc.CodecDescriptorFactory
 
 class DolbyioCommsSdkFlutterPlugin : FlutterPlugin, ActivityAware {
 
@@ -49,7 +51,8 @@ class DolbyioCommsSdkFlutterPlugin : FlutterPlugin, ActivityAware {
             NotificationEventEmitter(EventChannelHandler(NOTIFICATION)),
             RecordingEventEmitter(EventChannelHandler(RECORDING)),
             VideoPresentationEventEmitter(EventChannelHandler(VIDEO_PRESENTATION), videoPresentationHolder),
-            filePresentationEventEmitter
+            filePresentationEventEmitter,
+            AudioPreviewEventEmitter(EventChannelHandler(AUDIO_PREVIEW))
         )
 
         nativeModules = listOf(
@@ -70,7 +73,8 @@ class DolbyioCommsSdkFlutterPlugin : FlutterPlugin, ActivityAware {
                 filePresentationEventEmitter,
                 filePresentationHolder
             ),
-            MediaDeviceServiceNativeModule(scope)
+            MediaDeviceServiceNativeModule(scope),
+            AudioPreviewNativeModule(scope)
         )
 
         VoxeetSDK.registerComponentVersion(BuildConfig.COMPONENT_NAME, BuildConfig.SDK_VERSION)
@@ -97,6 +101,7 @@ class DolbyioCommsSdkFlutterPlugin : FlutterPlugin, ActivityAware {
         const val RECORDING = "dolbyio_recording_service_event_channel"
         const val VIDEO_PRESENTATION = "dolbyio_video_presentation_service_event_channel"
         const val FILE_PRESENTATION = "dolbyio_file_presentation_service_event_channel"
+        const val AUDIO_PREVIEW = "dolbyio_audio_preview_event_channel"
     }
 
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {

android/src/main/kotlin/io/dolby/comms/sdk/flutter/events/AudioPreviewEventEmitter.kt

@@ -0,0 +1,27 @@
+package io.dolby.comms.sdk.flutter.events
+
+import com.voxeet.VoxeetSDK
+import com.voxeet.android.media.capture.audio.preview.RecorderStatus
+
+class AudioPreviewEventEmitter(eventChannelHandler: EventChannelHandler) : NativeEventEmitter(eventChannelHandler) {
+
+    /**
+     * Emitted when the application user received an audio preview status changed.
+     */
+    private val previewCallback: (RecorderStatus) -> Unit = { status ->
+        android.util.Log.d("[KB]", "status changed: $status")
+        emit(OnStatusChanged, status.name)
+    }
+
+    override fun registerEventEmitter() {
+        VoxeetSDK.audio().local.preview().callback = previewCallback
+    }
+
+    override fun unregisterEventEmitter() {
+        VoxeetSDK.audio().local.preview().callback = null
+    }
+
+    companion object {
+        const val OnStatusChanged = "EVENT_AUDIO_PREVIEW_STATUS_CHANGED"
+    }
+}

android/src/main/kotlin/io/dolby/comms/sdk/flutter/events/EventChannelHandler.kt

@@ -22,6 +22,7 @@ class EventChannelHandler(private val channelName: String) : EventChannel.Stream
     }
 
     override fun onListen(arguments: Any?, callback: EventChannel.EventSink?) {
+        android.util.Log.d("[KB]", "arguments: ${arguments}")
         eventCallback = callback
     }
 

android/src/main/kotlin/io/dolby/comms/sdk/flutter/events/NativeEventEmitter.kt

@@ -11,16 +11,24 @@ abstract class NativeEventEmitter(private val eventChannel: EventChannelHandler)
 
     fun onAttached(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
         eventChannel.onAttached(flutterPluginBinding)
-        VoxeetSDK.instance().register(this)
+        registerEventEmitter()
     }
 
     fun onDetached() {
-        VoxeetSDK.instance().unregister(this)
+        unregisterEventEmitter()
         eventChannel.onDetached()
     }
 
     // Event needs to be emitted on main thread
     fun emit(key: String, data: Any?) = mainHandler.post {
         eventChannel.emitEvent(key, data)
     }
+
+    protected open fun registerEventEmitter() {
+        VoxeetSDK.instance().register(this)
+    }
+
+    protected open fun unregisterEventEmitter() {
+        VoxeetSDK.instance().unregister(this)
+    }
 }

android/src/main/kotlin/io/dolby/comms/sdk/flutter/mapper/AudioCaptureModeMapper.kt

@@ -2,6 +2,7 @@ package io.dolby.comms.sdk.flutter.mapper
 
 import com.voxeet.android.media.capture.audio.AudioCaptureMode
 import com.voxeet.android.media.capture.audio.Mode
+import com.voxeet.android.media.capture.audio.VoiceFont
 import com.voxeet.android.media.capture.audio.noise.NoiseReduction
 import com.voxeet.android.media.capture.audio.noise.StandardNoiseReduction
 
@@ -10,6 +11,7 @@ class AudioCaptureModeMapper(private val audioCaptureMode: AudioCaptureMode) : M
     override fun convertToMap() = mapOf(
         "mode" to audioCaptureMode.mode.convertToString(),
         "noiseReduction" to audioCaptureMode.noiseReduction?.convertToString(),
+        "voiceFont" to audioCaptureMode.voiceFont?.convertToString(),
     )
 
     private fun Mode.convertToString(): String = when (this) {
@@ -22,10 +24,27 @@ class AudioCaptureModeMapper(private val audioCaptureMode: AudioCaptureMode) : M
         else -> "low"
     }
 
+    private fun VoiceFont.convertToString(): String = when (this) {
+        VoiceFont.MASCULINE -> "masculine"
+        VoiceFont.FEMININE -> "feminine"
+        VoiceFont.HELIUM -> "helium"
+        VoiceFont.DARK_MODULATION -> "dark_modulation"
+        VoiceFont.BROKEN_ROBOT -> "broken_robot"
+        VoiceFont.INTERFERENCE -> "interference"
+        VoiceFont.ABYSS -> "abyss"
+        VoiceFont.WOBBLE -> "wobble"
+        VoiceFont.STARSHIP_CAPTAIN -> "starship_captain"
+        VoiceFont.NERVOUS_ROBOT -> "nervous_robot"
+        VoiceFont.SWARM -> "swarm"
+        VoiceFont.AM_RADIO -> "am_radio"
+        else -> "none"
+    }
+
     companion object {
         fun fromMap(map: Map<String, Any?>): AudioCaptureMode {
+            val voiceFont = toVoiceFont(map["voiceFont"] as String?)
             return when (toMode(map["mode"] as String?)) {
-                Mode.STANDARD -> AudioCaptureMode.standard(toNoiseReduction(map["noiseReduction"] as String?))
+                Mode.STANDARD -> AudioCaptureMode.standard(toNoiseReduction(map["noiseReduction"] as String?), voiceFont)
                 Mode.UNPROCESSED -> AudioCaptureMode.unprocessed()
             }
         }
@@ -35,6 +54,22 @@ class AudioCaptureModeMapper(private val audioCaptureMode: AudioCaptureMode) : M
             else -> Mode.STANDARD
         }
 
+        private fun toVoiceFont(font: String?): VoiceFont = when (font) {
+            "masculine" -> VoiceFont.MASCULINE
+            "feminine" -> VoiceFont.FEMININE
+            "helium" -> VoiceFont.HELIUM
+            "dark_modulation" -> VoiceFont.DARK_MODULATION
+            "broken_robot" -> VoiceFont.BROKEN_ROBOT
+            "interference" -> VoiceFont.INTERFERENCE
+            "abyss" -> VoiceFont.ABYSS
+            "wobble" -> VoiceFont.WOBBLE
+            "starship_captain" -> VoiceFont.STARSHIP_CAPTAIN
+            "nervous_robot" -> VoiceFont.NERVOUS_ROBOT
+            "swarm" -> VoiceFont.SWARM
+            "am_radio" -> VoiceFont.AM_RADIO
+            else -> VoiceFont.NONE
+        }
+
         private fun toNoiseReduction(noiseReduction: String?) = when (noiseReduction) {
             "high" -> StandardNoiseReduction.HIGH
             else -> StandardNoiseReduction.LOW

android/src/main/kotlin/io/dolby/comms/sdk/flutter/module/SessionServiceNativeModule.kt

@@ -18,6 +18,7 @@ class SessionServiceNativeModule(private val scope: CoroutineScope) : NativeModu
     override fun onMethodCall(call: MethodCall, result: Result) {
         when (call.method) {
             ::open.name -> open(call, result)
+            ::updateParticipantInfo.name -> updateParticipantInfo(call, result)
             ::close.name -> close(result)
             ::isOpen.name -> isOpen(result)
             ::getParticipant.name -> getParticipant(result)
@@ -45,6 +46,16 @@ class SessionServiceNativeModule(private val scope: CoroutineScope) : NativeModu
         }
     )
 
+    private fun updateParticipantInfo(call: MethodCall, result: Result) = scope.launch(
+        onError = result::onError,
+        onSuccess = {
+            VoxeetSDK.session().update(
+                call.argumentOrThrow<String>("name"),
+                call.argument<String>("avatarUrl")
+            ).await().let { result.success(it) }
+        }
+    )
+
     private fun close(result: Result) = scope.launch(
         onError = result::onError,
         onSuccess = {

android/src/main/kotlin/io/dolby/comms/sdk/flutter/module/audio/AudioPreviewNativeModule.kt

@@ -0,0 +1,99 @@
+package io.dolby.comms.sdk.flutter.module.audio
+
+import com.voxeet.VoxeetSDK
+import io.dolby.comms.sdk.flutter.extension.argumentOrThrow
+import io.dolby.comms.sdk.flutter.extension.await
+import io.dolby.comms.sdk.flutter.extension.launch
+import io.dolby.comms.sdk.flutter.extension.onError
+import io.dolby.comms.sdk.flutter.mapper.AudioCaptureModeMapper
+import io.dolby.comms.sdk.flutter.module.NativeModule
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import kotlinx.coroutines.CoroutineScope
+import java.lang.reflect.Proxy
+
+class AudioPreviewNativeModule(private val scope: CoroutineScope) : NativeModule {
+    private lateinit var channel: MethodChannel
+
+    override fun onAttached(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+        channel = MethodChannel(flutterPluginBinding.binaryMessenger, "dolbyio_audio_preview_channel")
+        channel.setMethodCallHandler(this)
+    }
+
+    override fun onDetached() {
+        channel.setMethodCallHandler(null)
+    }
+
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+        when (call.method) {
+            ::status.name -> status(result)
+            ::getCaptureMode.name -> getCaptureMode(result)
+            ::setCaptureMode.name -> setCaptureMode(call, result)
+            ::record.name -> record(call, result)
+            ::play.name -> play(call, result)
+            ::cancel.name -> cancel(result)
+            ::release.name -> release(result)
+        }
+    }
+
+    private fun status(result: MethodChannel.Result)  = scope.launch(
+        onError = result::onError,
+        onSuccess = {
+            VoxeetSDK.audio().local.preview().status.let {
+                result.success(it.name)
+            }
+        }
+    )
+
+    private fun getCaptureMode(result: MethodChannel.Result)  = scope.launch(
+        onError = result::onError,
+        onSuccess = {
+            VoxeetSDK.audio().local.preview().captureMode.let {
+                result.success(AudioCaptureModeMapper(it).convertToMap())
+            }
+        }
+    )
+
+    private fun setCaptureMode(call: MethodCall, result: MethodChannel.Result) = scope.launch(
+        onError = result::onError,
+        onSuccess = {
+            VoxeetSDK.audio().local.preview().captureMode = AudioCaptureModeMapper.fromMap(call.arguments as Map<String, Any?>)
+            result.success(null)
+        }
+    )
+
+    private fun record(call: MethodCall, result: MethodChannel.Result) = scope.launch(
+        onError = result::onError,
+        onSuccess = {
+            call.argumentOrThrow<Int>("duration").let { duration ->
+                VoxeetSDK.audio().local.preview().record(duration).await()
+                result.success(null)
+            }
+        }
+    )
+
+    private fun play(call: MethodCall, result: MethodChannel.Result) = scope.launch(
+        onError = result::onError,
+        onSuccess = {
+            call.argumentOrThrow<Boolean>("loop").let { loop ->
+                VoxeetSDK.audio().local.preview().play(loop).await()
+                result.success(null)
+            }
+        }
+    )
+
+    private fun cancel(result: MethodChannel.Result) = scope.launch(
+        onError = result::onError,
+        onSuccess = {
+            result.success(VoxeetSDK.audio().local.preview().cancel())
+        }
+    )
+
+    private fun release(result: MethodChannel.Result) = scope.launch(
+        onError = result::onError,
+        onSuccess = {
+            result.success(VoxeetSDK.audio().local.preview().release())
+        }
+    )
+}