[RDKEMW-6163] [RDKEMW-6164] CEC source and sink changes

HdmiCecSink/HdmiCecSink.cpp

@@ -1,4 +1,4 @@
 /**
 * If not stated otherwise in this file or this component's LICENSE
 * file the following copyright and licenses apply:
 *
@@ -753,7 +753,11 @@
 
            int err;
            dsHdmiInGetNumberOfInputsParam_t hdmiInput;
+#ifdef IO_HCEC_ENABLE_IARM
            InitializeIARM();
+#else
+           device::Host::getInstance().Register(this, "WPE[HdmiCecSink]");
+#endif /* IO_HCEC_ENABLE_IARM */
            m_sendKeyEventThreadExit = false;
            m_sendKeyEventThread = std::thread(threadSendKeyEvent);
 
@@ -879,7 +883,12 @@
 	    }
 
             HdmiCecSink::_instance = nullptr;
-            DeinitializeIARM();
+#ifdef IO_HCEC_ENABLE_IARM
+           DeinitializeIARM();
+#else
+           device::Host::getInstance().UnRegister(this);
+#endif /* IO_HCEC_ENABLE_IARM */
+
 	    LOGWARN(" HdmiCecSink Deinitialize() Done");
        }
 
@@ -920,6 +929,7 @@
            }
        }
 
+#ifdef IO_HCEC_ENABLE_IARM
        void HdmiCecSink::dsHdmiEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len)
        {
             if(!HdmiCecSink::_instance)
@@ -934,6 +944,16 @@
                 HdmiCecSink::_instance->onHdmiHotPlug(portId,isHdmiConnected);
             }
        }
+#else
+        void HdmiCecSink::OnHdmiInEventHotPlug(dsHdmiInPort_t port, bool isConnected)
+        {
+            if(!HdmiCecSink::_instance)
+                return;
+
+            LOGINFO("Received IARM_BUS_DSMGR_EVENT_HDMI_IN_HOTPLUG event port: %d isConnected: %d \r\n", port, isConnected);
+            HdmiCecSink::_instance->onHdmiHotPlug((int) port, (int) isConnected);
+        }
+#endif /* IO_HCEC_ENABLE_IARM */
 
        void HdmiCecSink::onPowerModeChanged(const PowerState currentState, const PowerState newState)
        {

HdmiCecSink/HdmiCecSink.h

@@ -1,4 +1,4 @@
 /**
 * If not stated otherwise in this file or this component's LICENSE
 * file the following copyright and licenses apply:
 *
@@ -41,6 +41,8 @@
 #include "UtilsLogging.h"
 #include <interfaces/IPowerManager.h>
 #include "PowerManagerInterface.h"
+#include "host.hpp"
+
 
 using namespace WPEFramework;
 using PowerState = WPEFramework::Exchange::IPowerManager::PowerState;
@@ -482,7 +484,7 @@
 		// As the registration/unregistration of notifications is realized by the class PluginHost::JSONRPC,
 		// this class exposes a public method called, Notify(), using this methods, all subscribed clients
 		// will receive a JSONRPC message as a notification, in case this method is called.
-        class HdmiCecSink : public PluginHost::IPlugin, public PluginHost::JSONRPC {
+        class HdmiCecSink : public PluginHost::IPlugin, public PluginHost::JSONRPC, device::Host::IHdmiInEvents {
 
 		enum {
 			POLL_THREAD_STATE_NONE,
@@ -530,6 +532,7 @@
             virtual const string Initialize(PluginHost::IShell* shell) override;
             virtual void Deinitialize(PluginHost::IShell* service) override;
             virtual string Information() const override { return {}; }
+            virtual void OnHdmiInEventHotPlug(dsHdmiInPort_t port, bool isConnected) override;
             static HdmiCecSink* _instance;
 			CECDeviceParams deviceList[16];
 			std::vector<HdmiPortMap> hdmiInputs;

HdmiCecSource/HdmiCecSourceImplementation.cpp

@@ -1,4 +1,4 @@
 /**
 * If not stated otherwise in this file or this component's LICENSE
 * file the following copyright and licenses apply:
 *
@@ -390,7 +390,12 @@
            }
            _registeredEventHandlers = false;
 
+#ifdef IO_HCEC_ENABLE_IARM
            DeinitializeIARM();
+#else
+           device::Host::getInstance().UnRegister(this);
+#endif /* IO_HCEC_ENABLE_IARM */
+
     }
 
     Core::hresult HdmiCecSourceImplementation::Configure(PluginHost::IShell* service)
@@ -409,7 +414,9 @@
             logicalAddress = 0xFF;
 
             //CEC plugin functionalities will only work if CECmgr is available. If plugin Initialize failure upper layer will call dtor directly.
+#ifdef IO_HCEC_ENABLE_IARM
             InitializeIARM();
+#endif /* IO_HCEC_ENABLE_IARM */
             InitializePowerManager(service);
 
             // load persistence setting
@@ -418,6 +425,11 @@
             {
                 //TODO(MROLLINS) this is probably per process so we either need to be running in our own process or be carefull no other plugin is calling it
                 device::Manager::Initialize();
+
+#ifndef IO_HCEC_ENABLE_IARM
+                device::Host::getInstance().Register(this, "WPE[HdmiCecSource]");
+#endif /* IO_HCEC_ENABLE_IARM */
+
                 std::string strVideoPort = device::Host::getInstance().getDefaultVideoPortName();
                 device::VideoOutputPort vPort = device::Host::getInstance().getVideoOutputPort(strVideoPort.c_str());
                 if (vPort.isDisplayConnected())
@@ -759,6 +771,7 @@
             LOGINFO("Exit threadHotPlugEventHandler \r\n");
         }
 
+#ifdef IO_HCEC_ENABLE_IARM
        void HdmiCecSourceImplementation::dsHdmiEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len)
        {
             if(!HdmiCecSourceImplementation::_instance  || !_instance->cecEnableStatus)
@@ -779,7 +792,24 @@
                 }
             }
        }
+#else
+       void HdmiCecSourceImplementation::OnDisplayHDMIHotPlug(dsDisplayEvent_t displayEvent)
+       {
+           LOGINFO("OnDisplayHDMIHotPlug : displayEvent = %d ", displayEvent);
 
+           if(!HdmiCecSourceImplementation::_instance  || !_instance->cecEnableStatus)
+           {
+               LOGINFO("Return from dsHdmiEventHandler due HdmiCecSourceImplementation::_instance:%p cecEnableStatus:%d  \r\n", HdmiCecSourceImplementation::_instance, _instance->cecEnableStatus);
+               return;
+           }
+
+           int hdmi_hotplug_event = (int) displayEvent;
+           LOGINFO("Received IARM_BUS_DSMGR_EVENT_HDMI_HOTPLUG  event data:%d \r\n", hdmi_hotplug_event);
+           std::thread worker(threadHotPlugEventHandler,hdmi_hotplug_event);
+           worker.detach();
+
+       }
+#endif /* IO_HCEC_ENABLE_IARM */
        void HdmiCecSourceImplementation::onPowerModeChanged(const PowerState currentState, const PowerState newState)
        {
             if(!HdmiCecSourceImplementation::_instance)

HdmiCecSource/HdmiCecSourceImplementation.h

@@ -42,6 +42,8 @@
 #include <interfaces/IPowerManager.h>
 #include "PowerManagerInterface.h"
 #include <interfaces/IHdmiCecSource.h>
+#include "host.hpp"
+
 
 using namespace WPEFramework;
 using PowerState = WPEFramework::Exchange::IPowerManager::PowerState;
@@ -170,7 +172,7 @@ namespace WPEFramework {
 		// As the registration/unregistration of notifications is realized by the class PluginHost::JSONRPC,
 		// this class exposes a public method called, Notify(), using this methods, all subscribed clients
 		// will receive a JSONRPC message as a notification, in case this method is called.
-        class HdmiCecSourceImplementation : public Exchange::IHdmiCecSource {
+        class HdmiCecSourceImplementation : public Exchange::IHdmiCecSource, device::Host::IDisplayDeviceEvents {
 		enum {
 				VOLUME_UP     = 0x41,
 				VOLUME_DOWN   = 0x42,
@@ -196,6 +198,7 @@ namespace WPEFramework {
         public:
             HdmiCecSourceImplementation();
             virtual ~HdmiCecSourceImplementation();
+            virtual void OnDisplayHDMIHotPlug(dsDisplayEvent_t displayEvent) override;
             void onPowerModeChanged(const PowerState currentState, const PowerState newState);
             void registerEventHandlers();
             static HdmiCecSourceImplementation* _instance;