[RDKEMW-6163] [RDKEMW-6164] CEC source and sink changes #244
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /** | ||
|
Check failure on line 1 in HdmiCecSink/HdmiCecSink.h
|
||
| * 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, public 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; | ||
|
|
@@ -586,6 +589,13 @@ | |
| END_INTERFACE_MAP | ||
|
|
||
| private: | ||
| template <typename T> | ||
| T* baseInterface() | ||
| { | ||
| static_assert(std::is_base_of<T, HdmiCecSink>(), "base type mismatch"); | ||
| return static_cast<T*>(this); | ||
| } | ||
|
|
||
| class PowerManagerNotification : public Exchange::IPowerManager::IModeChangedNotification { | ||
| private: | ||
| PowerManagerNotification(const PowerManagerNotification&) = delete; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /** | ||
|
Check failure on line 1 in HdmiCecSource/HdmiCecSourceImplementation.cpp
|
||
| * If not stated otherwise in this file or this component's LICENSE | ||
| * file the following copyright and licenses apply: | ||
| * | ||
|
|
@@ -25,7 +25,6 @@ | |
| #include "ccec/MessageEncoder.hpp" | ||
| #include "host.hpp" | ||
|
|
||
| #include "dsDisplay.h" | ||
| #include "videoOutputPort.hpp" | ||
| #include "manager.hpp" | ||
|
|
@@ -389,8 +388,7 @@ | |
| _powerManagerPlugin.Reset(); | ||
| } | ||
| _registeredEventHandlers = false; | ||
| device::Host::getInstance().UnRegister(baseInterface<device::Host::IDisplayDeviceEvents>()); | ||
| } | ||
|
|
||
| Core::hresult HdmiCecSourceImplementation::Configure(PluginHost::IShell* service) | ||
|
|
@@ -409,7 +407,6 @@ | |
| logicalAddress = 0xFF; | ||
|
|
||
| //CEC plugin functionalities will only work if CECmgr is available. If plugin Initialize failure upper layer will call dtor directly. | ||
| InitializePowerManager(service); | ||
|
|
||
| // load persistence setting | ||
|
|
@@ -418,6 +415,8 @@ | |
| { | ||
| //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(); | ||
| device::Host::getInstance().Register(baseInterface<device::Host::IDisplayDeviceEvents>(), "WPE::CecSource"); | ||
|
|
||
| std::string strVideoPort = device::Host::getInstance().getDefaultVideoPortName(); | ||
| device::VideoOutputPort vPort = device::Host::getInstance().getVideoOutputPort(strVideoPort.c_str()); | ||
| if (vPort.isDisplayConnected()) | ||
|
|
@@ -731,20 +730,6 @@ | |
| registerEventHandlers(); | ||
| } | ||
|
|
||
| void HdmiCecSourceImplementation::threadHotPlugEventHandler(int data) | ||
| { | ||
| LOGINFO("entry threadHotPlugEventHandler \r\n"); | ||
|
|
@@ -759,25 +744,21 @@ | |
| LOGINFO("Exit threadHotPlugEventHandler \r\n"); | ||
| } | ||
|
|
||
| void HdmiCecSourceImplementation::OnDisplayHDMIHotPlug(dsDisplayEvent_t displayEvent) | ||
| { | ||
| LOGINFO("HdmiCecSourceImplementation::OnDisplayHDMIHotPlug : displayEvent = %d ", displayEvent); | ||
|
|
||
| if(!HdmiCecSourceImplementation::_instance || !_instance->cecEnableStatus) | ||
| { | ||
| LOGINFO("HdmiCecSourceImplementation::OnDisplayHDMIHotPlug failed _instance:%p cecEnableStatus:%d \r\n", HdmiCecSourceImplementation::_instance, _instance->cecEnableStatus); | ||
| return; | ||
| } | ||
|
|
||
| int hdmi_hotplug_event = (int) displayEvent; | ||
karuppaiyak marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| 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(); | ||
|
|
||
| } | ||
|
|
||
| void HdmiCecSourceImplementation::onPowerModeChanged(const PowerState currentState, const PowerState newState) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * If not stated otherwise in this file or this component's LICENSE file the | ||
|
Check failure on line 2 in Tests/L1Tests/tests/test_HdmiCecSource.cpp
|
||
| * following copyright and licenses apply: | ||
| * | ||
| * Copyright 2022 RDK Management | ||
|
|
@@ -342,29 +342,9 @@ | |
| .WillByDefault(::testing::Return()); | ||
| ON_CALL(*p_connectionImplMock, addFrameListener(::testing::_)) | ||
| .WillByDefault(::testing::Return()); | ||
| EXPECT_CALL(*p_managerImplMock, Initialize()) | ||
| .Times(::testing::AnyNumber()) | ||
| .WillRepeatedly(::testing::Return()); | ||
| } | ||
| virtual ~HdmiCecSourceTest() override | ||
| { | ||
|
|
@@ -1408,18 +1388,14 @@ | |
| iCounter ++; | ||
| } | ||
|
|
||
| EXPECT_CALL(*p_hostImplMock, getDefaultVideoPortName()) | ||
| .Times(1) | ||
| .WillOnce(::testing::Return("TEST")); | ||
|
|
||
| EVENT_SUBSCRIBE(0, _T("onHdmiHotPlug"), _T("client.events.onHdmiHotPlug"), message); | ||
|
|
||
| //plugin->OnDisplayHDMIHotPlug(dsDISPLAY_EVENT_CONNECTED); | ||
| Plugin::HdmiCecSourceImplementation::_instance->OnDisplayHDMIHotPlug(dsDISPLAY_EVENT_CONNECTED); | ||
|
|
||
| EVENT_UNSUBSCRIBE(0, _T("onHdmiHotPlug"), _T("client.events.onHdmiHotPlug"), message); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.