Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,17 @@ 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.17](https://github.com/rdkcentral/devicesettings/compare/1.0.16...1.0.17)

- RDKEMW-4009: Add new AVI info frame APIs [`#83`](https://github.com/rdkcentral/devicesettings/pull/83)
- Merge tag '1.0.16' into develop [`11ffa44`](https://github.com/rdkcentral/devicesettings/commit/11ffa4407355950d6a7b4bb6db87c2460fac7b45)

#### [1.0.16](https://github.com/rdkcentral/devicesettings/compare/1.0.15...1.0.16)

> 23 June 2025

- RDKEMW-4848: VTS Compliance [`#79`](https://github.com/rdkcentral/devicesettings/pull/79)
- 1.0.16 release changelog updates [`955c616`](https://github.com/rdkcentral/devicesettings/commit/955c616a79811d343153baa710614f00a8bdfd6e)
- Merge tag '1.0.15' into develop [`e2909ef`](https://github.com/rdkcentral/devicesettings/commit/e2909efea5831021854bc3a56b590293529dac89)

#### [1.0.15](https://github.com/rdkcentral/devicesettings/compare/1.0.14...1.0.15)
Expand Down
4 changes: 3 additions & 1 deletion ds/include/videoOutputPort.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ class VideoOutputPort : public Enumerable {
int getConnectedDeviceType() const {return _hdmiDeviceType;};
bool isConnectedDeviceRepeater() const {return _isDeviceRepeater;};
void getEDIDBytes(std::vector<uint8_t> &edid) const;
void setAllmEnabled(bool enable) const;
void setAVIContentType(dsAviContentType_t contentType) const;
void setAVIScanInformation(dsAVIScanInformation_t scanInfo) const;

/**
* @fn int hasSurround() const
Expand Down Expand Up @@ -269,7 +272,6 @@ class VideoOutputPort : public Enumerable {
void ResetOutputToSDR();
bool SetHdmiPreference(dsHdcpProtocolVersion_t hdcpProtocol);
int GetHdmiPreference();
void setAllmEnabled(bool enable);

bool setScartParameter(const std::string parameter, const std::string value);
int getVideoEOTF() const;
Expand Down
32 changes: 29 additions & 3 deletions ds/videoOutputPort.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -912,16 +912,42 @@ int VideoOutputPort::GetHdmiPreference()

/**
* @fn void setAllmEnabled(bool enable);
* @brief Enables/Disables ALLM mode for HDMI output video port.
* @brief Enables/Disables ALLM mode for connected HDMI display.
*/
void VideoOutputPort::setAllmEnabled(bool enable)
void VideoOutputPort::Display::setAllmEnabled(bool enable) const
{
printf("VideoOutputPort::Display::setAllmEnabled \r\n");
dsError_t ret = dsSetAllmEnabled(_handle,enable);
if (ret != dsERR_NONE) {
throw Exception(ret);
}
}


/**
* @fn void setAVIContentType(dsAviContentType_t contentType);
* @brief Sets HDMI AVI content type signalling.
*/
void VideoOutputPort::Display::setAVIContentType(dsAviContentType_t contentType) const
{
printf("VideoOutputPort::Display::setAVIContentType \r\n");
dsError_t ret = dsSetAVIContentType(_handle,contentType);
if (ret != dsERR_NONE) {
throw Exception(ret);
}
}

/**
* @fn void setAVIScanInformation(dsAVIScanInformation_t scanInfo);
* @brief ets HDMI AVI scan info signalling.
*/
void VideoOutputPort::Display::setAVIScanInformation(dsAVIScanInformation_t scanInfo) const
{
printf("VideoOutputPort::Display::setAVIScanInformation \r\n");
dsError_t ret = dsSetAVIScanInformation(_handle,scanInfo);
if (ret != dsERR_NONE) {
throw Exception(ret);
}
}

}

Expand Down
66 changes: 66 additions & 0 deletions rpc/cli/dsDisplay.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,72 @@ dsError_t dsGetEDIDBytes(intptr_t handle, unsigned char *edid, int *length)
}
}

dsError_t dsSetAllmEnabled (intptr_t handle, bool enabled)
{
_DEBUG_ENTER();

dsDisplaySetAllmEnabledParam_t param;
memset(&param, 0, sizeof(param));
param.handle = handle;
param.enabled = enabled;

IARM_Result_t rpcRet = IARM_Bus_Call(IARM_BUS_DSMGR_NAME,
(char *) IARM_BUS_DSMGR_API_dsSetAllmEnabled,
(void *) &param,
sizeof(param));

if (IARM_RESULT_SUCCESS == rpcRet)
{
return param.result;
}

return dsERR_GENERAL ;
}

dsError_t dsSetAVIContentType (intptr_t handle, dsAviContentType_t contentType)
{
_DEBUG_ENTER();

dsDisplaySetAVIContentTypeParam_t param;
memset(&param, 0, sizeof(param));
param.handle = handle;
param.contentType = contentType;

IARM_Result_t rpcRet = IARM_Bus_Call(IARM_BUS_DSMGR_NAME,
(char *) IARM_BUS_DSMGR_API_dsSetAVIContentType,
(void *) &param,
sizeof(param));

if (IARM_RESULT_SUCCESS == rpcRet)
{
return param.result;
}

return dsERR_GENERAL ;
}

dsError_t dsSetAVIScanInformation (intptr_t handle, dsAVIScanInformation_t scanInfo)
{
_DEBUG_ENTER();

dsDisplaySetAVIScanInfoParam_t param;
memset(&param, 0, sizeof(param));
param.handle = handle;
param.scanInfo = scanInfo;

IARM_Result_t rpcRet = IARM_Bus_Call(IARM_BUS_DSMGR_NAME,
(char *) IARM_BUS_DSMGR_API_dsSetAVIScanInformation,
(void *) &param,
sizeof(param));

if (IARM_RESULT_SUCCESS == rpcRet)
{
return param.result;
}

return dsERR_GENERAL ;
}

dsError_t dsDisplayTerm(void)
{
_DEBUG_ENTER();
Expand Down
21 changes: 0 additions & 21 deletions rpc/cli/dsVideoPort.c
Original file line number Diff line number Diff line change
Expand Up @@ -965,27 +965,6 @@ dsError_t dsSetForceHDRMode(intptr_t handle, dsHDRStandard_t mode)
return dsERR_GENERAL ;
}

dsError_t dsSetAllmEnabled (intptr_t handle, bool enabled)
{
_DEBUG_ENTER();

dsSetAllmEnabledParam_t param;
memset(&param, 0, sizeof(param));
param.handle = handle;
param.enabled = enabled;

IARM_Result_t rpcRet = IARM_Bus_Call(IARM_BUS_DSMGR_NAME,
(char *) IARM_BUS_DSMGR_API_dsSetAllmEnabled,
(void *) &param,
sizeof(param));

if (IARM_RESULT_SUCCESS == rpcRet)
{
return param.result;
}

return dsERR_GENERAL ;
}

/** @} */
/** @} */
32 changes: 24 additions & 8 deletions rpc/include/dsRpc.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ extern "C" {
#define IARM_BUS_DSMGR_API_dsGetDisplayAspectRatio "dsGetDisplayAspectRatio"
#define IARM_BUS_DSMGR_API_dsGetEDID "dsGetEDID"
#define IARM_BUS_DSMGR_API_dsGetEDIDBytes "dsGetEDIDBytes"
#define IARM_BUS_DSMGR_API_dsSetAllmEnabled "dsSetAllmEnabled"
#define IARM_BUS_DSMGR_API_dsSetAVIContentType "dsSetAVIContentType"
#define IARM_BUS_DSMGR_API_dsSetAVIScanInformation "dsSetAVIScanInformation"
#define IARM_BUS_DSMGR_API_dsDisplayTerm "dsDisplayTerm"


Expand Down Expand Up @@ -612,6 +615,27 @@ typedef struct _dsDisplayGetEDIDParam_t {
dsDisplayEDID_t edid;
} dsDisplayGetEDIDParam_t;

typedef struct _dsDisplaySetAVIContentTypeParam_t
{
dsError_t result;
intptr_t handle;
dsAviContentType_t contentType;
}dsDisplaySetAVIContentTypeParam_t;

typedef struct _dsDisplaySetAVIScanInfoParam_t
{
dsError_t result;
intptr_t handle;
dsAVIScanInformation_t scanInfo;
}dsDisplaySetAVIScanInfoParam_t;

typedef struct _dsDisplaySetAllmEnabledParam_t
{
dsError_t result;
intptr_t handle;
bool enabled;
}dsDisplaySetAllmEnabledParam_t;

typedef struct _dsSupportedResolutionParam_t {
dsError_t result;
intptr_t handle;
Expand Down Expand Up @@ -997,14 +1021,6 @@ typedef struct _dsEdidVersionParam_t
tv_hdmi_edid_version_t iEdidVersion;
}dsEdidVersionParam_t;

typedef struct _dsSetAllmEnabledParam_t
{
dsError_t result;
intptr_t handle;
bool enabled;
}dsSetAllmEnabledParam_t;


typedef struct _dsEdidAllmSupportParam_t
{
dsError_t result;
Expand Down
Loading