From e3fa735d627004a046e371d2506926a1c241a71c Mon Sep 17 00:00:00 2001 From: "fy.tsuo" Date: Fri, 7 May 2021 17:35:45 +0800 Subject: [PATCH 1/5] audio: igo_nr: Moved struct IGO_PARAMS. Moved struct IGO_PARAMS from igo_nr.c to igo_nr.h since sof_igo_nr_config needs it. Signed-off-by: fy.tsuo --- src/audio/igo_nr/igo_nr.c | 19 ------------------- src/include/user/igo_nr.h | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c index ec6e1b5a7548..9784d85b9bec 100644 --- a/src/audio/igo_nr/igo_nr.c +++ b/src/audio/igo_nr/igo_nr.c @@ -29,25 +29,6 @@ #define SOF_IGO_NR_MAX_SIZE 4096 /* Max size for coef data in bytes */ -struct IGO_PARAMS { - uint32_t igo_params_ver; - uint32_t dump_data; - uint32_t nr_bypass; - uint32_t nr_mode1_en; - uint32_t nr_mode3_en; - uint32_t nr_ul_enable; - uint32_t agc_gain; - uint32_t nr_voice_str; - uint32_t nr_level; - uint32_t nr_mode1_floor; - uint32_t nr_mode1_od; - uint32_t nr_mode1_pp_param7; - uint32_t nr_mode1_pp_param8; - uint32_t nr_mode1_pp_param10; - uint32_t nr_mode3_floor; - uint32_t nr_mode1_pp_param53; -} __attribute__((packed)); - enum IGO_NR_ENUM { IGO_NR_ONOFF_SWITCH = 0, IGO_NR_ENUM_LAST, diff --git a/src/include/user/igo_nr.h b/src/include/user/igo_nr.h index 4d10a176f40a..c7da870bcf15 100644 --- a/src/include/user/igo_nr.h +++ b/src/include/user/igo_nr.h @@ -10,6 +10,25 @@ #include +struct IGO_PARAMS { + uint32_t igo_params_ver; + uint32_t dump_data; + uint32_t nr_bypass; + uint32_t nr_mode1_en; + uint32_t nr_mode3_en; + uint32_t nr_ul_enable; + uint32_t agc_gain; + uint32_t nr_voice_str; + uint32_t nr_level; + uint32_t nr_mode1_floor; + uint32_t nr_mode1_od; + uint32_t nr_mode1_pp_param7; + uint32_t nr_mode1_pp_param8; + uint32_t nr_mode1_pp_param10; + uint32_t nr_mode3_floor; + uint32_t nr_mode1_pp_param53; +} __attribute__((packed)); + struct sof_igo_nr_config { /* reserved */ struct IGO_PARAMS igo_params; From 2db4deff0853917e50f7a680ad0350d030e6a5f2 Mon Sep 17 00:00:00 2001 From: "fy.tsuo" Date: Fri, 7 May 2021 17:36:09 +0800 Subject: [PATCH 2/5] audio: igo_nr: Removed NULL assignment of cd. The NULL initialization of cd is not necessary. Signed-off-by: fy.tsuo --- src/audio/igo_nr/igo_nr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c index 9784d85b9bec..20cd7b5ab207 100644 --- a/src/audio/igo_nr/igo_nr.c +++ b/src/audio/igo_nr/igo_nr.c @@ -220,7 +220,7 @@ static struct comp_dev *igo_nr_new(const struct comp_driver *drv, struct sof_ipc_comp_process *ipc_igo_nr = (struct sof_ipc_comp_process *)comp; struct comp_dev *dev; - struct comp_data *cd = NULL; + struct comp_data *cd; size_t bs = ipc_igo_nr->size; int32_t ret; From ec63d15fa3a185f840bc8cfdaf8013c47a4b3265 Mon Sep 17 00:00:00 2001 From: "fy.tsuo" Date: Fri, 7 May 2021 17:36:28 +0800 Subject: [PATCH 3/5] audio: igo_nr: Removed ENUM type get/set of Kcontrol. ENUM handlers have been removed in igo_nr_cmd_get_value and igo_nr_cmd_set_value. Signed-off-by: fy.tsuo --- src/audio/igo_nr/igo_nr.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c index 20cd7b5ab207..97383be8671a 100644 --- a/src/audio/igo_nr/igo_nr.c +++ b/src/audio/igo_nr/igo_nr.c @@ -421,20 +421,6 @@ static int32_t igo_nr_cmd_get_value(struct comp_dev *dev, struct sof_ipc_ctrl_da int32_t ret = 0; switch (cdata->cmd) { - case SOF_CTRL_CMD_ENUM: - comp_info(dev, "igo_nr_cmd_get_value(), SOF_CTRL_CMD_ENUM index=%d", cdata->index); - switch (cdata->index) { - case IGO_NR_ONOFF_SWITCH: - for (j = 0; j < cdata->num_elems; j++) - cdata->chanv[j].value = cd->process_enable[j]; - break; - default: - comp_err(dev, "igo_nr_cmd_get_value() error: invalid cdata->index %d", - cdata->index); - ret = -EINVAL; - break; - } - break; case SOF_CTRL_CMD_SWITCH: for (j = 0; j < cdata->num_elems; j++) { cdata->chanv[j].channel = j; @@ -501,19 +487,6 @@ static int32_t igo_nr_cmd_set_value(struct comp_dev *dev, struct sof_ipc_ctrl_da int32_t ret; switch (cdata->cmd) { - case SOF_CTRL_CMD_ENUM: - comp_dbg(dev, "igo_nr_cmd_set_value(), SOF_CTRL_CMD_ENUM index=%d", cdata->index); - switch (cdata->index) { - case IGO_NR_ONOFF_SWITCH: - ret = igo_nr_set_chan(dev, cdata); - break; - default: - comp_err(dev, "igo_nr_cmd_set_value() error: invalid cdata->index %d", - cdata->index); - ret = -EINVAL; - break; - } - break; case SOF_CTRL_CMD_SWITCH: comp_dbg(dev, "igo_nr_cmd_set_value(), SOF_CTRL_CMD_SWITCH, cdata->comp_id = %u", cdata->comp_id); From 1e334eb0eb035be3015c92bf795c7ef87389a88e Mon Sep 17 00:00:00 2001 From: "fy.tsuo" Date: Fri, 7 May 2021 17:36:54 +0800 Subject: [PATCH 4/5] audio: igo_nr: Added a new line. A new line is missing after variable declaration. Signed-off-by: fy.tsuo --- src/audio/igo_nr/igo_nr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c index 97383be8671a..106d23871b6e 100644 --- a/src/audio/igo_nr/igo_nr.c +++ b/src/audio/igo_nr/igo_nr.c @@ -551,10 +551,9 @@ static void igo_nr_process(struct comp_dev *dev, static void igo_nr_get_igo_params(struct comp_dev *dev) { struct comp_data *cd = comp_get_drvdata(dev); - struct sof_igo_nr_config *p_config = comp_get_data_blob(cd->model_handler, NULL, NULL); - comp_info(dev, "igo_nr_get_igo_params()"); + comp_info(dev, "igo_nr_get_igo_params()"); if (p_config) { cd->config = *p_config; From fe9ad8a5f67c94879f490b57866fe3bcc2be7c3b Mon Sep 17 00:00:00 2001 From: "fy.tsuo" Date: Fri, 7 May 2021 23:59:17 +0800 Subject: [PATCH 5/5] audio: igo_nr: Added LICENSE file. Added legal license file for igo_nr feature. Signed-off-by: fy.tsuo --- src/audio/igo_nr/LICENSE | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/audio/igo_nr/LICENSE diff --git a/src/audio/igo_nr/LICENSE b/src/audio/igo_nr/LICENSE new file mode 100644 index 000000000000..88e14d052f90 --- /dev/null +++ b/src/audio/igo_nr/LICENSE @@ -0,0 +1 @@ +The AI Noise Reduction Software contained herein is the proprietary intellectual property of British Cayman Islands Intelligo Technology, Inc. All rights reserved. Customer who desires to obtain more information or the license to incorporate this Software into their systems and/or devices may contact Intelligo at support@intelli-go.ai. \ No newline at end of file