RDKEMW-6120: Updating Hdcp, AvInput and HdmiCEC DS MGR client to use libds client library #262
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /** | ||
|
Check failure on line 1 in AVInput/AVInput.h
|
||
| * If not stated otherwise in this file or this component's LICENSE | ||
| * file the following copyright and licenses apply: | ||
| * | ||
|
|
@@ -21,7 +21,10 @@ | |
|
|
||
| #include "Module.h" | ||
| #include "libIBus.h" | ||
|
|
||
| #include "dsTypes.h" | ||
| #include "host.hpp" | ||
| #include "manager.hpp" | ||
|
|
||
| #define DEFAULT_PRIM_VOL_LEVEL 25 | ||
| #define MAX_PRIM_VOL_LEVEL 100 | ||
|
|
@@ -30,9 +33,13 @@ | |
| namespace WPEFramework { | ||
| namespace Plugin { | ||
|
|
||
| class AVInput: public PluginHost::IPlugin, | ||
| public PluginHost::JSONRPC, | ||
| public device::Host::IHdmiInEvents, | ||
| public device::Host::ICompositeInEvents{ | ||
|
|
||
| private: | ||
|
|
||
| AVInput(const AVInput &) = delete; | ||
| AVInput &operator=(const AVInput &) = delete; | ||
|
|
||
|
|
@@ -45,6 +52,15 @@ | |
| INTERFACE_ENTRY(PluginHost::IDispatcher) | ||
| END_INTERFACE_MAP | ||
|
|
||
| private: | ||
|
|
||
| template <typename T> | ||
| T* baseInterface() | ||
| { | ||
| static_assert(std::is_base_of<T, AVInput>(), "base type mismatch"); | ||
| return static_cast<T*>(this); | ||
| } | ||
|
|
||
| int m_primVolume; | ||
| int m_inputVolume; //Player Volume | ||
|
|
||
|
|
@@ -57,9 +73,7 @@ | |
| virtual string Information() const override; | ||
|
|
||
| protected: | ||
|
|
||
| void RegisterAll(); | ||
| void UnregisterAll(); | ||
|
|
||
|
|
@@ -124,6 +138,30 @@ | |
|
|
||
| void hdmiInputAviContentTypeChange(int port, int content_type); | ||
| static void dsAviContentTypeEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len); | ||
|
|
||
| private: | ||
|
|
||
| bool _registeredDsEventHandlers; | ||
|
|
||
| public: | ||
|
|
||
| /* HdmiInEventNotification*/ | ||
|
|
||
| void OnHdmiInEventHotPlug(dsHdmiInPort_t port, bool isConnected) override; | ||
| void OnHdmiInEventSignalStatus(dsHdmiInPort_t port, dsHdmiInSignalStatus_t signalStatus) override; | ||
| void OnHdmiInEventStatus(dsHdmiInPort_t activePort, bool isPresented) override; | ||
| void OnHdmiInVideoModeUpdate(dsHdmiInPort_t port, const dsVideoPortResolution_t& videoPortResolution) override; | ||
| void OnHdmiInAllmStatus(dsHdmiInPort_t port, bool allmStatus) override; | ||
| void OnHdmiInAVIContentType(dsHdmiInPort_t port, dsAviContentType_t aviContentType) override; | ||
| void OnHdmiInVRRStatus(dsHdmiInPort_t port, dsVRRType_t vrrType) override; | ||
|
|
||
| /* CompositeInEventNotification */ | ||
|
|
||
| void OnCompositeInHotPlug(dsCompositeInPort_t port, bool isConnected) override; | ||
| void OnCompositeInSignalStatus(dsCompositeInPort_t port, dsCompInSignalStatus_t signalStatus) override; | ||
| void OnCompositeInStatus(dsCompositeInPort_t activePort, bool isPresented) override; | ||
| void OnCompositeInVideoModeUpdate(dsCompositeInPort_t activePort, dsVideoPortResolution_t videoResolution) override; | ||
|
|
||
| public: | ||
| static AVInput* _instance; | ||
| }; | ||
|
|
||
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 HdcpProfile/HdcpProfileImplementation.cpp
|
||
| * If not stated otherwise in this file or this component's LICENSE | ||
| * file the following copyright and licenses apply: | ||
| * | ||
|
|
@@ -23,14 +23,9 @@ | |
|
|
||
| #include "videoOutputPort.hpp" | ||
| #include "videoOutputPortConfig.hpp" | ||
| #include "manager.hpp" | ||
|
|
||
| #include "UtilsJsonRpc.h" | ||
|
|
||
| #define HDMI_HOT_PLUG_EVENT_CONNECTED 0 | ||
| #define HDMI_HOT_PLUG_EVENT_DISCONNECTED 1 | ||
|
|
@@ -61,14 +56,15 @@ | |
| HdcpProfileImplementation::~HdcpProfileImplementation() | ||
| { | ||
| LOGINFO("Call HdcpProfileImplementation destructor\n"); | ||
| device::Host::getInstance().UnRegister(baseInterface<device::Host::IVideoOutputPortEvents>()); | ||
| device::Host::getInstance().UnRegister(baseInterface<device::Host::IDisplayDeviceEvents>()); | ||
| if (_powerManagerPlugin) { | ||
| _powerManagerPlugin.Reset(); | ||
| } | ||
| if(_service != nullptr) | ||
| { | ||
| _service->Release(); | ||
| } | ||
| HdcpProfileImplementation::_instance = nullptr; | ||
| mShell = nullptr; | ||
| } | ||
|
|
@@ -82,26 +78,7 @@ | |
| .createInterface(); | ||
| } | ||
|
|
||
| void HdcpProfileImplementation::onHdmiOutputHotPlug(dsDisplayEvent_t connectStatus) | ||
| { | ||
| if (HDMI_HOT_PLUG_EVENT_CONNECTED == connectStatus) | ||
| { | ||
|
|
@@ -137,49 +114,36 @@ | |
| status.hdcpReason); | ||
| } | ||
|
|
||
| void HdcpProfileImplementation::onHdmiOutputHDCPStatusEvent(dsHdcpStatus_t hdcpStatus) | ||
| { | ||
| LOGINFO("hdcpStatus[%d]",hdcpStatus); | ||
| onHdcpProfileDisplayConnectionChanged(); | ||
| } | ||
|
|
||
| void HdcpProfileImplementation::OnDisplayHDMIHotPlug(dsDisplayEvent_t displayEvent) | ||
| { | ||
| LOGINFO("Received OnDisplayHDMIHotPlug event data:%d \r\n", displayEvent); | ||
| HdcpProfileImplementation::_instance->onHdmiOutputHotPlug(displayEvent); | ||
| } | ||
|
|
||
| void HdcpProfileImplementation::OnHDCPStatusChange(dsHdcpStatus_t hdcpStatus) | ||
| { | ||
| uint32_t res = Core::ERROR_GENERAL; | ||
| PowerState pwrStateCur = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN; | ||
| PowerState pwrStatePrev = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN; | ||
|
|
||
| ASSERT (_powerManagerPlugin); | ||
| if (_powerManagerPlugin){ | ||
| res = _powerManagerPlugin->GetPowerState(pwrStateCur, pwrStatePrev); | ||
| if (Core::ERROR_NONE != res) | ||
| { | ||
| LOGWARN("Failed to Invoke RPC method: GetPowerState"); | ||
| } | ||
| LOGINFO("Received OnHDCPStatusChange event data:%d param.curState: %d \r\n", hdcpStatus,pwrStateCur); | ||
| HdcpProfileImplementation::_instance->onHdmiOutputHDCPStatusEvent(hdcpStatus); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Register a notification callback | ||
| */ | ||
|
|
@@ -243,7 +207,8 @@ | |
| _service = service; | ||
| _service->AddRef(); | ||
| ASSERT(service != nullptr); | ||
| device::Host::getInstance().Register(baseInterface<device::Host::IVideoOutputPortEvents>(),"WPE::HdcpProfile"); | ||
| device::Host::getInstance().Register(baseInterface<device::Host::IDisplayDeviceEvents>(),"WPE::HdcpProfile"); | ||
| InitializePowerManager(service); | ||
| return result; | ||
| } | ||
|
|
||
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.
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.