Merge branch 'develop' into feature/RDKEMW-4309_remote_control_plugin_rf4ce_support

Author: dwolaver

CMakeLists.txt

@@ -55,7 +55,6 @@ option(GIT_BRANCH, "Repository Branch" OFF)
 option(IP_ENABLED "Enable IP" OFF)
 option(LOCAL_MIC "Local Microphone" OFF)
 option(LOCAL_MIC_DISABLE_VIA_PRIVACY "Use Privacy to disable microphone" OFF)
-option(MAC_POLLING "MAC polling" OFF)
 option(MEM_DEBUG "Enable memory debugging" OFF)
 option(MEMORY_LOCK "Memory Lock" OFF)
 option(MIC_TAP "Enable MIC_TAP" OFF)
@@ -67,7 +66,6 @@ option(THUNDER_SECURITY "Enable THUNDER_SECURITY" OFF)
 option(USE_SAFEC "Use safec" OFF)
 option(USE_IARM_POWER_MANAGER "Use IARM Power Manager" OFF)
 option(VOICE_KEYWORD_BEEP "Enable VOICE_KEYWORD_BEEP" OFF)
-option(VOICE_NEXTGEN_MAC "Enable VOICE_NEXTGEN_MAC" OFF)
 option(XRSR_HTTP "Enable XRSR_HTTP" OFF)
 option(XRSR_SDT "Enable XRSR_SDT" OFF)
 option(ENABLE_ASYNC_SRVR_MSG "Enable Asynchronous Server Messaging Feature" OFF)
@@ -218,7 +216,6 @@ if(AUTH_ENABLED)
          add_compile_definitions(AUTH_ACTIVATION_STATUS)
       endif()
       #By default disabled but can be enabled
-      #add_compile_definitions(AUTH_RECEIVER_ID)
       #add_compile_definitions(AUTH_EXPERIENCE)
       target_link_libraries(controlMgr ctrlm-hal-certificate)
    else()
@@ -287,10 +284,6 @@ if(LOCAL_MIC)
    endif()
 endif()
 
-if(MAC_POLLING)
-   add_compile_definitions(MAC_POLLING)
-endif()
-
 if(MEM_DEBUG)
    add_compile_definitions(MEM_DEBUG)
 endif()
@@ -347,10 +340,6 @@ if(VOICE_KEYWORD_BEEP)
    install(FILES ${CMAKE_SOURCE_DIR}/../${BEEP_ON_KWD_FILE} DESTINATION share )
 endif()
 
-if(VOICE_NEXTGEN_MAC)
-   add_compile_definitions(VOICE_NEXTGEN_MAC)
-endif()
-
 if(USE_DEPRECATED_HDMI_INPUT_PLUGIN)
    add_compile_definitions(USE_DEPRECATED_HDMI_INPUT_PLUGIN)
 endif()

include/ctrlm_ipc.h

@@ -157,7 +157,6 @@
 #define CTRLM_MAIN_MAX_BOUND_CONTROLLERS                          (9) ///< Maximum number of bound controllers
 #define CTRLM_MAIN_MAX_CHIPSET_LENGTH                            (16) ///< Maximum length of chipset name string (including null termination)
 #define CTRLM_MAIN_COMMIT_ID_MAX_LENGTH                          (48) ///< Maximum length of commit ID string (including null termination)
-#define CTRLM_MAIN_RECEIVER_ID_MAX_LENGTH                        (40) ///< Maximum length of receiver ID string (including null termination)
 #define CTRLM_MAIN_DEVICE_ID_MAX_LENGTH                          (24) ///< Maximum length of device ID string (including null termination)
 
 #define CTRLM_PROPERTY_ACTIVE_PERIOD_BUTTON_VALUE_MIN               (5000) ///< Minimum active period (in ms) for button binding.
@@ -499,7 +498,6 @@ typedef struct {
    char                     ctrlm_version[CTRLM_MAIN_VERSION_LENGTH];           ///< OUT - Software version of Control Manager
    char                     ctrlm_commit_id[CTRLM_MAIN_COMMIT_ID_MAX_LENGTH];   ///< OUT - Last commit ID of Control Manager
    char                     stb_device_id[CTRLM_MAIN_DEVICE_ID_MAX_LENGTH];     ///< OUT - Device ID obtained from the Set-Top Box
-   char                     stb_receiver_id[CTRLM_MAIN_RECEIVER_ID_MAX_LENGTH]; ///< OUT - Receiver ID obtained from the Set-Top Box
 } ctrlm_main_iarm_call_status_t;
 
 /// @brief RF Channel Structure

include/ctrlm_ipc_voice.h

@@ -119,7 +119,7 @@ typedef enum {
    CTRLM_VOICE_SESSION_ABORT_REASON_FAILURE               =  3, ///< Session aborted for any other reason
    CTRLM_VOICE_SESSION_ABORT_REASON_VOICE_DISABLED        =  4, ///< Session aborted because the voice feature is disabled
    CTRLM_VOICE_SESSION_ABORT_REASON_DEVICE_UPDATE         =  5, ///< Session aborted due to device update in progress
-   CTRLM_VOICE_SESSION_ABORT_REASON_NO_RECEIVER_ID        =  6, ///< Session aborted because there is no receiver id
+   CTRLM_VOICE_SESSION_ABORT_REASON_NO_AUTH_DATA          =  6, ///< Session aborted due to missing authorization data
    CTRLM_VOICE_SESSION_ABORT_REASON_NEW_SESSION           =  7, ///< Session aborted because the remote's previous session is still active
    CTRLM_VOICE_SESSION_ABORT_REASON_INVALID_CONTROLLER_ID =  8, ///< Session aborted because the controller id isn't valid
    CTRLM_VOICE_SESSION_ABORT_REASON_APPLICATION_RESTART   =  9, ///< Session aborted due to restarting controlMgr.

src/auth/ctrlm_auth.h

@@ -31,7 +31,6 @@ class ctrlm_auth_t {
    virtual ~ctrlm_auth_t();
 
    virtual bool is_ready()                                    = 0;
-   virtual bool get_receiver_id(std::string &receiver_id)     = 0;
    virtual bool get_device_id(std::string &device_id)         = 0;
    virtual bool get_account_id(std::string &account_id)       = 0;
    virtual bool get_partner_id(std::string &partner_id)       = 0;

src/auth/ctrlm_auth_thunder.cpp

@@ -33,11 +33,6 @@ bool ctrlm_auth_thunder_t::is_ready() {
    return(ret);
 }
 
-bool ctrlm_auth_thunder_t::get_receiver_id(std::string &receiver_id) {
-   bool ret = this->plugin->get_receiver_id(receiver_id);
-   return(ret);
-}
-
 bool ctrlm_auth_thunder_t::get_device_id(std::string &device_id) {
    bool ret = this->plugin->get_device_id(device_id);
    return(ret);

src/auth/ctrlm_auth_thunder.h

@@ -10,7 +10,6 @@ class ctrlm_auth_thunder_t : public ctrlm_auth_t {
    virtual ~ctrlm_auth_thunder_t();
 
    virtual bool is_ready();
-   virtual bool get_receiver_id(std::string &receiver_id);
    virtual bool get_device_id(std::string &device_id);
    virtual bool get_account_id(std::string &account_id);
    virtual bool get_partner_id(std::string &partner_id);

src/auth/ctrlm_thunder_plugin_authservice.cpp

@@ -73,24 +73,6 @@ bool ctrlm_thunder_plugin_authservice_t::is_device_activated() {
     return(ret);
 }
 
-bool ctrlm_thunder_plugin_authservice_t::get_receiver_id(std::string &receiver_id) {
-    bool ret = false;
-    JsonObject params, response;
-    if(this->call_plugin("getDeviceId", (void *)&params, (void *)&response)) {
-        if(response["success"].Boolean()) { // If success doesn't exist, it defaults to false which is fine.
-            receiver_id = response["deviceId"].String();
-            if(!receiver_id.empty()) {
-                ret = true;
-            }
-        } else {
-            XLOGD_WARN("Success for getDeviceId was false");
-        }
-    } else {
-        XLOGD_WARN("Call for getDeviceId failed");
-    }
-    return(ret);
-}
-
 bool ctrlm_thunder_plugin_authservice_t::get_device_id(std::string &device_id) {
     bool ret = false;
     JsonObject params, response;

src/auth/ctrlm_thunder_plugin_authservice.h

@@ -54,13 +54,6 @@ class ctrlm_thunder_plugin_authservice_t : public Thunder::Plugin::ctrlm_thunder
      */
     bool is_device_activated();
 
-    /**
-     * Function that retrieves the Receiver ID from Authservice.
-     * @param receiver_id The reference to a string which will contain the Receiver ID.
-     * @return True on success otherwise False.
-     */
-    bool get_receiver_id(std::string &receiver_id);
-
     /**
      * Function that retrieves the Device ID from Authservice.
      * @param device_id The reference to a string which will contain the Device ID.

src/ble/ctrlm_ble_network.cpp

@@ -2305,6 +2305,17 @@ void ctrlm_obj_network_ble_t::ind_process_voice_session_end(void *data, int size
       XLOGD_ERROR("Controller object doesn't exist for controller id %u!", controller_id);
       return;
    }
+
+   unsigned long long ieee_address = controllers_[controller_id]->ieee_address_get().get_value();;
+
+   if (ble_rcu_interface_) {
+      int32_t audioDuration = -1;
+      if (!ble_rcu_interface_->stopAudioStreaming(ieee_address, audioDuration)) {
+         XLOGD_ERROR("failed to end voice session for controller id <%u>", controller_id);
+      } else {
+         XLOGD_INFO("voice session ended for controller id <%u>", controller_id);
+      }
+   }
 }
 
 // ==================================================================================================================================================================

src/ble/hal/configsettings/configmodelsettings.cpp

@@ -37,6 +37,7 @@ using namespace std;
 ConfigModelSettingsData::ConfigModelSettingsData()
     : m_valid(false)
     , m_disabled(false)
+    , m_voiceKeyCodePresent(false)
     , m_typeZ(false)
     , m_hasConnParams(false)
     , m_servicesType(ConfigModelSettings::GattServiceType)
@@ -50,6 +51,8 @@ ConfigModelSettingsData::ConfigModelSettingsData(const ConfigModelSettingsData &
     , m_pairingNameFormat(other.m_pairingNameFormat)
     , m_otaProductName(other.m_otaProductName)
     , m_standbyMode(other.m_standbyMode)
+    , m_voiceKeyCode(other.m_voiceKeyCode)
+    , m_voiceKeyCodePresent(other.m_voiceKeyCodePresent)
     , m_typeZ(other.m_typeZ)
     , m_connParamUpdateBeforeOtaVersion(other.m_connParamUpdateBeforeOtaVersion)
     , m_upgradePauseVersion(other.m_upgradePauseVersion)
@@ -105,6 +108,7 @@ ConfigModelSettingsData::ConfigModelSettingsData(json_t *json)
     , m_pairingNameFormat("")
     , m_otaProductName("")
     , m_standbyMode("")
+    , m_voiceKeyCodePresent(false)
     , m_typeZ(false)
     , m_connParamUpdateBeforeOtaVersion("")
     , m_upgradePauseVersion("")