From: Suyeon Hwang <stom.hwang@samsung.com>
Date: Mon, 27 Dec 2021 09:40:27 +0000 (+0900)
Subject: Merge branch 'tizen_6.5' into tizen
X-Git-Tag: submit/tizen/20220120.074711~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3cc3d7f501d35fb1e55b3686745d6a597719fd4;p=platform%2Fcore%2Fuifw%2Fvoice-control.git

Merge branch 'tizen_6.5' into tizen

Change-Id: I3cdca0b8231528f8d8bc29144b81857f753975dc
---

b3cc3d7f501d35fb1e55b3686745d6a597719fd4
diff --cc server/vcd_server.c
index fbeab48,f55f33af4..81cbd50
--- a/server/vcd_server.c
+++ b/server/vcd_server.c
@@@ -63,11 -63,6 +63,11 @@@ static int __start_internal_recognition
  /*
  * VC Server Internal Functions
  */
 +static inline int __get_tts_played_pid()
 +{
- 	return g_current_uid > 0 ? g_current_uid / 1000 : 0;
++	return g_current_tts_uid > VC_INVALID_TTS_UID ? g_current_tts_uid / 1000 : VC_INVALID_TTS_UID;
 +}
 +
  static Eina_Bool __stop_by_silence(void *data)
  {
  	SLOG(LOG_INFO, TAG_VCD, "@@@ Silence Detected ");
@@@ -1146,8 -1136,8 +1146,8 @@@ int vcd_send_feedback_audio_format(int 
  
  	/* send TTS feedback audio format to VC manager */
  	int ret = VCD_ERROR_NONE;
 -	int pid = g_current_tts_uid / 1000;
 -	if (VC_INVALID_TTS_UID == g_current_tts_uid || vcd_client_manager_get_pid() == pid) {
 +	int pid = __get_tts_played_pid();
- 	if (0 == pid || vcd_client_manager_get_pid() == pid) {
++	if (VC_INVALID_TTS_UID == pid || vcd_client_manager_get_pid() == pid) {
  		ret = vcdc_send_feedback_audio_format_to_manager(vcd_client_manager_get_pid(), rate, channel, audio_type);
  		if (VCD_ERROR_NONE != ret) {
  			SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send TTS feedback audio format to VC manager");
@@@ -1168,10 -1158,10 +1168,10 @@@ int vcd_send_feedback_streaming(vce_fee
  	}
  
  	int ret = VCD_ERROR_NONE;
 -	int pid = g_current_tts_uid / 1000;
 +	int pid = __get_tts_played_pid();
- 	int utt_id = g_current_uid % 1000;
+ 	int utt_id = g_current_tts_uid % 1000;
  
- 	SLOG(LOG_INFO, TAG_VCD, "[Server DEBUG] Engine - Send TTS feedback streaming event(%d), uid(%d), is_mgr_client(%d)", event, g_current_uid, (pid == vcd_client_manager_get_pid() ? true : false));
+ 	SLOG(LOG_INFO, TAG_VCD, "[Server DEBUG] Engine - Send TTS feedback streaming event(%d), uid(%u), is_mgr_client(%d)", event, g_current_tts_uid, (pid == vcd_client_manager_get_pid() ? true : false));
  
  	if (pid == vcd_client_manager_get_pid()) {
  		/* send TTS feedback streaming to manager client */