RDKEMW-19410: Updating AVInput Plugin to Use ReFactored DeviceSettings Thunder Plugin via COM-RPC by yuvaramachandran-gurusamy · Pull Request #30 · rdkcentral/entservices-avinput

yuvaramachandran-gurusamy · 2026-07-06T18:00:23Z

No description provided.

…s Thunder Plugin via COM-RPC Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Copilot

Pull request overview

This PR adds a COM-RPC–based AVInput implementation that talks to the refactored DeviceSettings Thunder plugin, while retaining the existing libds/IARM-based implementation. The build is switched at CMake configure time via a new DS_COMRPC option.

Changes:

Added a new DS_COMRPC/ AVInput + AVInputImplementation pair using DeviceSettingsClientHelper and DeviceSettings COM-RPC sub-interfaces for HDMI-In / Composite-In.
Added a DS_IARM/ AVInput + AVInputImplementation pair (legacy path) to keep the libds/IARM implementation available.
Updated plugin/CMakeLists.txt to select sources/dependencies from DS_COMRPC/ vs DS_IARM/ based on DS_COMRPC.

Reviewed changes

Copilot reviewed 5 out of 9 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
plugin/DS_IARM/AVInputImplementation.h	Adds the legacy libds/IARM AVInput implementation interface + event dispatch scaffolding.
plugin/DS_IARM/AVInputImplementation.cpp	Implements legacy libds/IARM AVInput behaviors and event dispatching.
plugin/DS_IARM/AVInput.h	Adds legacy AVInput plugin wrapper (JSON-RPC + COM-RPC root to implementation).
plugin/DS_IARM/AVInput.cpp	Implements legacy AVInput plugin lifecycle and JSON-RPC `getInputDevices` wrapper.
plugin/DS_COMRPC/AVInputImplementation.h	Adds COM-RPC AVInput implementation interface bridging DeviceSettings notifications to AVInput events.
plugin/DS_COMRPC/AVInputImplementation.cpp	Implements COM-RPC AVInput behaviors via DeviceSettings sub-interfaces and notification delegates.
plugin/DS_COMRPC/AVInput.h	Adds COM-RPC AVInput plugin wrapper (JSON-RPC + COM-RPC root to implementation).
plugin/DS_COMRPC/AVInput.cpp	Implements COM-RPC AVInput plugin lifecycle and JSON-RPC `getInputDevices` wrapper using DeviceSettings queries.
plugin/CMakeLists.txt	Adds `DS_COMRPC` option and switches sources/includes/libs based on selected implementation.

+
+namespace WPEFramework {
+namespace Plugin {
+    SERVICE_REGISTRATION(AVInputImplementation, 1, 0);


+        case ON_AVINPUT_DEVICES_CHANGED: {
+
+            if (auto* const devices = boost::get<Exchange::IAVInput::IInputDeviceIterator* const>(&params)) {
+                LOGINFO("ON_AVINPUT_DEVICES_CHANGED");
+
+                std::list<IAVInput::IDevicesChangedNotification*>::const_iterator index(_devicesChangedNotifications.begin());
+
+                while (index != _devicesChangedNotifications.end()) {
+                    (*index)->OnDevicesChanged(*devices);
+                    ++index;
+                }
+            }
+            break;
+        }


+            audio->SetAudioMixerLevels(0, Exchange::IDeviceSettingsAudio::AUDIO_INPUT_PRIMARY, primaryVolume);
+            audio->SetAudioMixerLevels(0, Exchange::IDeviceSettingsAudio::AUDIO_INPUT_SYSTEM, inputVolume);
+            LOGINFO("Setting MixerLevels: primaryVolume[%d] inputVolume[%d]", primaryVolume, inputVolume);


+            return Core::ERROR_NONE;
+        }
+
+        int iType = AVInputUtils::getTypeOfInput(typeOfInput);


+    Core::hresult AVInputImplementation::SetVideoRectangle(const uint16_t x, const uint16_t y,
+        const uint16_t w, const uint16_t h, const string& typeOfInput, SuccessResult& successResult)
+    {
+        int iType = AVInputUtils::getTypeOfInput(typeOfInput);


Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Copilot

Pull request overview

Copilot reviewed 5 out of 9 changed files in this pull request and generated 5 comments.

+
+namespace WPEFramework {
+namespace Plugin {
+    SERVICE_REGISTRATION(AVInputImplementation, 1, 0);


+                        LOGERR("IDeviceSettingsHDMIIn not available");
+                        num = 0;
+                    }
+                    hdmiIn->Release();


+                        LOGERR("IDeviceSettingsCompositeIn not available");
+                        num = 0;
+                    }
+                    compositeIn->Release();


+        int iType = AVInputUtils::getTypeOfInput(typeOfInput);
+        Core::hresult comResult = Core::ERROR_NONE;


+        int iType = AVInputUtils::getTypeOfInput(typeOfInput);
+        Core::hresult comResult = Core::ERROR_NONE;


Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Copilot

Pull request overview

Copilot reviewed 5 out of 9 changed files in this pull request and generated 8 comments.

+                    auto* hdmiIn = AcquireSubInterface<Exchange::IDeviceSettingsHDMIIn>();
+                    if (nullptr != hdmiIn) {
+                        comResult = hdmiIn->GetHDMIInNumberOfInputs(num);
+                        if (comResult != Core::ERROR_NONE) {
+                            LOGERR("GetHDMIInNumberOfInputs failed, Error: %d", static_cast<int>(comResult));
+                            num = 0;
+                        }
+                    } else {
+                        LOGERR("IDeviceSettingsHDMIIn not available");
+                        num = 0;
+                    }
+                    hdmiIn->Release();
+                    break;


+                    auto* compositeIn = AcquireSubInterface<Exchange::IDeviceSettingsCompositeIn>();
+                    if (nullptr != compositeIn) {
+                        comResult = compositeIn->GetNrOfCompositeInputs(num);
+                        if (comResult != Core::ERROR_NONE) {
+                            LOGERR("GetNrOfCompositeInputs failed, Error: %d", static_cast<int>(comResult));
+                            num = 0;
+                        }
+                    } else {
+                        LOGERR("IDeviceSettingsCompositeIn not available");
+                        num = 0;
+                    }
+                    compositeIn->Release();
+                    isHdmi = false;
+                    break;
+                }


+            return Core::ERROR_NONE;
+        }
+
+        int iType = AVInputUtils::getTypeOfInput(typeOfInput);


+    Core::hresult AVInputImplementation::SetVideoRectangle(const uint16_t x, const uint16_t y,
+        const uint16_t w, const uint16_t h, const string& typeOfInput, SuccessResult& successResult)
+    {
+        int iType = AVInputUtils::getTypeOfInput(typeOfInput);


+    AVInputImplementation::~AVInputImplementation()
+    {
+        AVInputImplementation::_instance = nullptr;
+
+        // COM-RPC: notifications are unregistered in Deinitialize() via
+        // DeviceSettingsClientHelper::Close() which calls OnDeviceSettingsDeactivated()
+        _registeredDsEventHandlers = false;
+    }


+    }
+
+    Core::hresult AVInputImplementation::GetARCPortId(string& portId, bool& success)
+    {


+
+namespace WPEFramework {
+namespace Plugin {
+    SERVICE_REGISTRATION(AVInputImplementation, 1, 0);


+        } else {
+            SYSLOG(Logging::Startup, (_T("AVInput::Initialize: Failed to initialize AVInput plugin")));
+            message = _T("AVInput plugin could not be initialized");
+        }


Copilot

Pull request overview

Copilot reviewed 5 out of 9 changed files in this pull request and generated 7 comments.

+            if (auto* const devices = boost::get<Exchange::IAVInput::IInputDeviceIterator* const>(&params)) {
+                LOGINFO("ON_AVINPUT_DEVICES_CHANGED");
+
+                std::list<IAVInput::IDevicesChangedNotification*>::const_iterator index(_devicesChangedNotifications.begin());
+
+                while (index != _devicesChangedNotifications.end()) {
+                    (*index)->OnDevicesChanged(*devices);
+                    ++index;
+                }
+            }


+
+namespace WPEFramework {
+namespace Plugin {
+    SERVICE_REGISTRATION(AVInputImplementation, 1, 0);


+                        LOGERR("IDeviceSettingsHDMIIn not available");
+                        num = 0;
+                    }
+                    hdmiIn->Release();


+                        LOGERR("IDeviceSettingsCompositeIn not available");
+                        num = 0;
+                    }
+                    compositeIn->Release();


+        int iType = AVInputUtils::getTypeOfInput(typeOfInput);
+        Core::hresult comResult = Core::ERROR_NONE;


+    Core::hresult AVInputImplementation::SetVideoRectangle(const uint16_t x, const uint16_t y,
+        const uint16_t w, const uint16_t h, const string& typeOfInput, SuccessResult& successResult)
+    {
+        int iType = AVInputUtils::getTypeOfInput(typeOfInput);


+            JsonArray deviceArr = getInputDevices(iType);
+            response["devices"] = deviceArr;
+            response["deviceList"] = deviceArr;
+        }


Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Copilot

Pull request overview

Copilot reviewed 5 out of 9 changed files in this pull request and generated 4 comments.

+                        LOGERR("IDeviceSettingsHDMIIn not available");
+                        num = 0;
+                    }
+                    hdmiIn->Release();


+                        LOGERR("IDeviceSettingsCompositeIn not available");
+                        num = 0;
+                    }
+                    compositeIn->Release();


+            ~DispatchJob()
+            {
+                if (_avInputImplementation != nullptr) {
+                    _avInputImplementation->Release();
+                }
+            }


+namespace DSHelper = WPEFramework::Plugin::DeviceSettingsClientHelper;
+namespace WPEFramework {
+namespace Plugin {
+    SERVICE_REGISTRATION(AVInputImplementation, 1, 0);


Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Copilot

Pull request overview

Copilot reviewed 5 out of 9 changed files in this pull request and generated 8 comments.

+
+namespace WPEFramework {
+namespace Plugin {
+    SERVICE_REGISTRATION(AVInputImplementation, 1, 0);


+    AVInputImplementation::~AVInputImplementation()
+    {
+        AVInputImplementation::_instance = nullptr;
+
+        // COM-RPC: notifications are unregistered in Deinitialize() via
+        // DSHelper::Close() which calls OnDeviceSettingsDeactivated()
+        _registeredDsEventHandlers = false;
+    }


+    Core::hresult AVInputImplementation::Configure(PluginHost::IShell* service)
+    {
+        _service = service;
+
+        // COM-RPC: open the DeviceSettings plugin link.
+        // DS_IARM equivalent: device::Manager::Initialize()
+        // OnDeviceSettingsActivated() fires once DeviceSettings is ready,
+        // which registers the HDMI-In and Composite-In notification delegates.
+        DSHelper::Open(service);
+        LOGINFO("AVInputImplementation: DSHelper::Open() called");
+
+        return Core::ERROR_NONE;
+    }


+                case INPUT_TYPE_INT_HDMI: {
+                    // COM-RPC: device::HdmiInput::getInstance().getNumberOfInputs()
+                    auto* hdmiIn = DSHelper::AcquireSubInterface<Exchange::IDeviceSettingsHDMIIn>();
+                    if (nullptr != hdmiIn) {
+                        comResult = hdmiIn->GetHDMIInNumberOfInputs(num);
+                        if (comResult != Core::ERROR_NONE) {
+                            LOGERR("GetHDMIInNumberOfInputs failed, Error: %d", static_cast<int>(comResult));
+                            num = 0;
+                        }
+                    } else {
+                        LOGERR("IDeviceSettingsHDMIIn not available");
+                        num = 0;
+                    }
+                    hdmiIn->Release();
+                    break;
+                }


+                case INPUT_TYPE_INT_COMPOSITE: {
+                    // COM-RPC: device::CompositeInput::getInstance().getNumberOfInputs()
+                    auto* compositeIn = DSHelper::AcquireSubInterface<Exchange::IDeviceSettingsCompositeIn>();
+                    if (nullptr != compositeIn) {
+                        comResult = compositeIn->GetNrOfCompositeInputs(num);
+                        if (comResult != Core::ERROR_NONE) {
+                            LOGERR("GetNrOfCompositeInputs failed, Error: %d", static_cast<int>(comResult));
+                            num = 0;
+                        }
+                    } else {
+                        LOGERR("IDeviceSettingsCompositeIn not available");
+                        num = 0;
+                    }
+                    compositeIn->Release();
+                    isHdmi = false;
+                    break;
+                }


+        int iType = AVInputUtils::getTypeOfInput(typeOfInput);
+        Core::hresult comResult = Core::ERROR_NONE;
+


+        int iType = AVInputUtils::getTypeOfInput(typeOfInput);
+        Core::hresult comResult = Core::ERROR_NONE;
+


+                std::list<IAVInput::IDevicesChangedNotification*>::const_iterator index(_devicesChangedNotifications.begin());
+
+                while (index != _devicesChangedNotifications.end()) {
+                    (*index)->OnDevicesChanged(*devices);
+                    ++index;
+                }
+            }


yuvaramachandran-gurusamy added 4 commits July 5, 2026 22:48

RDKEMW-19410: Updating AVInput Plugin to Use ReFactored DeviceSetting…

c459855

…s Thunder Plugin via COM-RPC Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

RDKEMW-19410: Fix for Compilation Error and Logic missing issues

e9013b4

Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

RDKEMW-19410: Fix Compilation Error

b6bbd2a

Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

RDKEMW-19410: Fix Compilation Errors

f596efe

Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Copilot AI review requested due to automatic review settings July 6, 2026 18:00

yuvaramachandran-gurusamy requested a review from a team as a code owner July 6, 2026 18:00

Copilot started reviewing on behalf of yuvaramachandran-gurusamy July 6, 2026 18:00 View session

Copilot AI reviewed Jul 6, 2026

View reviewed changes

yuvaramachandran-gurusamy added 2 commits July 8, 2026 00:25

RDKEMW-19410: Adding Neccessary Logs

ca6daae

Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

RDKEMW-19410: Fix Build Error

de09fb0

Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Copilot AI review requested due to automatic review settings July 7, 2026 19:22

Copilot started reviewing on behalf of yuvaramachandran-gurusamy July 7, 2026 19:23 View session

Copilot AI reviewed Jul 7, 2026

View reviewed changes

RDKEMW-19410: Fix Build Error

5c3c830

Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Copilot AI review requested due to automatic review settings July 9, 2026 17:11

Copilot started reviewing on behalf of yuvaramachandran-gurusamy July 9, 2026 17:11 View session

Copilot AI reviewed Jul 9, 2026

View reviewed changes

RDKEMW-19410: Fix added for HDMI detection issue

725b902

Copilot AI review requested due to automatic review settings July 12, 2026 09:21

Copilot started reviewing on behalf of MadhusuthananRavi July 12, 2026 09:22 View session

Copilot AI reviewed Jul 12, 2026

View reviewed changes

RDKEMW-19410: Update AVInput based on latest configs

19590ed

Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Copilot AI review requested due to automatic review settings July 16, 2026 14:29

Copilot started reviewing on behalf of yuvaramachandran-gurusamy July 16, 2026 14:30 View session

Copilot AI reviewed Jul 16, 2026

View reviewed changes

RDKEMW-19410: Rename DeviceSettingsClientHelper in DSHelper

177f278

Signed-off-by: Yuvaramachandran Gurusamy <yuvaramachandran_gurusamy@comcast.com>

Copilot AI review requested due to automatic review settings July 16, 2026 16:18

Copilot started reviewing on behalf of yuvaramachandran-gurusamy July 16, 2026 16:19 View session

Copilot AI reviewed Jul 16, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

RDKEMW-19410: Updating AVInput Plugin to Use ReFactored DeviceSettings Thunder Plugin via COM-RPC#30

RDKEMW-19410: Updating AVInput Plugin to Use ReFactored DeviceSettings Thunder Plugin via COM-RPC#30
yuvaramachandran-gurusamy wants to merge 10 commits into
developfrom
topic/RDKEMW-19410

yuvaramachandran-gurusamy commented Jul 6, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		int iType = AVInputUtils::getTypeOfInput(typeOfInput);
		Core::hresult comResult = Core::ERROR_NONE;

Uh oh!

Conversation

yuvaramachandran-gurusamy commented Jul 6, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants