[libmm-camcorder] g_free and g_printf function fixes
[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_util.c
index 8db724c..c2540d8 100644 (file)
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <gst/video/video-info.h>
 #include <gio/gio.h>
+#include <errno.h>
 
 #include "mm_camcorder_internal.h"
 #include "mm_camcorder_util.h"
@@ -37,6 +38,8 @@
 #include <mm_util_imgp.h>
 #include <mm_util_jpeg.h>
 
+#include <storage.h>
+
 /*-----------------------------------------------------------------------
 |    GLOBAL VARIABLE DEFINITIONS for internal                          |
 -----------------------------------------------------------------------*/
@@ -44,7 +47,8 @@
 /*-----------------------------------------------------------------------
 |    LOCAL VARIABLE DEFINITIONS for internal                           |
 -----------------------------------------------------------------------*/
-#define TIME_STRING_MAX_LEN     64
+#define TIME_STRING_MAX_LEN                     64
+#define __MMCAMCORDER_CAPTURE_WAIT_TIMEOUT      5
 
 #define FPUTC_CHECK(x_char, x_file)\
 {\
@@ -59,7 +63,7 @@
        if (fputs(x_str, x_file) == EOF) \
        {\
                _mmcam_dbg_err("[Critical] fputs() returns fail.\n");\
-               SAFE_FREE(str); \
+               SAFE_G_FREE(str);       \
                return FALSE;\
        }\
 }
@@ -93,37 +97,26 @@ static gboolean _mmcamcorder_convert_NV12_to_I420(unsigned char *src, guint widt
 |    GLOBAL FUNCTION DEFINITIONS:                                                                                      |
 ---------------------------------------------------------------------------*/
 
-static int __gdbus_method_call_sync(const char* bus_name, const char* object, const char* iface,
-                                                       const char* method, GVariant* args, GVariant** result, bool is_sync)
+static int __gdbus_method_call_sync(GDBusConnection *conn, const char *bus_name,
+       const char *object, const char *iface, const char *method,
+       GVariant *args, GVariant **result, bool is_sync)
 {
        int ret = MM_ERROR_NONE;
-       GError *err = NULL;
-       GVariant* dbus_reply = NULL;
-       GDBusConnection *conn = NULL;
-
-       if (!object || !iface || !method) {
-               _mmcam_dbg_err("Invalid Argument");
-               if (!object)
-                       _mmcam_dbg_err("object null");
-               if (!iface)
-                       _mmcam_dbg_err("iface null");
-               if (!method)
-                       _mmcam_dbg_err("method null");
-               return MM_ERROR_INVALID_ARGUMENT;
-       }
+       GVariant *dbus_reply = NULL;
 
-       conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL);
-       if (conn == NULL) {
-               _mmcam_dbg_err("get connection failed");
-               return MM_ERROR_CAMCORDER_INTERNAL;
+       if (!conn || !object || !iface || !method) {
+               _mmcam_dbg_err("Invalid Argument %p %p %p %p",
+                       conn, object, iface, method);
+               return MM_ERROR_INVALID_ARGUMENT;
        }
 
-       _mmcam_dbg_log("Dbus call with obj : '%s' iface : '%s' method : '%s'", object, iface, method);
+       _mmcam_dbg_log("Dbus call - obj [%s], iface [%s], method [%s]", object, iface, method);
 
        if (is_sync) {
-               if (dbus_reply = g_dbus_connection_call_sync(conn, bus_name, object, iface, \
-                                    method, args,\
-                                    NULL, G_DBUS_CALL_FLAGS_NONE, G_DBUS_REPLY_TIMEOUT, NULL, &err )) {
+               dbus_reply = g_dbus_connection_call_sync(conn,
+                       bus_name, object, iface, method, args, NULL,
+                       G_DBUS_CALL_FLAGS_NONE, G_DBUS_REPLY_TIMEOUT, NULL, NULL);
+               if (dbus_reply) {
                        _mmcam_dbg_log("Method Call '%s.%s' Success", iface, method);
                        *result = dbus_reply;
                } else {
@@ -131,15 +124,116 @@ static int __gdbus_method_call_sync(const char* bus_name, const char* object, co
                        ret = MM_ERROR_CAMCORDER_INTERNAL;
                }
        } else {
-               g_dbus_connection_call(conn, bus_name, object, iface, \
-                                                            method, args, \
-                                                            NULL, G_DBUS_CALL_FLAGS_NONE, G_DBUS_REPLY_TIMEOUT, \
-                                                            NULL, NULL, NULL);
+               g_dbus_connection_call(conn, bus_name, object, iface, method, args, NULL,
+                       G_DBUS_CALL_FLAGS_NONE, G_DBUS_REPLY_TIMEOUT, NULL, NULL, NULL);
+       }
+
+       return ret;
+}
+
+static int __gdbus_subscribe_signal(GDBusConnection *conn,
+       const char *object_name, const char *iface_name, const char *signal_name,
+       GDBusSignalCallback signal_cb, guint *subscribe_id, void *userdata)
+{
+       guint subs_id = 0;
+
+       if (!conn || !object_name || !iface_name || !signal_name || !signal_cb || !subscribe_id) {
+               _mmcam_dbg_err("Invalid Argument %p %p %p %p %p %p",
+                       conn, object_name, iface_name, signal_name, signal_cb, subscribe_id);
+               return MM_ERROR_INVALID_ARGUMENT;
+       }
+
+       _mmcam_dbg_log("subscirbe signal Obj %s, iface_name %s, sig_name %s",
+               object_name, iface_name, signal_name);
+
+       subs_id = g_dbus_connection_signal_subscribe(conn,
+               NULL, iface_name, signal_name, object_name, NULL,
+               G_DBUS_SIGNAL_FLAGS_NONE, signal_cb, userdata, NULL);
+       if (!subs_id) {
+               _mmcam_dbg_err("g_dbus_connection_signal_subscribe() failed");
+               return MM_ERROR_CAMCORDER_INTERNAL;
+       } else {
+               *subscribe_id = subs_id;
+               _mmcam_dbg_log("subs_id %u", subs_id);
+       }
+
+       return MM_ERROR_NONE;
+}
+
+
+static void __gdbus_stream_eos_cb(GDBusConnection *connection,
+       const gchar *sender_name, const gchar *object_path, const gchar *interface_name,
+       const gchar *signal_name, GVariant *param, gpointer user_data)
+{
+       int played_idx = 0;
+       _MMCamcorderGDbusCbInfo *gdbus_info = NULL;
+
+       _mmcam_dbg_log("entered");
+
+       if (!param || !user_data) {
+               _mmcam_dbg_err("invalid parameter %p %p", param, user_data);
+               return;
+       }
+
+       gdbus_info = (_MMCamcorderGDbusCbInfo *)user_data;
+
+       g_variant_get(param, "(i)", &played_idx);
+
+       g_mutex_lock(&gdbus_info->sync_mutex);
+
+       _mmcam_dbg_log("gdbus_info->param %d, played_idx : %d",
+               gdbus_info->param, played_idx);
+
+       if (gdbus_info->param == played_idx) {
+               g_dbus_connection_signal_unsubscribe(connection, gdbus_info->subscribe_id);
+
+               gdbus_info->is_playing = FALSE;
+               gdbus_info->subscribe_id = 0;
+               gdbus_info->param = 0;
+
+               g_cond_signal(&gdbus_info->sync_cond);
+       }
+
+       g_mutex_unlock(&gdbus_info->sync_mutex);
+
+       return;
+}
+
+static int __gdbus_wait_for_cb_return(_MMCamcorderGDbusCbInfo *gdbus_info, int time_out)
+{
+       int ret = MM_ERROR_NONE;
+       gint64 end_time = 0;
+
+       if (!gdbus_info) {
+               _mmcam_dbg_err("invalid info");
+               return MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
+       }
+
+       g_mutex_lock(&gdbus_info->sync_mutex);
+
+       _mmcam_dbg_log("entered");
+
+       if (gdbus_info->is_playing == FALSE) {
+               _mmcam_dbg_log("callback is already returned");
+               g_mutex_unlock(&gdbus_info->sync_mutex);
+               return MM_ERROR_NONE;
+       }
+
+       end_time = g_get_monotonic_time()+ (time_out * G_TIME_SPAN_MILLISECOND);
+
+       if (g_cond_wait_until(&gdbus_info->sync_cond, &gdbus_info->sync_mutex, end_time)) {
+               _mmcam_dbg_log("wait signal received");
+       } else {
+               _mmcam_dbg_err("wait time is expired");
+               ret = MM_ERROR_CAMCORDER_RESPONSE_TIMEOUT;
        }
-       g_object_unref(conn);
+
+       g_mutex_unlock(&gdbus_info->sync_mutex);
+
        return ret;
 }
 
+
 gint32 _mmcamcorder_double_to_fix(gdouble d_number)
 {
        return (gint32) (d_number * 65536.0);
@@ -156,8 +250,8 @@ gint _mmcamcorder_find_tag(FILE *f, guint32 tag_fourcc, gboolean do_rewind)
        }
 
        while ((read_item = fread(&buf, sizeof(guchar), 8, f)) > 0) {
-               unsigned long long buf_size = 0;
-               unsigned int buf_fourcc = 0;
+               uint64_t buf_size = 0;
+               uint32_t buf_fourcc = 0;
 
                if (read_item < 8) {
                        _mmcam_dbg_err("fread failed : %d", read_item);
@@ -172,27 +266,28 @@ gint _mmcamcorder_find_tag(FILE *f, guint32 tag_fourcc, gboolean do_rewind)
                } else {
                        _mmcam_dbg_log("skip [%c%c%c%c] tag", MMCAM_FOURCC_ARGS(buf_fourcc));
 
-                       buf_size = (unsigned long long)_mmcamcorder_get_container_size(buf);
-                       buf_size = buf_size - 8; /* include tag */
+                       buf_size = _mmcamcorder_get_container_size(buf);
 
-                       do {
-                               if (buf_size > _MMCAMCORDER_MAX_INT) {
-                                       _mmcam_dbg_log("seek %d", _MMCAMCORDER_MAX_INT);
-                                       if (fseek(f, _MMCAMCORDER_MAX_INT, SEEK_CUR) != 0) {
-                                               _mmcam_dbg_err("fseek() fail");
-                                               return FALSE;
-                                       }
-
-                                       buf_size -= _MMCAMCORDER_MAX_INT;
-                               } else {
-                                       _mmcam_dbg_log("seek %d", buf_size);
-                                       if (fseek(f, buf_size, SEEK_CUR) != 0) {
-                                               _mmcam_dbg_err("fseek() fail");
-                                               return FALSE;
-                                       }
-                                       break;
+                       /* if size of mdat is 1, it means largesize is used.(bigger than 4GB) */
+                       if (buf_fourcc == MMCAM_FOURCC('m','d','a','t') &&
+                           buf_size == 1) {
+                               read_item = fread(&buf, sizeof(guchar), 8, f);
+                               if (read_item < 8) {
+                                       _mmcam_dbg_err("fread failed");
+                                       return FALSE;
                                }
-                       } while (TRUE);
+
+                               buf_size = _mmcamcorder_get_container_size64(buf);
+                               buf_size = buf_size - 16; /* include tag and large file flag(size 1) */
+                       } else {
+                               buf_size = buf_size - 8; /* include tag */
+                       }
+
+                       _mmcam_dbg_log("seek %llu", buf_size);
+                       if (fseeko(f, (off_t)buf_size, SEEK_CUR) != 0) {
+                               _mmcam_dbg_err("fseeko() fail");
+                               return FALSE;
+                       }
                }
        }
 
@@ -211,8 +306,8 @@ gboolean _mmcamcorder_find_fourcc(FILE *f, guint32 tag_fourcc, gboolean do_rewin
        }
 
        while ((read_item = fread(&buf, sizeof(guchar), 8, f))  > 0) {
-               unsigned long long buf_size = 0;
-               unsigned int buf_fourcc = 0;
+               uint64_t buf_size = 0;
+               uint32_t buf_fourcc = 0;
 
                if (read_item < 8) {
                        _mmcam_dbg_err("fread failed : %d", read_item);
@@ -224,38 +319,38 @@ gboolean _mmcamcorder_find_fourcc(FILE *f, guint32 tag_fourcc, gboolean do_rewin
                if (tag_fourcc == buf_fourcc) {
                        _mmcam_dbg_log("find tag : %c%c%c%c", MMCAM_FOURCC_ARGS(tag_fourcc));
                        return TRUE;
-               }
-               else if((buf_fourcc == MMCAM_FOURCC('m','o','o','v')) && (tag_fourcc != buf_fourcc)){
-                       if(_mmcamcorder_find_fourcc(f,tag_fourcc,FALSE)){
+               } else if (buf_fourcc == MMCAM_FOURCC('m','o','o','v') &&
+                          tag_fourcc != buf_fourcc) {
+                       if (_mmcamcorder_find_fourcc(f, tag_fourcc, FALSE)) {
                                return TRUE;
-                       }
-                       else{
+                       } else {
                                continue;
                        }
                } else {
                        _mmcam_dbg_log("skip [%c%c%c%c] tag", MMCAM_FOURCC_ARGS(buf_fourcc));
 
-                       buf_size = (unsigned long long)_mmcamcorder_get_container_size(buf);
-                       buf_size = buf_size - 8; /* include tag */
-
-                       do {
-                               if (buf_size > _MMCAMCORDER_MAX_INT) {
-                                       _mmcam_dbg_log("seek %d", _MMCAMCORDER_MAX_INT);
-                                       if (fseek(f, _MMCAMCORDER_MAX_INT, SEEK_CUR) != 0) {
-                                               _mmcam_dbg_err("fseek() fail");
-                                               return FALSE;
-                                       }
+                       buf_size = _mmcamcorder_get_container_size(buf);
 
-                                       buf_size -= _MMCAMCORDER_MAX_INT;
-                               } else {
-                                       _mmcam_dbg_log("seek %d", buf_size);
-                                       if (fseek(f, buf_size, SEEK_CUR) != 0) {
-                                               _mmcam_dbg_err("fseek() fail");
-                                               return FALSE;
-                                       }
-                                       break;
+                       /* if size of mdat is 1, it means largesize is used.(bigger than 4GB) */
+                       if (buf_fourcc == MMCAM_FOURCC('m','d','a','t') &&
+                           buf_size == 1) {
+                               read_item = fread(&buf, sizeof(guchar), 8, f);
+                               if (read_item < 8) {
+                                       _mmcam_dbg_err("fread failed");
+                                       return FALSE;
                                }
-                       } while (TRUE);
+
+                               buf_size = _mmcamcorder_get_container_size64(buf);
+                               buf_size = buf_size - 16; /* include tag and large file flag(size 1) */
+                       } else {
+                               buf_size = buf_size - 8; /* include tag */
+                       }
+
+                       _mmcam_dbg_log("seek %llu", buf_size);
+                       if (fseeko(f, (off_t)buf_size, SEEK_CUR) != 0) {
+                               _mmcam_dbg_err("fseeko() fail");
+                               return FALSE;
+                       }
                }
        }
 
@@ -267,18 +362,18 @@ gboolean _mmcamcorder_find_fourcc(FILE *f, guint32 tag_fourcc, gboolean do_rewin
 gboolean _mmcamcorder_update_size(FILE *f, gint64 prev_pos, gint64 curr_pos)
 {
        _mmcam_dbg_log("size : %"G_GINT64_FORMAT"", curr_pos-prev_pos);
-       if(fseek(f, prev_pos, SEEK_SET) != 0)
+       if(fseeko(f, prev_pos, SEEK_SET) != 0)
        {
-               _mmcam_dbg_err("fseek() fail");
+               _mmcam_dbg_err("fseeko() fail");
                return FALSE;
        }
 
        if (!write_to_32(f, curr_pos -prev_pos))
                return FALSE;
 
-       if(fseek(f, curr_pos, SEEK_SET) != 0)
+       if(fseeko(f, curr_pos, SEEK_SET) != 0)
        {
-               _mmcam_dbg_err("fseek() fail");
+               _mmcam_dbg_err("fseeko() fail");
                return FALSE;
        }
 
@@ -292,15 +387,15 @@ gboolean _mmcamcorder_write_loci(FILE *f, _MMCamcorderLocationInfo info)
 
        _mmcam_dbg_log("");
 
-       if((pos = ftell(f))<0)
+       if((pos = ftello(f))<0)
        {
-               _mmcam_dbg_err("ftell() returns negative value");       
+               _mmcam_dbg_err("ftello() returns negative value");
                return FALSE;
        }
-       
+
        if(!write_to_32(f, 0)) //size
                return FALSE;
-       
+
        if(!write_tag(f, "loci"))       // type
                return FALSE;
 
@@ -315,7 +410,7 @@ gboolean _mmcamcorder_write_loci(FILE *f, _MMCamcorderLocationInfo info)
        str = str_to_utf8("location_name");
 
        FPUTS_CHECK(str, f); // name
-       SAFE_FREE(str);
+       SAFE_G_FREE(str);
 
        FPUTC_CHECK('\0', f);
        FPUTC_CHECK(0, f);              //role
@@ -331,19 +426,19 @@ gboolean _mmcamcorder_write_loci(FILE *f, _MMCamcorderLocationInfo info)
 
        str = str_to_utf8("Astronomical_body");
        FPUTS_CHECK(str, f);//Astronomical_body
-       SAFE_FREE(str);
+       SAFE_G_FREE(str);
 
        FPUTC_CHECK('\0', f);
 
        str = str_to_utf8("Additional_notes");
        FPUTS_CHECK(str, f); // Additional_notes
-       SAFE_FREE(str);
+       SAFE_G_FREE(str);
 
        FPUTC_CHECK('\0', f);
 
-       if((current_pos = ftell(f))<0)
+       if((current_pos = ftello(f))<0)
        {
-               _mmcam_dbg_err("ftell() returns negative value");
+               _mmcam_dbg_err("ftello() returns negative value");
                return FALSE;
        }
 
@@ -414,9 +509,9 @@ gboolean _mmcamcorder_write_geodata(FILE *f,_MMCamcorderLocationInfo info) {
 
        _mmcam_dbg_log("");
 
-       if((pos = ftell(f))<0)
+       if((pos = ftello(f))<0)
        {
-               _mmcam_dbg_err("ftell() returns negative value");
+               _mmcam_dbg_err("ftello() returns negative value");
                return FALSE;
        }
 
@@ -434,9 +529,9 @@ gboolean _mmcamcorder_write_geodata(FILE *f,_MMCamcorderLocationInfo info) {
 
        FPUTC_CHECK(0x2F, f);
 
-       if((current_pos = ftell(f))<0)
+       if((current_pos = ftello(f))<0)
        {
-               _mmcam_dbg_err("ftell() returns negative value");
+               _mmcam_dbg_err("ftello() returns negative value");
                return FALSE;
        }
 
@@ -457,8 +552,8 @@ gboolean _mmcamcorder_write_udta(FILE *f, int gps_enable, _MMCamcorderLocationIn
                return TRUE;
        }
 
-       if ((pos = ftell(f))<0) {
-               _mmcam_dbg_err("ftell() returns negative value");
+       if ((pos = ftello(f))<0) {
+               _mmcam_dbg_err("ftello() returns negative value");
                return FALSE;
        }
 
@@ -486,8 +581,8 @@ gboolean _mmcamcorder_write_udta(FILE *f, int gps_enable, _MMCamcorderLocationIn
                }
        }
 
-       if ((current_pos = ftell(f))<0) {
-               _mmcam_dbg_err("ftell() returns negative value");
+       if ((current_pos = ftello(f))<0) {
+               _mmcam_dbg_err("ftello() returns negative value");
                return FALSE;
        }
 
@@ -515,7 +610,34 @@ guint64 _mmcamcorder_get_container_size(const guchar *size)
        result = result | (temp << 8);
        result = result | size[3];
 
-       _mmcam_dbg_log("result : %lld", (unsigned long long)result);
+       _mmcam_dbg_log("result : %llu", result);
+
+       return result;
+}
+
+
+guint64 _mmcamcorder_get_container_size64(const guchar *size)
+{
+       guint64 result = 0;
+       guint64 temp = 0;
+
+       temp = size[0];
+       result = temp << 56;
+       temp = size[1];
+       result = result | (temp << 48);
+       temp = size[2];
+       result = result | (temp << 40);
+       temp = size[3];
+       result = result | (temp << 32);
+       temp = size[4];
+       result = result | (temp << 24);
+       temp = size[5];
+       result = result | (temp << 16);
+       temp = size[6];
+       result = result | (temp << 8);
+       result = result | size[7];
+
+       _mmcam_dbg_log("result : %llu", result);
 
        return result;
 }
@@ -568,24 +690,58 @@ gboolean _mmcamcorder_update_composition_matrix(FILE *f, int orientation)
 }
 
 
-int _mmcamcorder_get_freespace(const gchar *path, guint64 *free_space)
+int _mmcamcorder_get_freespace(const gchar *path, const gchar *root_directory, guint64 *free_space)
 {
-       struct statfs fs;
+       int ret = 0;
+       struct statvfs vfs;
 
-       g_assert(path);
+       int is_internal = TRUE;
+       struct stat stat_path;
+       struct stat stat_root;
 
-       if (!g_file_test(path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-               _mmcam_dbg_log("File(%s) doesn't exist.", path);
-               return -2;
+       if (path == NULL || free_space == NULL) {
+               _mmcam_dbg_err("invalid parameter %p, %p", path, free_space);
+               return -1;
        }
 
-       if (-1 == statfs(path, &fs)) {
-               _mmcam_dbg_log("statfs failed.(%s)", path);
-               return -1;
+       if (root_directory && strlen(root_directory) > 0) {
+               if (stat(path, &stat_path) != 0) {
+                       *free_space = 0;
+                       _mmcam_dbg_err("failed to stat for [%s][errno %d]", path, errno);
+                       return -1;
+               }
+
+               if (stat(root_directory, &stat_root) != 0) {
+                       *free_space = 0;
+                       _mmcam_dbg_err("failed to stat for [%s][errno %d]", root_directory, errno);
+                       return -1;
+               }
+
+               if (stat_path.st_dev != stat_root.st_dev) {
+                       is_internal = FALSE;
+               }
+       } else {
+               _mmcam_dbg_warn("root_directory is NULL, assume that it's internal storage.");
        }
 
-       *free_space = (guint64)fs.f_bsize * fs.f_bavail;
-       return 1;
+       if (is_internal) {
+               ret = storage_get_internal_memory_size(&vfs);
+       } else {
+               ret = storage_get_external_memory_size(&vfs);
+       }
+
+       if (ret < 0) {
+               *free_space = 0;
+               _mmcam_dbg_err("failed to get memory size [%s]", path);
+               return -1;
+       } else {
+               *free_space = vfs.f_bsize * vfs.f_bavail;
+               /*
+               _mmcam_dbg_log("vfs.f_bsize [%lu], vfs.f_bavail [%lu]", vfs.f_bsize, vfs.f_bavail);
+               _mmcam_dbg_log("memory size %llu [%s]", *free_space, path);
+               */
+               return 1;
+       }
 }
 
 
@@ -610,67 +766,97 @@ int _mmcamcorder_get_file_system_type(const gchar *path, int *file_system_type)
        return 0;
 }
 
-int _mmcamcorder_get_freespace_except_system(guint64 *free_space)
-{
-       double total_space=0;
-       double avail_space=0;
 
+int _mmcamcorder_get_device_flash_brightness(GDBusConnection *conn, int *brightness)
+{
+       int get_value = 0;
        int ret = MM_ERROR_NONE;
-       GVariant *params = NULL, *result = NULL;
-       const char *param_type = "(xx)";
-
-       if ((ret = __gdbus_method_call_sync("org.tizen.system.deviced",
-                                           "/Org/Tizen/System/DeviceD/Storage",
-                                           "org.tizen.system.deviced.storage",
-                                           "getstorage",
-                                           params,
-                                           &result,
-                                           TRUE)) != MM_ERROR_NONE) {
+       GVariant *params = NULL;
+       GVariant *result = NULL;
+
+       ret = __gdbus_method_call_sync(conn, "org.tizen.system.deviced",
+               "/Org/Tizen/System/DeviceD/Led", "org.tizen.system.deviced.Led",
+               "GetBrightnessForCamera", params, &result, TRUE);
+       if (ret != MM_ERROR_NONE) {
                _mmcam_dbg_err("Dbus Call on Client Error");
                return ret;
        }
 
        if (result) {
-               g_variant_get(result, param_type, &total_space, &avail_space);
-               *free_space = (guint64)avail_space;
-               _mmcam_dbg_log("free space [%" G_GUINT64_FORMAT "] ", *free_space);
+               g_variant_get(result, "(i)", &get_value);
+               *brightness = get_value;
+               _mmcam_dbg_log("flash brightness : %d", *brightness);
        } else {
                _mmcam_dbg_err("replied result is null");
                ret = MM_ERROR_CAMCORDER_INTERNAL;
        }
+
        return ret;
 }
 
-int _mmcamcorder_get_device_flash_brightness(int *brightness)
+
+int _mmcamcorder_send_sound_play_message(GDBusConnection *conn, _MMCamcorderGDbusCbInfo *gdbus_info,
+       const char *sample_name, const char *stream_role, const char *volume_gain, int sync_play)
 {
        int get_value = 0;
        int ret = MM_ERROR_NONE;
        GVariant *params = NULL, *result = NULL;
-       const char *param_type = "(i)";
-
-       if ((ret = __gdbus_method_call_sync("org.tizen.system.deviced",
-                                           "/Org/Tizen/System/DeviceD/Led",
-                                           "org.tizen.system.deviced.Led",
-                                           "GetBrightnessForCamera",
-                                           params,
-                                           &result,
-                                           TRUE)) != MM_ERROR_NONE) {
+       guint subs_id = 0;
+
+       if (!conn || !gdbus_info) {
+               _mmcam_dbg_err("Invalid parameter %p %p", conn, gdbus_info);
+               return MM_ERROR_CAMCORDER_INTERNAL;
+       }
+
+       params = g_variant_new("(sss)", sample_name, stream_role, volume_gain);
+       result = g_variant_new("(i)", get_value);
+
+       ret = __gdbus_method_call_sync(conn, "org.pulseaudio.Server",
+               "/org/pulseaudio/SoundPlayer", "org.pulseaudio.SoundPlayer",
+               "SamplePlay", params, &result, TRUE);
+       if (ret != MM_ERROR_NONE) {
                _mmcam_dbg_err("Dbus Call on Client Error");
                return ret;
        }
 
        if (result) {
-               g_variant_get(result, param_type, &get_value);
-               *brightness = get_value;
-               _mmcam_dbg_log("flash brightness : %d", *brightness);
+               g_variant_get(result, "(i)", &get_value);
+               _mmcam_dbg_log("played index : %d", get_value);
        } else {
                _mmcam_dbg_err("replied result is null");
-               ret = MM_ERROR_CAMCORDER_INTERNAL;
+               return MM_ERROR_CAMCORDER_INTERNAL;
+       }
+
+       g_mutex_lock(&gdbus_info->sync_mutex);
+
+       if (gdbus_info->subscribe_id > 0) {
+               _mmcam_dbg_warn("subscribe_id[%u] is remained. remove it.", gdbus_info->subscribe_id);
+
+               g_dbus_connection_signal_unsubscribe(conn, gdbus_info->subscribe_id);
+
+               gdbus_info->subscribe_id = 0;
+       }
+
+       gdbus_info->is_playing = TRUE;
+       gdbus_info->param = get_value;
+
+       ret = __gdbus_subscribe_signal(conn,
+               "/org/pulseaudio/SoundPlayer", "org.pulseaudio.SoundPlayer", "EOS",
+               __gdbus_stream_eos_cb, &subs_id, gdbus_info);
+
+       if (ret == MM_ERROR_NONE)
+               gdbus_info->subscribe_id = subs_id;
+
+       g_mutex_unlock(&gdbus_info->sync_mutex);
+
+       if (sync_play && ret == MM_ERROR_NONE) {
+               ret = __gdbus_wait_for_cb_return(gdbus_info, G_DBUS_CB_TIMEOUT_MSEC);
        }
 
        return ret;
 }
 
+
 int _mmcamcorder_get_file_size(const char *filename, guint64 *size)
 {
        struct stat buf;
@@ -717,7 +903,7 @@ void _mmcamcorder_remove_buffer_probe(MMHandleType handle, _MMCamcorderHandlerCa
 
                        list = g_list_next(list);
                        hcamcorder->buffer_probes = g_list_remove(hcamcorder->buffer_probes, item);
-                       SAFE_FREE(item);
+                       SAFE_G_FREE(item);
                } else {
                        _mmcam_dbg_log("Skip item : [ID : %lu], [Category : %x] ", item->handler_id, item->category);
                        list = g_list_next(list);
@@ -770,7 +956,7 @@ void _mmcamcorder_remove_one_buffer_probe(MMHandleType handle, void *object)
 
                        list = g_list_next(list);
                        hcamcorder->buffer_probes = g_list_remove(hcamcorder->buffer_probes, item);
-                       SAFE_FREE(item);
+                       SAFE_G_FREE(item);
 
                        break;
                } else {
@@ -820,7 +1006,7 @@ void _mmcamcorder_remove_event_probe(MMHandleType handle, _MMCamcorderHandlerCat
 
                        list = g_list_next(list);
                        hcamcorder->event_probes = g_list_remove(hcamcorder->event_probes, item);
-                       SAFE_FREE(item);
+                       SAFE_G_FREE(item);
                } else {
                        _mmcam_dbg_log("Skip item : [ID : %lu], [Category : %x] ", item->handler_id, item->category);
                        list = g_list_next(list);
@@ -878,7 +1064,7 @@ void _mmcamcorder_disconnect_signal(MMHandleType handle, _MMCamcorderHandlerCate
 
                        list = g_list_next(list);
                        hcamcorder->signals = g_list_remove(hcamcorder->signals, item);
-                       SAFE_FREE(item);
+                       SAFE_G_FREE(item);
                } else {
                        _mmcam_dbg_log("Skip item : [ID : %lu], [Category : %x] ", item->handler_id, item->category);
                        list = g_list_next(list);
@@ -949,13 +1135,14 @@ void _mmcamcorder_element_release_noti(gpointer data, GObject *where_the_object_
 }
 
 
-gboolean _mmcamcroder_msg_callback(void *data)
+#ifdef _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK
+gboolean _mmcamcorder_msg_callback(void *data)
 {
        _MMCamcorderMsgItem *item = (_MMCamcorderMsgItem*)data;
        mmf_camcorder_t *hcamcorder = NULL;
        mmf_return_val_if_fail(item, FALSE);
 
-       pthread_mutex_lock(&(item->lock));
+       g_mutex_lock(&item->lock);
 
        hcamcorder = MMF_CAMCORDER(item->handle);
        if (hcamcorder == NULL) {
@@ -991,30 +1178,41 @@ MSG_CALLBACK_DONE:
        if (item->id == MM_MESSAGE_CAMCORDER_FACE_DETECT_INFO) {
                MMCamFaceDetectInfo *cam_fd_info = (MMCamFaceDetectInfo *)item->param.data;
                if (cam_fd_info) {
-                       SAFE_FREE(cam_fd_info->face_info);
-                       free(cam_fd_info);
-                       cam_fd_info = NULL;
-               }
+                       SAFE_G_FREE(cam_fd_info->face_info);
+                       SAFE_G_FREE(cam_fd_info);
 
-               item->param.data = NULL;
-               item->param.size = 0;
+                       item->param.data = NULL;
+                       item->param.size = 0;
+               }
+       } else if (item->id == MM_MESSAGE_CAMCORDER_VIDEO_CAPTURED ||
+                  item->id == MM_MESSAGE_CAMCORDER_AUDIO_CAPTURED) {
+               MMCamRecordingReport *report = (MMCamRecordingReport *)item->param.data;
+               if (report) {
+                       if (report->recording_filename) {
+                               SAFE_G_FREE(report->recording_filename);
+                       }
+                       SAFE_G_FREE(report);
+                       item->param.data = NULL;
+               }
        }
 
-       pthread_mutex_unlock(&(item->lock));
-       pthread_mutex_destroy(&(item->lock));
+       g_mutex_unlock(&item->lock);
+       g_mutex_clear(&item->lock);
 
-       free(item);
-       item = NULL;
+       SAFE_G_FREE(item);
 
        /* For not being called again */
        return FALSE;
 }
+#endif /* _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK */
 
 
-gboolean _mmcamcroder_send_message(MMHandleType handle, _MMCamcorderMsgItem *data)
+gboolean _mmcamcorder_send_message(MMHandleType handle, _MMCamcorderMsgItem *data)
 {
        mmf_camcorder_t* hcamcorder = MMF_CAMCORDER(handle);
+#ifdef _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK
        _MMCamcorderMsgItem *item = NULL;
+#endif /* _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK */
 
        mmf_return_val_if_fail(hcamcorder, FALSE);
        mmf_return_val_if_fail(data, FALSE);
@@ -1023,6 +1221,7 @@ gboolean _mmcamcroder_send_message(MMHandleType handle, _MMCamcorderMsgItem *dat
        {
                case MM_MESSAGE_CAMCORDER_STATE_CHANGED:
                case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_ASM:
+               case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_RM:
                        data->param.union_type = MM_MSG_UNION_STATE;
                        break;
                case MM_MESSAGE_CAMCORDER_RECORDING_STATUS:
@@ -1048,49 +1247,76 @@ gboolean _mmcamcroder_send_message(MMHandleType handle, _MMCamcorderMsgItem *dat
                        break;
        }
 
+#ifdef _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK
        item = g_malloc(sizeof(_MMCamcorderMsgItem));
        if (item) {
                memcpy(item, data, sizeof(_MMCamcorderMsgItem));
                item->handle = handle;
-               pthread_mutex_init(&(item->lock), NULL);
+               g_mutex_init(&item->lock);
 
                _MMCAMCORDER_LOCK(handle);
                hcamcorder->msg_data = g_list_append(hcamcorder->msg_data, item);
-//             _mmcam_dbg_log("item[%p]", item);
+               /*_mmcam_dbg_log("item[%p]", item);*/
 
                /* Use DEFAULT priority */
-               g_idle_add_full(G_PRIORITY_DEFAULT, _mmcamcroder_msg_callback, item, NULL);
+               g_idle_add_full(G_PRIORITY_DEFAULT, _mmcamcorder_msg_callback, item, NULL);
 
                _MMCAMCORDER_UNLOCK(handle);
        } else {
                _mmcam_dbg_err("item[id:0x%x] malloc failed : %d", data->id, sizeof(_MMCamcorderMsgItem));
        }
+#else /* _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK */
+       _MMCAMCORDER_LOCK_MESSAGE_CALLBACK(hcamcorder);
+
+       if (hcamcorder->msg_cb) {
+               hcamcorder->msg_cb(data->id, (MMMessageParamType*)(&(data->param)), hcamcorder->msg_cb_param);
+       } else {
+               _mmcam_dbg_log("message callback is NULL. message id %d", data->id);
+       }
+
+       _MMCAMCORDER_UNLOCK_MESSAGE_CALLBACK(hcamcorder);
+
+       /* release allocated memory */
+       if (data->id == MM_MESSAGE_CAMCORDER_FACE_DETECT_INFO) {
+               MMCamFaceDetectInfo *cam_fd_info = (MMCamFaceDetectInfo *)data->param.data;
+               if (cam_fd_info) {
+                       SAFE_G_FREE(cam_fd_info->face_info);
+                       SAFE_G_FREE(cam_fd_info);
+                       data->param.size = 0;
+               }
+       } else if (data->id == MM_MESSAGE_CAMCORDER_VIDEO_CAPTURED ||
+                  data->id == MM_MESSAGE_CAMCORDER_AUDIO_CAPTURED) {
+               MMCamRecordingReport *report = (MMCamRecordingReport *)data->param.data;
+               if (report) {
+                       SAFE_G_FREE(report->recording_filename);
+                       data->param.data = NULL;
+               }
+               SAFE_G_FREE(report);
+       }
+#endif /* _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK */
 
        return TRUE;
 }
 
 
-void _mmcamcroder_remove_message_all(MMHandleType handle)
+void _mmcamcorder_remove_message_all(MMHandleType handle)
 {
        mmf_camcorder_t* hcamcorder = MMF_CAMCORDER(handle);
-       _MMCamcorderMsgItem *item = NULL;
        gboolean ret = TRUE;
+#ifdef _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK
+       _MMCamcorderMsgItem *item = NULL;
        GList *list = NULL;
-       struct timespec timeout;
-       struct timeval tv;
-       struct timeval tv_to_add;
-       struct timeval tv_result;
+       gint64 end_time = 0;
+#endif /* _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK */
 
        mmf_return_if_fail(hcamcorder);
 
        _MMCAMCORDER_LOCK(handle);
 
+#ifdef _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK
        if (!hcamcorder->msg_data) {
                _mmcam_dbg_log("No message data is remained.");
        } else {
-               tv_to_add.tv_sec = 0;
-               tv_to_add.tv_usec = 1000 * 100; /* 100 ms */
-
                list = hcamcorder->msg_data;
 
                while (list) {
@@ -1100,7 +1326,7 @@ void _mmcamcroder_remove_message_all(MMHandleType handle)
                        if (!item) {
                                _mmcam_dbg_err("Fail to remove message. The item is NULL");
                        } else {
-                               if (pthread_mutex_trylock(&(item->lock))) {
+                               if (g_mutex_trylock(&(item->lock))) {
                                        ret = g_idle_remove_by_data(item);
 
                                        _mmcam_dbg_log("remove msg item[%p], ret[%d]", item, ret);
@@ -1114,36 +1340,36 @@ void _mmcamcroder_remove_message_all(MMHandleType handle)
                                        if (item->id == MM_MESSAGE_CAMCORDER_FACE_DETECT_INFO) {
                                                MMCamFaceDetectInfo *cam_fd_info = (MMCamFaceDetectInfo *)item->param.data;
                                                if (cam_fd_info) {
-                                                       SAFE_FREE(cam_fd_info->face_info);
-                                                       free(cam_fd_info);
-                                                       cam_fd_info = NULL;
+                                                       SAFE_G_FREE(cam_fd_info->face_info);
+                                                       item->param.size = 0;
                                                }
-
-                                               item->param.data = NULL;
-                                               item->param.size = 0;
+                                               SAFE_G_FREE(cam_fd_info);
+                                       } else if (item->id == MM_MESSAGE_CAMCORDER_VIDEO_CAPTURED ||
+                                                  item->id == MM_MESSAGE_CAMCORDER_AUDIO_CAPTURED) {
+                                               MMCamRecordingReport *report = (MMCamRecordingReport *)item->param.data;
+                                               if (report) {
+                                                       SAFE_G_FREE(report->recording_filename);
+                                               }
+                                               SAFE_G_FREE(report);
                                        }
 
                                        hcamcorder->msg_data = g_list_remove(hcamcorder->msg_data, item);
 
-                                       pthread_mutex_unlock(&(item->lock));
+                                       g_mutex_unlock(&(item->lock));
 
                                        if (ret == TRUE) {
-                                               pthread_mutex_destroy(&(item->lock));
+                                               g_mutex_clear(&item->lock);
 
-                                               free(item);
-                                               item = NULL;
+                                               SAFE_G_FREE(item);
 
                                                _mmcam_dbg_log("remove msg done");
                                        }
                                } else {
                                        _mmcam_dbg_warn("item lock failed. it's being called...");
 
-                                       gettimeofday(&tv, NULL);
-                                       timeradd(&tv, &tv_to_add, &tv_result);
-                                       timeout.tv_sec = tv_result.tv_sec;
-                                       timeout.tv_nsec = tv_result.tv_usec * 1000;
+                                       end_time = g_get_monotonic_time() + (100 * G_TIME_SPAN_MILLISECOND);
 
-                                       if (_MMCAMCORDER_TIMED_WAIT(handle, timeout)) {
+                                       if (_MMCAMCORDER_WAIT_UNTIL(handle, end_time)) {
                                                _mmcam_dbg_warn("signal received");
                                        } else {
                                                _mmcam_dbg_warn("timeout");
@@ -1155,6 +1381,7 @@ void _mmcamcroder_remove_message_all(MMHandleType handle)
                g_list_free(hcamcorder->msg_data);
                hcamcorder->msg_data = NULL;
        }
+#endif /* _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK */
 
        /* remove idle function for playing capture sound */
        do {
@@ -1417,7 +1644,7 @@ gboolean _mmcamcorder_link_elements(GList *element_list)
 
        while (local_list) {
                element = (_MMCamcorderGstElement*)local_list->data;
-               if (element && element->gst) {
+               if (pre_element && pre_element->gst && element && element->gst) {
                        if (_MM_GST_ELEMENT_LINK(GST_ELEMENT(pre_element->gst), GST_ELEMENT(element->gst))) {
                                _mmcam_dbg_log("Link [%s] to [%s] OK",
                                               GST_ELEMENT_NAME(GST_ELEMENT(pre_element->gst)),
@@ -1437,9 +1664,8 @@ gboolean _mmcamcorder_link_elements(GList *element_list)
        return TRUE;
 }
 
-
 gboolean _mmcamcorder_resize_frame(unsigned char *src_data, unsigned int src_width, unsigned int src_height, unsigned int src_length, int src_format,
-                                   unsigned char **dst_data, unsigned int *dst_width, unsigned int *dst_height, unsigned int *dst_length)
+       unsigned char **dst_data, unsigned int *dst_width, unsigned int *dst_height, unsigned int *dst_length)
 {
        int ret = TRUE;
        int mm_ret = MM_ERROR_NONE;
@@ -1512,71 +1738,67 @@ gboolean _mmcamcorder_resize_frame(unsigned char *src_data, unsigned int src_wid
 
 
 gboolean _mmcamcorder_encode_jpeg(void *src_data, unsigned int src_width, unsigned int src_height,
-                                 int src_format, unsigned int src_length, unsigned int jpeg_quality,
-                                 void **result_data, unsigned int *result_length)
+       int src_format, unsigned int src_length, unsigned int jpeg_quality,
+       void **result_data, unsigned int *result_length)
 {
        int ret = 0;
        gboolean ret_conv = TRUE;
-       guint32 src_fourcc = 0;
        int jpeg_format = 0;
        unsigned char *converted_src = NULL;
        unsigned int converted_src_size = 0;
 
        mmf_return_val_if_fail(src_data && result_data && result_length, FALSE);
 
-       src_fourcc = _mmcamcorder_get_fourcc(src_format, 0, FALSE);
-
        switch (src_format) {
-               case MM_PIXEL_FORMAT_NV12:
-                       //jpeg_format = MM_UTIL_JPEG_FMT_NV12;
-                       ret_conv = _mmcamcorder_convert_NV12_to_I420(src_data,src_width,src_height,&converted_src,&converted_src_size);
-                       jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
-                       break;
-               case MM_PIXEL_FORMAT_NV16:
-                       jpeg_format = MM_UTIL_JPEG_FMT_NV16;
-                       converted_src = src_data;
-                       break;
-               case MM_PIXEL_FORMAT_NV21:
-                       jpeg_format = MM_UTIL_JPEG_FMT_NV21;
-                       converted_src = src_data;
-                       break;
-               case MM_PIXEL_FORMAT_YUYV:
-                       //jpeg_format = MM_UTIL_JPEG_FMT_YUYV;
-                       ret_conv = _mmcamcorder_convert_YUYV_to_I420(src_data,src_width,src_height,&converted_src,&converted_src_size);
-                       jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
-                       break;
-               case MM_PIXEL_FORMAT_UYVY:
-                       //jpeg_format = MM_UTIL_JPEG_FMT_UYVY;
-                       ret_conv = _mmcamcorder_convert_UYVY_to_I420(src_data,src_width,src_height,&converted_src,&converted_src_size);
-                       jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
-                       break;
-               case MM_PIXEL_FORMAT_I420:
-                       jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
-                       converted_src = src_data;
-                       break;
-               case MM_PIXEL_FORMAT_RGB888:
-                       jpeg_format = MM_UTIL_JPEG_FMT_RGB888;
-                       converted_src = src_data;
-                       break;
-               case MM_PIXEL_FORMAT_RGBA:
-                       jpeg_format = MM_UTIL_JPEG_FMT_RGBA8888;
-                       converted_src = src_data;
-                       break;
-               case MM_PIXEL_FORMAT_ARGB:
-                       jpeg_format = MM_UTIL_JPEG_FMT_ARGB8888;
-                       converted_src = src_data;
-                       break;
-               case MM_PIXEL_FORMAT_422P:
-                       jpeg_format = MM_UTIL_JPEG_FMT_YUV422;  // not supported
-                       return FALSE;
-               case MM_PIXEL_FORMAT_NV12T:
-               case MM_PIXEL_FORMAT_YV12:
-               case MM_PIXEL_FORMAT_RGB565:
-               case MM_PIXEL_FORMAT_ENCODED:
-               case MM_PIXEL_FORMAT_ITLV_JPEG_UYVY:
-               default:
-                       return FALSE;
-
+       case MM_PIXEL_FORMAT_NV12:
+               //jpeg_format = MM_UTIL_JPEG_FMT_NV12;
+               ret_conv = _mmcamcorder_convert_NV12_to_I420(src_data,src_width,src_height,&converted_src,&converted_src_size);
+               jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
+               break;
+       case MM_PIXEL_FORMAT_NV16:
+               jpeg_format = MM_UTIL_JPEG_FMT_NV16;
+               converted_src = src_data;
+               break;
+       case MM_PIXEL_FORMAT_NV21:
+               jpeg_format = MM_UTIL_JPEG_FMT_NV21;
+               converted_src = src_data;
+               break;
+       case MM_PIXEL_FORMAT_YUYV:
+               //jpeg_format = MM_UTIL_JPEG_FMT_YUYV;
+               ret_conv = _mmcamcorder_convert_YUYV_to_I420(src_data,src_width,src_height,&converted_src,&converted_src_size);
+               jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
+               break;
+       case MM_PIXEL_FORMAT_UYVY:
+               //jpeg_format = MM_UTIL_JPEG_FMT_UYVY;
+               ret_conv = _mmcamcorder_convert_UYVY_to_I420(src_data,src_width,src_height,&converted_src,&converted_src_size);
+               jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
+               break;
+       case MM_PIXEL_FORMAT_I420:
+               jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
+               converted_src = src_data;
+               break;
+       case MM_PIXEL_FORMAT_RGB888:
+               jpeg_format = MM_UTIL_JPEG_FMT_RGB888;
+               converted_src = src_data;
+               break;
+       case MM_PIXEL_FORMAT_RGBA:
+               jpeg_format = MM_UTIL_JPEG_FMT_RGBA8888;
+               converted_src = src_data;
+               break;
+       case MM_PIXEL_FORMAT_ARGB:
+               jpeg_format = MM_UTIL_JPEG_FMT_ARGB8888;
+               converted_src = src_data;
+               break;
+       case MM_PIXEL_FORMAT_422P:
+               jpeg_format = MM_UTIL_JPEG_FMT_YUV422;  // not supported
+               return FALSE;
+       case MM_PIXEL_FORMAT_NV12T:
+       case MM_PIXEL_FORMAT_YV12:
+       case MM_PIXEL_FORMAT_RGB565:
+       case MM_PIXEL_FORMAT_ENCODED:
+       case MM_PIXEL_FORMAT_ITLV_JPEG_UYVY:
+       default:
+               return FALSE;
        }
 
        if (ret_conv == FALSE) {
@@ -1609,7 +1831,7 @@ gboolean _mmcamcorder_encode_jpeg(void *src_data, unsigned int src_width, unsign
 
 /* make UYVY smaller as multiple size. ex: 640x480 -> 320x240 or 160x120 ... */
 gboolean _mmcamcorder_downscale_UYVYorYUYV(unsigned char *src, unsigned int src_width, unsigned int src_height,
-                                           unsigned char **dst, unsigned int dst_width, unsigned int dst_height)
+       unsigned char **dst, unsigned int dst_width, unsigned int dst_height)
 {
        unsigned int i = 0;
        int j = 0;
@@ -1667,13 +1889,6 @@ gboolean _mmcamcorder_downscale_UYVYorYUYV(unsigned char *src, unsigned int src_
        return TRUE;
 }
 
-gboolean _mmcamcorder_check_file_path(const gchar *path)
-{
-       if(strstr(path, "/opt/usr") != NULL) {
-               return TRUE;
-       }
-       return FALSE;
-}
 
 static guint16 get_language_code(const char *str)
 {
@@ -1728,28 +1943,60 @@ void *_mmcamcorder_util_task_thread_func(void *data)
 
        _mmcam_dbg_warn("start thread");
 
-       pthread_mutex_lock(&(hcamcorder->task_thread_lock));
+       g_mutex_lock(&hcamcorder->task_thread_lock);
 
        while (hcamcorder->task_thread_state != _MMCAMCORDER_TASK_THREAD_STATE_EXIT) {
                switch (hcamcorder->task_thread_state) {
                case _MMCAMCORDER_TASK_THREAD_STATE_NONE:
                        _mmcam_dbg_warn("wait for task signal");
-                       pthread_cond_wait(&(hcamcorder->task_thread_cond), &(hcamcorder->task_thread_lock));
+                       g_cond_wait(&hcamcorder->task_thread_cond, &hcamcorder->task_thread_lock);
                        _mmcam_dbg_warn("task signal received : state %d", hcamcorder->task_thread_state);
                        break;
                case _MMCAMCORDER_TASK_THREAD_STATE_SOUND_PLAY_START:
-                       _mmcamcorder_sound_play((MMHandleType)hcamcorder, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE, FALSE);
+                       _mmcamcorder_sound_play((MMHandleType)hcamcorder, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE02, FALSE);
+                       hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_NONE;
+                       break;
+               case _MMCAMCORDER_TASK_THREAD_STATE_SOUND_SOLO_PLAY_START:
+                       _mmcamcorder_sound_solo_play((MMHandleType)hcamcorder, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE01, FALSE);
                        hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_NONE;
                        break;
                case _MMCAMCORDER_TASK_THREAD_STATE_ENCODE_PIPE_CREATE:
                        ret = _mmcamcorder_video_prepare_record((MMHandleType)hcamcorder);
 
                        /* Play record start sound */
-                       _mmcamcorder_sound_solo_play((MMHandleType)hcamcorder, _MMCAMCORDER_FILEPATH_REC_START_SND, FALSE);
+                       _mmcamcorder_sound_solo_play((MMHandleType)hcamcorder, _MMCAMCORDER_SAMPLE_SOUND_NAME_REC_START, FALSE);
 
                        _mmcam_dbg_log("_mmcamcorder_video_prepare_record return 0x%x", ret);
                        hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_NONE;
                        break;
+               case _MMCAMCORDER_TASK_THREAD_STATE_CHECK_CAPTURE_IN_RECORDING:
+                       {
+                               gint64 end_time = 0;
+
+                               _mmcam_dbg_warn("wait for capture data in recording. wait signal...");
+
+                               end_time = g_get_monotonic_time() + (5 * G_TIME_SPAN_SECOND);
+
+                               if (g_cond_wait_until(&hcamcorder->task_thread_cond, &hcamcorder->task_thread_lock, end_time)) {
+                                       _mmcam_dbg_warn("signal received");
+                               } else {
+                                       _MMCamcorderMsgItem message;
+
+                                       memset(&message, 0x0, sizeof(_MMCamcorderMsgItem));
+
+                                       _mmcam_dbg_err("capture data wait time out, send error message");
+
+                                       message.id = MM_MESSAGE_CAMCORDER_ERROR;
+                                       message.param.code = MM_ERROR_CAMCORDER_RESPONSE_TIMEOUT;
+
+                                       _mmcamcorder_send_message((MMHandleType)hcamcorder, &message);
+
+                                       hcamcorder->capture_in_recording = FALSE;
+                               }
+
+                               hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_NONE;
+                       }
+                       break;
                default:
                        _mmcam_dbg_warn("invalid task thread state %d", hcamcorder->task_thread_state);
                        hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_EXIT;
@@ -1757,7 +2004,7 @@ void *_mmcamcorder_util_task_thread_func(void *data)
                }
        }
 
-       pthread_mutex_unlock(&(hcamcorder->task_thread_lock));
+       g_mutex_unlock(&hcamcorder->task_thread_lock);
 
        _mmcam_dbg_warn("exit thread");
 
@@ -1999,4 +2246,3 @@ static gboolean _mmcamcorder_convert_NV12_to_I420(unsigned char *src, guint widt
 
        return TRUE;
 }
-