Skip to content

Commit 8349223

Browse files
PrathyushakothuruPrathyushakothuru
committed
parameter changes
1 parent 05bd5b7 commit 8349223

File tree

2 files changed

+147
-15
lines changed

2 files changed

+147
-15
lines changed

‎AVInput/AVInput.cpp‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
**/
1919

2020
#include "AVInput.h"
21-
#include "dsMgr.h"
21+
//#include "dsMgr.h"
2222
#include "hdmiIn.hpp"
2323
#include "compositeIn.hpp"
2424

@@ -126,22 +126,15 @@ AVInput::~AVInput()
126126
const string AVInput::Initialize(PluginHost::IShell * /* service */)
127127
{
128128
AVInput::_instance = this;
129-
InitializeIARM();
129+
InitializeDeviceManager();
130130

131131
return (string());
132132
}
133133

134134
void AVInput::Deinitialize(PluginHost::IShell * /* service */)
135135
{
136-
_registeredHostEventHandlers = false;
137-
138-
if (_hostListener != nullptr)
139-
{
140-
delete _hostListener;
141-
_hostListener = nullptr;
142-
}
143136

144-
DeinitializeIARM();
137+
DeInitializeDeviceManager();
145138
_registeredHostEventHandlers = false;
146139

147140
AVInput::_instance = nullptr;
@@ -1727,7 +1720,7 @@ int AVInput::getEdidVersion(int iPort)
17271720
return edidVersion;
17281721
}
17291722

1730-
void DisplaySettings::registerHostEventHandlers()
1723+
void AVInput::registerHostEventHandlers()
17311724
{
17321725
LOGINFO("registerHostEventHandlers");
17331726
if(!_registeredHostEventHandlers)
@@ -1740,7 +1733,7 @@ void DisplaySettings::registerHostEventHandlers()
17401733

17411734
/* HDMIInEventsNotification*/
17421735

1743-
void AVInput::OnHdmiInAVIContentType(HDMIInPort port, HDMIInAviContentType aviContentType)
1736+
void AVInput::OnHdmiInAVIContentType(dsHdmiInPort_t port, dsAviContentType_t aviContentType)
17441737
{
17451738
LOGINFO("Received OnHdmiInAVIContentType callback, port: %d, Content Type: %d", port, aviContentType);
17461739

@@ -1776,7 +1769,7 @@ void AVInput::OnHdmiInEventStatus(dsHdmiInPort_t activePort, bool isPresented)
17761769
}
17771770
}
17781771

1779-
void AVInput::OnHdmiInVideoModeUpdate(HDMIInPort port, const HDMIVideoPortResolution& videoPortResolution)
1772+
void AVInput::OnHdmiInVideoModeUpdate(dsHdmiInPort_t port, const dsVideoPortResolution_t& videoPortResolution)
17801773
{
17811774
LOGINFO("Received OnHdmiInVideoModeUpdate callback, port: %d, pixelResolution: %d, interlaced: %d, frameRate: %d",
17821775
port,
@@ -1789,7 +1782,7 @@ void AVInput::OnHdmiInVideoModeUpdate(HDMIInPort port, const HDMIVideoPortResolu
17891782
}
17901783
}
17911784

1792-
void AVInput::OnHdmiInAllmStatus(HDMIInPort port, bool allmStatus)
1785+
void AVInput::OnHdmiInAllmStatus(dsHdmiInPort_t port, bool allmStatus)
17931786
{
17941787
LOGINFO("Received OnHdmiInAllmStatus callback, port: %d, ALLM Mode: %s",
17951788
port, allmStatus ? "true" : "false");
@@ -1799,7 +1792,7 @@ void AVInput::OnHdmiInAllmStatus(HDMIInPort port, bool allmStatus)
17991792
}
18001793
}
18011794

1802-
void AVInput::OnHdmiInVRRStatus(HDMIInPort port, HDMIInVRRType vrrType)
1795+
void AVInput::OnHdmiInVRRStatus(dsHdmiInPort_t port, dsVRRType_t vrrType)
18031796
{
18041797
LOGINFO("Received OnHdmiInVRRStatus callback, port: %d, VRR Type: %d",
18051798
port, vrrType);

‎AVInput/AVInput.h‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121

2222
#include "Module.h"
2323
#include "libIBus.h"
24+
25+
#if 1
2426
#include "dsTypes.h"
27+
#include "host.hpp"
28+
#endif
2529

2630
#define DEFAULT_PRIM_VOL_LEVEL 25
2731
#define MAX_PRIM_VOL_LEVEL 100
@@ -33,6 +37,112 @@ namespace Plugin {
3337
class AVInput: public PluginHost::IPlugin, public PluginHost::JSONRPC
3438
{
3539
private:
40+
41+
#if 1 /* HDMIIn Events from libds Library */
42+
43+
class HdmiInEventNotification : public device::Host::IHdmiInEvents {
44+
private:
45+
HdmiInEventNotification(const HdmiInEventNotification&) = delete;
46+
HdmiInEventNotification& operator=(const HdmiInEventNotification&) = delete;
47+
48+
public:
49+
explicit HdmiInEventNotification(AVInput& parent)
50+
: _parent(parent)
51+
{
52+
}
53+
~HdmiInEventNotification() override = default;
54+
55+
public:
56+
void OnHdmiInEventHotPlug(dsHdmiInPort_t port, bool isConnected) override
57+
{
58+
_parent.OnHdmiInEventHotPlug(port,isConnected);
59+
}
60+
61+
void OnHdmiInEventSignalStatus(dsHdmiInPort_t port, dsHdmiInSignalStatus_t signalStatus) override
62+
{
63+
_parent.OnHdmiInEventSignalStatus(port,signalStatus);
64+
}
65+
66+
void OnHdmiInEventStatus(dsHdmiInPort_t activePort, bool isPresented) override
67+
{
68+
_parent.OnHdmiInEventStatus(activePort,isPresented);
69+
}
70+
71+
void OnHdmiInVideoModeUpdate(dsHdmiInPort_t port, const dsVideoPortResolution_t& videoPortResolution) override
72+
{
73+
_parent.OnHdmiInVideoModeUpdate(port,videoPortResolution);
74+
}
75+
76+
void OnHdmiInAllmStatus(dsHdmiInPort_t port, bool allmStatus) override
77+
{
78+
_parent.OnHdmiInAllmStatus(port,allmStatus);
79+
}
80+
81+
void OnHdmiInAVIContentType(dsHdmiInPort_t port, dsAviContentType_t aviContentType) override
82+
{
83+
_parent.OnHdmiInAVIContentType(port, aviContentType);
84+
}
85+
86+
void OnHdmiInVRRStatus(dsHdmiInPort_t port, dsVRRType_t vrrType) override
87+
{
88+
_parent.OnHdmiInVRRStatus(port, vrrType);
89+
}
90+
91+
void OnHdmiInAVLatency(int audioDelay, int videoDelay) override
92+
{
93+
_parent.OnHdmiInAVLatency(audioDelay, videoDelay);
94+
}
95+
96+
BEGIN_INTERFACE_MAP(HdmiInEventNotification)
97+
INTERFACE_ENTRY(device::Host::IHDMIInEvents)
98+
END_INTERFACE_MAP
99+
100+
private:
101+
AVInput& _parent;
102+
};
103+
104+
class CompositeInEventNotification : public device::Host::ICompositeInEvents {
105+
private:
106+
CompositeInEventNotification(const CompositeInEventNotification&) = delete;
107+
CompositeInEventNotification& operator=(const CompositeInEventNotification&) = delete;
108+
109+
public:
110+
explicit CompositeInEventNotification(AVInput& parent)
111+
: _parent(parent)
112+
{
113+
}
114+
~CompositeInEventNotification() override = default;
115+
116+
public:
117+
void OnCompositeInHotPlug(dsCompositeInPort_t port, bool isConnected) override
118+
{
119+
_parent.OnCompositeInHotPlug(port,isConnected);
120+
}
121+
122+
void OnCompositeInSignalStatus(dsCompositeInPort_t port, dsCompInSignalStatus_t signalStatus) override
123+
{
124+
_parent.OnCompositeInSignalStatus(port,signalStatus);
125+
}
126+
127+
void OnCompositeInStatus(dsCompositeInPort_t activePort, bool isPresented) override
128+
{
129+
_parent.OnCompositeInStatus(activePort,isPresented);
130+
}
131+
132+
OnCompositeInVideoModeUpdate(dsCompositeInPort_t activePort, dsVideoPortResolution_t videoResolution) override
133+
{
134+
_parent.OnCompositeInVideoModeUpdate(activePort,videoResolution);
135+
}
136+
137+
BEGIN_INTERFACE_MAP(CompositeInEventNotification)
138+
INTERFACE_ENTRY(device::Host::ICompositeInEvents)
139+
END_INTERFACE_MAP
140+
141+
private:
142+
AVInput& _parent;
143+
};
144+
#endif
145+
36146
AVInput(const AVInput &) = delete;
37147
AVInput &operator=(const AVInput &) = delete;
38148

@@ -124,6 +234,35 @@ class AVInput: public PluginHost::IPlugin, public PluginHost::JSONRPC
124234

125235
void hdmiInputAviContentTypeChange(int port, int content_type);
126236
static void dsAviContentTypeEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len);
237+
238+
private:
239+
device::Host &_hostListener;
240+
HdmiInEventNotification _hdmiEventNotification;
241+
CompositeInEventNotification _compositeinEventNotification;
242+
243+
bool _registeredHostEventHandlers;
244+
245+
public:
246+
void registerHostEventHandlers();
247+
248+
/* HdmiInEventNotification*/
249+
250+
void OnHdmiInEventHotPlug(dsHdmiInPort_t port, bool isConnected);
251+
void OnHdmiInEventSignalStatus(dsHdmiInPort_t port, dsHdmiInSignalStatus_t signalStatus);
252+
void OnHdmiInEventStatus(dsHdmiInPort_t activePort, bool isPresented);
253+
void OnHdmiInVideoModeUpdate(dsHdmiInPort_t port, const dsVideoPortResolution_t& videoPortResolution);
254+
void OnHdmiInAllmStatus(dsHdmiInPort_t port, bool allmStatus);
255+
void OnHdmiInAVIContentType(dsHdmiInPort_t port, dsAviContentType_t aviContentType);
256+
void OnHdmiInVRRStatus(dsHdmiInPort_t port, dsVRRType_t vrrType);
257+
void OnHdmiInAVLatency(int audioDelay, int videoDelay);
258+
259+
/* CompositeInEventNotification */
260+
261+
void OnCompositeInHotPlug(dsCompositeInPort_t port, bool isConnected);
262+
void OnCompositeInSignalStatus(dsCompositeInPort_t port, dsCompInSignalStatus_t signalStatus);
263+
void OnCompositeInStatus(dsCompositeInPort_t activePort, bool isPresented);
264+
void OnCompositeInVideoModeUpdate(dsCompositeInPort_t activePort, dsVideoPortResolution_t videoResolution);
265+
127266
public:
128267
static AVInput* _instance;
129268
};

0 commit comments

Comments
 (0)