Added music mode support (#1810)

* added music mode support * 🤖 Automated Format and Fix * Added option to toggle music mode from app settings * 🤖 Automated Format and Fix * chore: updated changelog --------- Co-authored-by: Decoder07 <[email protected]> Co-authored-by: ygit <[email protected]>
100mslive · Aug 29, 2024 · 68f239b · 68f239b
1 parent e08c00a
commit 68f239b
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 13 deletions.
diff --git a/packages/hms_room_kit/lib/src/common/utility_functions.dart b/packages/hms_room_kit/lib/src/common/utility_functions.dart
@@ -396,6 +396,8 @@ class Utilities {
     required bool joinWithMutedAudio,
     required bool isSoftwareDecoderDisabled,
     required bool isNoiseCancellationEnabled,
+    required bool isAutomaticGainControlEnabled,
+    required bool isNoiseSuppressionEnabled,
     HMSAudioMode? audioMode,
   }) {
     return HMSTrackSetting(
@@ -414,7 +416,9 @@ class Utilities {
                 ? HMSTrackInitState.MUTED
                 : HMSTrackInitState.UNMUTED,
             audioMode: audioMode,
-            enableNoiseCancellation: isNoiseCancellationEnabled),
+            enableNoiseCancellation: isNoiseCancellationEnabled,
+            enableAutomaticGainControl: isAutomaticGainControlEnabled,
+            enableNoiseSupression: isNoiseSuppressionEnabled),
         videoTrackSetting: HMSVideoTrackSetting(
             trackInitialState: joinWithMutedVideo
                 ? HMSTrackInitState.MUTED

diff --git a/packages/hms_room_kit/lib/src/hms_prebuilt_options.dart b/packages/hms_room_kit/lib/src/hms_prebuilt_options.dart
@@ -30,15 +30,25 @@ class HMSPrebuiltOptions {
   final HMSIOSScreenshareConfig? iOSScreenshareConfig;
 
   ///To enable noise cancellation in prebuilt.
-  ///Default value is true
+  ///Default value is false
   final bool enableNoiseCancellation;
 
+  ///To enable automatic gain control in prebuilt.
+  ///Default value is false
+  final bool isAutomaticGainControlEnabled;
+
+  ///To enable noise suppression in prebuilt.
+  ///Default value is false
+  final bool isNoiseSuppressionEnabled;
+
   ///[HMSPrebuiltOptions] is a class that is used to pass the options to the prebuilt
   HMSPrebuiltOptions(
       {this.userName,
       this.userId,
       this.endPoints,
       this.debugInfo = false,
       this.iOSScreenshareConfig,
-      this.enableNoiseCancellation = false});
+      this.enableNoiseCancellation = false,
+      this.isAutomaticGainControlEnabled = false,
+      this.isNoiseSuppressionEnabled = false});
 }
diff --git a/packages/hms_room_kit/lib/src/hmssdk_interactor.dart b/packages/hms_room_kit/lib/src/hmssdk_interactor.dart
@@ -38,7 +38,9 @@ class HMSSDKInteractor {
       bool isAudioMixerDisabled = true,
       HMSAudioMode audioMode = HMSAudioMode.VOICE,
       bool isPrebuilt = false,
-      bool isNoiseCancellationEnabled = false}) {
+      bool isNoiseCancellationEnabled = false,
+      bool isAutomaticGainControlEnabled = false,
+      bool isNoiseSuppressionEnabled = false}) {
     HMSLogSettings hmsLogSettings = HMSLogSettings(
         maxDirSizeInBytes: 1000000,
         isLogStorageEnabled: true,
@@ -50,7 +52,9 @@ class HMSSDKInteractor {
         joinWithMutedAudio: joinWithMutedAudio,
         isSoftwareDecoderDisabled: isSoftwareDecoderDisabled,
         audioMode: audioMode,
-        isNoiseCancellationEnabled: isNoiseCancellationEnabled);
+        isNoiseCancellationEnabled: isNoiseCancellationEnabled,
+        isAutomaticGainControlEnabled: isAutomaticGainControlEnabled,
+        isNoiseSuppressionEnabled: isNoiseSuppressionEnabled);
 
     hmsSDK = HMSSDK(
         iOSScreenshareConfig: iOSScreenshareConfig,

diff --git a/packages/hms_room_kit/lib/src/screen_controller.dart b/packages/hms_room_kit/lib/src/screen_controller.dart
@@ -147,6 +147,10 @@ class _ScreenControllerState extends State<ScreenController> {
         isAudioMixerDisabled: AppDebugConfig.isAudioMixerDisabled,
         isNoiseCancellationEnabled:
             widget.options?.enableNoiseCancellation ?? false,
+        isAutomaticGainControlEnabled:
+            widget.options?.isAutomaticGainControlEnabled ?? false,
+        isNoiseSuppressionEnabled:
+            widget.options?.isNoiseSuppressionEnabled ?? false,
         isPrebuilt: true);
     await _hmsSDKInteractor.build();
 

diff --git a/packages/hms_room_kit/lib/src/service/app_debug_config.dart b/packages/hms_room_kit/lib/src/service/app_debug_config.dart
@@ -6,7 +6,6 @@ class AppDebugConfig {
   Setting these values to defaults and can be toggled from the application
   This will not be shipped with the ui_kit package and only used for internal testing
   */
-  static bool skipPreview = false;
   static bool mirrorCamera = true;
   static bool showStats = false;
   static bool isSoftwareDecoderDisabled = true;
@@ -25,7 +24,6 @@ class AppDebugConfig {
 
   /// Resets the debug configuration to default values
   static void resetToDefault() {
-    skipPreview = false;
     mirrorCamera = true;
     showStats = false;
     isSoftwareDecoderDisabled = true;

diff --git a/...ssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSTrackSettingsExtension.kt b/...ssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HMSTrackSettingsExtension.kt
@@ -58,6 +58,20 @@ class HMSTrackSettingsExtension {
                         hmsAudioTrackSettings.enableNoiseCancellation(true)
                     }
                 }
+
+                val enableAutomaticGainControl = audioHashMap["enable_automatic_gain_control"] as? Boolean
+                enableAutomaticGainControl?.let {
+                    if(it){
+                        hmsAudioTrackSettings.enableAutomaticGainControl(true)
+                    }
+                }
+
+                val enableNoiseSupression = audioHashMap["enable_noise_supression"] as? Boolean
+                enableNoiseSupression?.let {
+                    if(it){
+                        hmsAudioTrackSettings.enableNoiseSupression(true)
+                    }
+                }
             }
 
             var hmsVideoTrackSettings = HMSVideoTrackSettings.Builder()

diff --git a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt
@@ -3,7 +3,13 @@ Board: https://app.devrev.ai/100ms/vistas/vista-250
 - Add support for zoom in camera controls
 https://app.devrev.ai/100ms/works/ISS-23282
 
+- Add support for Music Mode
+https://app.devrev.ai/100ms/works/ISS-22859
+
+- Support for long running sessions
+https://app.devrev.ai/100ms/works/ISS-23134
+
 Room Kit: 1.1.6
 Core SDK: 1.10.6
-Android SDK: 2.9.64
+Android SDK: 2.9.65
 iOS SDK: 1.15.0
diff --git a/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart b/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
@@ -88,7 +88,6 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
     AppDebugConfig.isSoftwareDecoderDisabled = isSoftwareDecoderDisabled;
     AppDebugConfig.mirrorCamera = mirrorCamera;
     AppDebugConfig.showStats = showStats;
-    AppDebugConfig.skipPreview = skipPreview;
     AppDebugConfig.isDebugMode = isDebugMode;
     AppDebugConfig.nameChangeOnPreview = true;
     AppDebugConfig.isVirtualBackgroundEnabled = isVirtualBackgroundEnabled;

diff --git a/packages/hmssdk_flutter/example/lib/main.dart b/packages/hmssdk_flutter/example/lib/main.dart
@@ -235,6 +235,7 @@ class _HomePageState extends State<HomePage> {
   TextEditingController meetingLinkController = TextEditingController();
   Uuid? uuid;
   String uuidString = "";
+  HMSAudioMode audioMode = HMSAudioMode.VOICE;
 
   PackageInfo _packageInfo = PackageInfo(
     appName: 'Unknown',
@@ -264,6 +265,9 @@ class _HomePageState extends State<HomePage> {
     } else {
       meetingLinkController.text = widget.deepLinkURL ?? "";
     }
+
+    int audioModeInt = await Utilities.getIntData(key: "audio-mode");
+    audioMode = HMSAudioMode.values[audioModeInt];
   }
 
   Future<bool> _closeApp() {
@@ -348,7 +352,11 @@ class _HomePageState extends State<HomePage> {
                               appGroup: "group.flutterhms",
                               preferredExtension:
                                   "live.100ms.flutter.FlutterBroadcastUploadExtension"),
-                          enableNoiseCancellation: true)),
+                          enableNoiseCancellation: true,
+                          isNoiseSuppressionEnabled:
+                              audioMode == HMSAudioMode.MUSIC,
+                          isAutomaticGainControlEnabled:
+                              audioMode == HMSAudioMode.MUSIC)),
                 )));
   }
 

diff --git a/packages/hmssdk_flutter/lib/assets/sdk-versions.json b/packages/hmssdk_flutter/lib/assets/sdk-versions.json
@@ -4,5 +4,5 @@
   "iOSBroadcastExtension": "0.0.9",
   "iOSHLSPlayerSDK": "0.0.2",
   "iOSNoiseCancellationModels": "1.0.0",
-  "android": "2.9.64"
+  "android": "2.9.65"
 }
diff --git a/packages/hmssdk_flutter/lib/src/model/hms_audio_track_setting.dart b/packages/hmssdk_flutter/lib/src/model/hms_audio_track_setting.dart
@@ -40,14 +40,26 @@ class HMSAudioTrackSetting {
   ///Refer: Read more about noise cancellation [here](///)
   final bool enableNoiseCancellation;
 
+  ///[enableAutomaticGainControl] property sets the automatic gain control status in the room whether is enabled or not.
+  ///
+  ///Refer: Read more about automatic gain control [here](///)
+  final bool enableAutomaticGainControl;
+
+  ///[enableNoiseSupression] property sets the noise suppression status in the room whether is enabled or not.
+  ///
+  ///Refer: Read more about noise suppression [here](///)
+  final bool enableNoiseSupression;
+
   HMSAudioTrackSetting(
       {this.useHardwareAcousticEchoCanceler,
       this.audioSource,
       this.trackInitialState = HMSTrackInitState.UNMUTED,
       this.audioMode,
       this.phoneCallState =
           HMSAndroidPhoneCallState.DISABLE_MUTE_ON_VOIP_PHONE_CALL_RING,
-      this.enableNoiseCancellation = false});
+      this.enableNoiseCancellation = false,
+      this.enableAutomaticGainControl = false,
+      this.enableNoiseSupression = false});
 
   factory HMSAudioTrackSetting.fromMap(Map map) {
     List<HMSAudioNode> nodeList = [];
@@ -109,7 +121,9 @@ class HMSAudioTrackSetting {
       'phone_call_state':
           HMSAndroidPhoneCallStateValue.getValuefromHMSPhoneCallState(
               phoneCallState),
-      'enable_noise_cancellation': enableNoiseCancellation
+      'enable_noise_cancellation': enableNoiseCancellation,
+      'enable_automatic_gain_control': enableAutomaticGainControl,
+      'enable_noise_supression': enableNoiseSupression
     };
   }
 }