New Api definition

ds/include/videoOutputPort.hpp

@@ -284,6 +284,12 @@ class  VideoOutputPort : public Enumerable {
 	void setPreferredColorDepth(const unsigned int colordepth, bool persist = true);
 	void getColorDepthCapabilities (unsigned int *capabilities) const;
 
+//    static IARM_Result_t _SetStandbyVideoState(void *arg)
+    void SetStandbyVideoState();
+
+//    static IARM_Result_t _GetStandbyVideoState(void *arg)
+    void GetStandbyVideoState();
+
 private:
 	Display _display;
 

ds/videoOutputPort.cpp

@@ -1,6 +1,6 @@
 /*
  * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2016 RDK Management
  *
@@ -911,18 +911,38 @@
     return hdcpProtocol;
 }
 
+bool VideoOutputPort::SetStandbyVideoState(const string port , const bool enable)
+{
+    dsError_t ret = dsSetStandbyVideoState(port, enable);
+    if (ret != dsERR_NONE) {
+        return false;
+    }
+    return true;
+
+}
+
+bool VideoOutputPort::GetStandbyVideoState(const string port, bool isEnabled)
+{
+    dsError_t ret = dsGetStandbyVideoState(port, isEnabled);
+    if (ret != dsERR_NONE) {
+        return false;
+    }
+    return true;
+
+}
+
 /**
  * @fn void setAllmEnabled(bool enable); 
  * @brief Enables/Disables ALLM mode for connected HDMI display.
  */
- 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);
-     }
- }
+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);

rpc/cli/dsVideoPort.c

@@ -1,5 +1,5 @@
 /* If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2016 RDK Management
  *
@@ -965,6 +965,54 @@
         return dsERR_GENERAL ;
 }
 
+dsError_t dsSetStandbyVideoState(string port , const bool enable)
+{
+    dsError_t dsErr = dsERR_GENERAL;
+    _DEBUG_ENTER();
+
+    if(!port.empty())
+    {
+        dsMgrStandbyVideoStateParam_t param;
+        param.port = port;
+        param.isEnabled = enable;
+        param.result = 0;
+
+        IARM_Result_t rpcRet = IARM_Bus_Call(IARM_BUS_DSMGR_NAME,
+                                (char *)IARM_BUS_DSMGR_API_dsSetStandbyVideoState,
+                                (void *)&param, sizeof(param));
+
+        if (IARM_RESULT_SUCCESS == rpcRet)
+        {
+            dsErr = dsERR_NONE;
+        }
+    }
+    return dsErr ;
+}
+
+dsError_t dsGetStandbyVideoState(string port , bool enable)
+{
+    dsError_t dsErr = dsERR_GENERAL;
+    _DEBUG_ENTER();
+
+    if(!port.empty())
+    {
+        dsMgrStandbyVideoStateParam_t param;
+        param.port = port;
+        param.result = 0;
+
+        IARM_Result_t rpcRet = IARM_Bus_Call(IARM_BUS_DSMGR_NAME,
+                (char *)IARM_BUS_DSMGR_API_dsGetStandbyVideoState,
+                (void *)&param,
+                sizeof(param));
+
+        if (IARM_RESULT_SUCCESS == rpcRet)
+        {
+            enable = param.isEnabled;
+            dsErr = dsERR_NONE;
+        }
+    }
+    return dsErr ;
+}
 
 /** @} */
 /** @} */

rpc/include/dsRpc.h

@@ -195,6 +195,9 @@ extern "C" {
 #define IARM_BUS_DSMGR_API_dsSetBackgroundColor "dsSetBackgroundColor"
 #define IARM_BUS_DSMGR_API_dsSetForceHDRMode "dsSetForceHDRMode"
 #define IARM_BUS_DSMGR_API_dsSetAllmEnabled "dsSetAllmEnabled"
+#define IARM_BUS_DSMGR_API_dsSetStandbyVideoState   "dsSetStandbyVideoState"
+#define IARM_BUS_DSMGR_API_dsGetStandbyVideoState   "dsGetStandbyVideoState"
+
 /*
  * Declare RPC FP  API names 
  */

rpc/srv/dsVideoPort.c

@@ -1,6 +1,6 @@
 /*
  * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2016 RDK Management
  *
@@ -61,9 +61,14 @@
 #define DEFAULT_RESOLUTION  "720p"
 #define DEFAULT_RESOLUTION_1080P "1080p"
 #define DEFAULT_RESOLUTION_2160P "2160p"
-
+#define MAX_NUM_VIDEO_PORTS 5
 #define DEFAULT_SD_RESOLUTION "480i"
 
+typedef struct{
+    char port[DSMGR_MAX_VIDEO_PORT_NAME_LENGTH];
+    bool isEnabled;
+}DSMgr_Standby_Video_State_t;
+
 static int m_isInitialized = 0;
 static int m_isPlatInitialized = 0;
 static pthread_mutex_t dsLock = PTHREAD_MUTEX_INITIALIZER;
@@ -75,6 +80,8 @@
 static bool force_disable_4K = false;
 static const dsDisplayColorDepth_t DEFAULT_COLOR_DEPTH = dsDISPLAY_COLORDEPTH_AUTO;
 static dsDisplayColorDepth_t hdmiColorDept = DEFAULT_COLOR_DEPTH;
+static DSMgr_Standby_Video_State_t g_standby_video_port_setting[MAX_NUM_VIDEO_PORTS];
+
 #define NULL_HANDLE 0
 #define IARM_BUS_Lock(lock) pthread_mutex_lock(&dsLock)
 #define IARM_BUS_Unlock(lock) pthread_mutex_unlock(&dsLock)
@@ -317,7 +324,9 @@
 		IARM_Bus_RegisterCall(IARM_BUS_DSMGR_API_dsColorDepthCapabilities,_dsColorDepthCapabilities);
 		IARM_Bus_RegisterCall(IARM_BUS_DSMGR_API_dsGetPreferredColorDepth,_dsGetPreferredColorDepth);
 		IARM_Bus_RegisterCall(IARM_BUS_DSMGR_API_dsSetPreferredColorDepth,_dsSetPreferredColorDepth);
-
+        IARM_Bus_RegisterCall(IARM_BUS_DSMGR_API_dsSetStandbyVideoState,_dsSetStandbyVideoState);
+        IARM_Bus_RegisterCall(IARM_BUS_DSMGR_API_dsGetStandbyVideoState,_dsGetStandbyVideoState);
+
         dsError_t eRet = _dsVideoFormatUpdateRegisterCB (_dsVideoFormatUpdateCB) ;
         if (dsERR_NONE != eRet) {
             INT_DEBUG("%s: _dsVideoFormatUpdateRegisterCB eRet:%04x", __FUNCTION__, eRet);
@@ -1195,6 +1204,96 @@
 
 }
 
+IARM_Result_t _dsSetStandbyVideoState(void *arg)
+{
+    dsMgrStandbyVideoStateParam_t *param = (dsMgrStandbyVideoStateParam_t *)arg;
+    if(NULL == param->port)
+    {
+        param->result = -1;
+        INT_DEBUG("[%s] empty port name. Cannot proceed.\n", __FUNCTION__);
+        return IARM_RESULT_SUCCESS;
+    }
+    else
+        param->result = 0;
+
+    int i = 0;
+    for(i = 0; i < MAX_NUM_VIDEO_PORTS; i++)
+    {
+        if(0 == strncasecmp(param->port, g_standby_video_port_setting[i].port, DSMGR_MAX_VIDEO_PORT_NAME_LENGTH))
+        {
+            /*Found a match. Update it*/
+            g_standby_video_port_setting[i].isEnabled = ((0 == param->isEnabled) ? false : true);
+            break;
+        }
+    }
+    if(MAX_NUM_VIDEO_PORTS == i)
+    {
+        /*No matching entries are present. Add one.*/
+        for(i = 0; i < MAX_NUM_VIDEO_PORTS; i++)
+        {
+            if('\0' == g_standby_video_port_setting[i].port[0])
+            {
+                strncpy(g_standby_video_port_setting[i].port, param->port, (DSMGR_MAX_VIDEO_PORT_NAME_LENGTH - 1));
+                g_standby_video_port_setting[i].isEnabled = ((0 == param->isEnabled) ? false : true);
+                break;
+            }
+        }
+    }
+    if(MAX_NUM_VIDEO_PORTS == i)
+    {
+        INT_DEBUG("[%s] Error! Out of room to write new video port setting for standby mode.\n", __FUNCTION__);
+    }
+
+    try
+    {
+        device::VideoOutputPort &vPort = device::Host::getInstance().getVideoOutputPort(param->port);
+        if((POWER_STATE_ON != curState) && (POWER_STATE_OFF != curState))
+        {
+            /*We're currently in one of the standby states. This new setting needs to be applied right away.*/
+            INT_DEBUG("[%s] Setting standby %s port status to %s.\n", __FUNCTION__, param->port, ((1 == param->isEnabled)? "enabled" : "disabled"));
+            if(1 == param->isEnabled)
+                vPort.enable();
+            else
+                vPort.disable();
+        }
+        else
+        {
+            INT_DEBUG("[%s] video port %s will be %s when going into standby mode.\n", __FUNCTION__, param->port, ((1 == param->isEnabled)? "enabled" : "disabled"));
+        }
+    }
+    catch (...)
+    {
+        INT_DEBUG("Exception Caught during [%s]. Possible bad video port.\n", __FUNCTION__);
+        param->result = -1;
+    }
+    return IARM_RESULT_SUCCESS;
+}
+
+IARM_Result_t _dsGetStandbyVideoState(void *arg)
+{
+    INT_INFO("Entering [%s]\r\n", __FUNCTION__);
+    dsMgrStandbyVideoStateParam_t *param = (dsMgrStandbyVideoStateParam_t *)arg;
+    if(NULL == param->port)
+    {
+        INT_DEBUG("[%s]Bad port name. Cannot get state.\n", __FUNCTION__);
+        return IARM_RESULT_SUCCESS;
+    }
+
+    try
+    {
+        device::VideoOutputPort &vPort = device::Host::getInstance().getVideoOutputPort(param->port);
+    }
+    catch (...)
+    {
+        INT_DEBUG("Exception Caught during [%s]. Possible bad video port.\n", __FUNCTION__);
+        param->result = -1;
+        return IARM_RESULT_SUCCESS;
+    }
+    param->isEnabled = ((true == get_video_port_standby_setting(param->port))? 1 : 0);
+    param->result = 0;
+    return IARM_RESULT_SUCCESS;
+}
+
 dsError_t handleDsColorDepthCapabilities(intptr_t handle, unsigned int *colorDepthCapability )
 {
 #ifndef RDK_DSHAL_NAME