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 70 out of 71 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.

…d and connected. (#171)

Copilot

Pull request overview

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

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

Copilot · 2026-02-09T17:53:31Z

src/config/ctrlm_config.cpp

            ret = true;
        } else {
-            XLOGD_ERROR("JSON ERROR: Line <%u> Column <%u> Text <%s>", json_error.line, json_error.column, json_error.text);
+            XLOGD_ERROR("JSON ERROR: Line <%u> Column <%u> Text <%s> Contents <%s>", json_error.line, json_error.column, json_error.text, contents.c_str());


The JSON parse error log includes the full configuration file contents. Configuration can contain sensitive data (tokens, identifiers), and logging the whole file increases exposure risk. Consider logging only the parse location + a small surrounding snippet, or gating full-content logging behind a debug/verbose flag that is disabled in production builds.

Copilot · 2026-02-09T17:53:32Z

src/ipc/ctrlm_rcp_ipc_event.cpp

+char *ctrlm_rcp_ipc_net_status_t::to_string() const
+{
+    return json_dumps(to_json(), JSON_ENCODE_ANY);
 }


ctrlm_rcp_ipc_*::to_string() now returns a raw char* from json_dumps(), which requires the caller to free() it. This is easy to misuse and can introduce leaks or double-frees. Prefer returning std::string (as before) or a smart-pointer/RAII wrapper with clear ownership semantics.

Copilot · 2026-02-09T17:53:32Z

src/voice/ipc/ctrlm_voice_ipc_iarm_thunder.cpp

+        XLOGD_AUTOMATION_INFO("%ul : <%s>", size, this->obj_voice->voice_stb_data_pii_mask_get() ? "***" : message);  //CID -160950 - Printargs
+        ret = broadcast_iarm_event<ctrlm_voice_iarm_event_json_t>(CTRLM_MAIN_IARM_BUS_NAME, CTRLM_VOICE_IARM_EVENT_JSON_SERVER_MESSAGE, message);


The format string uses %ul for an unsigned long (size). %ul is not a valid printf specifier; use %lu to avoid undefined behavior / incorrect output.

Copilot · 2026-02-09T17:53:32Z

src/factory/ctrlmf_audio_capture.cpp

+   bool has_valid_cert = false;
+   ctrlmf_ws_init(audio_frame_size, CTRLMF_WS_PORT_INT, true, &g_audio_cap.callbacks, &has_valid_cert);
+
+   // Set the FFV url to our websocket
+   std::string url_new = has_valid_cert ? CTRLMF_WSS_URL : CTRLMF_WS_URL;
+
+   if(g_audio_cap.use_mic_tap) {


ctrlmf_ws_init(...) return value is ignored. If the websocket listener fails to start, the code still proceeds to reconfigure voice URLs, which can leave the system pointing at a non-existent endpoint. Check the return value and fail/rollback early (and avoid changing the URL) when initialization fails.

Copilot · 2026-02-09T17:53:32Z

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()) {


streamEnd selection appears inverted. Earlier logic used ON_AUDIO_DURATION when pressAndHoldSupport is false; here ON_AUDIO_DURATION is selected when getPressAndHoldSupport() is true. This will cause the wrong stream termination behavior (key-up vs duration) for BLE voice sessions.

Suggested change

if (rcu->getPressAndHoldSupport()) {

if (!rcu->getPressAndHoldSupport()) {

add support for having multiple IR database vendor implementations simultaneously

Copilot

Pull request overview

Copilot reviewed 77 out of 78 changed files in this pull request and generated 4 comments.

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

Copilot · 2026-02-09T23:57:42Z

src/ipc/ctrlm_rcp_ipc_event.cpp

+char *ctrlm_rcp_ipc_upgrade_status_t::to_string() const
+{
+    return json_dumps(to_json(), JSON_ENCODE_ANY);
+}


ctrlm_rcp_ipc_upgrade_status_t::to_string() returns a json_dumps() buffer but does not decref the json object created by to_json(), which will leak. Please decref the json_t after dumping (and clearly define who frees the returned char*), or return a std::string instead.

Copilot · 2026-02-09T23:57:43Z

src/ipc/ctrlm_rcp_ipc_event.cpp

+char *ctrlm_rcp_ipc_validation_status_t::to_string() const
+{
+    return json_dumps(to_json(), JSON_ENCODE_ANY);
+}


ctrlm_rcp_ipc_validation_status_t::to_string() returns a json_dumps() buffer but does not decref the json object created by to_json(), which leaks memory each call. Please decref the json_t after dumping (and document/free the returned char*), or return a std::string.

Copilot · 2026-02-09T23:57:43Z

src/voice/ipc/ctrlm_voice_ipc_iarm_thunder.cpp

+        XLOGD_AUTOMATION_INFO("%ul : <%s>", size, this->obj_voice->voice_stb_data_pii_mask_get() ? "***" : message);  //CID -160950 - Printargs
+        ret = broadcast_iarm_event<ctrlm_voice_iarm_event_json_t>(CTRLM_MAIN_IARM_BUS_NAME, CTRLM_VOICE_IARM_EVENT_JSON_SERVER_MESSAGE, message);


The printf format specifier for an unsigned long is "%lu", but this log line uses "%ul". This is an invalid format string and can lead to undefined behavior / incorrect output. Please change it to the correct specifier for the type of size.

Copilot · 2026-02-09T23:57:43Z

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()) {


In start_controller_audio_streaming(), the stream end condition for press-and-hold appears inverted. Earlier logic treated non-press-and-hold (press-and-release) sessions as needing CTRLM_HAL_BLE_VOICE_STREAM_END_ON_AUDIO_DURATION, while press-and-hold should typically end on key-up. With the current check, press-and-hold sessions will end on duration and press-and-release will end on key-up, which can prematurely end PAR sessions or leave streams running longer than intended. Please swap the condition to match the intended semantics of getPressAndHoldSupport().

Suggested change

if (rcu->getPressAndHoldSupport()) {

if (!rcu->getPressAndHoldSupport()) {

Copilot

Pull request overview

Copilot reviewed 81 out of 82 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.

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.

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

Copilot AI reviewed Jan 21, 2026

View reviewed changes

msmith113 and others added 2 commits January 23, 2026 11:10

RDKEMW-12457: No longer ignoring device re-pair if it's already paire…

7517d91

…d and connected. (#171)

RDKEMW-11792 : FFV config file isolation (#165)

e6a6bd6

Copilot AI review requested due to automatic review settings February 9, 2026 17:46

Copilot started reviewing on behalf of dwolaver February 9, 2026 17:46 View session

Copilot AI reviewed Feb 9, 2026

View reviewed changes

egalla204 added 2 commits February 9, 2026 14:12

RDKEMW-9474: ctrlm multiple simultaneous IR databases (#161)

517b501

add support for having multiple IR database vendor implementations simultaneously

RDKEMW-13049: remove RCU firmware upgrade retries on failure (#173)

57a5840

Copilot AI review requested due to automatic review settings February 9, 2026 23:51

Copilot started reviewing on behalf of egalla204 February 9, 2026 23:52 View session

Copilot AI reviewed Feb 9, 2026

View reviewed changes

klu339 and others added 2 commits February 11, 2026 11:16

RDKEMW-12828: device minor id, vendor, and product value updates (#175)

a48ef12

RDKEMW-13881: update CHANGELOG for release v1.1.10 (#178)

7706a0c

Copilot AI review requested due to automatic review settings February 11, 2026 18:47

Copilot started reviewing on behalf of egalla204 February 11, 2026 18:47 View session

Copilot AI reviewed Feb 11, 2026

View reviewed changes

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

		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);

		XLOGD_AUTOMATION_INFO("%ul : <%s>", size, this->obj_voice->voice_stb_data_pii_mask_get() ? "***" : message); //CID -160950 - Printargs
		ret = broadcast_iarm_event<ctrlm_voice_iarm_event_json_t>(CTRLM_MAIN_IARM_BUS_NAME, CTRLM_VOICE_IARM_EVENT_JSON_SERVER_MESSAGE, message);

	if (rcu->getPressAndHoldSupport()) {
	if (!rcu->getPressAndHoldSupport()) {

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

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 9, 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 Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 9, 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

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants