RDKEMW-1061: RDK-E Add COMRPC

hgfell683 · hgfell683 · commit 5ec336802d71 · 2025-02-25T16:09:30.000-05:00
Reason for change: Create the interface file for HdmiCecSource Test Procedure:
Risks: low
Priority: P1

Signed-off-by:Hayden Gfeller Hayden_Gfeller@comcast.com
diff --git a/HdmiCecSource/HdmiCecSource.cpp b/HdmiCecSource/HdmiCecSource.cpp
@@ -118,7 +118,6 @@ namespace WPEFramework
         const string HdmiCecSource::Initialize(PluginHost::IShell *service)
         {
            LOGWARN("Initlaizing CEC_2");
-           uint32_t res = Core::ERROR_GENERAL;
 
            profileType = searchRdkProfile();
 
@@ -131,11 +130,12 @@ namespace WPEFramework
            string msg;
            HdmiCecSource::_instance = this;
            _hdmiCecSource = _service->Root<Exchange::IHdmiCecSource>(_connectionId, 5000, _T("HdmiCecSourceImplementation"));
+           _service->Register(&_notification);
 
            if(nullptr != _hdmiCecSource)
             {
                 _hdmiCecSource->Configure(service);
-                _hdmiCecSource->Register(&_hdmiCecSourceNotification);
+                _hdmiCecSource->Register(&_notification);
                 msg = "HdmiCecSource plugin is available";
                 LOGINFO("HdmiCecSource plugin is available. Successfully activated HdmiCecSource Plugin");
             }
@@ -154,11 +154,7 @@ namespace WPEFramework
         void HdmiCecSource::Deinitialize(PluginHost::IShell* /* service */)
         {
            LOGWARN("Deinitialize CEC_2");
-           if(_powerManagerPlugin)
-           {
-               _powerManagerPlugin.Reset();
-           }
-           _registeredEventHandlers = false;
+           
 
            profileType = searchRdkProfile();
 
@@ -168,12 +164,12 @@ namespace WPEFramework
                 return ;
            }
 
-           if(true == getEnabled())
+           if(true == HdmiCecSource::_hdmiCecSource->getEnabled())
            {
                HdmiCecSource::_hdmiCecSource->SetEnabled(false,false);
            }
            isDeviceActiveSource = false;
-           HdmiCecSource::_instance->sendActiveSourceEvent();
+           HdmiCecSource::_instance->OnActiveSourceStatusUpdated();
            HdmiCecSource::_instance = nullptr;
 
            DeinitializeIARM();
@@ -187,11 +183,11 @@ namespace WPEFramework
 		sendNotify(eventString[HDMICECSOURCE_EVENT_DEVICE_INFO_UPDATED], params);
 	}
 
-    void HdmiCecSource::sendActiveSourceEvent()
+    void HdmiCecSource::OnActiveSourceStatusUpdated()
        {
            JsonObject params;
            params["status"] = isDeviceActiveSource;
-           LOGWARN(" sendActiveSourceEvent isDeviceActiveSource: %d ",isDeviceActiveSource);
+           LOGWARN(" OnActiveSourceStatusUpdated isDeviceActiveSource: %d ",isDeviceActiveSource);
            sendNotify(eventString[HDMICECSOURCE_EVENT_ACTIVE_SOURCE_STATUS_UPDATED], params);
        }
 
diff --git a/HdmiCecSource/HdmiCecSource.h b/HdmiCecSource/HdmiCecSource.h
@@ -96,14 +96,17 @@ namespace WPEFramework {
                                 void OnDeviceRemoved(const uint8_t logicalAddress) override;
                                 void OnDeviceInfoUpdated(const int logicalAddress) override;
                                 void OnActiveSourceStatusUpdated(const bool isActiveSource) override;
-                                void standbyMessageReceived(const int8_t logicalAddress) override;
+                                void StandbyMessageReceived(const int8_t logicalAddress) override;
+                                void SendKeyReleasedMsgEvent(const int8_t logicalAddress) override;
+                                void SendKeyPressMsgEvent(const int8_t logicalAddress, const int32_t keyCode) override;
 
                     };
 
             public:
                 // We do not allow this plugin to be copied !!
                 HdmiCecSource(const HdmiCecSource&) = delete;
                 HdmiCecSource& operator=(const HdmiCecSource&) = delete;
+                static HdmiCecSource* _instance;
 
                 HdmiCecSource();
                 virtual ~HdmiCecSource();
@@ -126,6 +129,7 @@ namespace WPEFramework {
             private:
                 PluginHost::IShell* _service{};
                 Exchange::IHdmiCecSource* _hdmiCecSource;
+                Core::Sink<Notification> _notification;
         };
 	} // namespace Plugin
 } // namespace WPEFramework
diff --git a/HdmiCecSource/HdmiCecSourceImplementation.cpp b/HdmiCecSource/HdmiCecSourceImplementation.cpp
@@ -130,7 +130,7 @@ namespace WPEFramework
              else
                  isDeviceActiveSource = false;
              LOGINFO("ActiveSource isDeviceActiveSource status :%d \n", isDeviceActiveSource);
-             HdmiCecSourceImplementation::_instance->sendActiveSourceEvent();
+             HdmiCecSource::_instance->OnActiveSourceStatusUpdated();
              HdmiCecSourceImplementation::_instance->addDevice(header.from.toInt());
        }
        void HdmiCecSourceProcessor::process (const InActiveSource &msg, const Header &header)
@@ -270,7 +270,7 @@ namespace WPEFramework
              else
                  isDeviceActiveSource = false;
              LOGINFO("physical_addr : %s isDeviceActiveSource :%d \n",physical_addr.toString().c_str(),isDeviceActiveSource);
-             HdmiCecSourceImplementation::_instance->sendActiveSourceEvent();
+             HdmiCecSource::_instance->OnActiveSourceStatusUpdated();
        }
        void HdmiCecSourceProcessor::process (const RoutingInformation &msg, const Header &header)
        {
@@ -281,7 +281,7 @@ namespace WPEFramework
              else
                  isDeviceActiveSource = false;
              LOGINFO("physical_addr : %s isDeviceActiveSource :%d \n",physical_addr.toString().c_str(),isDeviceActiveSource);
-             HdmiCecSourceImplementation::_instance->sendActiveSourceEvent();
+             HdmiCecSource::_instance->OnActiveSourceStatusUpdated();
        }
        void HdmiCecSourceProcessor::process (const SetStreamPath &msg, const Header &header)
        {
@@ -292,7 +292,7 @@ namespace WPEFramework
              else
                  isDeviceActiveSource = false;
              LOGINFO("physical_addr : %s isDeviceActiveSource :%d \n",physical_addr.toString().c_str(),isDeviceActiveSource);
-             HdmiCecSourceImplementation::_instance->sendActiveSourceEvent();
+             HdmiCecSource::_instance->OnActiveSourceStatusUpdated();
 
        }
        void HdmiCecSourceProcessor::process (const GetMenuLanguage &msg, const Header &header)
@@ -397,10 +397,12 @@ namespace WPEFramework
     {
          LOGWARN("dtor");
          HdmiCecSourceImplementation::_instance = nullptr;
-         if(_engine.IsValid())
+
+           if(_powerManagerPlugin)
            {
-               _engine.Release();
+               _powerManagerPlugin.Reset();
            }
+           _registeredEventHandlers = false;
     }
 
     HdmiCecSourceImplimentation::Configure(PluginHost::IShell* service)

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ namespace WPEFramework`
`118`	`118`	`const string HdmiCecSource::Initialize(PluginHost::IShell *service)`
`119`	`119`	`{`
`120`	`120`	`LOGWARN("Initlaizing CEC_2");`
`121`		`- uint32_t res = Core::ERROR_GENERAL;`
`122`	`121`
`123`	`122`	`profileType = searchRdkProfile();`
`124`	`123`
`@@ -131,11 +130,12 @@ namespace WPEFramework`
`131`	`130`	`string msg;`
`132`	`131`	`HdmiCecSource::_instance = this;`
`133`	`132`	`_hdmiCecSource = _service->Root<Exchange::IHdmiCecSource>(_connectionId, 5000, _T("HdmiCecSourceImplementation"));`
	`133`	`+ _service->Register(&_notification);`
`134`	`134`
`135`	`135`	`if(nullptr != _hdmiCecSource)`
`136`	`136`	`{`
`137`	`137`	`_hdmiCecSource->Configure(service);`
`138`		`- _hdmiCecSource->Register(&_hdmiCecSourceNotification);`
	`138`	`+ _hdmiCecSource->Register(&_notification);`
`139`	`139`	`msg = "HdmiCecSource plugin is available";`
`140`	`140`	`LOGINFO("HdmiCecSource plugin is available. Successfully activated HdmiCecSource Plugin");`
`141`	`141`	`}`
`@@ -154,11 +154,7 @@ namespace WPEFramework`
`154`	`154`	`void HdmiCecSource::Deinitialize(PluginHost::IShell* /* service */)`
`155`	`155`	`{`
`156`	`156`	`LOGWARN("Deinitialize CEC_2");`
`157`		`- if(_powerManagerPlugin)`
`158`		`- {`
`159`		`- _powerManagerPlugin.Reset();`
`160`		`- }`
`161`		`- _registeredEventHandlers = false;`
	`157`	`+`
`162`	`158`
`163`	`159`	`profileType = searchRdkProfile();`
`164`	`160`
`@@ -168,12 +164,12 @@ namespace WPEFramework`
`168`	`164`	`return ;`
`169`	`165`	`}`
`170`	`166`
`171`		`- if(true == getEnabled())`
	`167`	`+ if(true == HdmiCecSource::_hdmiCecSource->getEnabled())`
`172`	`168`	`{`
`173`	`169`	`HdmiCecSource::_hdmiCecSource->SetEnabled(false,false);`
`174`	`170`	`}`
`175`	`171`	`isDeviceActiveSource = false;`
`176`		`- HdmiCecSource::_instance->sendActiveSourceEvent();`
	`172`	`+ HdmiCecSource::_instance->OnActiveSourceStatusUpdated();`
`177`	`173`	`HdmiCecSource::_instance = nullptr;`
`178`	`174`
`179`	`175`	`DeinitializeIARM();`
`@@ -187,11 +183,11 @@ namespace WPEFramework`
`187`	`183`	`sendNotify(eventString[HDMICECSOURCE_EVENT_DEVICE_INFO_UPDATED], params);`
`188`	`184`	`}`
`189`	`185`
`190`		`- void HdmiCecSource::sendActiveSourceEvent()`
	`186`	`+ void HdmiCecSource::OnActiveSourceStatusUpdated()`
`191`	`187`	`{`
`192`	`188`	`JsonObject params;`
`193`	`189`	`params["status"] = isDeviceActiveSource;`
`194`		`- LOGWARN(" sendActiveSourceEvent isDeviceActiveSource: %d ",isDeviceActiveSource);`
	`190`	`+ LOGWARN(" OnActiveSourceStatusUpdated isDeviceActiveSource: %d ",isDeviceActiveSource);`
`195`	`191`	`sendNotify(eventString[HDMICECSOURCE_EVENT_ACTIVE_SOURCE_STATUS_UPDATED], params);`
`196`	`192`	`}`
`197`	`193`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ namespace WPEFramework`
`130`	`130`	`else`
`131`	`131`	`isDeviceActiveSource = false;`
`132`	`132`	`LOGINFO("ActiveSource isDeviceActiveSource status :%d \n", isDeviceActiveSource);`
`133`		`- HdmiCecSourceImplementation::_instance->sendActiveSourceEvent();`
	`133`	`+ HdmiCecSource::_instance->OnActiveSourceStatusUpdated();`
`134`	`134`	`HdmiCecSourceImplementation::_instance->addDevice(header.from.toInt());`
`135`	`135`	`}`
`136`	`136`	`void HdmiCecSourceProcessor::process (const InActiveSource &msg, const Header &header)`
`@@ -270,7 +270,7 @@ namespace WPEFramework`
`270`	`270`	`else`
`271`	`271`	`isDeviceActiveSource = false;`
`272`	`272`	`LOGINFO("physical_addr : %s isDeviceActiveSource :%d \n",physical_addr.toString().c_str(),isDeviceActiveSource);`
`273`		`- HdmiCecSourceImplementation::_instance->sendActiveSourceEvent();`
	`273`	`+ HdmiCecSource::_instance->OnActiveSourceStatusUpdated();`
`274`	`274`	`}`
`275`	`275`	`void HdmiCecSourceProcessor::process (const RoutingInformation &msg, const Header &header)`
`276`	`276`	`{`
`@@ -281,7 +281,7 @@ namespace WPEFramework`
`281`	`281`	`else`
`282`	`282`	`isDeviceActiveSource = false;`
`283`	`283`	`LOGINFO("physical_addr : %s isDeviceActiveSource :%d \n",physical_addr.toString().c_str(),isDeviceActiveSource);`
`284`		`- HdmiCecSourceImplementation::_instance->sendActiveSourceEvent();`
	`284`	`+ HdmiCecSource::_instance->OnActiveSourceStatusUpdated();`
`285`	`285`	`}`
`286`	`286`	`void HdmiCecSourceProcessor::process (const SetStreamPath &msg, const Header &header)`
`287`	`287`	`{`
`@@ -292,7 +292,7 @@ namespace WPEFramework`
`292`	`292`	`else`
`293`	`293`	`isDeviceActiveSource = false;`
`294`	`294`	`LOGINFO("physical_addr : %s isDeviceActiveSource :%d \n",physical_addr.toString().c_str(),isDeviceActiveSource);`
`295`		`- HdmiCecSourceImplementation::_instance->sendActiveSourceEvent();`
	`295`	`+ HdmiCecSource::_instance->OnActiveSourceStatusUpdated();`
`296`	`296`
`297`	`297`	`}`
`298`	`298`	`void HdmiCecSourceProcessor::process (const GetMenuLanguage &msg, const Header &header)`
`@@ -397,10 +397,12 @@ namespace WPEFramework`
`397`	`397`	`{`
`398`	`398`	`LOGWARN("dtor");`
`399`	`399`	`HdmiCecSourceImplementation::_instance = nullptr;`
`400`		`- if(_engine.IsValid())`
	`400`	`+`
	`401`	`+ if(_powerManagerPlugin)`
`401`	`402`	`{`
`402`		`- _engine.Release();`
	`403`	`+ _powerManagerPlugin.Reset();`
`403`	`404`	`}`
	`405`	`+ _registeredEventHandlers = false;`
`404`	`406`	`}`
`405`	`407`
`406`	`408`	`HdmiCecSourceImplimentation::Configure(PluginHost::IShell* service)`