Add a missing file in CMakeLists and a code to handle TTS feedback data

Change-Id: I9e8ef00e6e88a363cfc47578b9e19e7335f3f4c1
Signed-off-by: sooyeon <sooyeon.kim@samsung.com>

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 0001ef9..63ced4a 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -4,6 +4,7 @@ SET(SRCS
        vc_client.c
 #      vc_dbus.c
        vc_tidl.c
+       vc_proxy.c
        ../common/vc_cmd_db.c
        ../common/vc_command.c
        ../common/vc_command_util.c

diff --git a/client/vc.c b/client/vc.c
index 0688716..4dbb113 100644 (file)
--- a/client/vc.c
+++ b/client/vc.c
@@ -621,6 +621,7 @@ static void __start_prepare_thread(void *data, Ecore_Thread *thread)
                        break;
                } else {
                        retry_count++;
+                       usleep(200000);
                }
        }
 

diff --git a/client/vc_tidl.c b/client/vc_tidl.c
index 9e85e9a..110440a 100755 (executable)
--- a/client/vc_tidl.c
+++ b/client/vc_tidl.c
@@ -80,6 +80,8 @@ static char* __get_engine_appid(void)
 
        char* appid = strdup(engine_name);
 
+       SLOG(LOG_INFO, TAG_VCC, "[INFO] VC engine appid(%s)", appid);
+
        return appid;
 }
 
@@ -128,6 +130,8 @@ static void __on_rejected(rpc_port_proxy_vc_proxy_vc_h h, void* user_data)
 
 static rpc_port_proxy_vc_proxy_vc_h __create_rpc_port(int pid, const char* engine_app_id)
 {
+       SLOG(LOG_INFO, TAG_VCC, "[INFO] vc __create_rpc_port");
+
        rpc_port_proxy_vc_proxy_vc_callback_s rpc_callback = {
                .connected = __on_connected,
                .disconnected = __on_disconnected,
@@ -139,6 +143,7 @@ static rpc_port_proxy_vc_proxy_vc_h __create_rpc_port(int pid, const char* engin
        if (0 != rpc_port_proxy_vc_proxy_vc_create(engine_app_id, &rpc_callback, (void*)ptr_pid, &handle)) {
                return NULL;
        }
+       SLOG(LOG_DEBUG, TAG_VCC, "[DEBUG] Succeed rpc_port_proxy_vc_proxy_vc_create");
 
        return handle;
 }
@@ -240,15 +245,19 @@ static void __notify_cb(void* user_data, int pid, bundle* msg)
 void __feedback_cb(void *user_data, int utt_id, int event, rpc_port_proxy_vc_proxy_array_char_h pcm_data, int len)
 {
        // corresponding to listener_event_callback (only for tts_streaming)
-       SLOG(LOG_DEBUG, TAG_VCC, "__feedback_cb is invoked utt_id(%d) event(%d)", utt_id, event);
+       SLOG(LOG_DEBUG, TAG_VCC, "__feedback_cb is invoked. utt_id(%d), event(%d), pcm_len(%d)", utt_id, event, len);
 
-       // char* utt_id;
-       // char* event;
+       char* data_char = NULL;
+       rpc_port_proxy_vc_proxy_array_char_get(pcm_data, &data_char, &len);
 
-       // bundle_get_str(msg, VC_BUNDLE_UTTID, &utt_id);
-       // bundle_get_str(msg, VC_BUNDLE_FEEDBACK_EVENT, &event);
-       // __vc_cb_tts_streaming(utt_id, event, buffer, len);
        /* VCD_METHOD_FEEDBACK_STREAMING */
+       __vc_cb_tts_streaming(utt_id, event, data_char, len);
+
+       if (NULL != data_char) {
+               free(data_char);
+               data_char = NULL;
+       }
+
 }
 
 static int __create_notify_callback_handle(vc_tidl_info_s* info)

diff --git a/server/vcd_tidl.c b/server/vcd_tidl.c
index 6a67e3b..e5905ba 100644 (file)
--- a/server/vcd_tidl.c
+++ b/server/vcd_tidl.c
@@ -845,6 +845,10 @@ int vcdc_send_feedback_streaming(int pid, int utt_id, vc_feedback_event_e event,
 
     rpc_port_stub_vcd_stub_vc_feedback_cb_invoke(info->feedback_cb, utt_id, event, arr_char, len);
 
+    rpc_port_stub_vcd_stub_array_char_destroy(arr_char);
+
+    bundle_free(msg);
+
     return VCD_ERROR_NONE;
 }
 

diff --git a/tests/org.tizen.vc-unittests.xml b/tests/org.tizen.vc-unittests.xml
index 571a9e9..86f8b8f 100644 (file)
--- a/tests/org.tizen.vc-unittests.xml
+++ b/tests/org.tizen.vc-unittests.xml
@@ -11,5 +11,7 @@
         <privileges>
             <privilege>http://tizen.org/privilege/recorder</privilege>
             <privilege>http://tizen.org/privilege/voicecontrol.manager</privilege>
+            <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+            <privilege>http://tizen.org/privilege/datasharing</privilege>
         </privileges>
 </manifest>