RDKEMW-1015 : HDMICEC SINK COMRPC

Author: hgfell683

HdmiCecSink/HdmiCecSink.cpp

@@ -19,98 +19,14 @@
 
 #include "HdmiCecSink.h"
 
-#include "ccec/Connection.hpp"
-#include "ccec/CECFrame.hpp"
-#include "ccec/MessageEncoder.hpp"
-#include "host.hpp"
-#include "UtilsgetRFCConfig.h"
-
-#include "dsMgr.h"
-#include "dsRpc.h"
-#include "dsDisplay.h"
-#include "videoOutputPort.hpp"
-#include "manager.hpp"
-#include "websocket/URL.h"
-
 #include "UtilsIarm.h"
 #include "UtilsJsonRpc.h"
 #include "UtilssyncPersistFile.h"
 #include "UtilsSearchRDKProfile.h"
 
-#define HDMICECSINK_METHOD_SET_ENABLED 			"setEnabled"
-#define HDMICECSINK_METHOD_GET_ENABLED 			"getEnabled"
-#define HDMICECSINK_METHOD_OTP_SET_ENABLED 		"setOTPEnabled"
-#define HDMICECSINK_METHOD_OTP_GET_ENABLED 		"getOTPEnabled"
-#define HDMICECSINK_METHOD_SET_OSD_NAME 		"setOSDName"
-#define HDMICECSINK_METHOD_GET_OSD_NAME 		"getOSDName"
-#define HDMICECSINK_METHOD_SET_VENDOR_ID 		"setVendorId"
-#define HDMICECSINK_METHOD_GET_VENDOR_ID 		"getVendorId"
-#define HDMICECSINK_METHOD_PRINT_DEVICE_LIST 	"printDeviceList"
-#define HDMICECSINK_METHOD_SET_ACTIVE_PATH 		"setActivePath"
-#define HDMICECSINK_METHOD_SET_ROUTING_CHANGE 	"setRoutingChange"
-#define HDMICECSINK_METHOD_GET_DEVICE_LIST 		"getDeviceList"
-#define HDMICECSINK_METHOD_GET_ACTIVE_SOURCE 	"getActiveSource"
-#define HDMICECSINK_METHOD_SET_ACTIVE_SOURCE 	"setActiveSource"
-#define HDMICECSINK_METHOD_GET_ACTIVE_ROUTE   	"getActiveRoute"
-#define HDMICECSINK_METHOD_SET_MENU_LANGUAGE  	"setMenuLanguage"
-#define HDMICECSINK_METHOD_REQUEST_ACTIVE_SOURCE "requestActiveSource"
-#define HDMICECSINK_METHOD_SETUP_ARC              "setupARCRouting"
-#define HDMICECSINK_METHOD_REQUEST_SHORT_AUDIO_DESCRIPTOR  "requestShortAudioDescriptor"
-#define HDMICECSINK_METHOD_SEND_STANDBY_MESSAGE            "sendStandbyMessage"
-#define HDMICECSINK_METHOD_SEND_AUDIO_DEVICE_POWER_ON "sendAudioDevicePowerOnMessage"
-#define HDMICECSINK_METHOD_SEND_KEY_PRESS                          "sendKeyPressEvent"
-#define HDMICECSINK_METHOD_SEND_USER_CONTROL_PRESSED          "sendUserControlPressed"
-#define HDMICECSINK_METHOD_SEND_USER_CONTROL_RELEASED         "sendUserControlReleased"
-#define HDMICECSINK_METHOD_SEND_GIVE_AUDIO_STATUS          "sendGetAudioStatusMessage"
-#define HDMICECSINK_METHOD_GET_AUDIO_DEVICE_CONNECTED_STATUS   "getAudioDeviceConnectedStatus"
-#define HDMICECSINK_METHOD_REQUEST_AUDIO_DEVICE_POWER_STATUS   "requestAudioDevicePowerStatus"
-#define HDMICECSINK_METHOD_SET_LATENCY_INFO	"setLatencyInfo"
-
-#define TEST_ADD 0
-#define HDMICECSINK_REQUEST_MAX_RETRY 				3
-#define HDMICECSINK_REQUEST_MAX_WAIT_TIME_MS 		2000
-#define HDMICECSINK_PING_INTERVAL_MS 				10000
-#define HDMICECSINK_WAIT_FOR_HDMI_IN_MS 			1000
-#define HDMICECSINK_REQUEST_INTERVAL_TIME_MS 		500
-#define HDMICECSINK_NUMBER_TV_ADDR 					2
-#define HDMICECSINK_UPDATE_POWER_STATUS_INTERVA_MS    (60 * 1000)
-#define HDMISINK_ARC_START_STOP_MAX_WAIT_MS           4000
-#define HDMICECSINK_UPDATE_AUDIO_STATUS_INTERVAL_MS    500
-
-
-#define SAD_FMT_CODE_AC3 2
-#define SAD_FMT_CODE_ENHANCED_AC3 10
-
-#define SYSTEM_AUDIO_MODE_ON 0x01
-#define SYSTEM_AUDIO_MODE_OFF 0x00
-#define AUDIO_DEVICE_POWERSTATE_OFF 1
-
-#define DEFAULT_VIDEO_LATENCY 100
-#define DEFAULT_LATENCY_FLAGS 3
-#define DEFAULT_AUDIO_OUTPUT_DELAY 100
-
-//Device Type is TV - Bit 7 is set to 1
-#define ALL_DEVICE_TYPES  128
-
-//RC Profile of TV is 3 - Typical TV Remote
-#define RC_PROFILE_TV 10
-
-//Device Features supported by TV - ARC Tx
-#define DEVICE_FEATURES_TV 4
 
 #define TR181_HDMICECSINK_CEC_VERSION "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.HdmiCecSink.CECVersion"
 
-enum {
-	DEVICE_POWER_STATE_ON = 0,
-	DEVICE_POWER_STATE_OFF = 1
-};
-
-
-#define CEC_SETTING_ENABLED_FILE "/opt/persistent/ds/cecData_2.json"
-#define CEC_SETTING_OTP_ENABLED "cecOTPEnabled"
-#define CEC_SETTING_ENABLED "cecEnabled"
-#define CEC_SETTING_OSD_NAME "cecOSDName"
-#define CEC_SETTING_VENDOR_ID "cecVendorId"
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 3
@@ -193,6 +109,8 @@ namespace WPEFramework
 			return ;
 		}
 
+        bool success = false;
+
         HdmiCecSink::_hdmiCecSink->SetEnabled(false,success);
 
         if(nullptr != _hdmiCecSink)

HdmiCecSink/HdmiCecSink.h

@@ -197,7 +197,7 @@ namespace WPEFramework {
                                 void ShortAudiodescriptorEvent(Exchange::IHdmiCecSink::IHdmiCecSinkShortAudioDescriptorIterator* const& ShortAudioDescriptor) override
                                 {
                                     LOGINFO("ShortAudiodescriptorEvent");
-                                    Exchange::JHdmiCecSink::Event::ShortAudiodescriptorEvent(_parent, ShortAudioDescriptor);
+                                    Exchange::JHdmiCecSink::Event::ShortAudiodescriptorEvent(_parent, &ShortAudioDescriptor);
                                 }
 
                                 void StandbyMessageReceived(const int logicalAddress) override