Browse Source

Merge "dsp: adm: Update module id for sound focus and source tracking"

Linux Build Service Account 6 years ago
parent
commit
6734209811
2 changed files with 4 additions and 3 deletions
  1. 3 3
      dsp/q6adm.c
  2. 1 0
      include/dsp/apr_audio-v2.h

+ 3 - 3
dsp/q6adm.c

@@ -4323,7 +4323,7 @@ int adm_set_sound_focus(int port_id, int copp_idx,
 		  __func__, port_id, copp_idx);
 
 	memset(&param_hdr, 0, sizeof(param_hdr));
-	param_hdr.module_id = VOICEPROC_MODULE_ID_GENERIC_TX;
+	param_hdr.module_id = VOICEPROC_MODULE_ID_FLUENCE_PRO_VC_TX;
 	param_hdr.instance_id = INSTANCE_ID_0;
 	param_hdr.param_id = VOICEPROC_PARAM_ID_FLUENCE_SOUNDFOCUS;
 	param_hdr.param_size = sizeof(soundfocus_params);
@@ -4384,7 +4384,7 @@ int adm_get_sound_focus(int port_id, int copp_idx,
 		return -ENOMEM;
 
 	memset(&param_hdr, 0, sizeof(param_hdr));
-	param_hdr.module_id = VOICEPROC_MODULE_ID_GENERIC_TX;
+	param_hdr.module_id = VOICEPROC_MODULE_ID_FLUENCE_PRO_VC_TX;
 	param_hdr.instance_id = INSTANCE_ID_0;
 	param_hdr.param_id = VOICEPROC_PARAM_ID_FLUENCE_SOUNDFOCUS;
 	param_hdr.param_size = max_param_size;
@@ -4523,7 +4523,7 @@ int adm_get_source_tracking(int port_id, int copp_idx,
 	mem_hdr.mem_map_handle = atomic_read(
 		&this_adm.mem_map_handles[ADM_MEM_MAP_INDEX_SOURCE_TRACKING]);
 
-	param_hdr.module_id = VOICEPROC_MODULE_ID_GENERIC_TX;
+	param_hdr.module_id = VOICEPROC_MODULE_ID_FLUENCE_PRO_VC_TX;
 	param_hdr.instance_id = INSTANCE_ID_0;
 	param_hdr.param_id = VOICEPROC_PARAM_ID_FLUENCE_SOURCETRACKING;
 	/*

+ 1 - 0
include/dsp/apr_audio-v2.h

@@ -11263,6 +11263,7 @@ struct adm_set_compressed_device_latency {
 } __packed;
 
 #define VOICEPROC_MODULE_ID_GENERIC_TX                      0x00010EF6
+#define VOICEPROC_MODULE_ID_FLUENCE_PRO_VC_TX               0x00010F35
 #define VOICEPROC_PARAM_ID_FLUENCE_SOUNDFOCUS               0x00010E37
 #define VOICEPROC_PARAM_ID_FLUENCE_SOURCETRACKING           0x00010E38
 #define MAX_SECTORS                                         8