Rebase by muraliselvaraj2020 · Pull Request #155 · rdkcentral/control

muraliselvaraj2020 · 2025-12-02T16:38:17Z

No description provided.

This reverts commit b47d6f8.

…HREAD (#118)

…C_DISABLE_VIA_PRIVACY (#120)

…CURTAIL (#132)

* RDKEMW-8929: Refactor base ipc class Reason for change: Test Procedure: Risks: Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com> * Updating based on Copilot review comments --------- Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

Copilot

Pull request overview

This pull request represents a major "rebase" effort that refactors the codebase to remove numerous compile-time flags and replace them with runtime configuration. The changes focus on voice control features, power management, and device management infrastructure.

Changes:

Removes compile-time flags (CTRLM_LOCAL_MIC, CTRLM_LOCAL_MIC_TAP, BEEP_ON_KWD_ENABLED, NETWORKED_STANDBY_MODE_ENABLED, etc.) and replaces them with runtime checks
Refactors IPC/IARM infrastructure to use a common base class with API revision management
Updates logging to use "AUTOMATION" variants of logging macros throughout the codebase
Adds controller ID range management for RF4CE and BLE networks
Introduces callback mechanism for audio streaming initiation
Updates factory test infrastructure to support dynamic audio analysis plugins

Reviewed changes

Copilot reviewed 65 out of 66 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
src/voice/ipc/ctrlm_voice_ipc_iarm_thunder.cpp	Refactors voice IPC to use runtime feature detection, adds API revision setting
src/voice/ctrlm_voice_obj.cpp	Replaces compile flags with runtime configuration for local mic and beep features
src/voice/ctrlm_voice_obj.h	Adds new member variables for runtime feature flags and audio start callback support
src/rf4ce/ctrlm_rf4ce_network.cpp	Major refactoring to extract audio streaming logic, add controller ID range management
src/ble/ctrlm_ble_network.cpp	Similar refactoring for BLE audio streaming, adds controller ID migration logic
src/ipc/ctrlm_rcp_ipc_iarm_thunder.cpp	Updates to use new broadcast_iarm_event signatures and API revision management
src/ipc/ctrlm_ipc_iarm.h/cpp	Adds API revision management and refactors event broadcasting
src/factory/.c/.cpp	Updates factory test infrastructure for dynamic plugin loading
CMakeLists.txt	Removes numerous build options and simplifies configuration

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-13T16:05:11Z

src/ctrlm_main.cpp


         if(it->response != CTRLM_THREAD_MONITOR_RESPONSE_ALIVE) {
-            XLOGD_TELEMETRY("Thread %s is unresponsive", it->name);
+            XLOGD_AUTOMATION_TELEMETRY("Thread %s is unresponsive", it->name);


The logging macro XLOGD_AUTOMATION_TELEMETRY is being used but may not be defined. This could cause compilation errors. Verify that this logging macro is properly defined in the logging infrastructure.

Copilot · 2026-01-13T16:05:11Z

src/ipc/ctrlm_rcp_ipc_event.h

+                if (it.second == CTRLM_IARM_CALL_RESULT_SUCCESS) {
+                    return true;
                }
            }
-            return true;
+            return false;


The logic change for result checking appears to be inverted. The original code returned true if all results were SUCCESS and false if any failed. The new code returns true if ANY result is SUCCESS and false if all failed. This could cause incorrect behavior when processing multiple network results.

Copilot · 2026-01-13T16:05:12Z

src/voice/ipc/ctrlm_voice_ipc_iarm_thunder.cpp

+                            false, NULL, NULL, NULL, (fd >= 0) ? true : false, true, NULL, NULL,
+                            str_transcription.empty() ? NULL : str_transcription.c_str(), str_audio_file.empty() ? NULL : str_audio_file.c_str(), &request_uuid, request_config.low_latency, request_config.low_cpu_util, fd);


The function ctrlm_voice_ipc_iarm_thunder_t::voice_session_request has a complex function call signature with many parameters. Lines 770-771 add two NULL parameters before the transcription and audio file parameters. This changes the function signature but it's not clear if all call sites have been updated correctly. Verify that the function parameter order matches the declaration in the header file.

Copilot

Pull request overview

Copilot reviewed 83 out of 84 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 83 out of 84 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

* RDKEMW-14445 : Add session end and protocol return to telemetry Reason for change: ctrlm currently does not know why xrsr might have ended a session. Also it does not know what protocol error may have occurred only that one did. Test Procedure: check telemetry for new fields, parse them, confirm that new data exists and is correct Priority: P0 Signed-off-by: Jason Thomson <jason_thomson@comcast.com> * Fixing whitespace * Order of vars * Update telemetry markers version number * Reverting enum name change * Renaming vars for clarity, reordering vars for consistency * Fix whitespace * Adding stream end reason to telemetry log * Adding stream reason end to telemetry --------- Signed-off-by: Jason Thomson <jason_thomson@comcast.com>

…RF mode (#181)

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

* RDKEMW-5849 : remove deprecated "experience" code Reason for change: the app controls experience, ctrlm does is no longer involved Test Procedure: nothing new to test. Check that normal functionality is not affected Priority; P2 Signed-off-by: Jason Thomson <jason_thomson@comcast.com> * Align CTRLM_VOICE_QUERY_STRING_MAX_PAIRS with xrsr without including xrsr.h --------- Signed-off-by: Jason Thomson <jason_thomson@comcast.com>

Copilot

Pull request overview

Copilot reviewed 96 out of 97 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

src/ble/ctrlm_ble_network.cpp

+    ctrlm_hal_ble_VoiceStreamEnd_t streamEnd = CTRLM_HAL_BLE_VOICE_STREAM_END_ON_KEY_UP;
+    auto rcu = controllers_.at(id);
+
+    if (rcu->getPressAndHoldSupport()) {


* RDKEMW-16711: Update Thunder plugin to use _string and _boolean Reason for change: Thunder API now returns a string for last wakeup reason and a boolean for Networked Standby Mode Enabled, rather than a JsonObject. Updating ctrlm accordingly Test Procedure: NSM testing Priority: P0 Risks: Low Signed-off-by: Jason Thomson <jason_thomson@comcast.com> * Update ctrlm_thunder_plugin.h Address co-pilot comments * Update ctrlm_thunder_plugin.h * Update ctrlm_thunder_plugin.h --------- Signed-off-by: Jason Thomson <jason_thomson@comcast.com>

https://ccp.sys.comcast.net/browse/RDKEMW-16915

Copilot

Pull request overview

Copilot reviewed 98 out of 99 changed files in this pull request and generated 1 comment.

Comments suppressed due to low confidence (6)

src/irdb/ctrlm_irdb_interface.cpp:1

msg->success points to a stack success_vec, which is then mutated by network handlers. Unless ctrlm_main_queue_handler_push_new(..., true) is guaranteed to synchronously execute the handler and return only after completion on the same thread, this is a use-after-return/data-race risk (and even if synchronous, the cross-thread mutation of a std::vector without synchronization is unsafe unless execution is fully serialized). Prefer making the success container owned by the queued message (e.g., heap-owned inside the shared_ptr message object), and use an explicit completion mechanism (semaphore/future/promise) to wait before reading results.
src/irdb/ctrlm_irdb_interface.cpp:1
msg->success points to a stack success_vec, which is then mutated by network handlers. Unless ctrlm_main_queue_handler_push_new(..., true) is guaranteed to synchronously execute the handler and return only after completion on the same thread, this is a use-after-return/data-race risk (and even if synchronous, the cross-thread mutation of a std::vector without synchronization is unsafe unless execution is fully serialized). Prefer making the success container owned by the queued message (e.g., heap-owned inside the shared_ptr message object), and use an explicit completion mechanism (semaphore/future/promise) to wait before reading results.
src/ipc/ctrlm_rcp_ipc_event.cpp:1
to_string() now returns a raw char* allocated by json_dumps, which requires the caller to free() it. This is error-prone and will likely introduce leaks (especially since the previous API returned std::string). Consider returning std::string (or a RAII wrapper) to preserve safe ownership semantics, or at minimum document the ownership contract prominently and ensure all call sites free the returned buffer.
src/input_event/ctrlm_input_event_writer.cpp:1
The fixed sysfs_name[16] buffer can be too small for the uinput sysfs name; truncation would break later resolution of /sys/devices/virtual/input/<sysfs_name_> and /dev/input/event*. Use a larger buffer (e.g., UINPUT_MAX_NAME_SIZE / a conservative size like 80+) and/or validate that the returned name was not truncated before storing it.
src/ipc/ctrlm_ipc_iarm.h:1
size = sizeof(T) + str_size can overflow size_t for large payloads, causing under-allocation and potential buffer overflow when writing payload. Add an overflow check before allocation and enforce a reasonable maximum payload size for IARM event messages.
src/voice/ctrlm_voice_obj.h:1
Several members (e.g., m_timestamp, m_cb_confirm_voice_obj, m_cb_confirm_param, m_status, m_device_type) are not default-initialized, which makes it easy to accidentally use uninitialized data on new/alternative code paths (especially since instances are stack-allocated and partially filled in multiple call sites). Initialize all fields with safe defaults in-class (e.g., nullptr/invalid enums/zeroed timestamp) to eliminate UB risk and simplify future maintenance.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-09T19:14:33Z

src/config/ctrlm_config.cpp

+        }
+        json_t *append_root = json_loads(contents.c_str(), JSON_REJECT_DUPLICATES, &json_error);
+        if(append_root == NULL) {
+            XLOGD_ERROR("JSON ERROR: Line <%u> Column <%u> Text <%s> Contents <%s>", json_error.line, json_error.column, json_error.text, contents.c_str());


Logging the full configuration contents on JSON parse errors can leak sensitive values (tokens, keys, PII) and can also generate very large logs. Prefer logging only the error location plus a small bounded context window (or truncated contents), and consider redacting known sensitive fields.

egalla204 and others added 13 commits November 5, 2025 18:00

RDKEMW-10164: update CHANGELOG for release v1.1.5 (#139)

6342f27

RDKEMW-10311 : RF4CE update key mapping (#140)

4705590

Revert "RDKEMW-8929 (#129)" (#145)

07c0c95

This reverts commit b47d6f8.

RDKEMW-7905 : remove ctrlm build flags - ANSI_CODES_DISABLED (#110)

e652641

RDKEMW-8295 : remove ctrlm build flags - MEMORY_LOCK (#111)

fc5045c

RDKEMW-8296 : remove ctrlm build flags - DEEPSLEEP_CLOSE_DB (#112)

284efc8

RDKEMW-8668 : modify ctrlm build flag - BREAKPAD (#119)

d327435

RDKEMW-8297 : remove ctrlm build flags - A5000_ENABLE (#117)

cd566c4

RDKEMW-8664 : remove ctrlm build flags - MEM_DEBUG, ASSERT_ON_WRONG_T…

97ea739

…HREAD (#118)

RDKEMW-8676 : remove ctrlm build flags - MIC_TAP, LOCAL_MIC, LOCAL_MI…

84e8ce8

…C_DISABLE_VIA_PRIVACY (#120)

RDKEMW-9124 : remove xr-voice-sdk build flags - XRAUDIO_CURTAIL XLOG_…

bcc3be8

…CURTAIL (#132)

RDKEMW-10480 : ctrlm release v1.1.6, xr-voice-sdk v1.0.7 (#149)

a5109c8

RDKEMW-9600: FIRST_PACKET_TIMEOUTs (#135)

e1fadf0

muraliselvaraj2020 requested a review from a team as a code owner December 2, 2025 16:38

klu339 and others added 9 commits December 2, 2025 12:09

RDKEMW-10425: Automation Logging (#144)

baebbf2

RDKEMW-11159: new_certselector_type (#157)

d72398a

RDKEMW-11249: update CHANGELOG for ctrlm release v1.1.7 (#158)

4f688c6

RDKEMW-8930 : remove ctrlm build flags - FACTORY_AUDIO_PLAYBACK (#143)

2f1050b

RDKEMW-11283: add product description docs (#159)

f7ef989

RDKEMW-8929: Refactor base ipc class (#162)

3ab9e92

* RDKEMW-8929: Refactor base ipc class Reason for change: Test Procedure: Risks: Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com> * Updating based on Copilot review comments --------- Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

RDKEMW-12151 : ctrlm release v1.1.8, xr-voice-sdk v1.0.9 (#166)

d66eb1d

RDKEMW-11471: Remove netType param (#164)

e502de1

RDKEMW-10631: Filter out unpaired devices when reconnecting all devices

fc1c94a

Copilot AI review requested due to automatic review settings January 13, 2026 16:01

Copilot started reviewing on behalf of msmith113 January 13, 2026 16:02 View session

Copilot AI reviewed Jan 13, 2026

View reviewed changes

klu339 and others added 2 commits January 13, 2026 14:43

RDKEMW-12512: ctrlm release v1.1.9 (#169)

084f519

RDKEMW-9843: report loaded and unloaded voltage from RCU (#163)

932b09e

Copilot AI review requested due to automatic review settings January 21, 2026 14:51

Copilot started reviewing on behalf of msmith113 January 21, 2026 14:51 View session

klu339 added 2 commits February 18, 2026 11:27

RDKEMW-13833: Remove duplicate RFC fetch attempts in listeners (#179)

d5d14f0

RDKEMW-12930: RF4CE network export XCONF on pair/unpair/etc. (#177)

2eaa356

Copilot AI review requested due to automatic review settings February 19, 2026 14:50

Copilot started reviewing on behalf of klu339 February 19, 2026 14:51 View session

Copilot AI reviewed Feb 19, 2026

View reviewed changes

klu339 and others added 2 commits February 19, 2026 09:59

RDKEMW-13753: Report manually set IRDB codes RF4CE remotes (#176)

add759e

RDKEMW-11359: Logging proximity key as debug instead of telemetry (#167)

5a90734

Copilot AI review requested due to automatic review settings February 19, 2026 17:02

Copilot started reviewing on behalf of msmith113 February 19, 2026 17:03 View session

Copilot AI reviewed Feb 19, 2026

View reviewed changes

jthomp007c and others added 2 commits March 5, 2026 11:04

RDKEMW-14589: No UI action with "Info" keypress from rf4ce remote in …

3c06b8f

…RF mode (#181)

Copilot AI review requested due to automatic review settings March 5, 2026 18:36

Copilot AI reviewed Mar 5, 2026

View reviewed changes

egalla204 and others added 5 commits March 5, 2026 14:42

1.1.11 release changelog updates

6dcab57

add date'

f3b6611

Merge branch 'release/1.1.11'

a84164f

Merge branch 'release/1.1.11' into develop

34d65ad

Copilot AI review requested due to automatic review settings March 17, 2026 15:30

Copilot started reviewing on behalf of jthomp007c March 17, 2026 15:30 View session

Copilot AI reviewed Mar 17, 2026

View reviewed changes

src/ble/ctrlm_ble_network.cpp

ctrlm_hal_ble_VoiceStreamEnd_t streamEnd = CTRLM_HAL_BLE_VOICE_STREAM_END_ON_KEY_UP;

auto rcu = controllers_.at(id);

if (rcu->getPressAndHoldSupport()) {

jthomp007c and others added 3 commits April 9, 2026 07:30

1.1.12 release changelog updates

793ed9c

1.1.12 release changelog updates (#201)

67e73a0

https://ccp.sys.comcast.net/browse/RDKEMW-16915

Copilot AI review requested due to automatic review settings April 9, 2026 19:05

Merge branch 'main' into release/1.1.12

271c033

Copilot AI reviewed Apr 9, 2026

View reviewed changes

Copilot started reviewing on behalf of egalla204 April 9, 2026 19:17 View session

Merge branch 'release/1.1.12' into develop

8ca5cc3

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebase#155

Rebase#155
muraliselvaraj2020 wants to merge 46 commits intofeature/ES1-2965from
develop

muraliselvaraj2020 commented Dec 2, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 13, 2026

Uh oh!

Copilot AI Jan 13, 2026

Uh oh!

Copilot AI Jan 13, 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 Apr 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

		false, NULL, NULL, NULL, (fd >= 0) ? true : false, true, NULL, NULL,
		str_transcription.empty() ? NULL : str_transcription.c_str(), str_audio_file.empty() ? NULL : str_audio_file.c_str(), &request_uuid, request_config.low_latency, request_config.low_cpu_util, fd);

Conversation

muraliselvaraj2020 commented Dec 2, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 13, 2026

Choose a reason for hiding this comment

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

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 Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants