[RDKEMW-6168] Update AVInput with libds client library notifications #248
+382
−554
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /** | ||
|
Check failure on line 1 in AVInput/AVInput.cpp
|
||
| * If not stated otherwise in this file or this component's LICENSE | ||
| * file the following copyright and licenses apply: | ||
| * | ||
|
|
@@ -18,13 +18,12 @@ | |
| **/ | ||
|
|
||
| #include "AVInput.h" | ||
|
|
||
| #include "hdmiIn.hpp" | ||
| #include "compositeIn.hpp" | ||
Prathyushakothuru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| #include "UtilsJsonRpc.h" | ||
| #include "UtilsIarm.h" | ||
|
|
||
| #include "exception.hpp" | ||
| #include <vector> | ||
|
|
@@ -113,6 +112,7 @@ | |
|
|
||
| AVInput::AVInput() | ||
| : PluginHost::JSONRPC() | ||
| , _registeredDsEventHandlers(false) | ||
| { | ||
| RegisterAll(); | ||
| } | ||
|
|
@@ -125,14 +125,38 @@ | |
| const string AVInput::Initialize(PluginHost::IShell * /* service */) | ||
| { | ||
| AVInput::_instance = this; | ||
| try | ||
| { | ||
| device::Manager::Initialize(); | ||
| LOGINFO("device::Manager::Initialize success"); | ||
| registerDsEventHandlers(); | ||
| } | ||
| catch(const device::Exception& err) | ||
Prathyushakothuru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| LOGINFO("device::Manager::Initialize failed"); | ||
Prathyushakothuru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| LOG_DEVICE_EXCEPTION0(); | ||
| } | ||
|
|
||
| return (string()); | ||
| } | ||
|
|
||
| void AVInput::Deinitialize(PluginHost::IShell * /* service */) | ||
| { | ||
|
|
||
| device::Host::getInstance().UnRegister(baseInterface<device::Host::IHdmiInEvents>()); | ||
| device::Host::getInstance().UnRegister(baseInterface<device::Host::ICompositeInEvents>()); | ||
| _registeredDsEventHandlers = false; | ||
| try | ||
| { | ||
| device::Manager::DeInitialize(); | ||
| LOGINFO("device::Manager::DeInitialize success"); | ||
|
There was a problem hiding this comment. correct the try-catch block alignment wrt other places where it is already used. |
||
| } | ||
| catch(const device::Exception& err) | ||
| { | ||
| LOGINFO("device::Manager::DeInitialize failed"); | ||
| LOG_DEVICE_EXCEPTION0(); | ||
| } | ||
|
|
||
| AVInput::_instance = nullptr; | ||
| } | ||
|
|
||
|
|
@@ -141,97 +165,6 @@ | |
| return (string()); | ||
| } | ||
|
|
||
| void AVInput::RegisterAll() | ||
| { | ||
| Register<JsonObject, JsonObject>(_T(AVINPUT_METHOD_NUMBER_OF_INPUTS), &AVInput::endpoint_numberOfInputs, this); | ||
|
|
@@ -923,7 +856,7 @@ | |
|
|
||
| sendNotify(AVINPUT_EVENT_ON_VIDEO_MODE_UPDATED, params); | ||
| } | ||
| #if 0 | ||
Prathyushakothuru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| void AVInput::dsAviContentTypeEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len) | ||
| { | ||
| if(!AVInput::_instance) | ||
|
|
@@ -939,6 +872,7 @@ | |
| AVInput::_instance->hdmiInputAviContentTypeChange(hdmi_in_port, avi_content_type); | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| void AVInput::hdmiInputAviContentTypeChange( int port , int content_type) | ||
| { | ||
|
|
@@ -948,6 +882,7 @@ | |
| sendNotify(AVINPUT_EVENT_ON_AVI_CONTENT_TYPE_CHANGED, params); | ||
| } | ||
|
|
||
| #if 0 | ||
| void AVInput::dsAVEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len) | ||
| { | ||
| if(!AVInput::_instance) | ||
|
|
@@ -1071,6 +1006,8 @@ | |
| } | ||
| } | ||
|
|
||
| #endif | ||
|
|
||
| void AVInput::AVInputALLMChange( int port , bool allm_mode) | ||
| { | ||
| JsonObject params; | ||
|
|
@@ -1792,5 +1729,146 @@ | |
| return edidVersion; | ||
| } | ||
|
|
||
| void AVInput::registerDsEventHandlers() | ||
Prathyushakothuru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| LOGINFO("registerDsEventHandlers"); | ||
| if(!_registeredDsEventHandlers) | ||
| { | ||
| _registeredDsEventHandlers = true; | ||
| device::Host::getInstance().Register(baseInterface<device::Host::IHdmiInEvents>()); | ||
Prathyushakothuru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| device::Host::getInstance().Register(baseInterface<device::Host::ICompositeInEvents>()); | ||
| } | ||
| } | ||
|
|
||
| /* HDMIInEventsNotification*/ | ||
|
|
||
| void AVInput::OnHdmiInAVIContentType(dsHdmiInPort_t port, dsAviContentType_t aviContentType) | ||
| { | ||
| LOGINFO("Received OnHdmiInAVIContentType callback, port: %d, Content Type: %d", port, aviContentType); | ||
|
|
||
| if(AVInput::_instance) { | ||
| AVInput::_instance->hdmiInputAviContentTypeChange(port, aviContentType); | ||
| } | ||
| } | ||
|
|
||
| void AVInput::OnHdmiInEventHotPlug(dsHdmiInPort_t port, bool isConnected) | ||
| { | ||
| LOGINFO("Received OnHdmiInEventHotPlug callback, port: %d, isConnected: %s", port, isConnected ? "true" : "false"); | ||
|
|
||
| if(AVInput::_instance) { | ||
| AVInput::_instance->AVInputHotplug(port,isConnected ? AV_HOT_PLUG_EVENT_CONNECTED : AV_HOT_PLUG_EVENT_DISCONNECTED, HDMI); | ||
| } | ||
| } | ||
|
|
||
| void AVInput::OnHdmiInEventSignalStatus(dsHdmiInPort_t port, dsHdmiInSignalStatus_t signalStatus) | ||
| { | ||
| LOGINFO("Received OnHdmiInEventSignalStatus callback, port: %d, signalStatus: %d",port, signalStatus); | ||
|
|
||
| if(AVInput::_instance) { | ||
| AVInput::_instance->AVInputSignalChange(port, signalStatus, HDMI); | ||
| } | ||
| } | ||
|
|
||
| void AVInput::OnHdmiInEventStatus(dsHdmiInPort_t activePort, bool isPresented) | ||
| { | ||
| LOGINFO("Received OnHdmiInEventStatus callback, port: %d, isPresented: %s",activePort, isPresented ? "true" : "false"); | ||
|
|
||
| if (AVInput::_instance) { | ||
| AVInput::_instance->AVInputStatusChange(activePort, isPresented, HDMI); | ||
| } | ||
| } | ||
|
|
||
| void AVInput::OnHdmiInVideoModeUpdate(dsHdmiInPort_t port, const dsVideoPortResolution_t& videoPortResolution) | ||
| { | ||
| LOGINFO("Received OnHdmiInVideoModeUpdate callback, port: %d, pixelResolution: %d, interlaced: %d, frameRate: %d", | ||
| port, | ||
| videoPortResolution.pixelResolution, | ||
| videoPortResolution.interlaced, | ||
| videoPortResolution.frameRate); | ||
|
|
||
| if (AVInput::_instance) { | ||
| AVInput::_instance->AVInputVideoModeUpdate(port, videoPortResolution, HDMI); | ||
| } | ||
| } | ||
|
|
||
| void AVInput::OnHdmiInAllmStatus(dsHdmiInPort_t port, bool allmStatus) | ||
| { | ||
| LOGINFO("Received OnHdmiInAllmStatus callback, port: %d, ALLM Mode: %s", | ||
| port, allmStatus ? "true" : "false"); | ||
|
|
||
| if (AVInput::_instance) { | ||
| AVInput::_instance->AVInputALLMChange(port, allmStatus); | ||
| } | ||
| } | ||
|
|
||
| void AVInput::OnHdmiInVRRStatus(dsHdmiInPort_t port, dsVRRType_t vrrType) | ||
| { | ||
| LOGINFO("Received OnHdmiInVRRStatus callback, port: %d, VRR Type: %d", | ||
| port, vrrType); | ||
|
|
||
| if (!AVInput::_instance) | ||
| return; | ||
|
|
||
| // Handle transitions | ||
| if (vrrType == dsVRR_NONE) { | ||
| if (AVInput::_instance->m_currentVrrType != dsVRR_NONE) { | ||
| AVInput::_instance->AVInputVRRChange(port,AVInput::_instance->m_currentVrrType,false); | ||
| } | ||
| } else { | ||
| if (AVInput::_instance->m_currentVrrType != dsVRR_NONE) { | ||
| AVInput::_instance->AVInputVRRChange(port,AVInput::_instance->m_currentVrrType,false); | ||
| } | ||
| AVInput::_instance->AVInputVRRChange(port,vrrType,true); | ||
| } | ||
|
|
||
| AVInput::_instance->m_currentVrrType = vrrType; | ||
| } | ||
|
|
||
|
|
||
| /*CompositeInEventsNotification*/ | ||
|
|
||
| void AVInput::OnCompositeInHotPlug(dsCompositeInPort_t port, bool isConnected) | ||
| { | ||
| LOGINFO("Received OnCompositeInHotPlug callback, port: %d, isConnected: %s",port, isConnected ? "true" : "false"); | ||
|
|
||
| if(AVInput::_instance) { | ||
| AVInput::_instance->AVInputHotplug(port,isConnected ? AV_HOT_PLUG_EVENT_CONNECTED : AV_HOT_PLUG_EVENT_DISCONNECTED,COMPOSITE); | ||
| } | ||
| } | ||
|
|
||
| void AVInput::OnCompositeInSignalStatus(dsCompositeInPort_t port, dsCompInSignalStatus_t signalStatus) | ||
| { | ||
| LOGINFO("Received OnCompositeInSignalStatus callback, port: %d, signalStatus: %d",port, signalStatus); | ||
|
|
||
| if(AVInput::_instance) { | ||
| AVInput::_instance->AVInputSignalChange(port, signalStatus, COMPOSITE); | ||
| } | ||
| } | ||
|
|
||
| void AVInput::OnCompositeInStatus(dsCompositeInPort_t activePort, bool isPresented) | ||
| { | ||
| LOGINFO("Received OnCompositeInStatus callback, port: %d, isPresented: %s", | ||
| activePort, isPresented ? "true" : "false"); | ||
|
|
||
| if (AVInput::_instance) { | ||
| AVInput::_instance->AVInputStatusChange(activePort, isPresented, COMPOSITE); | ||
| } | ||
| } | ||
|
|
||
| void AVInput::OnCompositeInVideoModeUpdate(dsCompositeInPort_t activePort, dsVideoPortResolution_t videoResolution) | ||
| { | ||
| LOGINFO("Received OnCompositeInVideoModeUpdate callback, port: %d, pixelResolution: %d, interlaced: %d, frameRate: %d", | ||
| activePort, | ||
| videoResolution.pixelResolution, | ||
| videoResolution.interlaced, | ||
| videoResolution.frameRate); | ||
|
|
||
| if (AVInput::_instance) { | ||
| AVInput::_instance->AVInputVideoModeUpdate(activePort, videoResolution, COMPOSITE); | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
| } // namespace Plugin | ||
| } // namespace WPEFramework | ||
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.