/*
-* Copyright (c) 2011-2014 Samsung Electronics Co., Ltd All Rights Reserved
+* Copyright (c) 2011-2014 Samsung Electronics Co., Ltd All Rights Reserved
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*/
#include <aul.h>
+#include <cynara-client.h>
+#include <cynara-error.h>
+#include <cynara-session.h>
#include <dirent.h>
#include <Ecore.h>
#include <fcntl.h>
#include <pthread.h>
#include <sys/stat.h>
-#include <sys/types.h>
+#include <sys/types.h>
#include <sys/wait.h>
#include <system_info.h>
#include <unistd.h>
#include "stt_main.h"
-static bool g_is_daemon_started = false;
+static void __stt_notify_state_changed(void *data);
+static Eina_Bool __stt_notify_error(void *data);
static Ecore_Timer* g_connect_timer = NULL;
+static float g_volume_db = 0;
-static Eina_Bool __stt_notify_state_changed(void *data);
-static Eina_Bool __stt_notify_error(void *data);
+static int g_feature_enabled = -1;
+
+static int g_privilege_allowed = -1;
+static cynara *p_cynara = NULL;
-static int g_stt_daemon_pid = -1;
-static int g_count_check_daemon = 0;
+static bool g_err_callback_status = false;
const char* stt_tag()
{
return "sttc";
}
+static int __stt_get_feature_enabled()
+{
+ if (0 == g_feature_enabled) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
+ return STT_ERROR_NOT_SUPPORTED;
+ } else if (-1 == g_feature_enabled) {
+ bool stt_supported = false;
+ bool mic_supported = false;
+ if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
+ if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
+ if (false == stt_supported || false == mic_supported) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
+ g_feature_enabled = 0;
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+
+ g_feature_enabled = 1;
+ } else {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to get feature value");
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ } else {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to get feature value");
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ }
+
+ return 0;
+}
+
+static int __check_privilege_initialize()
+{
+ int ret = cynara_initialize(&p_cynara, NULL);
+ if (CYNARA_API_SUCCESS != ret)
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] fail to initialize");
+
+ return ret == CYNARA_API_SUCCESS;
+}
+
+static int __check_privilege(const char* uid, const char * privilege)
+{
+ FILE *fp = NULL;
+ char smack_label[1024] = "/proc/self/attr/current";
+
+ if (!p_cynara) {
+ return false;
+ }
+
+ fp = fopen(smack_label, "r");
+ if (fp != NULL) {
+ if (fread(smack_label, 1, sizeof(smack_label), fp) <= 0)
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] fail to fread");
+
+ fclose(fp);
+ }
+
+ pid_t pid = getpid();
+ char *session = cynara_session_from_pid(pid);
+ int ret = cynara_check(p_cynara, smack_label, session, uid, privilege);
+ SLOG(LOG_DEBUG, TAG_STTC, "[Client]cynara_check returned %d(%s)", ret, (CYNARA_API_ACCESS_ALLOWED == ret) ? "Allowed" : "Denied");
+ if (session)
+ free(session);
+
+ if (ret != CYNARA_API_ACCESS_ALLOWED)
+ return false;
+ return true;
+}
+
+static void __check_privilege_deinitialize()
+{
+ if (p_cynara)
+ cynara_finish(p_cynara);
+ p_cynara = NULL;
+}
+
+static int __stt_check_privilege()
+{
+ char uid[16];
+
+ if (0 == g_privilege_allowed) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Permission is denied");
+ return STT_ERROR_PERMISSION_DENIED;
+ } else if (-1 == g_privilege_allowed) {
+ if (false == __check_privilege_initialize()){
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] privilege initialize is failed");
+ return STT_ERROR_PERMISSION_DENIED;
+ }
+ snprintf(uid, 16, "%d", getuid());
+ if (false == __check_privilege(uid, STT_PRIVILEGE)) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Permission is denied");
+ g_privilege_allowed = 0;
+ __check_privilege_deinitialize();
+ return STT_ERROR_PERMISSION_DENIED;
+ }
+ __check_privilege_deinitialize();
+ }
+
+ g_privilege_allowed = 1;
+ return STT_ERROR_NONE;
+}
+
static const char* __stt_get_error_code(stt_error_e err)
{
- switch(err) {
+ switch (err) {
case STT_ERROR_NONE: return "STT_ERROR_NONE";
case STT_ERROR_OUT_OF_MEMORY: return "STT_ERROR_OUT_OF_MEMORY";
case STT_ERROR_IO_ERROR: return "STT_ERROR_IO_ERROR";
void __stt_config_lang_changed_cb(const char* before_language, const char* current_language, void* user_data)
{
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "Language changed : Before lang(%s) Current lang(%s)",
+ SLOG(LOG_DEBUG, TAG_STTC, "Language changed : Before lang(%s) Current lang(%s)",
before_language, current_language);
if (0 == strcmp(before_language, current_language)) {
while (NULL != iter) {
data = iter->data;
if (NULL != data->default_lang_changed_cb) {
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "Call default language changed callback : uid(%d)", data->uid);
- data->default_lang_changed_cb(data->stt, before_language, current_language,
+ SLOG(LOG_DEBUG, TAG_STTC, "Call default language changed callback : uid(%d)", data->uid);
+ data->default_lang_changed_cb(data->stt, before_language, current_language,
data->default_lang_changed_user_data);
}
}
}
- return;
+ return;
+}
+
+void __stt_config_engine_changed_cb(const char* engine_id, const char* setting, const char* language, bool support_silence, bool need_credential, void* user_data)
+{
+ stt_h stt = (stt_h)user_data;
+
+ stt_client_s* client = stt_client_get(stt);
+ if (NULL == client) {
+ SLOG(LOG_ERROR, TAG_STTC, "[WARNING] A handle is not valid");
+ return;
+ }
+
+ if (NULL != engine_id) SLOG(LOG_DEBUG, TAG_STTC, "Engine id(%s)", engine_id);
+ if (NULL != setting) SLOG(LOG_DEBUG, TAG_STTC, "Engine setting(%s)", setting);
+ if (NULL != language) SLOG(LOG_DEBUG, TAG_STTC, "Language(%s)", language);
+ SLOG(LOG_DEBUG, TAG_STTC, "Silence(%s), Credential(%s)", support_silence ? "on" : "off", need_credential ? "need" : "no need");
+
+ /* call callback function */
+ if (NULL != client->engine_changed_cb) {
+ client->engine_changed_cb(stt, engine_id, language, support_silence, need_credential, client->engine_changed_user_data);
+ } else {
+ SLOG(LOG_WARN, TAG_STTC, "No registered callback function of supported languages");
+ }
+ return;
+}
+
+static int __stt_check_handle(stt_h stt, stt_client_s** client)
+{
+ if (NULL == stt) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input handle is null");
+ return STT_ERROR_INVALID_PARAMETER;
+ }
+
+ stt_client_s* temp = NULL;
+ temp = stt_client_get(stt);
+
+ /* check handle */
+ if (NULL == temp) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+ return STT_ERROR_INVALID_PARAMETER;
+ }
+ *client = temp;
+
+ return STT_ERROR_NONE;
}
int stt_create(stt_h* stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== Create STT");
return ret;
}
- ret = stt_config_mgr_set_callback(client->uid, NULL, __stt_config_lang_changed_cb, NULL, NULL);
+ ret = stt_config_mgr_set_callback(client->uid, __stt_config_engine_changed_cb, __stt_config_lang_changed_cb, NULL, client->stt);
ret = __stt_convert_config_error_code(ret);
if (0 != ret) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to set config changed : %s", __stt_get_error_code(ret));
return ret;
}
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "[Success] uid(%d)", (*stt)->handle);
+ SLOG(LOG_DEBUG, TAG_STTC, "[Success] uid(%d)", (*stt)->handle);
SLOG(LOG_DEBUG, TAG_STTC, "=====");
SLOG(LOG_DEBUG, TAG_STTC, " ");
int stt_destroy(stt_h stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== Destroy STT");
if (NULL == stt) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input handle is null");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
-
+
stt_client_s* client = stt_client_get(stt);
/* check handle */
if (0 != ret) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request finalize : %s", __stt_get_error_code(ret));
}
-
- g_is_daemon_started = false;
case STT_STATE_CREATED:
if (NULL != g_connect_timer) {
SLOG(LOG_DEBUG, TAG_STTC, "Connect Timer is deleted");
}
}
+ stt = NULL;
+
SLOG(LOG_DEBUG, TAG_STTC, "=====");
SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_NONE;
}
-bool __stt_config_supported_engine_cb(const char* engine_id, const char* engine_name,
+bool __stt_config_supported_engine_cb(const char* engine_id, const char* engine_name,
const char* setting, bool support_silence, void* user_data)
{
stt_h stt = (stt_h)user_data;
} else {
SLOG(LOG_WARN, TAG_STTC, "No registered callback function of supported engine");
}
-
+
return false;
}
int stt_foreach_supported_engines(stt_h stt, stt_supported_engine_cb callback, void* user_data)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== Foreach Supported engine");
if (NULL == stt || NULL == callback) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
/* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
if (client->current_state != STT_STATE_CREATED) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not CREATE");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not CREATED", client->current_state);
return STT_ERROR_INVALID_STATE;
}
int stt_get_engine(stt_h stt, char** engine_id)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== Get current engine");
if (NULL == stt || NULL == engine_id) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
/* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
if (client->current_state != STT_STATE_CREATED) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not CREATE");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not CREATED", client->current_state);
return STT_ERROR_INVALID_STATE;
}
int ret = 0;
- ret = stt_config_mgr_get_engine(engine_id);
- ret = __stt_convert_config_error_code(ret);
- if (0 != ret) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request get current engine : %s", __stt_get_error_code(ret));
+
+ if (NULL != client->current_engine_id) {
+ *engine_id = strdup(client->current_engine_id);
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Current engine uuid = %s", *engine_id);
} else {
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Current engine uuid = %s", *engine_id);
+
+ ret = stt_config_mgr_get_engine(engine_id);
+ ret = __stt_convert_config_error_code(ret);
+ if (0 != ret) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request get current engine : %s", __stt_get_error_code(ret));
+ } else {
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Current engine uuid = %s", *engine_id);
+ }
}
SLOG(LOG_DEBUG, TAG_STTC, "=====");
int stt_set_engine(stt_h stt, const char* engine_id)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== Set current engine");
if (NULL == stt || NULL == engine_id) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
/* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
/* check state */
if (client->current_state != STT_STATE_CREATED) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not CREATE");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not CREATED", client->current_state);
return STT_ERROR_INVALID_STATE;
}
}
client->current_engine_id = strdup(engine_id);
-#if 0
- if (client->current_state == STT_STATE_READY) {
- int ret = 0;
- bool silence_supported = false;
- ret = stt_dbus_request_set_current_engine(client->uid, engine_id, &silence_supported);
-
- if (0 != ret) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to set current engine : %s", __stt_get_error_code(ret));
- return ret;
- } else {
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Current engine uuid = %s", engine_id);
-
- /* success to change engine */
- client->silence_supported = silence_supported;
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "Supported options : silence(%s)", silence_supported ? "true" : "false");
- }
- }
-#endif
SLOG(LOG_DEBUG, TAG_STTC, "=====");
SLOG(LOG_DEBUG, TAG_STTC, " ");
return 0;
}
-static int __read_proc(const char *path, char *buf, int size)
+int stt_set_credential(stt_h stt, const char* credential)
{
- int fd;
- int ret;
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
+ }
- if (NULL == buf || NULL == path) {
- return -1;
+ SLOG(LOG_DEBUG, TAG_STTC, "===== Set credential");
+
+ if (NULL == stt || NULL == credential) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL, stt(%s), credential(%a)", stt, credential);
+ return STT_ERROR_INVALID_PARAMETER;
}
- fd = open(path, O_RDONLY);
- if (fd < 0) {
- return -1;
+ stt_client_s* client = stt_client_get(stt);
+
+ /* check handle */
+ if (NULL == client) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+ return STT_ERROR_INVALID_PARAMETER;
}
- ret = read(fd, buf, size - 1);
- if (0 >= ret) {
- close(fd);
- return -1;
- } else {
- buf[ret] = 0;
+ /* check state */
+ if (client->current_state != STT_STATE_CREATED && client->current_state != STT_STATE_READY) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not CREATED or READY", client->current_state);
+ return STT_ERROR_INVALID_STATE;
}
- close(fd);
- return ret;
+
+ client->credential = strdup(credential);
+
+ SLOG(LOG_DEBUG, TAG_STTC, "=====");
+ SLOG(LOG_DEBUG, TAG_STTC, " ");
+
+ return STT_ERROR_NONE;
}
-static bool __stt_check_daemon_exist()
+int stt_set_private_data(stt_h stt, const char* key, const char* data)
{
- char buf[128];
- int ret;
+ stt_client_s* client = NULL;
- FILE* fp;
- fp = fopen(STT_PID_FILE_PATH, "r");
- if (NULL == fp) {
- return false;
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
+ }
+ if (0 != __stt_check_handle(stt, &client)) {
+ return STT_ERROR_INVALID_PARAMETER;
}
- g_stt_daemon_pid = -1;
- int pid;
- if (0 >= fscanf(fp, "%d", &pid)) {
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "Fail to read pid");
- fclose(fp);
- return false;
+ SLOG(LOG_DEBUG, TAG_STTC, "===== Set private data");
+
+ if (NULL == key || NULL == data) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid parameter");
+ return STT_ERROR_INVALID_PARAMETER;
}
- fclose(fp);
- snprintf(buf, sizeof(buf), "/proc/%d/cmdline", pid);
- ret = __read_proc(buf, buf, sizeof(buf));
- if (0 >= ret) {
- return false;
- } else {
- if (!strcmp(buf, "/usr/bin/stt-daemon")) {
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "Daemon existed - [%d]%s", pid, buf);
- g_stt_daemon_pid = pid;
- return true;
+ /* check state */
+ if (STT_STATE_READY != client->current_state) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
+ return STT_ERROR_INVALID_STATE;
+ }
+
+ int ret = -1;
+ int count = 0;
+ while (0 != ret) {
+ ret = stt_dbus_request_set_private_data(client->uid, key, data);
+ if (0 != ret) {
+ if (STT_ERROR_TIMED_OUT != ret) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to set private data : %s", __stt_get_error_code(ret));
+ return ret;
+ } else {
+ SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry : %s", __stt_get_error_code(ret));
+ usleep(10000);
+ count++;
+ if (STT_RETRY_COUNT == count) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
+ return ret;
+ }
+ }
}
}
- return false;
-}
-static void* __fork_stt_daemon(void* NotUsed)
+ SLOG(LOG_DEBUG, TAG_STTC, "=====");
+ SLOG(LOG_DEBUG, TAG_STTC, "");
+
+ return STT_ERROR_NONE;
+
+}
+int stt_get_private_data(stt_h stt, const char* key, char** data)
{
- int pid, i;
- pid = fork();
+ stt_client_s* client = NULL;
- switch(pid) {
- case -1:
- SLOG(LOG_DEBUG, TAG_STTC, "[STT ERROR] fail to create STT-DAEMON");
- break;
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
+ }
+ if (0 != __stt_check_handle(stt, &client)) {
+ return STT_ERROR_INVALID_PARAMETER;
+ }
- case 0:
- setsid();
- for (i = 0;i < _NSIG;i++)
- signal(i, SIG_DFL);
+ SLOG(LOG_DEBUG, TAG_STTC, "===== Get private data");
- execl("/usr/bin/stt-daemon", "/usr/bin/stt-daemon", NULL);
- break;
+ if (NULL == key || NULL == data) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid parameter");
+ return STT_ERROR_INVALID_PARAMETER;
+ }
- default:
- break;
+ /* check state */
+ if (STT_STATE_READY != client->current_state) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
+ return STT_ERROR_INVALID_STATE;
}
- return (void*) 1;
-}
+ int ret = -1;
+ int count = 0;
+ while (0 != ret) {
+ ret = stt_dbus_request_get_private_data(client->uid, key, data);
+ if (0 != ret) {
+ if (STT_ERROR_TIMED_OUT != ret) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to get private data : %s", __stt_get_error_code(ret));
+ return ret;
+ } else {
+ SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry : %s", __stt_get_error_code(ret));
+ usleep(10000);
+ count++;
+ if (STT_RETRY_COUNT == count) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
+ return ret;
+ }
+ }
+ }
+ }
+
+ SLOG(LOG_DEBUG, TAG_STTC, "=====");
+ SLOG(LOG_DEBUG, TAG_STTC, "");
+ return STT_ERROR_NONE;
+}
static Eina_Bool __stt_connect_daemon(void *data)
{
stt_client_s* client = (stt_client_s*)data;
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+ g_connect_timer = NULL;
return EINA_FALSE;
}
int ret = -1;
ret = stt_dbus_request_hello();
- if (STT_DAEMON_NORMAL != ret) {
+ if (0 != ret) {
if (STT_ERROR_INVALID_STATE == ret) {
+ g_connect_timer = NULL;
return EINA_FALSE;
}
-
- if (STT_DAEMON_ON_TERMINATING == ret) {
- /* Todo - Wait for terminating and do it again*/
- usleep(50);
- return EINA_TRUE;
- } else {
- /* for new daemon */
- bool check = __stt_check_daemon_exist();
- if (true == check) {
- g_count_check_daemon++;
- if (3 < g_count_check_daemon) {
- /* Todo - Kill daemon and restart */
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "Need to Kill daemon");
- }
- usleep(50);
- return EINA_TRUE;
- } else {
- if (false == g_is_daemon_started) {
- g_is_daemon_started = true;
-
- pthread_t thread;
- int thread_id;
- thread_id = pthread_create(&thread, NULL, __fork_stt_daemon, NULL);
- if (thread_id < 0) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to make thread");
- g_connect_timer = NULL;
- return EINA_FALSE;
- }
-
- pthread_detach(thread);
- }
-
- usleep(50);
- return EINA_TRUE;
- }
- }
+ return EINA_TRUE;
}
g_connect_timer = NULL;
SLOG(LOG_DEBUG, TAG_STTC, "===== Connect daemon");
/* request initialization */
-
bool silence_supported = false;
+ bool credential_needed = false;
- ret = stt_dbus_request_initialize(client->uid, &silence_supported);
+ ret = stt_dbus_request_initialize(client->uid, &silence_supported, &credential_needed);
if (STT_ERROR_ENGINE_NOT_FOUND == ret) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to initialize : %s", __stt_get_error_code(ret));
-
+
client->reason = STT_ERROR_ENGINE_NOT_FOUND;
ecore_timer_add(0, __stt_notify_error, (void*)client);
} else {
/* success to connect stt-daemon */
client->silence_supported = silence_supported;
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "Supported options : silence(%s)", silence_supported ? "true" : "false");
+ client->credential_needed = credential_needed;
+ SLOG(LOG_DEBUG, TAG_STTC, "Supported options : silence(%s), credential(%s)", silence_supported ? "support" : "no support", credential_needed ? "need" : "no need");
}
if (NULL != client->current_engine_id) {
ret = -1;
int count = 0;
silence_supported = false;
+ credential_needed = false;
while (0 != ret) {
- ret = stt_dbus_request_set_current_engine(client->uid, client->current_engine_id, &silence_supported);
+ ret = stt_dbus_request_set_current_engine(client->uid, client->current_engine_id, &silence_supported, &credential_needed);
if (0 != ret) {
if (STT_ERROR_TIMED_OUT != ret) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to set current engine : %s", __stt_get_error_code(ret));
return ret;
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry");
- usleep(10);
+ usleep(10000);
count++;
- if (10 == count) {
+ if (STT_RETRY_COUNT == count) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
return ret;
}
/* success to change engine */
client->silence_supported = silence_supported;
- SLOG(LOG_DEBUG, TAG_STTC, "Supported options : silence(%s)", silence_supported ? "true" : "false");
+ SLOG(LOG_DEBUG, TAG_STTC, "Supported options : silence(%s), credential(%s)", silence_supported ? "support" : "no support", credential_needed ? "need" : "no need");
}
}
}
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] uid(%d)", client->uid);
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] uid(%d)", client->uid);
client->before_state = client->current_state;
client->current_state = STT_STATE_READY;
if (NULL != client->state_changed_cb) {
stt_client_use_callback(client);
- client->state_changed_cb(client->stt, client->before_state,
- client->current_state, client->state_changed_user_data);
+ client->state_changed_cb(client->stt, client->before_state,
+ client->current_state, client->state_changed_user_data);
stt_client_not_use_callback(client);
SLOG(LOG_DEBUG, TAG_STTC, "State changed callback is called");
} else {
int stt_prepare(stt_h stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== Prepare STT");
/* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
/* check state */
if (client->current_state != STT_STATE_CREATED) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not 'CREATED'");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not 'CREATED'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
- g_count_check_daemon = 0;
g_connect_timer = ecore_timer_add(0, __stt_connect_daemon, (void*)client);
SLOG(LOG_DEBUG, TAG_STTC, "=====");
int stt_unprepare(stt_h stt)
{
- bool supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &supported)) {
- if (false == supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== Unprepare STT");
/* check state */
if (client->current_state != STT_STATE_READY) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not 'READY'");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
break;
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry");
- usleep(10);
+ usleep(10000);
count++;
- if (10 == count) {
+ if (STT_RETRY_COUNT == count) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
break;
}
}
}
- g_is_daemon_started = false;
-
client->internal_state = STT_INTERNAL_STATE_NONE;
client->before_state = client->current_state;
if (NULL != client->state_changed_cb) {
stt_client_use_callback(client);
- client->state_changed_cb(client->stt, client->before_state,
- client->current_state, client->state_changed_user_data);
+ client->state_changed_cb(client->stt, client->before_state,
+ client->current_state, client->state_changed_user_data);
stt_client_not_use_callback(client);
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] State changed callback is null");
}
+ if (g_connect_timer) {
+ ecore_timer_del(g_connect_timer);
+ g_connect_timer = NULL;
+ }
+
SLOG(LOG_DEBUG, TAG_STTC, "=====");
SLOG(LOG_DEBUG, TAG_STTC, " ");
int stt_foreach_supported_languages(stt_h stt, stt_supported_language_cb callback, void* user_data)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== Foreach Supported Language");
if (NULL == stt || NULL == callback) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
/* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
}
} else {
current_engine_id = strdup(client->current_engine_id);
+ if (NULL == current_engine_id) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to allocate memory");
+ return STT_ERROR_OUT_OF_MEMORY;
+ }
}
client->supported_lang_cb = callback;
int stt_get_default_language(stt_h stt, char** language)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== Get Default Language");
if (NULL == stt || NULL == language) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
stt_client_s* client = stt_client_get(stt);
-
- /* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
int stt_get_state(stt_h stt, stt_state_e* state)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt || NULL == state) {
}
stt_client_s* client = stt_client_get(stt);
-
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get state : A handle is not valid");
return STT_ERROR_INVALID_PARAMETER;
*state = client->current_state;
- switch(*state) {
- case STT_STATE_CREATED: SLOG(LOG_DEBUG, TAG_STTC, "Current state is 'CREATED'"); break;
- case STT_STATE_READY: SLOG(LOG_DEBUG, TAG_STTC, "Current state is 'Ready'"); break;
- case STT_STATE_RECORDING: SLOG(LOG_DEBUG, TAG_STTC, "Current state is 'Recording'"); break;
- case STT_STATE_PROCESSING: SLOG(LOG_DEBUG, TAG_STTC, "Current state is 'Processing'"); break;
- default: SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid value"); break;
+ switch (*state) {
+ case STT_STATE_CREATED: SLOG(LOG_DEBUG, TAG_STTC, "Current state is 'CREATED'"); break;
+ case STT_STATE_READY: SLOG(LOG_DEBUG, TAG_STTC, "Current state is 'Ready'"); break;
+ case STT_STATE_RECORDING: SLOG(LOG_DEBUG, TAG_STTC, "Current state is 'Recording'"); break;
+ case STT_STATE_PROCESSING: SLOG(LOG_DEBUG, TAG_STTC, "Current state is 'Processing'"); break;
+ default: SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid value"); break;
}
return STT_ERROR_NONE;
}
+int stt_get_error_message(stt_h stt, char** err_msg)
+{
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
+ }
+
+ if (NULL == stt || NULL == err_msg) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
+ return STT_ERROR_INVALID_PARAMETER;
+ }
+
+ if (false == g_err_callback_status) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] This callback should be called during an err_callback");
+ return STT_ERROR_OPERATION_FAILED;
+ }
+
+ stt_client_s* client = stt_client_get(stt);
+ if (NULL == client) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get error msg : A handle is not valid");
+ return STT_ERROR_INVALID_PARAMETER;
+ }
+
+ if (NULL != client->err_msg) {
+ *err_msg = strdup(client->err_msg);
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Error msg (%s)", *err_msg);
+ } else {
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Error msg (NULL)");
+ }
+
+ SLOG(LOG_DEBUG, TAG_STTC, "=====");
+ SLOG(LOG_DEBUG, TAG_STTC, " ");
+
+ return STT_ERROR_NONE;
+}
+
int stt_is_recognition_type_supported(stt_h stt, const char* type, bool* support)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt || NULL == type || NULL == support) {
}
stt_client_s* client = stt_client_get(stt);
-
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not valid");
return STT_ERROR_INVALID_PARAMETER;
/* check state */
if (client->current_state != STT_STATE_READY) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not READY");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
return STT_ERROR_INVALID_STATE;
}
return ret;
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry");
- usleep(10);
+ usleep(10000);
count++;
- if (10 == count) {
+ if (STT_RETRY_COUNT == count) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
return ret;
}
}
} else {
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] recognition type is %s", *support ? "true " : "false");
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] recognition type is %s", *support ? "true " : "false");
break;
}
}
int stt_set_silence_detection(stt_h stt, stt_option_silence_detection_e type)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt) {
}
stt_client_s* client = stt_client_get(stt);
-
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get state : A handle is not valid");
return STT_ERROR_INVALID_PARAMETER;
/* check state */
if (client->current_state != STT_STATE_READY) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not READY");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
return STT_ERROR_INVALID_STATE;
}
if (true == client->silence_supported) {
if (type >= STT_OPTION_SILENCE_DETECTION_FALSE && type <= STT_OPTION_SILENCE_DETECTION_AUTO) {
- client->silence = type;
+ client->silence = type;
} else {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Type is invalid");
return STT_ERROR_INVALID_PARAMETER;
}
} else {
- return STT_ERROR_NOT_SUPPORTED_FEATURE;
+ return STT_ERROR_NOT_SUPPORTED_FEATURE;
}
return STT_ERROR_NONE;
int stt_set_start_sound(stt_h stt, const char* filename)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== STT SET START SOUND");
return STT_ERROR_INVALID_PARAMETER;
}
- stt_client_s* client = stt_client_get(stt);
+ if (0 != access(filename, F_OK)) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] File does not exist");
+ return STT_ERROR_INVALID_PARAMETER;
+ }
+ stt_client_s* client = stt_client_get(stt);
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get state : A handle is not valid");
return STT_ERROR_INVALID_PARAMETER;
/* check state */
if (client->current_state != STT_STATE_READY) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not READY");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
return STT_ERROR_INVALID_STATE;
}
return ret;
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry");
- usleep(10);
+ usleep(10000);
count++;
- if (10 == count) {
+ if (STT_RETRY_COUNT == count) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
return ret;
}
}
} else {
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Set start sound : %s", filename);
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Set start sound : %s", filename);
break;
}
}
int stt_unset_start_sound(stt_h stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== STT UNSET START SOUND");
/* check state */
if (client->current_state != STT_STATE_READY) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not READY");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
return STT_ERROR_INVALID_STATE;
}
return ret;
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry");
- usleep(10);
+ usleep(10000);
count++;
- if (10 == count) {
+ if (STT_RETRY_COUNT == count) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
return ret;
}
}
} else {
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Unset start sound");
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Unset start sound");
break;
}
}
int stt_set_stop_sound(stt_h stt, const char* filename)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== STT SET STOP SOUND");
return STT_ERROR_INVALID_PARAMETER;
}
+ if (0 != access(filename, F_OK)) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] File does not exist");
+ return STT_ERROR_INVALID_PARAMETER;
+ }
+
stt_client_s* client = stt_client_get(stt);
if (NULL == client) {
/* check state */
if (client->current_state != STT_STATE_READY) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not READY");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
return STT_ERROR_INVALID_STATE;
}
return ret;
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry");
- usleep(10);
+ usleep(10000);
count++;
- if (10 == count) {
+ if (STT_RETRY_COUNT == count) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
return ret;
}
}
} else {
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Set stop sound : %s", filename);
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Set stop sound : %s", filename);
break;
}
}
int stt_unset_stop_sound(stt_h stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== STT UNSET STOP SOUND");
/* check state */
if (client->current_state != STT_STATE_READY) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not READY");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
return STT_ERROR_INVALID_STATE;
}
return ret;
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry");
- usleep(10);
+ usleep(10000);
count++;
- if (10 == count) {
+ if (STT_RETRY_COUNT == count) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
return ret;
}
}
} else {
- SECURE_SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Unset stop sound");
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Unset stop sound");
break;
}
}
int stt_start(stt_h stt, const char* language, const char* type)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== STT START");
if (NULL == stt) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
stt_client_s* client = stt_client_get(stt);
-
- /* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
/* check state */
if (client->current_state != STT_STATE_READY) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state is not READY");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State: Current state(%d) is not READY", client->current_state);
return STT_ERROR_INVALID_STATE;
}
if (STT_INTERNAL_STATE_NONE != client->internal_state) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is NOT none : %d", client->internal_state);
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
- return STT_ERROR_INVALID_STATE;
+ return STT_ERROR_IN_PROGRESS_TO_RECORDING;
}
+ int ret = -1;
char appid[128] = {0, };
- aul_app_get_appid_bypid(getpid(), appid, sizeof(appid));
-
- if (0 == strlen(appid)) {
+ ret = aul_app_get_appid_bypid(getpid(), appid, sizeof(appid));
+
+ if ((AUL_R_OK != ret) || (0 == strlen(appid))) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to get application ID");
} else {
SLOG(LOG_DEBUG, TAG_STTC, "[DEBUG] Current app id is %s", appid);
temp = strdup(language);
}
- int ret = -1;
- /* do request */
- int count = 0;
- while (0 != ret) {
- ret = stt_dbus_request_start(client->uid, temp, type, client->silence, appid);
- if (0 > ret) {
- /* Failure */
- if (STT_ERROR_TIMED_OUT != ret) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to start : %s", __stt_get_error_code(ret));
- if (NULL != temp) free(temp);
- return ret;
- } else {
- SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry to start");
- usleep(10);
- count++;
- if (10 == count) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
- if (NULL != temp) free(temp);
- return ret;
- }
- }
- } else {
- /* Success */
- if (NULL != temp) free(temp);
-
- if (STT_RESULT_STATE_DONE == ret) {
- SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Start is done : %d", ret);
- client->before_state = client->current_state;
- client->current_state = STT_STATE_RECORDING;
-
- if (NULL != client->state_changed_cb) {
- stt_client_use_callback(client);
- client->state_changed_cb(client->stt, client->before_state,
- client->current_state, client->state_changed_user_data);
- stt_client_not_use_callback(client);
- SLOG(LOG_DEBUG, TAG_STTC, "State changed callback is called");
- } else {
- SLOG(LOG_WARN, TAG_STTC, "[WARNING] State changed callback is null");
- }
- } else if (STT_RESULT_STATE_NOT_DONE == ret) {
- SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Start is not done : %d", ret);
- client->internal_state = STT_INTERNAL_STATE_STARTING;
- } else {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid result : %d", ret);
- }
+ if (true == client->credential_needed && NULL == client->credential) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Do not have app credential for this engine(%s)", client->current_engine_id);
+ return STT_ERROR_PERMISSION_DENIED;
+ }
- ret = STT_ERROR_NONE;
- break;
- }
+ ret = stt_dbus_request_start(client->uid, temp, type, client->silence, appid, client->credential);
+ if (0 != ret) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to start : %s", __stt_get_error_code(ret));
+ } else {
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Start is successful but not done");
+ client->internal_state = STT_INTERNAL_STATE_STARTING;
}
+ if (NULL != temp) free(temp);
+
SLOG(LOG_DEBUG, TAG_STTC, "=====");
SLOG(LOG_DEBUG, TAG_STTC, " ");
int stt_stop(stt_h stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== STT STOP");
if (NULL == stt) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input parameter is NULL");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
stt_client_s* client = stt_client_get(stt);
-
- /* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
- }
-
+ }
+
/* check state */
if (client->current_state != STT_STATE_RECORDING) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Current state is NOT RECORDING");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Current state(%d) is NOT RECORDING", client->current_state);
return STT_ERROR_INVALID_STATE;
}
if (STT_INTERNAL_STATE_NONE != client->internal_state) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is NOT none : %d", client->internal_state);
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
- return STT_ERROR_INVALID_STATE;
+ return STT_ERROR_IN_PROGRESS_TO_PROCESSING;
}
- int ret = -1;
- /* do request */
- int count = 0;
- while (0 != ret) {
- ret = stt_dbus_request_stop(client->uid);
- if (0 > ret) {
- /* Failure */
- if (STT_ERROR_TIMED_OUT != ret) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to stop : %s", __stt_get_error_code(ret));
- return ret;
- } else {
- SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry stop");
- usleep(10);
- count++;
- if (10 == count) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
- return ret;
- }
- }
- } else {
- if (STT_RESULT_STATE_DONE == ret) {
- SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Stop is done : %d", ret);
- client->before_state = client->current_state;
- client->current_state = STT_STATE_PROCESSING;
-
- if (NULL != client->state_changed_cb) {
- stt_client_use_callback(client);
- client->state_changed_cb(client->stt, client->before_state,
- client->current_state, client->state_changed_user_data);
- stt_client_not_use_callback(client);
- SLOG(LOG_DEBUG, TAG_STTC, "State changed callback is called");
- } else {
- SLOG(LOG_WARN, TAG_STTC, "[WARNING] State changed callback is null");
- }
- } else if (STT_RESULT_STATE_NOT_DONE == ret) {
- SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Stop is not done : %d", ret);
- client->internal_state = STT_INTERNAL_STATE_STOPING;
- } else {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid result : %d", ret);
- }
- ret = STT_ERROR_NONE;
- break;
- }
+ int ret = stt_dbus_request_stop(client->uid);
+
+ if (0 != ret) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to stop : %s", __stt_get_error_code(ret));
+ } else {
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Stop is successful but not done");
+ client->internal_state = STT_INTERNAL_STATE_STOPING;
}
SLOG(LOG_DEBUG, TAG_STTC, "=====");
int stt_cancel(stt_h stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== STT CANCEL");
if (NULL == stt) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Input handle is null");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
}
/* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
return STT_ERROR_INVALID_PARAMETER;
- }
+ }
/* check state */
if (STT_STATE_RECORDING != client->current_state && STT_STATE_PROCESSING != client->current_state) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid state : Current state is 'Ready'");
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid state : Current state(%d) is 'Ready'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
if (STT_INTERNAL_STATE_NONE != client->internal_state) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Invalid State : Internal state is NOT none : %d", client->internal_state);
- SLOG(LOG_DEBUG, TAG_STTC, "=====");
- SLOG(LOG_DEBUG, TAG_STTC, " ");
- return STT_ERROR_INVALID_STATE;
+ return STT_ERROR_IN_PROGRESS_TO_READY;
}
- int ret = -1;
- /* do request */
- int count = 0;
- while (0 != ret) {
- ret = stt_dbus_request_cancel(client->uid);
- if (0 != ret) {
- /* Failure */
- if (STT_ERROR_TIMED_OUT != ret) {
- SLOG(LOG_DEBUG, TAG_STTC, "[ERROR] Fail to cancel : %s", __stt_get_error_code(ret));
- return ret;
- } else {
- SLOG(LOG_WARN, TAG_STTC, "[WARNING] retry");
- usleep(10);
- count++;
- if (10 == count) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to request");
- return ret;
- }
- }
- } else {
- SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS]");
-
- client->before_state = client->current_state;
- client->current_state = STT_STATE_READY;
-
- if (NULL != client->state_changed_cb) {
- stt_client_use_callback(client);
- client->state_changed_cb(client->stt, client->before_state,
- client->current_state, client->state_changed_user_data);
- stt_client_not_use_callback(client);
- SLOG(LOG_DEBUG, TAG_STTC, "State changed callback is called");
- } else {
- SLOG(LOG_WARN, TAG_STTC, "[WARNING] State changed callback is null");
- }
- ret = STT_ERROR_NONE;
- break;
- }
+ int ret = stt_dbus_request_cancel(client->uid);
+ if (0 != ret) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to cancel : %s", __stt_get_error_code(ret));
+ } else {
+ SLOG(LOG_DEBUG, TAG_STTC, "[SUCCESS] Cancel is successful but not done");
+ client->internal_state = STT_INTERNAL_STATE_CANCELING;
}
SLOG(LOG_DEBUG, TAG_STTC, "=====");
return ret;
}
-static int __stt_get_audio_volume(float* volume)
+int __stt_cb_set_volume(int uid, float volume)
{
- FILE* fp = fopen(STT_AUDIO_VOLUME_PATH, "rb");
- if (!fp) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to open Volume File");
- return STT_ERROR_OPERATION_FAILED;
+ stt_client_s* client = NULL;
+
+ client = stt_client_get_by_uid(uid);
+ if (NULL == client) {
+ SLOG(LOG_ERROR, TAG_STTC, "Handle is NOT valid");
+ return STT_ERROR_INVALID_PARAMETER;
}
- int readlen = fread((void*)volume, sizeof(*volume), 1, fp);
- fclose(fp);
+ if (STT_STATE_RECORDING != client->current_state) {
+ SLOG(LOG_DEBUG, TAG_STTC, "[ERROR] Invalid state : NO 'Recording' state, cur(%d)", client->current_state);
+ return STT_ERROR_INVALID_STATE;
+ }
- if (0 == readlen)
- *volume = 0.0f;
+ g_volume_db = volume;
+ SLOG(LOG_DEBUG, TAG_STTC, "Set volume (%f)", g_volume_db);
return 0;
}
int stt_get_recording_volume(stt_h stt, float* volume)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt || NULL == volume) {
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
return STT_ERROR_INVALID_PARAMETER;
- }
-
+ }
+
if (STT_STATE_RECORDING != client->current_state) {
- SLOG(LOG_DEBUG, TAG_STTC, "[ERROR] Invalid state : NO 'Recording' state");
+ SLOG(LOG_DEBUG, TAG_STTC, "[ERROR] Invalid state : NO 'Recording' state, cur(%d)", client->current_state);
return STT_ERROR_INVALID_STATE;
- }
-
- int ret = 0;
- ret = __stt_get_audio_volume(volume);
- if (0 != ret) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to get audio volume : %s", __stt_get_error_code(ret));
- return STT_ERROR_OPERATION_FAILED;
}
+ *volume = g_volume_db;
+
return STT_ERROR_NONE;
}
-bool __stt_result_time_cb(int index, int event, const char* text, long start_time, long end_time, void* user_data)
+bool __stt_result_time_cb(int index, int event, const char* text, long start_time, long end_time, void* user_data)
{
stt_client_s* client = (stt_client_s*)user_data;
if (NULL != client->result_time_cb) {
SLOG(LOG_DEBUG, TAG_STTC, "(%d) event(%d) text(%s) start(%ld) end(%ld)",
index, event, text, start_time, end_time);
- client->result_time_cb(client->stt, index, (stt_result_time_event_e)event,
+ client->result_time_cb(client->stt, index, (stt_result_time_event_e)event,
text, start_time, end_time, client->result_time_user_data);
} else {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Callback is NULL");
int stt_foreach_detailed_result(stt_h stt, stt_result_time_cb callback, void* user_data)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
SLOG(LOG_DEBUG, TAG_STTC, "===== STT FOREACH DETAILED RESULT");
{
stt_client_s* client = (stt_client_s*)data;
+ SLOG(LOG_WARN, TAG_STTC, "[WARNING] Error from sttd");
+
/* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to notify error : A handle is not valid");
if (NULL != client->error_cb) {
stt_client_use_callback(client);
- client->error_cb(client->stt, client->reason, client->error_user_data);
+ g_err_callback_status = true;
+ client->error_cb(client->stt, client->reason, client->error_user_data);
+ g_err_callback_status = false;
stt_client_not_use_callback(client);
- SLOG(LOG_DEBUG, TAG_STTC, "Error callback is called");
+ SLOG(LOG_WARN, TAG_STTC, "[WARNING] Error callback is called : reason [%d]", client->reason);
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] Error callback is null");
}
return EINA_FALSE;
}
-int __stt_cb_error(int uid, int reason)
+int __stt_cb_error(int uid, int reason, char* err_msg)
{
stt_client_s* client = stt_client_get_by_uid(uid);
- if( NULL == client ) {
- SLOG(LOG_ERROR, TAG_STTC, "Handle not found\n");
+ if (NULL == client) {
+ SLOG(LOG_ERROR, TAG_STTC, "Handle not found");
return -1;
}
client->reason = reason;
+ client->internal_state = STT_INTERNAL_STATE_NONE;
+ if (NULL != client->err_msg) {
+ free(client->err_msg);
+ client->err_msg = NULL;
+ }
+ client->err_msg = strdup(err_msg);
+
+ SLOG(LOG_INFO, TAG_STTC, "internal state is initialized to 0");
if (NULL != client->error_cb) {
ecore_timer_add(0, __stt_notify_error, client);
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] Error callback is null");
- }
+ }
return 0;
}
-static Eina_Bool __stt_notify_state_changed(void *data)
+static void __stt_notify_state_changed(void *data)
{
stt_client_s* client = (stt_client_s*)data;
/* check handle */
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to notify error : A handle is not valid");
- return EINA_FALSE;
+ return;
}
- if (NULL == stt_client_get_by_uid(client->uid))
- return EINA_FALSE;
+ if (NULL == stt_client_get_by_uid(client->uid)) {
+ return;
+ }
if (STT_INTERNAL_STATE_STARTING == client->internal_state && STT_STATE_RECORDING == client->current_state) {
client->internal_state = STT_INTERNAL_STATE_NONE;
- SLOG(LOG_DEBUG, TAG_STTC, "Internal state change NULL");
+ SLOG(LOG_DEBUG, TAG_STTC, "Internal state change to NONE");
} else if (STT_INTERNAL_STATE_STOPING == client->internal_state && STT_STATE_PROCESSING == client->current_state) {
client->internal_state = STT_INTERNAL_STATE_NONE;
- SLOG(LOG_DEBUG, TAG_STTC, "Internal state change NULL");
+ SLOG(LOG_DEBUG, TAG_STTC, "Internal state change to NONE");
+ } else if (STT_INTERNAL_STATE_CANCELING == client->internal_state && STT_STATE_READY == client->current_state) {
+ client->internal_state = STT_INTERNAL_STATE_NONE;
+ SLOG(LOG_DEBUG, TAG_STTC, "Internal state change to NONE");
}
if (NULL != client->state_changed_cb) {
stt_client_use_callback(client);
- client->state_changed_cb(client->stt, client->before_state,
- client->current_state, client->state_changed_user_data);
+ client->state_changed_cb(client->stt, client->before_state,
+ client->current_state, client->state_changed_user_data);
stt_client_not_use_callback(client);
+ SLOG(LOG_DEBUG, TAG_STTC, "State changed callback is called");
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] State changed callback is null");
}
- return EINA_FALSE;
+ return;
}
static Eina_Bool __stt_notify_result(void *data)
if (NULL != client->recognition_result_cb) {
stt_client_use_callback(client);
- client->recognition_result_cb(client->stt, client->event, (const char**)client->data_list, client->data_count,
+ client->recognition_result_cb(client->stt, client->event, (const char**)client->data_list, client->data_count,
client->msg, client->recognition_result_user_data);
stt_client_not_use_callback(client);
SLOG(LOG_DEBUG, TAG_STTC, "client recognition result callback called");
temp = client->data_list;
int i = 0;
- for (i = 0;i < client->data_count;i++) {
+ for (i = 0; i < client->data_count; i++) {
if (NULL != temp[i]) {
free(temp[i]);
temp[i] = NULL;
client->data_count = 0;
stt_config_mgr_remove_time_info_file();
-
+
if (STT_RESULT_EVENT_FINAL_RESULT == client->event || STT_RESULT_EVENT_ERROR == client->event) {
client->before_state = client->current_state;
client->current_state = STT_STATE_READY;
if (NULL != client->state_changed_cb) {
- ecore_timer_add(0, __stt_notify_state_changed, client);
+ ecore_main_loop_thread_safe_call_async(__stt_notify_state_changed, client);
} else {
SLOG(LOG_WARN, TAG_STTC, "[WARNING] State changed callback is null");
}
int __stt_cb_result(int uid, int event, char** data, int data_count, const char* msg)
{
stt_client_s* client = NULL;
-
+
client = stt_client_get_by_uid(uid);
if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "Handle is NOT valid");
- return -1;
+ return STT_ERROR_INVALID_PARAMETER;
}
- if (NULL != msg) SLOG(LOG_DEBUG, TAG_STTC, "Recognition Result Message = %s", msg);
+ if (NULL != msg)
+ SLOG(LOG_DEBUG, TAG_STTC, "Recognition Result Message = %s", msg);
- int i=0;
- for (i = 0;i < data_count;i++) {
- if (NULL != data[i]) SECURE_SLOG(LOG_DEBUG, TAG_STTC, "Recognition Result[%d] = %s", i, data[i]);
- }
+ int i = 0;
+ for (i = 0; i < data_count; i++) {
+ if (NULL != data[i])
+ SLOG(LOG_DEBUG, TAG_STTC, "Recognition Result[%d] = %s", i, data[i]);
+ }
if (NULL != client->recognition_result_cb) {
client->event = event;
if (data_count > 0) {
char **temp = NULL;
temp = (char**)calloc(data_count, sizeof(char*));
+ if (NULL == temp) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to allocate memory");
+ return STT_ERROR_OUT_OF_MEMORY;
+ }
- for (i = 0;i < data_count;i++) {
- if(NULL != data[i])
+ for (i = 0; i < data_count; i++) {
+ if (NULL != data[i])
temp[i] = strdup(data[i]);
- else
+ else
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Result data is error");
}
client->data_list = temp;
}
-
- ecore_timer_add(0, __stt_notify_result, client);
} else {
SLOG(LOG_ERROR, TAG_STTC, "[ERROR] User result callback is null");
}
- return 0;
+ ecore_timer_add(0, __stt_notify_result, client);
+
+ return STT_ERROR_NONE;
}
int __stt_cb_set_state(int uid, int state)
{
stt_client_s* client = stt_client_get_by_uid(uid);
- if( NULL == client ) {
+ if (NULL == client) {
SLOG(LOG_ERROR, TAG_STTC, "Handle not found");
return -1;
}
client->before_state = client->current_state;
client->current_state = state_from_daemon;
- ecore_timer_add(0, __stt_notify_state_changed, client);
+ ecore_main_loop_thread_safe_call_async(__stt_notify_state_changed, client);
return 0;
}
int stt_set_recognition_result_cb(stt_h stt, stt_recognition_result_cb callback, void* user_data)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (stt == NULL || callback == NULL)
}
if (STT_STATE_CREATED != client->current_state) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state is not 'ready'");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
int stt_unset_recognition_result_cb(stt_h stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt)
}
if (STT_STATE_CREATED != client->current_state) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state is not 'ready'");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
int stt_set_state_changed_cb(stt_h stt, stt_state_changed_cb callback, void* user_data)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt || NULL == callback)
}
if (STT_STATE_CREATED != client->current_state) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state is not 'ready'");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
int stt_unset_state_changed_cb(stt_h stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt)
}
if (STT_STATE_CREATED != client->current_state) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state is not 'ready'");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
int stt_set_error_cb(stt_h stt, stt_error_cb callback, void* user_data)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt || NULL == callback)
}
if (STT_STATE_CREATED != client->current_state) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state is not 'ready'");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
int stt_unset_error_cb(stt_h stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt)
}
if (STT_STATE_CREATED != client->current_state) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state is not 'ready'");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
int stt_set_default_language_changed_cb(stt_h stt, stt_default_language_changed_cb callback, void* user_data)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt || NULL == callback)
}
if (STT_STATE_CREATED != client->current_state) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state is not 'ready'");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
int stt_unset_default_language_changed_cb(stt_h stt)
{
- bool stt_supported = false;
- bool mic_supported = false;
- if (0 == system_info_get_platform_bool(STT_FEATURE_PATH, &stt_supported)) {
- if (0 == system_info_get_platform_bool(STT_MIC_FEATURE_PATH, &mic_supported)) {
- if (false == stt_supported || false == mic_supported) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] STT NOT supported");
- return STT_ERROR_NOT_SUPPORTED;
- }
- }
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
}
if (NULL == stt)
}
if (STT_STATE_CREATED != client->current_state) {
- SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state is not 'ready'");
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
return STT_ERROR_INVALID_STATE;
}
return 0;
}
+
+int stt_set_engine_changed_cb(stt_h stt, stt_engine_changed_cb callback, void* user_data)
+{
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
+ }
+
+ if (NULL == stt || NULL == callback)
+ return STT_ERROR_INVALID_PARAMETER;
+
+ stt_client_s* client = stt_client_get(stt);
+
+ /* check handle */
+ if (NULL == client) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+ return STT_ERROR_INVALID_PARAMETER;
+ }
+
+ if (STT_STATE_CREATED != client->current_state) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
+ return STT_ERROR_INVALID_STATE;
+ }
+
+ client->engine_changed_cb = callback;
+ client->engine_changed_user_data = user_data;
+
+ return 0;
+}
+
+int stt_unset_engine_changed_cb(stt_h stt)
+{
+ if (0 != __stt_get_feature_enabled()) {
+ return STT_ERROR_NOT_SUPPORTED;
+ }
+ if (0 != __stt_check_privilege()) {
+ return STT_ERROR_PERMISSION_DENIED;
+ }
+
+ if (NULL == stt)
+ return STT_ERROR_INVALID_PARAMETER;
+
+ stt_client_s* client = stt_client_get(stt);
+
+ /* check handle */
+ if (NULL == client) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] A handle is not available");
+ return STT_ERROR_INVALID_PARAMETER;
+ }
+
+ if (STT_STATE_CREATED != client->current_state) {
+ SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Current state(%d) is not 'Created'", client->current_state);
+ return STT_ERROR_INVALID_STATE;
+ }
+
+ client->engine_changed_cb = NULL;
+ client->engine_changed_user_data = NULL;
+
+ return 0;
+}