rdkcentral · hgfell683 · Nov 19, 2025 · Nov 5, 2025 · Nov 10, 2025 · Nov 10, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [1.0.21](https://github.com/rdkcentral/devicesettings/compare/1.0.21...1.0.21)
+#### [1.0.24](https://github.com/rdkcentral/devicesettings/compare/1.0.23...1.0.24)
+
+- RDKEMW-10107: Speaker volume level do not persist after reboot [`#169`](https://github.com/rdkcentral/devicesettings/pull/169)
+- Merge tag '1.0.23' into develop [`0fa742c`](https://github.com/rdkcentral/devicesettings/commit/0fa742ce90128f321551ecd9007fbc83a8ef9202)
+
+#### [1.0.23](https://github.com/rdkcentral/devicesettings/compare/1.0.22...1.0.23)
+
+> 10 November 2025
+
+- RDKEMW-9408: Refactored the code to avoid duplicated lines [`#160`](https://github.com/rdkcentral/devicesettings/pull/160)
+- 1.0.23 release change log updates [`7659e1f`](https://github.com/rdkcentral/devicesettings/commit/7659e1f4e0a241bec376b2ba945b9af9b9517fcb)
+- Merge tag '1.0.22' into develop [`07dfc36`](https://github.com/rdkcentral/devicesettings/commit/07dfc36c5451cec8841e06746f4c234189c0d127)
+
+#### [1.0.22](https://github.com/rdkcentral/devicesettings/compare/1.0.21...1.0.22)
+
+> 15 October 2025
 
 - RDKEMW-9411:TV information not telemetry friendly [`#163`](https://github.com/rdkcentral/devicesettings/pull/163)
 - Update CODEOWNERS [`#161`](https://github.com/rdkcentral/devicesettings/pull/161)
+- 1.0.22 release change log updates [`828258b`](https://github.com/rdkcentral/devicesettings/commit/828258b4c1fbc4385b2437b845d754e7ab0dce05)
 - Merge tag '1.0.21' into develop [`2c97d46`](https://github.com/rdkcentral/devicesettings/commit/2c97d46c936691b45c3265b05da65976ddb6aef0)
 
 #### [1.0.21](https://github.com/rdkcentral/devicesettings/compare/1.0.20...1.0.21)
@@ -23,10 +39,21 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - 1.0.21 release change log updates [`e2e586c`](https://github.com/rdkcentral/devicesettings/commit/e2e586cb43068363fd7a8236f97ba7b760e31e8e)
 - Merge tag '1.0.20' into develop [`b8246d2`](https://github.com/rdkcentral/devicesettings/commit/b8246d21e1fdd0774739553db5cc576a0df10399)
 
-#### [1.0.20](https://github.com/rdkcentral/devicesettings/compare/1.0.19...1.0.20)
+#### [1.0.20](https://github.com/rdkcentral/devicesettings/compare/1.0.20-hotfix.2...1.0.20)
 
 > 17 September 2025
 
+#### [1.0.20-hotfix.2](https://github.com/rdkcentral/devicesettings/compare/1.0.20-hotfix.1...1.0.20-hotfix.2)
+
+> 5 November 2025
+
+- RDKEMW-9411:TV information not telemetry friendly [`#163`](https://github.com/rdkcentral/devicesettings/pull/163)
+
+#### [1.0.20-hotfix.1](https://github.com/rdkcentral/devicesettings/compare/1.0.19...1.0.20-hotfix.1)
+
+> 29 October 2025
+
+- RDKEMW-8665: Init time reference for cond wait API call [`#156`](https://github.com/rdkcentral/devicesettings/pull/156)
 - RDKEMW-7967: Adding retry logic for dsFPInit [`#144`](https://github.com/rdkcentral/devicesettings/pull/144)
 - RDKEMW-6149: Implementation of IARM libds event notification APIs [`#121`](https://github.com/rdkcentral/devicesettings/pull/121)
 - 1.0.20 release change log updates [`8c82428`](https://github.com/rdkcentral/devicesettings/commit/8c82428087b9221d7d46af2baef470c541cb3827)
@@ -91,10 +118,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - 1.0.13 release change log updates [`46313cd`](https://github.com/rdkcentral/devicesettings/commit/46313cdef42716cfec368f6dd8a71508dd9773ba)
 - RDKEMW-4128 Coverity Integration [`d6306c5`](https://github.com/rdkcentral/devicesettings/commit/d6306c5712f7212794cd29994dd1dda5091bf81d)
 
-#### [1.0.12](https://github.com/rdkcentral/devicesettings/compare/1.0.12-hotfix.3...1.0.12)
+#### [1.0.12](https://github.com/rdkcentral/devicesettings/compare/1.0.12-hotfix.4...1.0.12)
 
 > 11 June 2025
 
+#### [1.0.12-hotfix.4](https://github.com/rdkcentral/devicesettings/compare/1.0.12-hotfix.3...1.0.12-hotfix.4)
+
+> 15 October 2025
+
+- Update dsDisplay.c [`#166`](https://github.com/rdkcentral/devicesettings/pull/166)
+
 #### [1.0.12-hotfix.3](https://github.com/rdkcentral/devicesettings/compare/1.0.12-hotfix.2...1.0.12-hotfix.3)
 
 > 11 September 2025

diff --git a/rpc/srv/dsAudio.c b/rpc/srv/dsAudio.c
@@ -1,6 +1,6 @@
 /*
 * If not stated otherwise in this file or this component's LICENSE file the
 * following copyright and licenses apply:
 *
 * Copyright 2016 RDK Management
 *
@@ -60,7 +60,6 @@
 static bool m_MS12DEEnabled = 0;
 static bool m_LEEnabled = 0;
 static int m_volumeDuckingLevel = 0;
-static float m_volumeLevel = 0;
 static int m_MuteStatus = false;
 static int m_isDuckingInProgress = false;
 static bool m_AudioPortEnabled[dsAUDIOPORT_TYPE_MAX] = {false};
@@ -351,7 +350,6 @@
                     audioLevel_cache_spdif = m_audioLevel;
                     if (dsSetAudioLevelFunc(handle, m_audioLevel) == dsERR_NONE) {
                         INT_INFO("Port %s: Initialized audio level : %f\n","SPDIF0", m_audioLevel);
-                        m_volumeLevel = m_audioLevel;
                     }
                 }
 //SPEAKER init
@@ -372,7 +370,6 @@
                     m_audioLevel = atof(_AudioLevel.c_str());
 		    audioLevel_cache_speaker = m_audioLevel;
                     if (dsSetAudioLevelFunc(handle, m_audioLevel) == dsERR_NONE) {
-                        m_volumeLevel = m_audioLevel;
                         INT_INFO("Port %s: Initialized audio level : %f\n","SPEAKER0", m_audioLevel);
                     }
                 }
@@ -416,7 +413,6 @@
 		    audioLevel_cache_hdmi = m_audioLevel;
                     if (dsSetAudioLevelFunc(handle, m_audioLevel) == dsERR_NONE) {
                         INT_INFO("Port %s: Initialized audio level : %f\n","HDMI0", m_audioLevel);
-                        m_volumeLevel = m_audioLevel;
                     }
                 }
 
@@ -2790,28 +2786,36 @@
 
     IARM_BUS_Lock(lock);
     int volume = 0;
+    float volumeLevel = 0;
     bool portEnabled = false;
     dsAudioSetDuckingParam_t *param = (dsAudioSetDuckingParam_t *)arg;
     IARM_Bus_DSMgr_EventData_t eventData;
-    INT_DEBUG("%s action : %d type :%d val :%d m_volumeLevel:%f \n",__FUNCTION__,param->action,param->type,param->level,m_volumeLevel );
+    INT_DEBUG("%s action : %d type :%d val :%d \n",__FUNCTION__,param->action,param->type,param->level);
 
     dsError_t ret = dsIsAudioPortEnabled(param->handle, &portEnabled);
     if (ret != dsERR_NONE) {
         INT_INFO("%s failed dsIsAudioPortEnabled\n",__FUNCTION__);
     }
 
+    ret = dsGetAudioLevel (param->handle, &volumeLevel);
+    if (ret != dsERR_NONE) {
+        INT_ERROR("%s failed dsGetAudioLevel\n",__FUNCTION__);
+    }
+
+    INT_DEBUG("%s volumeLevel:%f \n",__FUNCTION__, volumeLevel);
+
     if(param->action == dsAUDIO_DUCKINGACTION_START)
     {
         m_isDuckingInProgress = true;
 	if(param->type == dsAUDIO_DUCKINGTYPE_RELATIVE )
 	{
-             volume = (m_volumeLevel * param->level) / 100;
+             volume = (volumeLevel * param->level) / 100;
 	}
 	else
 	{
-           if(param->level > m_volumeLevel)
+           if(param->level > volumeLevel)
            {
-		 volume =  m_volumeLevel;
+		 volume =  volumeLevel;
 	   }
            else
 	   {
@@ -2822,7 +2826,7 @@
     else
     {
 	m_isDuckingInProgress = false;
-	volume = m_volumeLevel;
+	volume = volumeLevel;
     }
 
     if(m_MuteStatus || !portEnabled)
@@ -3113,11 +3117,9 @@
             if(m_isDuckingInProgress && currlevel != m_volumeDuckingLevel )
             {
                dsSetAudioLevelFunc(param->handle, m_volumeDuckingLevel);
-               m_volumeLevel = (int) param->level;
             }
             else if (m_isDuckingInProgress || dsSetAudioLevelFunc(param->handle, param->level) == dsERR_NONE)
             {
-              m_volumeLevel = (int) param->level;
               result = IARM_RESULT_SUCCESS;
             }
         } else if( dsSetAudioLevelFunc(param->handle, param->level) == dsERR_NONE) {
@@ -3190,7 +3192,11 @@
     }
     else
     {
-         volume = m_volumeLevel;
+         dsError_t ret = dsGetAudioLevel (handle, &volume);
+         if (ret != dsERR_NONE) {
+            INT_ERROR("%s dsGetAudioLevel\n",__FUNCTION__);
+         }
+         INT_DEBUG("%s: audio level %f\n", __FUNCTION__, volume);
     }
     if (dsSetAudioLevelFunc == 0)
     {