From 033454b563ff10b80e0487eff8c7cb921bb58b1f Mon Sep 17 00:00:00 2001 From: "neethu.arambilsunny@sky.uk" Date: Mon, 12 May 2025 17:16:01 +0100 Subject: [PATCH 01/11] RDKEMW-4116 : VRR Feature Middleware changes. --- AVInput/AVInput.cpp | 216 +++++++++++++++++++++++++++++++++++++++++++- AVInput/AVInput.h | 8 ++ 2 files changed, 222 insertions(+), 2 deletions(-) diff --git a/AVInput/AVInput.cpp b/AVInput/AVInput.cpp index 8c71c7a6..094c5f99 100644 --- a/AVInput/AVInput.cpp +++ b/AVInput/AVInput.cpp @@ -48,6 +48,8 @@ #define AVINPUT_METHOD_GET_EDID_VERSION "getEdidVersion" #define AVINPUT_METHOD_SET_EDID_ALLM_SUPPORT "setEdid2AllmSupport" #define AVINPUT_METHOD_GET_EDID_ALLM_SUPPORT "getEdid2AllmSupport" +#define AVINPUT_METHOD_SET_VRR_SUPPORT "setVRRSupport" +#define AVINPUT_METHOD_GET_VRR_SUPPORT "getVRRSupport" #define AVINPUT_METHOD_GET_HDMI_COMPATIBILITY_VERSION "getHdmiVersion" #define AVINPUT_METHOD_SET_MIXER_LEVELS "setMixerLevels" #define AVINPUT_METHOD_START_INPUT "startInput" @@ -156,7 +158,11 @@ void AVInput::InitializeIARM() IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_HDMI_IN_ALLM_STATUS, dsAVGameFeatureStatusEventHandler)); - IARM_CHECK(IARM_Bus_RegisterEventHandler( + IARM_CHECK(IARM_Bus_RegisterEventHandler( + IARM_BUS_DSMGR_NAME, + IARM_BUS_DSMGR_EVENT_HDMI_IN_VRR_STATUS, + dsAVGameFeatureStatusEventHandler)); + IARM_CHECK(IARM_Bus_RegisterEventHandler( IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_HOTPLUG, dsAVEventHandler)); @@ -198,6 +204,9 @@ void AVInput::DeinitializeIARM() IARM_CHECK(IARM_Bus_RemoveEventHandler( IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_HDMI_IN_ALLM_STATUS, dsAVGameFeatureStatusEventHandler)); + IARM_CHECK(IARM_Bus_RemoveEventHandler( + IARM_BUS_DSMGR_NAME, + IARM_BUS_DSMGR_EVENT_HDMI_IN_VRR_STATUS, dsAVGameFeatureStatusEventHandler)); IARM_CHECK(IARM_Bus_RemoveEventHandler( IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_HOTPLUG, dsAVEventHandler)); @@ -231,6 +240,8 @@ void AVInput::RegisterAll() Register(_T(AVINPUT_METHOD_SET_MIXER_LEVELS), &AVInput::setMixerLevels, this); Register(_T(AVINPUT_METHOD_SET_EDID_ALLM_SUPPORT), &AVInput::setEdid2AllmSupportWrapper, this); Register(_T(AVINPUT_METHOD_GET_EDID_ALLM_SUPPORT), &AVInput::getEdid2AllmSupportWrapper, this); + Register(_T(AVINPUT_METHOD_SET_VRR_SUPPORT), &AVInput::setVRRSupportWrapper, this); + Register(_T(AVINPUT_METHOD_GET_VRR_SUPPORT), &AVInput::getVRRSupportWrapper, this); Register(_T(AVINPUT_METHOD_GET_HDMI_COMPATIBILITY_VERSION), &AVInput::getHdmiVersionWrapper, this); Register(_T(AVINPUT_METHOD_START_INPUT), &AVInput::startInput, this); Register(_T(AVINPUT_METHOD_STOP_INPUT), &AVInput::stopInput, this); @@ -239,6 +250,7 @@ void AVInput::RegisterAll() Register(_T(AVINPUT_METHOD_GAME_FEATURE_STATUS), &AVInput::getGameFeatureStatusWrapper, this); m_primVolume = DEFAULT_PRIM_VOL_LEVEL; m_inputVolume = DEFAULT_INPUT_VOL_LEVEL; + m_currentVrrType = dsVRR_NONE; } void AVInput::UnregisterAll() @@ -251,6 +263,8 @@ void AVInput::UnregisterAll() Unregister(_T(AVINPUT_METHOD_READ_EDID)); Unregister(_T(AVINPUT_METHOD_READ_RAWSPD)); Unregister(_T(AVINPUT_METHOD_READ_SPD)); + Unregister(_T(AVINPUT_METHOD_SET_VRR_SUPPORT)); + Unregister(_T(AVINPUT_METHOD_GET_VRR_SUPPORT)); Unregister(_T(AVINPUT_METHOD_SET_EDID_VERSION)); Unregister(_T(AVINPUT_METHOD_GET_EDID_VERSION)); Unregister(_T(AVINPUT_METHOD_START_INPUT)); @@ -1001,6 +1015,28 @@ void AVInput::dsAVGameFeatureStatusEventHandler(const char *owner, IARM_EventId_ AVInput::_instance->AVInputALLMChange(hdmi_in_port, allm_mode); } + if (IARM_BUS_DSMGR_EVENT_HDMI_IN_VRR_STATUS == eventId) + { + IARM_Bus_DSMgr_EventData_t *eventData = (IARM_Bus_DSMgr_EventData_t *)data; + int hdmi_in_port = eventData->data.hdmi_in_vrr_mode.port; + dsVRRType_t new_vrrType = eventData->data.hdmi_in_vrr_mode.vrr_type; + LOGWARN("Received IARM_BUS_DSMGR_EVENT_HDMI_IN_VRR_STATUS event port: %d, VRR Type: %d", hdmi_in_port,new_vrrType); + + if(new_vrrType == dsVRR_NONE) + { + if(AVInput::_instance->m_currentVrrType != dsVRR_NONE){ + AVInput::_instance->AVInputVRRChange(hdmi_in_port, AVInput::_instance->m_currentVrrType, false); + } + } + else + { + if(AVInput::_instance->m_currentVrrType != dsVRR_NONE){ + AVInput::_instance->AVInputVRRChange(hdmi_in_port, AVInput::_instance->m_currentVrrType, false); + } + AVInput::_instance->AVInputVRRChange(hdmi_in_port, new_vrrType, true); + } + AVInput::_instance->m_currentVrrType = new_vrrType; + } } void AVInput::AVInputALLMChange( int port , bool allm_mode) @@ -1013,6 +1049,37 @@ void AVInput::AVInputALLMChange( int port , bool allm_mode) sendNotify(AVINPUT_EVENT_ON_GAME_FEATURE_STATUS_CHANGED, params); } +void AVInput::AVInputVRRChange( int port , dsVRRType_t vrr_type, bool vrr_mode) +{ + JsonObject params; + switch(vrr_type) + { + case dsVRR_HDMI_VRR: + params["id"] = port; + params["gameFeature"] = "VRR-HDMI"; + params["mode"] = vrr_mode; + break; + case dsVRR_AMD_FREESYNC: + params["id"] = port; + params["gameFeature"] = "VRR-FREESYNC"; + params["mode"] = vrr_mode; + break; + case dsVRR_AMD_FREESYNC_PREMIUM: + params["id"] = port; + params["gameFeature"] = "VRR-FREESYNC-PREMIUM"; + params["mode"] = vrr_mode; + break; + case dsVRR_AMD_FREESYNC_PREMIUM_PRO: + params["id"] = port; + params["gameFeature"] = "VRR-FREESYNC-PREMIUM-PRO"; + params["mode"] = vrr_mode; + break; + default: + break; + } + sendNotify(AVINPUT_EVENT_ON_GAME_FEATURE_STATUS_CHANGED, params); +} + uint32_t AVInput::getSupportedGameFeatures(const JsonObject& parameters, JsonObject& response) { LOGINFOMETHOD(); @@ -1067,9 +1134,49 @@ uint32_t AVInput::getGameFeatureStatusWrapper(const JsonObject& parameters, Json LOGWARN("AVInput::getGameFeatureStatusWrapper ALLM MODE:%d", allm); response["mode"] = allm; } + else if(strcmp (sGameFeature.c_str(), "VRR-HDMI") == 0) + { + bool hdmi_vrr = false; + dsVRRType_t vrrType; + getVRRStatus(portId, &vrrType); + if(vrrType == dsVRR_HDMI_VRR) + hdmi_vrr = true; + LOGWARN("AVInput::getGameFeatureStatusWrapper HDMI VRR MODE:%d", hdmi_vrr); + response["mode"] = hdmi_vrr; + } + else if(strcmp (sGameFeature.c_str(), "VRR-FREESYNC") == 0) + { + bool freesync = false; + dsVRRType_t vrrType; + getVRRStatus(portId, &vrrType); + if(vrrType == dsVRR_AMD_FREESYNC) + freesync = true; + LOGWARN("AVInput::getGameFeatureStatusWrapper FREESYNC MODE:%d", freesync); + response["mode"] = freesync; + } + else if(strcmp (sGameFeature.c_str(), "VRR-FREESYNC-PREMIUM") == 0) + { + bool freesync_premium = false; + dsVRRType_t vrrType; + getVRRStatus(portId, &vrrType); + if(vrrType == dsVRR_AMD_FREESYNC_PREMIUM) + freesync_premium = true; + LOGWARN("AVInput::getGameFeatureStatusWrapper FREESYNC PREMIUM MODE:%d", freesync_premium); + response["mode"] = freesync_premium; + } + else if(strcmp (sGameFeature.c_str(), "VRR-FREESYNC-PREMIUM-PRO") == 0) + { + bool freesync_premium_pro = false; + dsVRRType_t vrrType; + getVRRStatus(portId, &vrrType); + if(vrrType == dsVRR_AMD_FREESYNC_PREMIUM_PRO) + freesync_premium_pro = true; + LOGWARN("AVInput::getGameFeatureStatusWrapper FREESYNC PREMIUM PRO MODE:%d", freesync_premium_pro); + response["mode"] = freesync_premium_pro; + } else { - LOGWARN("AVInput::getGameFeatureStatusWrapper Mode is not supported. Supported mode: ALLM"); + LOGWARN("AVInput::getGameFeatureStatusWrapper Mode is not supported. Supported mode: ALLM, VRR-HDMI, VRR-FREESYNC-PREMIUM"); returnResponse(false); } returnResponse(true); @@ -1091,6 +1198,21 @@ bool AVInput::getALLMStatus(int iPort) return allm; } +void AVInput::getVRRStatus(int iPort, dsVRRType_t *vrrType) +{ + + try + { + device::HdmiInput::getInstance().getVRRStatus (iPort, vrrType); + LOGWARN("AVInput::getVRRStatus VRR TYPE: %d", *vrrType); + } + catch (const device::Exception& err) + { + LOG_DEVICE_EXCEPTION1(std::to_string(iPort)); + } + +} + uint32_t AVInput::getRawSPDWrapper(const JsonObject& parameters, JsonObject& response) { LOGINFOMETHOD(); @@ -1363,6 +1485,96 @@ uint32_t AVInput::getEdid2AllmSupportWrapper(const JsonObject& parameters, JsonO } } +bool AVInput::getVRRSupport(int portId,bool *vrrSupportValue) +{ + bool ret = true; + try + { + device::HdmiInput::getInstance().getVRRSupport (portId, vrrSupportValue); + LOGINFO("AVInput - getVRRSupport:%d", *vrrSupportValue); + } + catch (const device::Exception& err) + { + LOG_DEVICE_EXCEPTION1(std::to_string(portId)); + ret = false; + } + return ret; +} + +uint32_t AVInput::getVRRSupportWrapper(const JsonObject& parameters, JsonObject& response) +{ + LOGINFOMETHOD(); + string sPortId = parameters["portId"].String(); + + int portId = 0; + bool vrrSupport = true; + returnIfParamNotFound(parameters, "portId"); + + try { + portId = stoi(sPortId); + }catch (const std::exception& err) { + LOGWARN("sPortId invalid paramater: %s ", sPortId.c_str()); + returnResponse(false); + } + + bool result = getVRRSupport(portId, &vrrSupport); + if(result == true) + { + response["vrrSupport"] = vrrSupport; + returnResponse(true); + } + else + { + returnResponse(false); + } +} + +bool AVInput::setVRRSupport(int portId, bool vrrSupport) +{ + bool ret = true; + try + { + device::HdmiInput::getInstance().setVRRSupport (portId, vrrSupport); + LOGWARN("AVInput - vrrSupport:%d", vrrSupport); + } + catch (const device::Exception& err) + { + LOG_DEVICE_EXCEPTION1(std::to_string(portId)); + ret = false; + } + return ret; + +} + +uint32_t AVInput::setVRRSupportWrapper(const JsonObject& parameters, JsonObject& response) +{ + LOGINFOMETHOD(); + + returnIfParamNotFound(parameters, "portId"); + returnIfParamNotFound(parameters, "vrrSupport"); + + int portId = 0; + string sPortId = parameters["portId"].String(); + bool vrrSupport = parameters["vrrSupport"].Boolean(); + + try { + portId = stoi(sPortId); + }catch (const std::exception& err) { + LOGWARN("sPortId invalid paramater: %s ", sPortId.c_str()); + returnResponse(false); + } + + bool result = setVRRSupport(portId, vrrSupport); + if(result == true) + { + returnResponse(true); + } + else + { + returnResponse(false); + } +} + uint32_t AVInput::setEdidVersionWrapper(const JsonObject& parameters, JsonObject& response) { LOGINFOMETHOD(); diff --git a/AVInput/AVInput.h b/AVInput/AVInput.h index 22b61827..470f1e2d 100644 --- a/AVInput/AVInput.h +++ b/AVInput/AVInput.h @@ -47,6 +47,8 @@ class AVInput: public PluginHost::IPlugin, public PluginHost::JSONRPC int m_primVolume; int m_inputVolume; //Player Volume + + dsVRRType_t m_currentVrrType; public: // IPlugin methods // ------------------------------------------------------------------------------------------------------- @@ -79,6 +81,8 @@ class AVInput: public PluginHost::IPlugin, public PluginHost::JSONRPC uint32_t getEdidVersionWrapper(const JsonObject& parameters, JsonObject& response); uint32_t setEdid2AllmSupportWrapper(const JsonObject& parameters, JsonObject& response); uint32_t getEdid2AllmSupportWrapper(const JsonObject& parameters, JsonObject& response); + uint32_t setVRRSupportWrapper(const JsonObject& parameters, JsonObject& response); + uint32_t getVRRSupportWrapper(const JsonObject& parameters, JsonObject& response); uint32_t startInput(const JsonObject& parameters, JsonObject& response); uint32_t stopInput(const JsonObject& parameters, JsonObject& response); uint32_t setVideoRectangleWrapper(const JsonObject& parameters, JsonObject& response); @@ -95,10 +99,14 @@ class AVInput: public PluginHost::IPlugin, public PluginHost::JSONRPC std::string getSPD(int iPort); int setEdidVersion(int iPort, int iEdidVer); int getEdidVersion(int iPort); + bool setVRRSupport(int portId, bool vrrSupport); + bool getVRRSupport(int portId, bool *vrrSupportValue); bool setVideoRectangle(int x, int y, int width, int height, int type); bool getALLMStatus(int iPort); + void getVRRStatus(int iPort, dsVRRType_t *vrrType); void AVInputHotplug(int input , int connect, int type); + void AVInputVRRChange( int port , dsVRRType_t vrr_type, bool vrr_mode); static void dsAVEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len); void AVInputSignalChange( int port , int signalStatus, int type); From f42680c36704650095061d813fbb68f5c6064b70 Mon Sep 17 00:00:00 2001 From: neethuas379 Date: Mon, 26 May 2025 14:47:23 +0530 Subject: [PATCH 02/11] Update AVInput.h --- AVInput/AVInput.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AVInput/AVInput.h b/AVInput/AVInput.h index 470f1e2d..b6c86142 100644 --- a/AVInput/AVInput.h +++ b/AVInput/AVInput.h @@ -83,6 +83,7 @@ class AVInput: public PluginHost::IPlugin, public PluginHost::JSONRPC uint32_t getEdid2AllmSupportWrapper(const JsonObject& parameters, JsonObject& response); uint32_t setVRRSupportWrapper(const JsonObject& parameters, JsonObject& response); uint32_t getVRRSupportWrapper(const JsonObject& parameters, JsonObject& response); + uint32_t getVRRFrameRateWrapper(const JsonObject& parameters, JsonObject& response); uint32_t startInput(const JsonObject& parameters, JsonObject& response); uint32_t stopInput(const JsonObject& parameters, JsonObject& response); uint32_t setVideoRectangleWrapper(const JsonObject& parameters, JsonObject& response); @@ -103,7 +104,7 @@ class AVInput: public PluginHost::IPlugin, public PluginHost::JSONRPC bool getVRRSupport(int portId, bool *vrrSupportValue); bool setVideoRectangle(int x, int y, int width, int height, int type); bool getALLMStatus(int iPort); - void getVRRStatus(int iPort, dsVRRType_t *vrrType); + bool getVRRStatus(int iPort, dsHdmiInVrrStatus_t *vrrStatus); void AVInputHotplug(int input , int connect, int type); void AVInputVRRChange( int port , dsVRRType_t vrr_type, bool vrr_mode); From 78f58ffebdd7dc34588a2202722758881503600c Mon Sep 17 00:00:00 2001 From: neethuas379 Date: Mon, 26 May 2025 14:59:45 +0530 Subject: [PATCH 03/11] Update AVInput.cpp --- AVInput/AVInput.cpp | 68 +++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/AVInput/AVInput.cpp b/AVInput/AVInput.cpp index 094c5f99..a1e08ba1 100644 --- a/AVInput/AVInput.cpp +++ b/AVInput/AVInput.cpp @@ -50,6 +50,7 @@ #define AVINPUT_METHOD_GET_EDID_ALLM_SUPPORT "getEdid2AllmSupport" #define AVINPUT_METHOD_SET_VRR_SUPPORT "setVRRSupport" #define AVINPUT_METHOD_GET_VRR_SUPPORT "getVRRSupport" +#define AVINPUT_METHOD_GET_VRR_FRAME_RATE "getVRRFrameRate" #define AVINPUT_METHOD_GET_HDMI_COMPATIBILITY_VERSION "getHdmiVersion" #define AVINPUT_METHOD_SET_MIXER_LEVELS "setMixerLevels" #define AVINPUT_METHOD_START_INPUT "startInput" @@ -242,6 +243,7 @@ void AVInput::RegisterAll() Register(_T(AVINPUT_METHOD_GET_EDID_ALLM_SUPPORT), &AVInput::getEdid2AllmSupportWrapper, this); Register(_T(AVINPUT_METHOD_SET_VRR_SUPPORT), &AVInput::setVRRSupportWrapper, this); Register(_T(AVINPUT_METHOD_GET_VRR_SUPPORT), &AVInput::getVRRSupportWrapper, this); + Register(_T(AVINPUT_METHOD_GET_VRR_FRAME_RATE), &AVInput::getVRRFrameRateWrapper, this); Register(_T(AVINPUT_METHOD_GET_HDMI_COMPATIBILITY_VERSION), &AVInput::getHdmiVersionWrapper, this); Register(_T(AVINPUT_METHOD_START_INPUT), &AVInput::startInput, this); Register(_T(AVINPUT_METHOD_STOP_INPUT), &AVInput::stopInput, this); @@ -265,6 +267,7 @@ void AVInput::UnregisterAll() Unregister(_T(AVINPUT_METHOD_READ_SPD)); Unregister(_T(AVINPUT_METHOD_SET_VRR_SUPPORT)); Unregister(_T(AVINPUT_METHOD_GET_VRR_SUPPORT)); + Unregister(_T(AVINPUT_METHOD_GET_VRR_FRAME_RATE)); Unregister(_T(AVINPUT_METHOD_SET_EDID_VERSION)); Unregister(_T(AVINPUT_METHOD_GET_EDID_VERSION)); Unregister(_T(AVINPUT_METHOD_START_INPUT)); @@ -1137,9 +1140,9 @@ uint32_t AVInput::getGameFeatureStatusWrapper(const JsonObject& parameters, Json else if(strcmp (sGameFeature.c_str(), "VRR-HDMI") == 0) { bool hdmi_vrr = false; - dsVRRType_t vrrType; - getVRRStatus(portId, &vrrType); - if(vrrType == dsVRR_HDMI_VRR) + dsHdmiInVrrStatus_t vrrStatus; + getVRRStatus(portId, &vrrStatus); + if(vrrStatus.vrrType == dsVRR_HDMI_VRR) hdmi_vrr = true; LOGWARN("AVInput::getGameFeatureStatusWrapper HDMI VRR MODE:%d", hdmi_vrr); response["mode"] = hdmi_vrr; @@ -1147,9 +1150,9 @@ uint32_t AVInput::getGameFeatureStatusWrapper(const JsonObject& parameters, Json else if(strcmp (sGameFeature.c_str(), "VRR-FREESYNC") == 0) { bool freesync = false; - dsVRRType_t vrrType; - getVRRStatus(portId, &vrrType); - if(vrrType == dsVRR_AMD_FREESYNC) + dsHdmiInVrrStatus_t vrrStatus; + getVRRStatus(portId, &vrrStatus); + if(vrrStatus.vrrType == dsVRR_AMD_FREESYNC) freesync = true; LOGWARN("AVInput::getGameFeatureStatusWrapper FREESYNC MODE:%d", freesync); response["mode"] = freesync; @@ -1157,9 +1160,9 @@ uint32_t AVInput::getGameFeatureStatusWrapper(const JsonObject& parameters, Json else if(strcmp (sGameFeature.c_str(), "VRR-FREESYNC-PREMIUM") == 0) { bool freesync_premium = false; - dsVRRType_t vrrType; - getVRRStatus(portId, &vrrType); - if(vrrType == dsVRR_AMD_FREESYNC_PREMIUM) + dsHdmiInVrrStatus_t vrrStatus; + getVRRStatus(portId, &vrrStatus); + if(vrrStatus.vrrType == dsVRR_AMD_FREESYNC_PREMIUM) freesync_premium = true; LOGWARN("AVInput::getGameFeatureStatusWrapper FREESYNC PREMIUM MODE:%d", freesync_premium); response["mode"] = freesync_premium; @@ -1167,9 +1170,9 @@ uint32_t AVInput::getGameFeatureStatusWrapper(const JsonObject& parameters, Json else if(strcmp (sGameFeature.c_str(), "VRR-FREESYNC-PREMIUM-PRO") == 0) { bool freesync_premium_pro = false; - dsVRRType_t vrrType; - getVRRStatus(portId, &vrrType); - if(vrrType == dsVRR_AMD_FREESYNC_PREMIUM_PRO) + dsHdmiInVrrStatus_t vrrStatus; + getVRRStatus(portId, &vrrStatus); + if(vrrStatus.vrrType == dsVRR_AMD_FREESYNC_PREMIUM_PRO) freesync_premium_pro = true; LOGWARN("AVInput::getGameFeatureStatusWrapper FREESYNC PREMIUM PRO MODE:%d", freesync_premium_pro); response["mode"] = freesync_premium_pro; @@ -1198,19 +1201,20 @@ bool AVInput::getALLMStatus(int iPort) return allm; } -void AVInput::getVRRStatus(int iPort, dsVRRType_t *vrrType) +void AVInput::getVRRStatus(int iPort, dsHdmiInVrrStatus_t *vrrStatus) { - + bool ret = true; try { - device::HdmiInput::getInstance().getVRRStatus (iPort, vrrType); - LOGWARN("AVInput::getVRRStatus VRR TYPE: %d", *vrrType); + device::HdmiInput::getInstance().getVRRStatus (iPort, vrrStatus); + LOGWARN("AVInput::getVRRStatus VRR TYPE: %d, VRR FRAMERATE: %f", vrrStatus->vrrType,vrrStatus->vrrAmdfreesyncFramerate_Hz); } catch (const device::Exception& err) { LOG_DEVICE_EXCEPTION1(std::to_string(iPort)); + ret = false; } - + return ret; } uint32_t AVInput::getRawSPDWrapper(const JsonObject& parameters, JsonObject& response) @@ -1504,11 +1508,11 @@ bool AVInput::getVRRSupport(int portId,bool *vrrSupportValue) uint32_t AVInput::getVRRSupportWrapper(const JsonObject& parameters, JsonObject& response) { LOGINFOMETHOD(); + returnIfParamNotFound(parameters, "portId"); string sPortId = parameters["portId"].String(); int portId = 0; bool vrrSupport = true; - returnIfParamNotFound(parameters, "portId"); try { portId = stoi(sPortId); @@ -1575,6 +1579,34 @@ uint32_t AVInput::setVRRSupportWrapper(const JsonObject& parameters, JsonObject& } } +uint32_t AVInput::getVRRFrameRateWrapper(const JsonObject& parameters, JsonObject& response) +{ + LOGINFOMETHOD(); + returnIfParamNotFound(parameters, "portId"); + string sPortId = parameters["portId"].String(); + + int portId = 0; + dsHdmiInVrrStatus_t vrrStatus; + + try { + portId = stoi(sPortId); + }catch (const std::exception& err) { + LOGWARN("sPortId invalid paramater: %s ", sPortId.c_str()); + returnResponse(false); + } + + bool result = getVRRStatus(portId, &vrrStatus); + if(result == true) + { + response["currentVRRVideoFrameRate"] = vrrStatus.vrrAmdfreesyncFramerate_Hz; + returnResponse(true); + } + else + { + returnResponse(false); + } +} + uint32_t AVInput::setEdidVersionWrapper(const JsonObject& parameters, JsonObject& response) { LOGINFOMETHOD(); From eb4c50627cca28d866fe312fc4590cf4d3885cb3 Mon Sep 17 00:00:00 2001 From: neethuas379 Date: Mon, 26 May 2025 17:23:57 +0530 Subject: [PATCH 04/11] Update AVInput.cpp --- AVInput/AVInput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AVInput/AVInput.cpp b/AVInput/AVInput.cpp index a1e08ba1..9bd519eb 100644 --- a/AVInput/AVInput.cpp +++ b/AVInput/AVInput.cpp @@ -1201,7 +1201,7 @@ bool AVInput::getALLMStatus(int iPort) return allm; } -void AVInput::getVRRStatus(int iPort, dsHdmiInVrrStatus_t *vrrStatus) +bool AVInput::getVRRStatus(int iPort, dsHdmiInVrrStatus_t *vrrStatus) { bool ret = true; try From 49ba711a3583999761dabf4af5b235044a47724b Mon Sep 17 00:00:00 2001 From: neethuas379 Date: Tue, 10 Jun 2025 19:22:51 +0530 Subject: [PATCH 05/11] Update AVInput.cpp --- AVInput/AVInput.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/AVInput/AVInput.cpp b/AVInput/AVInput.cpp index 9bd519eb..0562267e 100644 --- a/AVInput/AVInput.cpp +++ b/AVInput/AVInput.cpp @@ -68,6 +68,12 @@ #define AVINPUT_EVENT_ON_GAME_FEATURE_STATUS_CHANGED "gameFeatureStatusUpdate" #define AVINPUT_EVENT_ON_AVI_CONTENT_TYPE_CHANGED "aviContentTypeUpdate" +#define STR_ALLM "ALLM" +#define VRR_TYPE_HDMI "VRR-HDMI" +#define VRR_TYPE_FREESYNC "VRR-FREESYNC" +#define VRR_TYPE_FREESYNC_PREMIUM "VRR-FREESYNC-PREMIUM" +#define VRR_TYPE_FREESYNC_PREMIUM_PRO "VRR-FREESYNC-PREMIUM-PRO" + static bool isAudioBalanceSet = false; static int planeType = 0; From dcee164f26692b92e7d7fadf9b36e1523cd84d69 Mon Sep 17 00:00:00 2001 From: neethuas379 Date: Tue, 10 Jun 2025 19:27:05 +0530 Subject: [PATCH 06/11] Update AVInput.cpp --- AVInput/AVInput.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/AVInput/AVInput.cpp b/AVInput/AVInput.cpp index 0562267e..ede81737 100644 --- a/AVInput/AVInput.cpp +++ b/AVInput/AVInput.cpp @@ -1052,7 +1052,7 @@ void AVInput::AVInputALLMChange( int port , bool allm_mode) { JsonObject params; params["id"] = port; - params["gameFeature"] = "ALLM"; + params["gameFeature"] = STR_ALLM; params["mode"] = allm_mode; sendNotify(AVINPUT_EVENT_ON_GAME_FEATURE_STATUS_CHANGED, params); @@ -1065,22 +1065,22 @@ void AVInput::AVInputVRRChange( int port , dsVRRType_t vrr_type, bool vrr_mode) { case dsVRR_HDMI_VRR: params["id"] = port; - params["gameFeature"] = "VRR-HDMI"; + params["gameFeature"] = VRR_TYPE_HDMI; params["mode"] = vrr_mode; break; case dsVRR_AMD_FREESYNC: params["id"] = port; - params["gameFeature"] = "VRR-FREESYNC"; + params["gameFeature"] = VRR_TYPE_FREESYNC; params["mode"] = vrr_mode; break; case dsVRR_AMD_FREESYNC_PREMIUM: params["id"] = port; - params["gameFeature"] = "VRR-FREESYNC-PREMIUM"; + params["gameFeature"] = VRR_TYPE_FREESYNC_PREMIUM; params["mode"] = vrr_mode; break; case dsVRR_AMD_FREESYNC_PREMIUM_PRO: params["id"] = port; - params["gameFeature"] = "VRR-FREESYNC-PREMIUM-PRO"; + params["gameFeature"] = VRR_TYPE_FREESYNC_PREMIUM_PRO; params["mode"] = vrr_mode; break; default: @@ -1137,13 +1137,13 @@ uint32_t AVInput::getGameFeatureStatusWrapper(const JsonObject& parameters, Json returnResponse(false); } - if (strcmp (sGameFeature.c_str(), "ALLM") == 0) + if (strcmp (sGameFeature.c_str(), STR_ALLM) == 0) { bool allm = getALLMStatus(portId); LOGWARN("AVInput::getGameFeatureStatusWrapper ALLM MODE:%d", allm); response["mode"] = allm; } - else if(strcmp (sGameFeature.c_str(), "VRR-HDMI") == 0) + else if(strcmp (sGameFeature.c_str(), VRR_TYPE_HDMI) == 0) { bool hdmi_vrr = false; dsHdmiInVrrStatus_t vrrStatus; @@ -1153,7 +1153,7 @@ uint32_t AVInput::getGameFeatureStatusWrapper(const JsonObject& parameters, Json LOGWARN("AVInput::getGameFeatureStatusWrapper HDMI VRR MODE:%d", hdmi_vrr); response["mode"] = hdmi_vrr; } - else if(strcmp (sGameFeature.c_str(), "VRR-FREESYNC") == 0) + else if(strcmp (sGameFeature.c_str(), VRR_TYPE_FREESYNC) == 0) { bool freesync = false; dsHdmiInVrrStatus_t vrrStatus; @@ -1163,7 +1163,7 @@ uint32_t AVInput::getGameFeatureStatusWrapper(const JsonObject& parameters, Json LOGWARN("AVInput::getGameFeatureStatusWrapper FREESYNC MODE:%d", freesync); response["mode"] = freesync; } - else if(strcmp (sGameFeature.c_str(), "VRR-FREESYNC-PREMIUM") == 0) + else if(strcmp (sGameFeature.c_str(), VRR_TYPE_FREESYNC_PREMIUM) == 0) { bool freesync_premium = false; dsHdmiInVrrStatus_t vrrStatus; @@ -1173,7 +1173,7 @@ uint32_t AVInput::getGameFeatureStatusWrapper(const JsonObject& parameters, Json LOGWARN("AVInput::getGameFeatureStatusWrapper FREESYNC PREMIUM MODE:%d", freesync_premium); response["mode"] = freesync_premium; } - else if(strcmp (sGameFeature.c_str(), "VRR-FREESYNC-PREMIUM-PRO") == 0) + else if(strcmp (sGameFeature.c_str(), VRR_TYPE_FREESYNC_PREMIUM_PRO) == 0) { bool freesync_premium_pro = false; dsHdmiInVrrStatus_t vrrStatus; From 8986170c1956a7a678b78c142cd0430bae459c58 Mon Sep 17 00:00:00 2001 From: "neethu.arambilsunny@sky.uk" Date: Mon, 16 Jun 2025 15:17:00 +0100 Subject: [PATCH 07/11] Added L1Tests --- Tests/L1Tests/tests/test_AVInput.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Tests/L1Tests/tests/test_AVInput.cpp b/Tests/L1Tests/tests/test_AVInput.cpp index fae90a90..d5e12f58 100644 --- a/Tests/L1Tests/tests/test_AVInput.cpp +++ b/Tests/L1Tests/tests/test_AVInput.cpp @@ -72,6 +72,9 @@ TEST_F(AVInputTest, RegisteredMethods) EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("contentProtected"))); EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("setEdid2AllmSupport"))); EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("getEdid2AllmSupport"))); + EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("setVRRSupport"))); + EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("getVRRSupport"))); + EXPECT_EQ(Core::ERROR_NONE, handler.Exists(_T("getVRRFrameRate"))); } TEST_F(AVInputTest, contentProtected) @@ -111,3 +114,21 @@ TEST_F(AVInputDsTest, setEdid2AllmSupport) EXPECT_EQ(response, string("{\"success\":true}")); } +TEST_F(AVInputDsTest, getVRRSupport) +{ + EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("getVRRSupport"), _T("{\"portId\": \"0\",\"vrrSupport\":true}"), response)); + EXPECT_EQ(response, string("{\"vrrSupport\":true,\"success\":true}")); +} + +TEST_F(AVInputDsTest, setVRRSupport) +{ + EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("setVRRSupport"), _T("{\"portId\": \"0\",\"vrrSupport\":true}"), response)); + EXPECT_EQ(response, string("{\"success\":true}")); +} + +TEST_F(AVInputDsTest, getVRRFrameRate) +{ + EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("getVRRFrameRate"), _T("{\"portId\": \"0\",\"currentVRRVideoFrameRate\":48.6}"), response)); + EXPECT_EQ(response, string("{\"currentVRRVideoFrameRate\":48.6,\"success\":true}")); +} + From 06cdde8f5f90883cd99f3092081ed60d436a7ff8 Mon Sep 17 00:00:00 2001 From: neethuas379 Date: Mon, 16 Jun 2025 22:28:41 +0530 Subject: [PATCH 08/11] Update test_AVInput.cpp --- Tests/L1Tests/tests/test_AVInput.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/L1Tests/tests/test_AVInput.cpp b/Tests/L1Tests/tests/test_AVInput.cpp index d5e12f58..a82e2d21 100644 --- a/Tests/L1Tests/tests/test_AVInput.cpp +++ b/Tests/L1Tests/tests/test_AVInput.cpp @@ -128,7 +128,7 @@ TEST_F(AVInputDsTest, setVRRSupport) TEST_F(AVInputDsTest, getVRRFrameRate) { - EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("getVRRFrameRate"), _T("{\"portId\": \"0\",\"currentVRRVideoFrameRate\":48.6}"), response)); - EXPECT_EQ(response, string("{\"currentVRRVideoFrameRate\":48.6,\"success\":true}")); + EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("getVRRFrameRate"), _T("{\"portId\": \"0\"}"), response)); + EXPECT_EQ(response, string("{\"currentVRRVideoFrameRate\":0,\"success\":true}")); } From 1c37f749067cb176609e6613cf23f401b170920b Mon Sep 17 00:00:00 2001 From: neethuas379 Date: Mon, 16 Jun 2025 22:30:57 +0530 Subject: [PATCH 09/11] Update AVInput.cpp --- AVInput/AVInput.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/AVInput/AVInput.cpp b/AVInput/AVInput.cpp index bee90af4..c7586702 100644 --- a/AVInput/AVInput.cpp +++ b/AVInput/AVInput.cpp @@ -1616,6 +1616,7 @@ uint32_t AVInput::getVRRFrameRateWrapper(const JsonObject& parameters, JsonObjec int portId = 0; dsHdmiInVrrStatus_t vrrStatus; + vrrStatus.vrrAmdfreesyncFramerate_Hz = 0; try { portId = stoi(sPortId); From 80c66cfd9e96e17b98eb219d2dc9a64210653829 Mon Sep 17 00:00:00 2001 From: agampa263 <133222558+agampa263@users.noreply.github.com> Date: Tue, 17 Jun 2025 19:57:40 +0530 Subject: [PATCH 10/11] RDKEMW-4135:Coverity integration with Entservices repo (#147) Reason for change: Updating build_dependencies.sh Test Procedure: Verify checks in github Risks: Low Signed-off-by:AkshayKumar_Gampa --- build_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_dependencies.sh b/build_dependencies.sh index 92d10f7f..cbd25a7f 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -31,7 +31,7 @@ git clone --branch R4.4.3 https://github.com/rdkcentral/ThunderTools.git git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git -git clone --branch main https://github.com/rdkcentral/entservices-apis.git +git clone --branch develop https://github.com/rdkcentral/entservices-apis.git git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git From 1c94f606d197c0a361012043d0077c319d39736f Mon Sep 17 00:00:00 2001 From: siva aditya varma uppalapati Date: Tue, 17 Jun 2025 15:27:39 +0000 Subject: [PATCH 11/11] 1.2.0 release changelog updates --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfb49314..76faba4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,27 @@ 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.2.0](https://github.com/rdkcentral/entservices-inputoutput/compare/1.1.1...1.2.0) + +- RDKEMW-4135:Coverity integration with Entservices repo [`#147`](https://github.com/rdkcentral/entservices-inputoutput/pull/147) +- RDKEMW-4116 : VRR Feature Middleware changes. [`#103`](https://github.com/rdkcentral/entservices-inputoutput/pull/103) +- topic/RDK-58099: HdmiCecSink syntax error [`#142`](https://github.com/rdkcentral/entservices-inputoutput/pull/142) +- [RDKEMW-2711] RDKEMW-4650: Enabling the L1/L2 test in the Testframework [`#130`](https://github.com/rdkcentral/entservices-inputoutput/pull/130) +- Update AVInput.cpp [`78f58ff`](https://github.com/rdkcentral/entservices-inputoutput/commit/78f58ffebdd7dc34588a2202722758881503600c) +- Added L1Tests [`8986170`](https://github.com/rdkcentral/entservices-inputoutput/commit/8986170c1956a7a678b78c142cd0430bae459c58) +- Update AVInput.cpp [`dcee164`](https://github.com/rdkcentral/entservices-inputoutput/commit/dcee164f26692b92e7d7fadf9b36e1523cd84d69) + #### [1.1.1](https://github.com/rdkcentral/entservices-inputoutput/compare/1.1.0...1.1.1) +> 11 June 2025 + - RDKEMW-5124: Higher framerate support in Thunder [`#134`](https://github.com/rdkcentral/entservices-inputoutput/pull/134) - RDK-57440: Enable HdcpProfile for contract test [`#132`](https://github.com/rdkcentral/entservices-inputoutput/pull/132) - [RDKEMW-2711] RDKEMW-4232: Moving the L2 Test files to specific entservices for inputoutput repo [`#123`](https://github.com/rdkcentral/entservices-inputoutput/pull/123) - RDKEMW-4196: Cleanup and remove pwrmgr references from workflows [`#126`](https://github.com/rdkcentral/entservices-inputoutput/pull/126) - RDKEMW-4220: Fix wpeframework crash on reactivating plugin and powerstate change [`#104`](https://github.com/rdkcentral/entservices-inputoutput/pull/104) - RDKEMW-4139: Coverity integration with Entservices-inputoutput repo [`#116`](https://github.com/rdkcentral/entservices-inputoutput/pull/116) +- 1.1.1 release change log updates [`6b11c5b`](https://github.com/rdkcentral/entservices-inputoutput/commit/6b11c5b379c1bfdfc533fc090d73245d4cfe264e) - Merge tag '1.1.0' into develop [`2ce89ed`](https://github.com/rdkcentral/entservices-inputoutput/commit/2ce89edb2c300ecc3275fab6673b48823578d053) #### [1.1.0](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.12...1.1.0)