RDKTV-35677: Delay in Volume Level Status update on the panel (rdkcentral#6319)

* RDKTV-35677: Delay in Volume Level Status update on the panel

Reason for change: Increase the Audio Status Timer to 2s and handle the corner cases.
Test Procedure: refer the ticket
Risks: None
Signed-off-by: Neethu A S [email protected]

* Update HdmiCecSink.cpp

* Update HdmiCecSink.cpp

---------

Signed-off-by: Neethu A S [email protected]

Author: Neethu379

HdmiCecSink/HdmiCecSink.cpp

@@ -78,8 +78,7 @@
 #define HDMICECSINK_NUMBER_TV_ADDR 					2
 #define HDMICECSINK_UPDATE_POWER_STATUS_INTERVA_MS    (60 * 1000)
 #define HDMISINK_ARC_START_STOP_MAX_WAIT_MS           4000
-#define HDMICECSINK_UPDATE_AUDIO_STATUS_INTERVAL_MS    500
-
+#define HDMICECSINK_UPDATE_AUDIO_STATUS_INTERVAL_MS    2000
 
 #define SAD_FMT_CODE_AC3 2
 #define SAD_FMT_CODE_ENHANCED_AC3 10
@@ -695,6 +694,7 @@ namespace WPEFramework
 		   m_isHdmiInConnected = false;
 		   hdmiCecAudioDeviceConnected = false;
 		   m_isAudioStatusInfoUpdated = false;
+		   m_audioStatusRequestedCount = 0;
 		   m_audioStatusReceived = false;
 		   m_audioStatusTimerStarted = false;
                    m_audioDevicePowerStatusRequested = false;
@@ -1223,9 +1223,11 @@ namespace WPEFramework
 			    LOGINFO("AudioStatus received from the Audio Device and the timer is still active. So stopping the timer!\n");
 			    m_audioStatusDetectionTimer.stop();
 		    }
-		    LOGINFO("AudioStatus received from the Audio Device. Updating the AudioStatus info! m_isAudioStatusInfoUpdated :%d, m_audioStatusReceived :%d, m_audioStatusTimerStarted:%d ", m_isAudioStatusInfoUpdated,m_audioStatusReceived,m_audioStatusTimerStarted);
+		    LOGINFO("AudioStatus received from the Audio Device. Updating the AudioStatus info! m_isAudioStatusInfoUpdated :%d, m_audioStatusRequestedCount :%d, m_audioStatusReceived :%d, m_audioStatusTimerStarted:%d ", m_isAudioStatusInfoUpdated,m_audioStatusRequestedCount,m_audioStatusReceived,m_audioStatusTimerStarted);
 	    }
-			LOGINFO("Command: ReportAudioStatus  %s audio Mute status %d  means %s  and current Volume level is %d \n",GetOpName(msg.opCode()),msg.status.getAudioMuteStatus(),msg.status.toString().c_str(),msg.status.getAudioVolume());
+	    if(m_audioStatusRequestedCount > 0)
+		    m_audioStatusRequestedCount--;
+	    LOGINFO("Command: ReportAudioStatus  %s audio Mute status %d  means %s  and current Volume level is %d \n",GetOpName(msg.opCode()),msg.status.getAudioMuteStatus(),msg.status.toString().c_str(),msg.status.getAudioVolume());
             params["muteStatus"]  = msg.status.getAudioMuteStatus();
             params["volumeLevel"] = msg.status.getAudioVolume();
             sendNotify(eventString[HDMICECSINK_EVENT_REPORT_AUDIO_STATUS], params);
@@ -1417,7 +1419,15 @@ namespace WPEFramework
              return;
             if(!(_instance->smConnection))
                 return;
+	    if (m_audioStatusDetectionTimer.isActive())
+	    {
+		    LOGINFO("Stopping the Audio Status Timer!\n");
+		    m_audioStatusDetectionTimer.stop();
+		    m_audioStatusTimerStarted = false;
+		    LOGINFO("m_isAudioStatusInfoUpdated :%d, m_audioStatusReceived :%d, m_audioStatusTimerStarted:%d ",m_isAudioStatusInfoUpdated,m_audioStatusReceived,m_audioStatusTimerStarted);
+	    }
              LOGINFO(" Send GiveAudioStatus ");
+	     m_audioStatusRequestedCount++;
 	      _instance->smConnection->sendTo(LogicalAddress::AUDIO_SYSTEM,MessageEncoder().encode(GiveAudioStatus()), 100);
 
         }
@@ -2651,10 +2661,11 @@ namespace WPEFramework
 						m_audioStatusDetectionTimer.stop();
 					}
 					m_isAudioStatusInfoUpdated = false;
+					m_audioStatusRequestedCount = 0;
 					m_audioStatusReceived = false;
 					m_audioStatusTimerStarted = false;
-					LOGINFO("Audio device removed, reset the audio status info.  m_isAudioStatusInfoUpdated :%d, m_audioStatusReceived :%d, m_audioStatusTimerStarted:%d ", m_isAudioStatusInfoUpdated,m_audioStatusReceived,m_audioStatusTimerStarted);
-                                        sendNotify(eventString[HDMICECSINK_EVENT_AUDIO_DEVICE_CONNECTED_STATUS], params)
+                                        LOGINFO("Audio device removed, reset the audio status info.  m_isAudioStatusInfoUpdated :%d, m_audioStatusRequestedCount :%d, m_audioStatusReceived :%d, m_audioStatusTimerStarted:%d", m_isAudioStatusInfoUpdated,m_audioStatusRequestedCount,m_audioStatusReceived,m_audioStatusTimerStarted);
+					sendNotify(eventString[HDMICECSINK_EVENT_AUDIO_DEVICE_CONNECTED_STATUS], params)
                                 }
 
 				_instance->deviceList[logicalAddress].m_isRequestRetry = 0;
@@ -3287,10 +3298,10 @@ namespace WPEFramework
 			    m_audioStatusDetectionTimer.stop();
 	    }
 	    m_isAudioStatusInfoUpdated = false;
+	    m_audioStatusRequestedCount = 0;
 	    m_audioStatusReceived = false;
 	    m_audioStatusTimerStarted = false;
-	    LOGINFO("CEC Disabled, reset the audio status info. m_isAudioStatusInfoUpdated :%d, m_audioStatusReceived :%d, m_audioStatusTimerStarted:%d ", m_isAudioStatusInfoUpdated,m_audioStatusReceived,m_audioStatusTimerStarted);
-
+	    LOGINFO("CEC Disabled, reset the audio status info. m_isAudioStatusInfoUpdated :%d, m_audioStatusRequestedCount :%d, m_audioStatusReceived :%d, m_audioStatusTimerStarted:%d ", m_isAudioStatusInfoUpdated,m_audioStatusRequestedCount,m_audioStatusReceived,m_audioStatusTimerStarted);
 
 	    for(int i=0; i< 16; i++)
             {
@@ -3527,6 +3538,8 @@ namespace WPEFramework
                     keyInfo = _instance->m_SendKeyQueue.front();
                     _instance->m_SendKeyQueue.pop();
 
+		if((keyInfo.logicalAddr != 0x5) || ((keyInfo.logicalAddr == 0x5) && (_instance->hdmiCecAudioDeviceConnected == true)))
+		{
 		    if(keyInfo.UserControl == "sendUserControlPressed" )
 		    {
 			    LOGINFO("sendUserControlPressed : logical addr:0x%x keyCode: 0x%x  queue size :%zu \n",keyInfo.logicalAddr,keyInfo.keyCode,_instance->m_SendKeyQueue.size());
@@ -3546,16 +3559,16 @@ namespace WPEFramework
 
 		    if((_instance->m_SendKeyQueue.size()<=1 || (_instance->m_SendKeyQueue.size() % 2 == 0)) && ((keyInfo.keyCode == VOLUME_UP) || (keyInfo.keyCode == VOLUME_DOWN) || (keyInfo.keyCode == MUTE)) )
 		    {
+			LOGINFO("m_isAudioStatusInfoUpdated :%d, m_audioStatusRequestedCount :%d, m_audioStatusReceived :%d, m_audioStatusTimerStarted:%d ",_instance->m_isAudioStatusInfoUpdated,_instance->m_audioStatusRequestedCount,_instance->m_audioStatusReceived,_instance->m_audioStatusTimerStarted);
 			if(keyInfo.keyCode == MUTE)
 			{
 				_instance->sendGiveAudioStatusMsg();
 			}
 			else
 			{
-				LOGINFO("m_isAudioStatusInfoUpdated :%d, m_audioStatusReceived :%d, m_audioStatusTimerStarted:%d ",_instance->m_isAudioStatusInfoUpdated,_instance->m_audioStatusReceived,_instance->m_audioStatusTimerStarted);
 				if (!_instance->m_isAudioStatusInfoUpdated)
 				{
-					if ( !(_instance->m_audioStatusDetectionTimer.isActive()))
+					if ((!(_instance->m_audioStatusDetectionTimer.isActive())) && (_instance->m_audioStatusRequestedCount == 0))
 					{
 						LOGINFO("Audio status info not updated. Starting the Timer!");
 						_instance->m_audioStatusTimerStarted = true;
@@ -3570,6 +3583,7 @@ namespace WPEFramework
 					}
 				}
 			}
+		    }
 		}
 
             }//while(!_instance->m_sendKeyEventThreadExit)

HdmiCecSink/HdmiCecSink.h

@@ -634,6 +634,7 @@ namespace WPEFramework {
 	    bool m_isAudioStatusInfoUpdated;
 	    bool m_audioStatusReceived;
 	    bool m_audioStatusTimerStarted;
+	    int m_audioStatusRequestedCount;
             std::thread m_sendKeyEventThread;
             std::mutex m_sendKeyEventMutex;
             std::queue<SendKeyInfo> m_SendKeyQueue;