Skip to content

Commit 4f0f28f

Browse files
PrathyushakothuruPrathyushakothuru
committed
fixing review comments_!
1 parent edf04fd commit 4f0f28f

File tree

2 files changed

+35
-183
lines changed

2 files changed

+35
-183
lines changed

‎AVInput/AVInput.cpp‎

Lines changed: 14 additions & 163 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "AVInput.h"
2121

22-
#include "hdmiIn.hpp"
2322
#include "compositeIn.hpp"
23+
#include "hdmiIn.hpp"
2424

2525
#include "UtilsJsonRpc.h"
2626
#include "UtilsIarm.h"
@@ -126,16 +126,21 @@ const string AVInput::Initialize(PluginHost::IShell * /* service */)
126126
{
127127
AVInput::_instance = this;
128128
try
129-
{
130-
device::Manager::Initialize();
131-
LOGINFO("device::Manager::Initialize success");
132-
registerDsEventHandlers();
129+
{
130+
device::Manager::Initialize();
131+
LOGINFO("device::Manager::Initialize success");
132+
if (!_registeredDsEventHandlers) {
133+
_registeredDsEventHandlers = true;
134+
device::Host::getInstance().Register(baseInterface<device::Host::IHdmiInEvents>(), "WPE::HdmiInEvents");
135+
device::Host::getInstance().Register(baseInterface<device::Host::ICompositeInEvents>(), "WPE::CompositeInEvents");
133136
}
137+
}
134138
catch(const device::Exception& err)
135-
{
136-
LOGINFO("device::Manager::Initialize failed");
137-
LOG_DEVICE_EXCEPTION0();
138-
}
139+
{
140+
LOGINFO("device::Manager::Initialize failed");
141+
LOG_DEVICE_EXCEPTION0();
142+
return std::string("AVInput: Initialization failed");
143+
}
139144

140145
return (string());
141146
}
@@ -856,23 +861,6 @@ void AVInput::AVInputVideoModeUpdate( int port , dsVideoPortResolution_t resolut
856861

857862
sendNotify(AVINPUT_EVENT_ON_VIDEO_MODE_UPDATED, params);
858863
}
859-
#if 0
860-
void AVInput::dsAviContentTypeEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len)
861-
{
862-
if(!AVInput::_instance)
863-
return;
864-
865-
if (IARM_BUS_DSMGR_EVENT_HDMI_IN_AVI_CONTENT_TYPE == eventId)
866-
{
867-
IARM_Bus_DSMgr_EventData_t *eventData = (IARM_Bus_DSMgr_EventData_t *)data;
868-
int hdmi_in_port = eventData->data.hdmi_in_content_type.port;
869-
int avi_content_type = eventData->data.hdmi_in_content_type.aviContentType;
870-
LOGINFO("Received IARM_BUS_DSMGR_EVENT_HDMI_IN_AVI_CONTENT_TYPE event port: %d, Content Type : %d", hdmi_in_port,avi_content_type);
871-
872-
AVInput::_instance->hdmiInputAviContentTypeChange(hdmi_in_port, avi_content_type);
873-
}
874-
}
875-
#endif
876864

877865
void AVInput::hdmiInputAviContentTypeChange( int port , int content_type)
878866
{
@@ -882,132 +870,6 @@ void AVInput::hdmiInputAviContentTypeChange( int port , int content_type)
882870
sendNotify(AVINPUT_EVENT_ON_AVI_CONTENT_TYPE_CHANGED, params);
883871
}
884872

885-
#if 0
886-
void AVInput::dsAVEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len)
887-
{
888-
if(!AVInput::_instance)
889-
return;
890-
891-
IARM_Bus_DSMgr_EventData_t *eventData = (IARM_Bus_DSMgr_EventData_t *)data;
892-
if (IARM_BUS_DSMGR_EVENT_HDMI_IN_HOTPLUG == eventId) {
893-
int hdmiin_hotplug_port = eventData->data.hdmi_in_connect.port;
894-
int hdmiin_hotplug_conn = eventData->data.hdmi_in_connect.isPortConnected;
895-
LOGWARN("Received IARM_BUS_DSMGR_EVENT_HDMI_IN_HOTPLUG event data:%d", hdmiin_hotplug_port);
896-
AVInput::_instance->AVInputHotplug(hdmiin_hotplug_port, hdmiin_hotplug_conn ? AV_HOT_PLUG_EVENT_CONNECTED : AV_HOT_PLUG_EVENT_DISCONNECTED, HDMI);
897-
}
898-
else if (IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_HOTPLUG == eventId) {
899-
int compositein_hotplug_port = eventData->data.composite_in_connect.port;
900-
int compositein_hotplug_conn = eventData->data.composite_in_connect.isPortConnected;
901-
LOGWARN("Received IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_HOTPLUG event data:%d", compositein_hotplug_port);
902-
AVInput::_instance->AVInputHotplug(compositein_hotplug_port, compositein_hotplug_conn ? AV_HOT_PLUG_EVENT_CONNECTED : AV_HOT_PLUG_EVENT_DISCONNECTED, COMPOSITE);
903-
}
904-
}
905-
906-
void AVInput::dsAVSignalStatusEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len)
907-
{
908-
if(!AVInput::_instance)
909-
return;
910-
IARM_Bus_DSMgr_EventData_t *eventData = (IARM_Bus_DSMgr_EventData_t *)data;
911-
if (IARM_BUS_DSMGR_EVENT_HDMI_IN_SIGNAL_STATUS == eventId) {
912-
int hdmi_in_port = eventData->data.hdmi_in_sig_status.port;
913-
int hdmi_in_signal_status = eventData->data.hdmi_in_sig_status.status;
914-
LOGWARN("Received IARM_BUS_DSMGR_EVENT_HDMI_IN_SIGNAL_STATUS event port: %d, signal status: %d", hdmi_in_port,hdmi_in_signal_status);
915-
AVInput::_instance->AVInputSignalChange(hdmi_in_port, hdmi_in_signal_status, HDMI);
916-
}
917-
else if (IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_SIGNAL_STATUS == eventId) {
918-
int composite_in_port = eventData->data.composite_in_sig_status.port;
919-
int composite_in_signal_status = eventData->data.composite_in_sig_status.status;
920-
LOGWARN("Received IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_SIGNAL_STATUS event port: %d, signal status: %d", composite_in_port,composite_in_signal_status);
921-
AVInput::_instance->AVInputSignalChange(composite_in_port, composite_in_signal_status, COMPOSITE);
922-
}
923-
}
924-
925-
void AVInput::dsAVStatusEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len)
926-
{
927-
if(!AVInput::_instance)
928-
return;
929-
IARM_Bus_DSMgr_EventData_t *eventData = (IARM_Bus_DSMgr_EventData_t *)data;
930-
if (IARM_BUS_DSMGR_EVENT_HDMI_IN_STATUS == eventId) {
931-
int hdmi_in_port = eventData->data.hdmi_in_status.port;
932-
bool hdmi_in_status = eventData->data.hdmi_in_status.isPresented;
933-
LOGWARN("Received IARM_BUS_DSMGR_EVENT_HDMI_IN_STATUS event port: %d, started: %d", hdmi_in_port,hdmi_in_status);
934-
AVInput::_instance->AVInputStatusChange(hdmi_in_port, hdmi_in_status, HDMI);
935-
}
936-
else if (IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_STATUS == eventId) {
937-
int composite_in_port = eventData->data.composite_in_status.port;
938-
bool composite_in_status = eventData->data.composite_in_status.isPresented;
939-
LOGWARN("Received IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_STATUS event port: %d, started: %d", composite_in_port,composite_in_status);
940-
AVInput::_instance->AVInputStatusChange(composite_in_port, composite_in_status, COMPOSITE);
941-
}
942-
}
943-
944-
void AVInput::dsAVVideoModeEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len)
945-
{
946-
if(!AVInput::_instance)
947-
return;
948-
949-
if (IARM_BUS_DSMGR_EVENT_HDMI_IN_VIDEO_MODE_UPDATE == eventId) {
950-
IARM_Bus_DSMgr_EventData_t *eventData = (IARM_Bus_DSMgr_EventData_t *)data;
951-
int hdmi_in_port = eventData->data.hdmi_in_video_mode.port;
952-
dsVideoPortResolution_t resolution = {};
953-
resolution.pixelResolution = eventData->data.hdmi_in_video_mode.resolution.pixelResolution;
954-
resolution.interlaced = eventData->data.hdmi_in_video_mode.resolution.interlaced;
955-
resolution.frameRate = eventData->data.hdmi_in_video_mode.resolution.frameRate;
956-
LOGWARN("Received IARM_BUS_DSMGR_EVENT_HDMI_IN_VIDEO_MODE_UPDATE event port: %d, pixelResolution: %d, interlaced : %d, frameRate: %d \n", hdmi_in_port,resolution.pixelResolution, resolution.interlaced, resolution.frameRate);
957-
AVInput::_instance->AVInputVideoModeUpdate(hdmi_in_port, resolution,HDMI);
958-
}
959-
else if (IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_VIDEO_MODE_UPDATE == eventId) {
960-
IARM_Bus_DSMgr_EventData_t *eventData = (IARM_Bus_DSMgr_EventData_t *)data;
961-
int composite_in_port = eventData->data.composite_in_video_mode.port;
962-
dsVideoPortResolution_t resolution = {};
963-
resolution.pixelResolution = eventData->data.composite_in_video_mode.resolution.pixelResolution;
964-
resolution.interlaced = eventData->data.composite_in_video_mode.resolution.interlaced;
965-
resolution.frameRate = eventData->data.composite_in_video_mode.resolution.frameRate;
966-
LOGWARN("Received IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_VIDEO_MODE_UPDATE event port: %d, pixelResolution: %d, interlaced : %d, frameRate: %d \n", composite_in_port,resolution.pixelResolution, resolution.interlaced, resolution.frameRate);
967-
AVInput::_instance->AVInputVideoModeUpdate(composite_in_port, resolution,COMPOSITE);
968-
}
969-
}
970-
971-
void AVInput::dsAVGameFeatureStatusEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len)
972-
{
973-
if(!AVInput::_instance)
974-
return;
975-
976-
if (IARM_BUS_DSMGR_EVENT_HDMI_IN_ALLM_STATUS == eventId)
977-
{
978-
IARM_Bus_DSMgr_EventData_t *eventData = (IARM_Bus_DSMgr_EventData_t *)data;
979-
int hdmi_in_port = eventData->data.hdmi_in_allm_mode.port;
980-
bool allm_mode = eventData->data.hdmi_in_allm_mode.allm_mode;
981-
LOGWARN("Received IARM_BUS_DSMGR_EVENT_HDMI_IN_ALLM_STATUS event port: %d, ALLM Mode: %d", hdmi_in_port,allm_mode);
982-
983-
AVInput::_instance->AVInputALLMChange(hdmi_in_port, allm_mode);
984-
}
985-
if (IARM_BUS_DSMGR_EVENT_HDMI_IN_VRR_STATUS == eventId)
986-
{
987-
IARM_Bus_DSMgr_EventData_t *eventData = (IARM_Bus_DSMgr_EventData_t *)data;
988-
int hdmi_in_port = eventData->data.hdmi_in_vrr_mode.port;
989-
dsVRRType_t new_vrrType = eventData->data.hdmi_in_vrr_mode.vrr_type;
990-
LOGWARN("Received IARM_BUS_DSMGR_EVENT_HDMI_IN_VRR_STATUS event port: %d, VRR Type: %d", hdmi_in_port,new_vrrType);
991-
992-
if(new_vrrType == dsVRR_NONE)
993-
{
994-
if(AVInput::_instance->m_currentVrrType != dsVRR_NONE){
995-
AVInput::_instance->AVInputVRRChange(hdmi_in_port, AVInput::_instance->m_currentVrrType, false);
996-
}
997-
}
998-
else
999-
{
1000-
if(AVInput::_instance->m_currentVrrType != dsVRR_NONE){
1001-
AVInput::_instance->AVInputVRRChange(hdmi_in_port, AVInput::_instance->m_currentVrrType, false);
1002-
}
1003-
AVInput::_instance->AVInputVRRChange(hdmi_in_port, new_vrrType, true);
1004-
}
1005-
AVInput::_instance->m_currentVrrType = new_vrrType;
1006-
}
1007-
}
1008-
1009-
#endif
1010-
1011873
void AVInput::AVInputALLMChange( int port , bool allm_mode)
1012874
{
1013875
JsonObject params;
@@ -1729,17 +1591,6 @@ int AVInput::getEdidVersion(int iPort)
17291591
return edidVersion;
17301592
}
17311593

1732-
void AVInput::registerDsEventHandlers()
1733-
{
1734-
LOGINFO("registerDsEventHandlers");
1735-
if(!_registeredDsEventHandlers)
1736-
{
1737-
_registeredDsEventHandlers = true;
1738-
device::Host::getInstance().Register(baseInterface<device::Host::IHdmiInEvents>());
1739-
device::Host::getInstance().Register(baseInterface<device::Host::ICompositeInEvents>());
1740-
}
1741-
}
1742-
17431594
/* HDMIInEventsNotification*/
17441595

17451596
void AVInput::OnHdmiInAVIContentType(dsHdmiInPort_t port, dsAviContentType_t aviContentType)

‎AVInput/AVInput.h‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
#include "dsTypes.h"
2626
#include "host.hpp"
2727
#include "manager.hpp"
28-
#include "dsRpc.h"
29-
3028

3129
#define DEFAULT_PRIM_VOL_LEVEL 25
3230
#define MAX_PRIM_VOL_LEVEL 100
@@ -35,8 +33,10 @@
3533
namespace WPEFramework {
3634
namespace Plugin {
3735

38-
class AVInput: public PluginHost::IPlugin, public PluginHost::JSONRPC,
39-
public device::Host::IHdmiInEvents, public device::Host::ICompositeInEvents{
36+
class AVInput: public PluginHost::IPlugin,
37+
public PluginHost::JSONRPC,
38+
public device::Host::IHdmiInEvents,
39+
public device::Host::ICompositeInEvents{
4040

4141
private:
4242

@@ -52,12 +52,14 @@ class AVInput: public PluginHost::IPlugin, public PluginHost::JSONRPC,
5252
INTERFACE_ENTRY(PluginHost::IDispatcher)
5353
END_INTERFACE_MAP
5454

55+
private:
56+
5557
template <typename T>
56-
T* baseInterface()
57-
{
58-
static_assert(std::is_base_of<T, AVInput>(), "base type mismatch");
59-
return static_cast<T*>(this);
60-
}
58+
T* baseInterface()
59+
{
60+
static_assert(std::is_base_of<T, AVInput>(), "base type mismatch");
61+
return static_cast<T*>(this);
62+
}
6163

6264
int m_primVolume;
6365
int m_inputVolume; //Player Volume
@@ -142,24 +144,23 @@ class AVInput: public PluginHost::IPlugin, public PluginHost::JSONRPC,
142144
bool _registeredDsEventHandlers;
143145

144146
public:
145-
void registerDsEventHandlers();
146147

147148
/* HdmiInEventNotification*/
148149

149-
void OnHdmiInEventHotPlug(dsHdmiInPort_t port, bool isConnected);
150-
void OnHdmiInEventSignalStatus(dsHdmiInPort_t port, dsHdmiInSignalStatus_t signalStatus);
150+
void OnHdmiInEventHotPlug(dsHdmiInPort_t port, bool isConnected) override;
151+
void OnHdmiInEventSignalStatus(dsHdmiInPort_t port, dsHdmiInSignalStatus_t signalStatus) override;
151152
void OnHdmiInEventStatus(dsHdmiInPort_t activePort, bool isPresented);
152-
void OnHdmiInVideoModeUpdate(dsHdmiInPort_t port, const dsVideoPortResolution_t& videoPortResolution);
153-
void OnHdmiInAllmStatus(dsHdmiInPort_t port, bool allmStatus);
154-
void OnHdmiInAVIContentType(dsHdmiInPort_t port, dsAviContentType_t aviContentType);
155-
void OnHdmiInVRRStatus(dsHdmiInPort_t port, dsVRRType_t vrrType);
153+
void OnHdmiInVideoModeUpdate(dsHdmiInPort_t port, const dsVideoPortResolution_t& videoPortResolution) override;
154+
void OnHdmiInAllmStatus(dsHdmiInPort_t port, bool allmStatus) override;
155+
void OnHdmiInAVIContentType(dsHdmiInPort_t port, dsAviContentType_t aviContentType) override;
156+
void OnHdmiInVRRStatus(dsHdmiInPort_t port, dsVRRType_t vrrType) override;
156157

157158
/* CompositeInEventNotification */
158159

159-
void OnCompositeInHotPlug(dsCompositeInPort_t port, bool isConnected);
160-
void OnCompositeInSignalStatus(dsCompositeInPort_t port, dsCompInSignalStatus_t signalStatus);
161-
void OnCompositeInStatus(dsCompositeInPort_t activePort, bool isPresented);
162-
void OnCompositeInVideoModeUpdate(dsCompositeInPort_t activePort, dsVideoPortResolution_t videoResolution);
160+
void OnCompositeInHotPlug(dsCompositeInPort_t port, bool isConnected) override;
161+
void OnCompositeInSignalStatus(dsCompositeInPort_t port, dsCompInSignalStatus_t signalStatus) override;
162+
void OnCompositeInStatus(dsCompositeInPort_t activePort, bool isPresented) override;
163+
void OnCompositeInVideoModeUpdate(dsCompositeInPort_t activePort, dsVideoPortResolution_t videoResolution) ;
163164

164165
public:
165166
static AVInput* _instance;

0 commit comments

Comments
 (0)