Skip to content

RDKEMW-6339: No Audio when TV connected to speakers via SPDIF #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuvaramachandran-gurusamy wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RDKEMW-6339: No Audio when TV connected to speakers via SPDIF #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 149 additions & 32 deletions rpc/srv/dsAudio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:

Check failure on line 3 in rpc/srv/dsAudio.c

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'rpc/srv/dsAudio.c' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/b34ed54, 7016 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/b34ed545b533a0cf4d29d221cc23daad47f32644.tar.gz, file: rpc/srv/dsAudio.c)

Check failure on line 3 in rpc/srv/dsAudio.c

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'rpc/srv/dsAudio.c' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/2003, 7016 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/rdk-dev-2003.tar.gz, file: rpc/srv/dsAudio.c)

Check failure on line 3 in rpc/srv/dsAudio.c

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'rpc/srv/dsAudio.c' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/2009, 7016 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/rdk-dev-2009.tar.gz, file: rpc/srv/dsAudio.c)

Check failure on line 3 in rpc/srv/dsAudio.c

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'rpc/srv/dsAudio.c' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/2102, 7016 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/rdk-dev-2102.tar.gz, file: rpc/srv/dsAudio.c)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -63,6 +63,7 @@
static float m_volumeLevel = 0;
static int m_MuteStatus = false;
static int m_isDuckingInProgress = false;
static bool m_AudioPortEnabled[dsAUDIOPORT_TYPE_MAX] = {false};

static pthread_mutex_t dsLock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t audioLevelMutex = PTHREAD_MUTEX_INITIALIZER;
Expand Down Expand Up @@ -178,6 +179,8 @@
IARM_Result_t _dsSetMS12SetttingsOverride(void *arg);
IARM_Result_t _dsGetHDMIARCPortId(void *arg);

bool dsSetAudioDelayInternal(intptr_t handle,uint32_t audioDelay);
uint32_t dsGetAudioDelayInternal(dsAudioPortType_t _APortType);

static void _GetAudioModeFromPersistent(void *arg);
static dsAudioPortType_t _GetAudioPortType(intptr_t handle);
Expand Down Expand Up @@ -3308,6 +3311,45 @@
return result;
}

bool dsSetAudioDelayInternal(intptr_t handle, uint32_t audioDelay)
{
bool result = false;
typedef dsError_t (*dsSetAudioDelay_t)(intptr_t handle, uint32_t audioDelayMs);
static dsSetAudioDelay_t func = 0;
if (func == 0) {
void *dllib = dlopen(RDK_DSHAL_NAME, RTLD_LAZY);
if (dllib) {
func = (dsSetAudioDelay_t) dlsym(dllib, "dsSetAudioDelay");
if (func) {
INT_DEBUG("dsSetAudioDelay_t(int, uint32_t) is defined and loaded\r\n");
}
else {
INT_INFO("dsSetAudioDelay_t(int, uint32_t) is not defined\r\n");
}
dlclose(dllib);
}
else {
INT_ERROR("Opening RDK_DSHAL_NAME [%s] failed\r\n", RDK_DSHAL_NAME);
}
}

if (func != 0 )
{
// Amit add a check for enable
if (func(handle, audioDelay) != dsERR_NONE)
{
INT_INFO("%s: (SERVER) Unable to set audiodelay\n", __FUNCTION__);
}
else
{
INT_INFO("%s: (SERVER) success \n", __FUNCTION__);
result = true;
}
}
return result;
}



IARM_Result_t _dsEnableAudioPort(void *arg)
{
Expand Down Expand Up @@ -3357,7 +3399,16 @@
__FUNCTION__, isEnabledAudioPortKey.c_str(), param->enabled, bAudioPortEnableVerify);
}
else {
INT_DEBUG("%s : %s Audio port status verification passed. status %d\n", __FUNCTION__, isEnabledAudioPortKey.c_str(), param->enabled);
INT_DEBUG("%s : %s Audio port status verification passed. status %d\n", __FUNCTION__, isEnabledAudioPortKey.c_str(), param->enabled);
//Amit update cache and apply audio delay if port enabled
m_AudioPortEnabled[_APortType]= param->enabled;
Copy link
Contributor

@rdkcmf-jenkins rdkcmf-jenkins Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverity Issue - Out-of-bounds write

Overrunning array "m_AudioPortEnabled" of 6 bytes at byte offset 6 using index "_APortType" (which evaluates to 6).

High Impact, CWE-119
OVERRUN

INT_INFO("Amit %s : port id:%d enabled status :%d\n", __FUNCTION__, _APortType , param->enabled);
if(m_AudioPortEnabled[_APortType])
Copy link
Contributor

@rdkcmf-jenkins rdkcmf-jenkins Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverity Issue - Out-of-bounds read

Overrunning array "m_AudioPortEnabled" of 6 bytes at byte offset 6 using index "_APortType" (which evaluates to 6).

High Impact, CWE-125
OVERRUN

{
uint32_t audioDelay = dsGetAudioDelayInternal(_APortType);
dsSetAudioDelayInternal(param->handle,audioDelay);
}

}
}
else {
Expand Down Expand Up @@ -3722,15 +3773,20 @@

if (func != 0 && param != NULL)
{
if (func(param->handle, param->audioDelayMs) != dsERR_NONE)
dsAudioPortType_t _APortType = _GetAudioPortType(param->handle);
// Amit add a check for enable
if (m_AudioPortEnabled[_APortType] && func(param->handle, param->audioDelayMs) != dsERR_NONE)
Copy link
Contributor

@rdkcmf-jenkins rdkcmf-jenkins Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverity Issue - Out-of-bounds read

Overrunning array "m_AudioPortEnabled" of 6 bytes at byte offset 6 using index "_APortType" (which evaluates to 6).

High Impact, CWE-125
OVERRUN

{
INT_INFO("%s: (SERVER) Unable to set audiodelay\n", __FUNCTION__);
result = IARM_RESULT_INVALID_STATE;
}
else
{
INT_INFO("%s: (SERVER) Unable to set audiodelay as port is not enabled: %d \n", __FUNCTION__,m_AudioPortEnabled[_APortType]);
Copy link
Contributor

@rdkcmf-jenkins rdkcmf-jenkins Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverity Issue - Out-of-bounds read

Overrunning array "m_AudioPortEnabled" of 6 bytes at byte offset 6 using index "_APortType" (which evaluates to 6).

High Impact, CWE-125
OVERRUN

}

#ifdef DS_AUDIO_SETTINGS_PERSISTENCE
std::string _AudioDelay = std::to_string(param->audioDelayMs);
dsAudioPortType_t _APortType = _GetAudioPortType(param->handle);
switch(_APortType) {
case dsAUDIOPORT_TYPE_SPDIF:
INT_DEBUG("%s: port: %s , persist audio delay: %d\n",__func__,"SPDIF0", param->audioDelayMs);
Expand Down Expand Up @@ -3763,6 +3819,89 @@

}

uint32_t dsGetAudioDelayInternal(dsAudioPortType_t _APortType)
{
std::string audioDelayMs = "0";
uint32_t returnAudioDelayMs = 0;
switch(_APortType) {
case dsAUDIOPORT_TYPE_SPDIF:
{
try {
audioDelayMs = device::HostPersistence::getInstance().getProperty("SPDIF0.audio.Delay");
}
catch(...) {
try {
INT_DEBUG("SPDIF0.audio.Delay not found in persistence store. Try system default\n");
audioDelayMs = device::HostPersistence::getInstance().getDefaultProperty("SPDIF0.audio.Delay");
}
catch(...) {
audioDelayMs = "0";
}
}
}
break;
case dsAUDIOPORT_TYPE_HDMI:
{
try {
audioDelayMs = device::HostPersistence::getInstance().getProperty("HDMI0.audio.Delay");
}
catch(...) {
try {
INT_DEBUG("HDMI0.audio.Delay not found in persistence store. Try system default\n");
audioDelayMs = device::HostPersistence::getInstance().getDefaultProperty("HDMI0.audio.Delay");
}
catch(...) {
audioDelayMs = "0";
}
}
}
break;
case dsAUDIOPORT_TYPE_SPEAKER:
{
try {
audioDelayMs = device::HostPersistence::getInstance().getProperty("SPEAKER0.audio.Delay");
}
catch(...) {
try {
INT_DEBUG("SPEAKER0.audio.Delay not found in persistence store. Try system default\n");
audioDelayMs = device::HostPersistence::getInstance().getDefaultProperty("SPEAKER0.audio.Delay");
}
catch(...) {
audioDelayMs = "0";
}
}
}
break;
case dsAUDIOPORT_TYPE_HDMI_ARC:
{
try {
audioDelayMs = device::HostPersistence::getInstance().getProperty("HDMI_ARC0.audio.Delay");
}
catch(...) {
try {
INT_DEBUG("HDMI_ARC0.audio.Delay not found in persistence store. Try system default\n");
audioDelayMs = device::HostPersistence::getInstance().getDefaultProperty("HDMI_ARC0.audio.Delay");
}
catch(...) {
audioDelayMs = "0";
}
}
} break;
default:
INT_DEBUG("%s: port: UNKNOWN , persist audio delay: %d : NOT SET\n",__func__, audioDelayMs);
Copy link
Contributor

@rdkcmf-jenkins rdkcmf-jenkins Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverity Issue - Invalid type in argument to printf format specifier

Argument "audioDelayMs" to format specifier "%d" was expected to have type "int" but has type "std::__cxx11::basic_string<char, std::char_traits, std::allocator >".

Medium Impact, CWE-686
PRINTF_ARGS

break;
}
try {
returnAudioDelayMs = std::stoul(audioDelayMs);
}
catch(...) {
INT_INFO("%s: Exception in getting the audio delay from persistence storage, returning default value 0\n", __FUNCTION__);
returnAudioDelayMs = 0;
}
return returnAudioDelayMs;
}


IARM_Result_t _dsGetAudioDelay(void *arg)
{
#ifndef RDK_DSHAL_NAME
Expand All @@ -3771,38 +3910,16 @@
#endif
_DEBUG_ENTER();
IARM_BUS_Lock(lock);

IARM_Result_t result = IARM_RESULT_INVALID_STATE;
typedef dsError_t (*dsGetAudioDelay_t)(intptr_t handle, uint32_t *audioDelayMs);
static dsGetAudioDelay_t func = 0;
if (func == 0) {
void *dllib = dlopen(RDK_DSHAL_NAME, RTLD_LAZY);
if (dllib) {
func = (dsGetAudioDelay_t) dlsym(dllib, "dsGetAudioDelay");
if (func) {
INT_DEBUG("dsGetAudioDelay_t(int, uint32_t*) is defined and loaded\r\n");
}
else {
INT_INFO("dsGetAudioDelay_t(int, uint32_t*) is not defined\r\n");
}
dlclose(dllib);
}
else {
INT_ERROR("Opening RDK_DSHAL_NAME [%s] failed\r\n", RDK_DSHAL_NAME);
}
}

dsGetAudioDelayParam_t *param = (dsGetAudioDelayParam_t *)arg;

if (func != 0 && param != NULL)
if (param != NULL)
{
uint32_t audioDelayMs = 0;
param->audioDelayMs = 0;
if (func(param->handle, &audioDelayMs) == dsERR_NONE)
{
param->audioDelayMs = audioDelayMs;
result = IARM_RESULT_SUCCESS;
}
uint32_t audioDelayMs = 0;
dsAudioPortType_t _APortType = _GetAudioPortType(param->handle);
audioDelayMs = dsGetAudioDelayInternal(_APortType);
param->audioDelayMs = audioDelayMs;
INT_INFO("%s: (SERVER) getAudioDelay audioDelayMs: %d \n", __FUNCTION__,audioDelayMs);
result = IARM_RESULT_SUCCESS;
}

IARM_BUS_Unlock(lock);
Expand Down
Loading