Skip to content

RDKEMW-19159: Update AAMP (dsMgr Client) to Use Existing Thunder Plugin for libds Methods and Event Notifications #224

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
nejuma1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

RDKEMW-19159: Update AAMP (dsMgr Client) to Use Existing Thunder Plugin for libds Methods and Event Notifications #224

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion externals/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ if(CMAKE_IARM_MGR)
set(EXT_SOURCES "${EXT_SOURCES}" rdk/IIarm/DeviceIARMInterface.cpp)
set(EXT_SOURCES "${EXT_SOURCES}" rdk/IFirebolt/DeviceFireboltInterface.cpp)
set(EXT_SOURCES "${EXT_SOURCES}" IFirebolt/FireboltInterface.cpp)
list(APPEND LIB_EXT_DEPENDS -lIARMBus -lds -ldshalcli)
list(APPEND LIB_EXT_DEPENDS -lIARMBus)
endif()

if(CMAKE_PLAYER_RFC_REQUIRED)
Expand Down
4 changes: 4 additions & 0 deletions externals/PlayerExternalsInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ bool PlayerExternalsInterface::IsConfigWifiCurlHeader()
return bRet;
}

/**
* @brief Deprecated runtime selector for Firebolt/IARM path.
* @deprecated Path selection is compile-time controlled by FIREBOLT_SUPPORTED.
*/
void PlayerExternalsInterface::SetUseFireBoltSDK(bool t_use_firebolt_sdk)
{
m_pIarmInterface->SetUseFireBoltSDK(t_use_firebolt_sdk);
Expand Down
10 changes: 9 additions & 1 deletion externals/PlayerExternalsInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ class FakePlayerExternalsInterface : public PlayerExternalsInterfaceBase
*/
bool GetActiveInterface()override{return false;}

/**
* @brief Deprecated runtime selector retained for interface compatibility.
* @deprecated Path selection is compile-time controlled by FIREBOLT_SUPPORTED.
*/
void SetUseFireBoltSDK(bool t_use_firebolt_sdk) override {}

void SetPowerEvent(bool powerEvt) override {}
Expand Down Expand Up @@ -324,7 +328,11 @@ class PlayerExternalsInterface
*/
bool IsConfigWifiCurlHeader();


/**
* @brief Deprecated runtime selector for Firebolt/IARM path.
* @deprecated Path selection is compile-time controlled by FIREBOLT_SUPPORTED.
* This API is retained only for backward compatibility.
*/
void SetUseFireBoltSDK(bool t_use_firebolt_sdk);

void SetPowerEvent(bool powerEvt);
Expand Down
5 changes: 5 additions & 0 deletions externals/PlayerExternalsInterfaceBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ class PlayerExternalsInterfaceBase

virtual ~PlayerExternalsInterfaceBase(){}

/**
* @brief Deprecated runtime selector for Firebolt/IARM path.
* @deprecated Path selection is compile-time controlled by FIREBOLT_SUPPORTED.
* Implementations may ignore this input.
*/
virtual void SetUseFireBoltSDK(bool t_use_firebolt_sdk) = 0;

virtual void SetPowerEvent(bool powerEvt) = 0;
Expand Down
4 changes: 3 additions & 1 deletion externals/PlayerThunderAccessBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ enum PlayerThunderAccessPlugin
SECMANAGER,
WATERMARK,
HDMIINPUT,
COMPOSITEINPUT
COMPOSITEINPUT,
HDCPPROFILE,
DISPLAYINFO
};
Comment on lines 44 to 50

/*
Expand Down
4 changes: 2 additions & 2 deletions externals/rdk/DeviceInterfaceBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ class DeviceInterfaceBase {
DeviceInterfaceBase()
{}

virtual void RegisterDsMgrEventHandler() = 0;
//virtual void RegisterDsMgrEventHandler() = 0;

virtual void RegisterNtwMgrEventHandler() = 0;

virtual void RemoveEventHandlers() = 0;
//virtual void RemoveEventHandlers() = 0;

virtual char *GetTR181Config(const char * paramName, size_t & iConfigLen) = 0;

Expand Down
15 changes: 5 additions & 10 deletions externals/rdk/IFirebolt/DeviceFireboltInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ DeviceFireboltInterface::DeviceFireboltInterface()
DeviceFireboltInterface::~DeviceFireboltInterface()
{
MW_PRE_LOGGER_LOG("DeviceFireboltInterface destructor called \n");
RemoveEventHandlers();
Firebolt::IFireboltAampAccessor::Instance().DeviceInterface().unsubscribeAll();
m_pFireboltInterface = nullptr;
}

Expand All @@ -81,7 +81,6 @@ void DeviceFireboltInterface::Initialize()
if(s_pDeviceFireboltInterface)
{
MW_PRE_LOGGER_LOG("Registering events \n");
s_pDeviceFireboltInterface->RegisterDsMgrEventHandler();
s_pDeviceFireboltInterface->RegisterNtwMgrEventHandler();
}
else
Expand All @@ -93,6 +92,7 @@ void DeviceFireboltInterface::Initialize()

}

#if 0 // RegisterDsMgrEventHandler removed: declaration commented out in all headers

void DeviceFireboltInterface::RegisterDsMgrEventHandler()
{
Expand Down Expand Up @@ -135,12 +135,7 @@ void DeviceFireboltInterface::RegisterDsMgrEventHandler()
}

}

void DeviceFireboltInterface::RemoveEventHandlers()
{
//removes everything ...
Firebolt::IFireboltAampAccessor::Instance().DeviceInterface().unsubscribeAll();
}
#endif // RegisterDsMgrEventHandler disabled

void DeviceFireboltInterface::RegisterNtwMgrEventHandler()
{
Expand Down Expand Up @@ -231,12 +226,12 @@ static void HDCPEventHandlerFirebolt(const Firebolt::Device::HDCPVersionMap& t_H

if(t_HDCPVersionMap.hdcp2_2)
{
pInstance->setHdcpProtocol(dsHDCP_VERSION_2X);
pInstance->setHdcpProtocol(HdcpProtocolVersion::V2X);
MW_LOG_INFO("HDCP protocol updated 2_2");
}
else if(t_HDCPVersionMap.hdcp1_4)
{
pInstance->setHdcpProtocol(dsHDCP_VERSION_1X);
pInstance->setHdcpProtocol(HdcpProtocolVersion::V1X);
MW_LOG_INFO("HDCP protocol updated 1_4");
}
else
Expand Down
4 changes: 2 additions & 2 deletions externals/rdk/IFirebolt/DeviceFireboltInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ class DeviceFireboltInterface : public DeviceInterfaceBase {

void ConnectionChanged(const bool connected, int error);

void RegisterDsMgrEventHandler() override;
//void RegisterDsMgrEventHandler() override;

void RegisterNtwMgrEventHandler() override;

void RemoveEventHandlers() override;
//void RemoveEventHandlers() override;

void DestroyFireboltInstance();

Expand Down
11 changes: 5 additions & 6 deletions externals/rdk/IIarm/DeviceIARMInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ typedef struct _IARM_BUS_NetSrvMgr_Iface_EventData_t {

std::shared_ptr<DeviceIARMInterface> s_pDeviceIARMInterface = nullptr;

#ifndef USE_DS_EVENT_SUPPORTED
#ifndef USE_DS_THUNDER_PLUGIN
static void HDMIEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len);
static void ResolutionHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len);
#endif
Expand Down Expand Up @@ -119,7 +119,7 @@ DeviceIARMInterface::~DeviceIARMInterface()
{
MW_PRE_LOGGER_LOG("DeviceIARMInterface destructor called \n");

RemoveEventHandlers();
IARM_Bus_RemoveEventHandler("NET_SRV_MGR", IARM_BUS_NETWORK_MANAGER_EVENT_INTERFACE_IPADDRESS, getActiveInterfaceEventHandler);

s_pDeviceIARMInterface = nullptr;
}
Expand All @@ -135,7 +135,6 @@ void DeviceIARMInterface::Initialize()
terminatePowerController();
}
#endif
s_pDeviceIARMInterface->RegisterDsMgrEventHandler();
s_pDeviceIARMInterface->RegisterNtwMgrEventHandler();
}

Expand Down Expand Up @@ -307,7 +306,7 @@ void DeviceIARMInterface::IARMInit()
MW_PRE_LOGGER_LOG("IARM Interface Init completed in Player\n");

}

/*
void DeviceIARMInterface::RegisterDsMgrEventHandler()
{
#ifndef USE_DS_EVENT_SUPPORTED
Expand All @@ -325,7 +324,7 @@ void DeviceIARMInterface::RemoveEventHandlers()
IARM_Bus_RemoveEventHandler(IARM_BUS_DSMGR_NAME,IARM_BUS_DSMGR_EVENT_RES_POSTCHANGE, ResolutionHandler);
#endif
IARM_Bus_RemoveEventHandler("NET_SRV_MGR", IARM_BUS_NETWORK_MANAGER_EVENT_INTERFACE_IPADDRESS, getActiveInterfaceEventHandler);
}
}*/

void DeviceIARMInterface::RegisterNtwMgrEventHandler()
{
Expand Down Expand Up @@ -420,7 +419,7 @@ static void getActiveInterfaceEventHandler (const char *owner, IARM_EventId_t ev

}

#ifndef USE_DS_EVENT_SUPPORTED
#ifndef USE_DS_THUNDER_PLUGIN
/**
* @brief IARM event handler for HDCP and HDMI hot plug events
*/
Expand Down
4 changes: 2 additions & 2 deletions externals/rdk/IIarm/DeviceIARMInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ class DeviceIARMInterface : public DeviceInterfaceBase{

private:

void RegisterDsMgrEventHandler() override;
//void RegisterDsMgrEventHandler() override;

void RegisterNtwMgrEventHandler() override;

void RemoveEventHandlers() override;
//void RemoveEventHandlers() override;

DeviceIARMInterface();

Expand Down
Loading
Loading