X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmm_camcorder_util.c;h=6414afd9c60f2c7f8c49f5020bc56794297aae4f;hb=6012f7ec5032f940e8446a7aec9a9ee001ba05c6;hp=3c0b1a33c2f66bced6b375ba30456b11a20e0387;hpb=dbe5026107e9f3bf131bef297b6814c21bcab5e6;p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git diff --git a/src/mm_camcorder_util.c b/src/mm_camcorder_util.c index 3c0b1a3..6414afd 100644 --- a/src/mm_camcorder_util.c +++ b/src/mm_camcorder_util.c @@ -30,7 +30,6 @@ #include #include #include -#include #include "mm_camcorder_internal.h" #include "mm_camcorder_util.h" @@ -38,8 +37,6 @@ #include #include -#include - /*----------------------------------------------------------------------- | GLOBAL VARIABLE DEFINITIONS for internal | -----------------------------------------------------------------------*/ @@ -50,22 +47,20 @@ #define TIME_STRING_MAX_LEN 64 #define __MMCAMCORDER_CAPTURE_WAIT_TIMEOUT 5 -#define FPUTC_CHECK(x_char, x_file)\ -{\ - if (fputc(x_char, x_file) == EOF) \ - {\ - _mmcam_dbg_err("[Critical] fputc() returns fail.\n"); \ - return FALSE;\ - }\ +#define FPUTC_CHECK(x_char, x_file) \ +{ \ + if (fputc(x_char, x_file) == EOF) { \ + _mmcam_dbg_err("[Critical] fputc() returns fail.\n"); \ + return FALSE; \ + } \ } -#define FPUTS_CHECK(x_str, x_file)\ -{\ - if (fputs(x_str, x_file) == EOF) \ - {\ - _mmcam_dbg_err("[Critical] fputs() returns fail.\n");\ - SAFE_FREE(str); \ - return FALSE;\ - }\ +#define FPUTS_CHECK(x_str, x_file) \ +{ \ + if (fputs(x_str, x_file) == EOF) { \ + _mmcam_dbg_err("[Critical] fputs() returns fail.\n"); \ + SAFE_G_FREE(str); \ + return FALSE; \ + } \ } /*--------------------------------------------------------------------------- @@ -73,7 +68,7 @@ ---------------------------------------------------------------------------*/ /* STATIC INTERNAL FUNCTION */ -//static gint skip_mdat(FILE *f); +//static gint skip_mdat(FILE *f); static guint16 get_language_code(const char *str); static gchar* str_to_utf8(const gchar *str); static inline gboolean write_tag(FILE *f, const gchar *tag); @@ -91,43 +86,31 @@ static gboolean _mmcamcorder_convert_NV12_to_I420(unsigned char *src, guint widt /*=========================================================================================== | | | FUNCTION DEFINITIONS | -| | +| | ========================================================================================== */ /*--------------------------------------------------------------------------- | 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) { - 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; @@ -136,44 +119,113 @@ 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); } - g_object_unref(conn); + 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 int __storage_device_supported_cb(int storage_id, storage_type_e type, storage_state_e state, const char *path, void *user_data) +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) { - char **root_directory = (char **)user_data; + int played_idx = 0; + _MMCamcorderGDbusCbInfo *gdbus_info = NULL; - if (root_directory == NULL) { - _mmcam_dbg_warn("user data is NULL"); - return FALSE; + _mmcam_dbg_log("entered"); + + if (!param || !user_data) { + _mmcam_dbg_err("invalid parameter %p %p", param, user_data); + return; } - _mmcam_dbg_log("storage id %d, type %d, state %d, path %s", - storage_id, type, state, path ? path : "NULL"); + gdbus_info = (_MMCamcorderGDbusCbInfo *)user_data; - if (type == STORAGE_TYPE_INTERNAL && path) { - if (*root_directory) { - free(*root_directory); - *root_directory = NULL; - } + g_variant_get(param, "(i)", &played_idx); - *root_directory = strdup(path); - if (*root_directory) { - _mmcam_dbg_log("get root directory %s", *root_directory); - return FALSE; - } else { - _mmcam_dbg_warn("strdup %s failed"); - } + 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); } - return TRUE; + 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_mutex_unlock(&gdbus_info->sync_mutex); + + return ret; } @@ -188,9 +240,8 @@ gint _mmcamcorder_find_tag(FILE *f, guint32 tag_fourcc, gboolean do_rewind) size_t read_item = 0; guchar buf[8]; - if (do_rewind) { + if (do_rewind) rewind(f); - } while ((read_item = fread(&buf, sizeof(guchar), 8, f)) > 0) { uint64_t buf_size = 0; @@ -212,7 +263,7 @@ gint _mmcamcorder_find_tag(FILE *f, guint32 tag_fourcc, gboolean do_rewind) buf_size = _mmcamcorder_get_container_size(buf); /* if size of mdat is 1, it means largesize is used.(bigger than 4GB) */ - if (buf_fourcc == MMCAM_FOURCC('m','d','a','t') && + if (buf_fourcc == MMCAM_FOURCC('m', 'd', 'a', 't') && buf_size == 1) { read_item = fread(&buf, sizeof(guchar), 8, f); if (read_item < 8) { @@ -244,9 +295,8 @@ gboolean _mmcamcorder_find_fourcc(FILE *f, guint32 tag_fourcc, gboolean do_rewin size_t read_item = 0; guchar buf[8]; - if (do_rewind) { + if (do_rewind) rewind(f); - } while ((read_item = fread(&buf, sizeof(guchar), 8, f)) > 0) { uint64_t buf_size = 0; @@ -262,20 +312,19 @@ 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 = _mmcamcorder_get_container_size(buf); /* if size of mdat is 1, it means largesize is used.(bigger than 4GB) */ - if (buf_fourcc == MMCAM_FOURCC('m','d','a','t') && + if (buf_fourcc == MMCAM_FOURCC('m', 'd', 'a', 't') && buf_size == 1) { read_item = fread(&buf, sizeof(guchar), 8, f); if (read_item < 8) { @@ -305,8 +354,7 @@ 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(fseeko(f, prev_pos, SEEK_SET) != 0) - { + if (fseeko(f, prev_pos, SEEK_SET) != 0) { _mmcam_dbg_err("fseeko() fail"); return FALSE; } @@ -314,8 +362,7 @@ gboolean _mmcamcorder_update_size(FILE *f, gint64 prev_pos, gint64 curr_pos) if (!write_to_32(f, curr_pos -prev_pos)) return FALSE; - if(fseeko(f, curr_pos, SEEK_SET) != 0) - { + if (fseeko(f, curr_pos, SEEK_SET) != 0) { _mmcam_dbg_err("fseeko() fail"); return FALSE; } @@ -330,112 +377,110 @@ gboolean _mmcamcorder_write_loci(FILE *f, _MMCamcorderLocationInfo info) _mmcam_dbg_log(""); - if((pos = ftello(f))<0) - { + if ((pos = ftello(f)) < 0) { _mmcam_dbg_err("ftello() returns negative value"); return FALSE; } - if(!write_to_32(f, 0)) //size + if (!write_to_32(f, 0)) //size return FALSE; - if(!write_tag(f, "loci")) // type + if (!write_tag(f, "loci")) // type return FALSE; FPUTC_CHECK(0, f); // version - if(!write_to_24(f, 0)) // flags + if (!write_to_24(f, 0)) // flags return FALSE; - if(!write_to_16(f, get_language_code("eng"))) // language + if (!write_to_16(f, get_language_code("eng"))) // language return FALSE; 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 - if(!write_to_32(f, info.longitude)) // Longitude + if (!write_to_32(f, info.longitude)) // Longitude return FALSE; - if(!write_to_32(f, info.latitude)) // Latitude + if (!write_to_32(f, info.latitude)) // Latitude return FALSE; - if(! write_to_32(f, info.altitude)) // Altitude + if (!write_to_32(f, info.altitude)) // Altitude return FALSE; 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 = ftello(f))<0) - { + if ((current_pos = ftello(f)) < 0) { _mmcam_dbg_err("ftello() returns negative value"); return FALSE; } - if(! _mmcamcorder_update_size(f, pos, current_pos)) + if (!_mmcamcorder_update_size(f, pos, current_pos)) return FALSE; return TRUE; } -void _mmcamcorder_write_Latitude(FILE *f,int value) { +void _mmcamcorder_write_Latitude(FILE *f, int value) +{ char s_latitude[9]; int l_decimal = 0; int l_below_decimal = 0; l_decimal = value / 10000; if (value < 0) { - if( l_decimal == 0) { + if (l_decimal == 0) snprintf(s_latitude, 5, "-%.2d.", l_decimal); - } else { + else snprintf(s_latitude, 5, "%.2d.", l_decimal); - } } else { snprintf(s_latitude, 5, "+%.2d.", l_decimal); } l_below_decimal = value - (l_decimal * 10000); - if (l_below_decimal < 0) { + if (l_below_decimal < 0) l_below_decimal = -l_below_decimal; - } + snprintf(&s_latitude[4], 5, "%.4d", l_below_decimal); write_tag(f, s_latitude); } -void _mmcamcorder_write_Longitude(FILE *f,int value) { +void _mmcamcorder_write_Longitude(FILE *f, int value) +{ char s_longitude[10]; int l_decimal = 0; int l_below_decimal = 0; l_decimal = value / 10000; if (value < 0) { - if( l_decimal == 0) { + if (l_decimal == 0) snprintf(s_longitude, 6, "-%.3d.", l_decimal); - } else { + else snprintf(s_longitude, 6, "%.3d.", l_decimal); - } } else { snprintf(s_longitude, 6, "+%.3d.", l_decimal); } l_below_decimal = value - (l_decimal * 10000); - if (l_below_decimal < 0) { + if (l_below_decimal < 0) l_below_decimal = -l_below_decimal; - } + snprintf(&s_longitude[5], 5, "%.4d", l_below_decimal); write_tag(f, s_longitude); @@ -446,39 +491,37 @@ void _mmcamcorder_write_Longitude(FILE *f,int value) { // 0x15c7 -> encode in english #define D_INFO_GEOGRAPH 0x001215c7 -gboolean _mmcamcorder_write_geodata(FILE *f,_MMCamcorderLocationInfo info) { - +gboolean _mmcamcorder_write_geodata(FILE *f, _MMCamcorderLocationInfo info) +{ gint64 current_pos, pos; _mmcam_dbg_log(""); - if((pos = ftello(f))<0) - { + if ((pos = ftello(f)) < 0) { _mmcam_dbg_err("ftello() returns negative value"); return FALSE; } - if(!write_to_32(f, 0)) //size + if (!write_to_32(f, 0)) //size return FALSE; // tag -> .xyz - if(!write_tag(f, D_GEOGRAPH)) // type + if (!write_tag(f, D_GEOGRAPH)) // type return FALSE; - if(!write_to_32(f, D_INFO_GEOGRAPH)) + if (!write_to_32(f, D_INFO_GEOGRAPH)) return FALSE; - _mmcamcorder_write_Latitude(f,info.latitude); - _mmcamcorder_write_Longitude(f,info.longitude); + _mmcamcorder_write_Latitude(f, info.latitude); + _mmcamcorder_write_Longitude(f, info.longitude); FPUTC_CHECK(0x2F, f); - if((current_pos = ftello(f))<0) - { + if ((current_pos = ftello(f)) < 0) { _mmcam_dbg_err("ftello() returns negative value"); return FALSE; } - if(! _mmcamcorder_update_size(f, pos, current_pos)) + if (!_mmcamcorder_update_size(f, pos, current_pos)) return FALSE; return TRUE; @@ -495,7 +538,7 @@ gboolean _mmcamcorder_write_udta(FILE *f, int gps_enable, _MMCamcorderLocationIn return TRUE; } - if ((pos = ftello(f))<0) { + if ((pos = ftello(f)) < 0) { _mmcam_dbg_err("ftello() returns negative value"); return FALSE; } @@ -518,13 +561,13 @@ gboolean _mmcamcorder_write_udta(FILE *f, int gps_enable, _MMCamcorderLocationIn return FALSE; } - if (!_mmcamcorder_write_geodata(f,geotag)) { + if (!_mmcamcorder_write_geodata(f, geotag)) { _mmcam_dbg_err("failed to write geodata"); return FALSE; } } - if ((current_pos = ftello(f))<0) { + if ((current_pos = ftello(f)) < 0) { _mmcam_dbg_err("ftello() returns negative value"); return FALSE; } @@ -627,61 +670,96 @@ gboolean _mmcamcorder_update_composition_matrix(FILE *f, int orientation) write_to_32(f, 0x40000000); _mmcam_dbg_log("orientation : %d, write data 0x%x 0x%x 0x%x 0x%x", - orientation, a, b, c, d); + orientation, a, b, c, d); + + return TRUE; +} + + +static int __mmcamcorder_storage_supported_cb(int storage_id, storage_type_e type, + storage_state_e state, const char *path, void *user_data) +{ + _MMCamcorderStorageInfo *info = (_MMCamcorderStorageInfo *)user_data; + + if (!info) { + _mmcam_dbg_err("NULL info"); + return FALSE; + } + + if (type == info->type) { + info->id = storage_id; + return FALSE; + } return TRUE; } -int _mmcamcorder_get_freespace(const gchar *path, const gchar *root_directory, guint64 *free_space) +int _mmcamcorder_get_storage_info(const gchar *path, const gchar *root_directory, _MMCamcorderStorageInfo *info) { int ret = 0; - int is_internal = 0; - struct statvfs vfs; struct stat stat_path; struct stat stat_root; - if (path == NULL || root_directory == NULL || free_space == NULL) { - _mmcam_dbg_err("invalid parameter %p, %p, %p", path, root_directory, free_space); + if (!path || !root_directory || !info) { + _mmcam_dbg_err("invalid parameter %p %p %p", path, root_directory, info); return -1; } - if (stat(path, &stat_path) != 0) { - *free_space = 0; - _mmcam_dbg_err("failed to stat for [%s][errno %d]", path, errno); - return -1; + if (strlen(root_directory) > 0) { + if (stat(path, &stat_path) != 0) { + _mmcam_dbg_err("failed to stat for [%s][errno %d]", path, errno); + return -1; + } + + if (stat(root_directory, &stat_root) != 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) + info->type = STORAGE_TYPE_INTERNAL; + else + info->type = STORAGE_TYPE_EXTERNAL; + } else { + info->type = STORAGE_TYPE_INTERNAL; + _mmcam_dbg_warn("invalid length of root directory, assume that it's internal storage."); } - if (stat(root_directory, &stat_root) != 0) { - *free_space = 0; - _mmcam_dbg_err("failed to stat for [%s][errno %d]", path, errno); + ret = storage_foreach_device_supported((storage_device_supported_cb)__mmcamcorder_storage_supported_cb, info); + if (ret != STORAGE_ERROR_NONE) { + _mmcam_dbg_err("storage_foreach_device_supported failed 0x%x", ret); return -1; } - if (stat_path.st_dev == stat_root.st_dev) { - is_internal = TRUE; - } else { - is_internal = FALSE; - } + _mmcam_dbg_log("storage info - type %d, id %d", info->type, info->id); + + return 0; +} - if (is_internal) { + +int _mmcamcorder_get_freespace(storage_type_e type, guint64 *free_space) +{ + int ret = 0; + struct statvfs vfs; + + if (type == STORAGE_TYPE_INTERNAL) ret = storage_get_internal_memory_size(&vfs); - } else { + else ret = storage_get_external_memory_size(&vfs); - } - if (ret < 0) { + if (ret != STORAGE_ERROR_NONE) { *free_space = 0; - _mmcam_dbg_err("failed to get memory size [%s]", path); + _mmcam_dbg_err("get memory size failed [type %d] 0x%x", type, ret); 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; } + + *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 0; } @@ -707,26 +785,23 @@ int _mmcamcorder_get_file_system_type(const gchar *path, int *file_system_type) } -int _mmcamcorder_get_device_flash_brightness(int *brightness) +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 = "(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) { + 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, &get_value); + g_variant_get(result, "(i)", &get_value); *brightness = get_value; _mmcam_dbg_log("flash brightness : %d", *brightness); } else { @@ -737,6 +812,68 @@ int _mmcamcorder_get_device_flash_brightness(int *brightness) return ret; } + +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; + 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, "(i)", &get_value); + _mmcam_dbg_log("played index : %d", get_value); + } else { + _mmcam_dbg_err("replied result is null"); + 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; @@ -775,7 +912,7 @@ void _mmcamcorder_remove_buffer_probe(MMHandleType handle, _MMCamcorderHandlerCa if (item->category & category) { if (item->object && GST_IS_PAD(item->object)) { _mmcam_dbg_log("Remove buffer probe on [%s:%s] - [ID : %lu], [Category : %x]", - GST_DEBUG_PAD_NAME(item->object), item->handler_id, item->category); + GST_DEBUG_PAD_NAME(item->object), item->handler_id, item->category); gst_pad_remove_probe(GST_PAD(item->object), item->handler_id); } else { _mmcam_dbg_warn("Remove buffer probe faild, the pad is null or not pad, just remove item from list and free it"); @@ -783,7 +920,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); @@ -828,7 +965,7 @@ void _mmcamcorder_remove_one_buffer_probe(MMHandleType handle, void *object) if (item->object && item->object == object) { if (GST_IS_PAD(item->object)) { _mmcam_dbg_log("Remove buffer probe on [%s:%s] - [ID : %lu], [Category : %x]", - GST_DEBUG_PAD_NAME(item->object), item->handler_id, item->category); + GST_DEBUG_PAD_NAME(item->object), item->handler_id, item->category); gst_pad_remove_probe(GST_PAD(item->object), item->handler_id); } else { _mmcam_dbg_warn("Remove buffer probe faild, the pad is null or not pad, just remove item from list and free it"); @@ -836,7 +973,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 { @@ -878,7 +1015,7 @@ void _mmcamcorder_remove_event_probe(MMHandleType handle, _MMCamcorderHandlerCat if (item->category & category) { if (item->object && GST_IS_PAD(item->object)) { _mmcam_dbg_log("Remove event probe on [%s:%s] - [ID : %lu], [Category : %x]", - GST_DEBUG_PAD_NAME(item->object), item->handler_id, item->category); + GST_DEBUG_PAD_NAME(item->object), item->handler_id, item->category); gst_pad_remove_probe(GST_PAD(item->object), item->handler_id); } else { _mmcam_dbg_warn("Remove event probe faild, the pad is null or not pad, just remove item from list and free it"); @@ -886,7 +1023,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); @@ -932,11 +1069,11 @@ void _mmcamcorder_disconnect_signal(MMHandleType handle, _MMCamcorderHandlerCate if (item->object && GST_IS_ELEMENT(item->object)) { if (g_signal_handler_is_connected(item->object, item->handler_id)) { _mmcam_dbg_log("Disconnect signal from [%s] : [ID : %lu], [Category : %x]", - GST_OBJECT_NAME(item->object), item->handler_id, item->category); + GST_OBJECT_NAME(item->object), item->handler_id, item->category); g_signal_handler_disconnect(item->object, item->handler_id); } else { _mmcam_dbg_warn("Signal was not connected, cannot disconnect it : [%s] [ID : %lu], [Category : %x]", - GST_OBJECT_NAME(item->object), item->handler_id, item->category); + GST_OBJECT_NAME(item->object), item->handler_id, item->category); } } else { _mmcam_dbg_err("Fail to Disconnecting signal, the element is null or not element, just remove item from list and free it"); @@ -944,7 +1081,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); @@ -968,11 +1105,11 @@ void _mmcamcorder_remove_all_handlers(MMHandleType handle, _MMCamcorderHandlerC _mmcam_dbg_log("ENTER"); - if(hcamcorder->signals) + if (hcamcorder->signals) _mmcamcorder_disconnect_signal((MMHandleType)hcamcorder, category); - if(hcamcorder->event_probes) + if (hcamcorder->event_probes) _mmcamcorder_remove_event_probe((MMHandleType)hcamcorder, category); - if(hcamcorder->buffer_probes) + if (hcamcorder->buffer_probes) _mmcamcorder_remove_buffer_probe((MMHandleType)hcamcorder, category); _mmcam_dbg_log("LEAVE"); @@ -981,7 +1118,7 @@ void _mmcamcorder_remove_all_handlers(MMHandleType handle, _MMCamcorderHandlerC void _mmcamcorder_element_release_noti(gpointer data, GObject *where_the_object_was) { - int i=0; + int i = 0; _MMCamcorderSubContext *sc = (_MMCamcorderSubContext *)data; mmf_return_if_fail(sc); @@ -989,8 +1126,7 @@ void _mmcamcorder_element_release_noti(gpointer data, GObject *where_the_object_ for (i = 0 ; i < _MMCAMCORDER_PIPELINE_ELEMENT_NUM ; i++) { if (sc->element[i].gst && (G_OBJECT(sc->element[i].gst) == where_the_object_was)) { - _mmcam_dbg_warn("The element[%d][%p] is finalized", - sc->element[i].id, sc->element[i].gst); + _mmcam_dbg_warn("The element[%d][%p] is finalized", sc->element[i].id, sc->element[i].gst); sc->element[i].gst = NULL; sc->element[i].id = _MMCAMCORDER_NONE; return; @@ -1001,8 +1137,7 @@ void _mmcamcorder_element_release_noti(gpointer data, GObject *where_the_object_ for (i = 0 ; i < _MMCAMCORDER_ENCODE_PIPELINE_ELEMENT_NUM ; i++) { if (sc->encode_element[i].gst && (G_OBJECT(sc->encode_element[i].gst) == where_the_object_was)) { - _mmcam_dbg_warn("The encode element[%d][%p] is finalized", - sc->encode_element[i].id, sc->encode_element[i].gst); + _mmcam_dbg_warn("The encode element[%d][%p] is finalized", sc->encode_element[i].id, sc->encode_element[i].gst); sc->encode_element[i].gst = NULL; sc->encode_element[i].id = _MMCAMCORDER_ENCODE_NONE; return; @@ -1015,13 +1150,14 @@ void _mmcamcorder_element_release_noti(gpointer data, GObject *where_the_object_ } +#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) { @@ -1031,7 +1167,7 @@ gboolean _mmcamcorder_msg_callback(void *data) /*_mmcam_dbg_log("msg id:%x, msg_cb:%p, msg_data:%p, item:%p", item->id, hcamcorder->msg_cb, hcamcorder->msg_data, item);*/ - _MMCAMCORDER_LOCK((MMHandleType)hcamcorder); + _MMCAMCORDER_LOCK(hcamcorder); /* remove item from msg data */ if (hcamcorder->msg_data) { @@ -1040,13 +1176,12 @@ gboolean _mmcamcorder_msg_callback(void *data) _mmcam_dbg_warn("msg_data is NULL but item[%p] will be removed", item); } - _MMCAMCORDER_UNLOCK((MMHandleType)hcamcorder); + _MMCAMCORDER_UNLOCK(hcamcorder); _MMCAMCORDER_LOCK_MESSAGE_CALLBACK(hcamcorder); - if ((hcamcorder) && (hcamcorder->msg_cb)) { + if ((hcamcorder) && (hcamcorder->msg_cb)) hcamcorder->msg_cb(item->id, (MMMessageParamType*)(&(item->param)), hcamcorder->msg_cb_param); - } _MMCAMCORDER_UNLOCK_MESSAGE_CALLBACK(hcamcorder); @@ -1057,72 +1192,83 @@ 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 _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); - switch (data->id) - { - case MM_MESSAGE_CAMCORDER_STATE_CHANGED: - case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_ASM: - data->param.union_type = MM_MSG_UNION_STATE; - break; - case MM_MESSAGE_CAMCORDER_RECORDING_STATUS: - data->param.union_type = MM_MSG_UNION_RECORDING_STATUS; - break; - case MM_MESSAGE_CAMCORDER_FIRMWARE_UPDATE: - data->param.union_type = MM_MSG_UNION_FIRMWARE; - break; - case MM_MESSAGE_CAMCORDER_CURRENT_VOLUME: - data->param.union_type = MM_MSG_UNION_REC_VOLUME_DB; - break; - case MM_MESSAGE_CAMCORDER_TIME_LIMIT: - case MM_MESSAGE_CAMCORDER_MAX_SIZE: - case MM_MESSAGE_CAMCORDER_NO_FREE_SPACE: - case MM_MESSAGE_CAMCORDER_ERROR: - case MM_MESSAGE_CAMCORDER_FOCUS_CHANGED: - case MM_MESSAGE_CAMCORDER_CAPTURED: - case MM_MESSAGE_CAMCORDER_VIDEO_CAPTURED: - case MM_MESSAGE_CAMCORDER_AUDIO_CAPTURED: - case MM_MESSAGE_READY_TO_RESUME: - default: - data->param.union_type = MM_MSG_UNION_CODE; - break; + switch (data->id) { + 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: + data->param.union_type = MM_MSG_UNION_RECORDING_STATUS; + break; + case MM_MESSAGE_CAMCORDER_FIRMWARE_UPDATE: + data->param.union_type = MM_MSG_UNION_FIRMWARE; + break; + case MM_MESSAGE_CAMCORDER_CURRENT_VOLUME: + data->param.union_type = MM_MSG_UNION_REC_VOLUME_DB; + break; + case MM_MESSAGE_CAMCORDER_TIME_LIMIT: + case MM_MESSAGE_CAMCORDER_MAX_SIZE: + case MM_MESSAGE_CAMCORDER_NO_FREE_SPACE: + case MM_MESSAGE_CAMCORDER_ERROR: + case MM_MESSAGE_CAMCORDER_FOCUS_CHANGED: + case MM_MESSAGE_CAMCORDER_CAPTURED: + case MM_MESSAGE_CAMCORDER_VIDEO_CAPTURED: + case MM_MESSAGE_CAMCORDER_AUDIO_CAPTURED: + case MM_MESSAGE_READY_TO_RESUME: + default: + data->param.union_type = MM_MSG_UNION_CODE; + 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, _mmcamcorder_msg_callback, item, NULL); @@ -1131,6 +1277,33 @@ gboolean _mmcamcorder_send_message(MMHandleType handle, _MMCamcorderMsgItem *dat } 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; } @@ -1139,24 +1312,21 @@ gboolean _mmcamcorder_send_message(MMHandleType handle, _MMCamcorderMsgItem *dat 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) { @@ -1166,7 +1336,7 @@ void _mmcamcorder_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); @@ -1180,40 +1350,38 @@ void _mmcamcorder_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; } + 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); - item->param.data = NULL; - item->param.size = 0; + 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 { + else _mmcam_dbg_warn("timeout"); - } } } } @@ -1221,6 +1389,7 @@ void _mmcamcorder_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 { @@ -1242,36 +1411,36 @@ int _mmcamcorder_get_pixel_format(GstCaps *caps) MMPixelFormatType type = 0; unsigned int fourcc = 0; - mmf_return_val_if_fail( caps != NULL, MM_PIXEL_FORMAT_INVALID ); + mmf_return_val_if_fail(caps != NULL, MM_PIXEL_FORMAT_INVALID); - structure = gst_caps_get_structure (caps, 0); - media_type = gst_structure_get_name (structure); + structure = gst_caps_get_structure(caps, 0); + media_type = gst_structure_get_name(structure); if (media_type == NULL) { _mmcam_dbg_err("failed to get media_type"); return MM_PIXEL_FORMAT_INVALID; } - gst_video_info_init (&media_info); + gst_video_info_init(&media_info); - if (!strcmp (media_type, "image/jpeg") ) { + if (!strcmp(media_type, "image/jpeg")) { _mmcam_dbg_log("It is jpeg."); type = MM_PIXEL_FORMAT_ENCODED; - } else if (!strcmp (media_type, "video/x-raw") && + } else if (!strcmp(media_type, "video/x-raw") && gst_video_info_from_caps(&media_info, caps) && GST_VIDEO_INFO_IS_YUV(&media_info)) { _mmcam_dbg_log("It is yuv."); fourcc = gst_video_format_to_fourcc(GST_VIDEO_INFO_FORMAT(&media_info)); type = _mmcamcorder_get_pixtype(fourcc); - } else if (!strcmp (media_type, "video/x-raw") && + } else if (!strcmp(media_type, "video/x-raw") && gst_video_info_from_caps(&media_info, caps) && GST_VIDEO_INFO_IS_RGB(&media_info)) { _mmcam_dbg_log("It is rgb."); type = MM_PIXEL_FORMAT_RGB888; - } else if (!strcmp (media_type, "video/x-h264")) { + } else if (!strcmp(media_type, "video/x-h264")) { _mmcam_dbg_log("It is H264"); type = MM_PIXEL_FORMAT_ENCODED_H264; } else { - _mmcam_dbg_err("Not supported format [%s]",media_type); + _mmcam_dbg_err("Not supported format [%s]", media_type); type = MM_PIXEL_FORMAT_INVALID; } @@ -1288,79 +1457,79 @@ unsigned int _mmcamcorder_get_fourcc(int pixtype, int codectype, int use_zero_co switch (pixtype) { case MM_PIXEL_FORMAT_NV12: - if (use_zero_copy_format) { - fourcc = GST_MAKE_FOURCC ('S', 'N', '1', '2'); - } else { - fourcc = GST_MAKE_FOURCC ('N', 'V', '1', '2'); - } + if (use_zero_copy_format) + fourcc = GST_MAKE_FOURCC('S', 'N', '1', '2'); + else + fourcc = GST_MAKE_FOURCC('N', 'V', '1', '2'); + break; case MM_PIXEL_FORMAT_NV21: - if (use_zero_copy_format) { - fourcc = GST_MAKE_FOURCC ('S', 'N', '2', '1'); - } else { - fourcc = GST_MAKE_FOURCC ('N', 'V', '2', '1'); - } + if (use_zero_copy_format) + fourcc = GST_MAKE_FOURCC('S', 'N', '2', '1'); + else + fourcc = GST_MAKE_FOURCC('N', 'V', '2', '1'); + break; case MM_PIXEL_FORMAT_YUYV: - if (use_zero_copy_format) { - fourcc = GST_MAKE_FOURCC ('S', 'U', 'Y', 'V'); - } else { - fourcc = GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'); - } + if (use_zero_copy_format) + fourcc = GST_MAKE_FOURCC('S', 'U', 'Y', 'V'); + else + fourcc = GST_MAKE_FOURCC('Y', 'U', 'Y', '2'); + break; case MM_PIXEL_FORMAT_UYVY: - if (use_zero_copy_format) { - fourcc = GST_MAKE_FOURCC ('S', 'Y', 'V', 'Y'); - } else { - fourcc = GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'); - } + if (use_zero_copy_format) + fourcc = GST_MAKE_FOURCC('S', 'Y', 'V', 'Y'); + else + fourcc = GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'); + break; case MM_PIXEL_FORMAT_I420: - if (use_zero_copy_format) { - fourcc = GST_MAKE_FOURCC ('S', '4', '2', '0'); - } else { - fourcc = GST_MAKE_FOURCC ('I', '4', '2', '0'); - } + if (use_zero_copy_format) + fourcc = GST_MAKE_FOURCC('S', '4', '2', '0'); + else + fourcc = GST_MAKE_FOURCC('I', '4', '2', '0'); + break; case MM_PIXEL_FORMAT_YV12: - fourcc = GST_MAKE_FOURCC ('Y', 'V', '1', '2'); + fourcc = GST_MAKE_FOURCC('Y', 'V', '1', '2'); break; case MM_PIXEL_FORMAT_422P: - fourcc = GST_MAKE_FOURCC ('4', '2', '2', 'P'); + fourcc = GST_MAKE_FOURCC('4', '2', '2', 'P'); break; case MM_PIXEL_FORMAT_RGB565: - fourcc = GST_MAKE_FOURCC ('R', 'G', 'B', 'P'); + fourcc = GST_MAKE_FOURCC('R', 'G', 'B', 'P'); break; case MM_PIXEL_FORMAT_RGB888: - fourcc = GST_MAKE_FOURCC ('R', 'G', 'B', ' '); + fourcc = GST_MAKE_FOURCC('R', 'G', 'B', ' '); break; case MM_PIXEL_FORMAT_ENCODED: if (codectype == MM_IMAGE_CODEC_JPEG) { - fourcc = GST_MAKE_FOURCC ('J', 'P', 'E', 'G'); + fourcc = GST_MAKE_FOURCC('J', 'P', 'E', 'G'); } else if (codectype == MM_IMAGE_CODEC_JPEG_SRW) { - fourcc = GST_MAKE_FOURCC ('J', 'P', 'E', 'G'); /*TODO: JPEG+SamsungRAW format */ + fourcc = GST_MAKE_FOURCC('J', 'P', 'E', 'G'); /*TODO: JPEG+SamsungRAW format */ } else if (codectype == MM_IMAGE_CODEC_SRW) { - fourcc = GST_MAKE_FOURCC ('J', 'P', 'E', 'G'); /*TODO: SamsungRAW format */ + fourcc = GST_MAKE_FOURCC('J', 'P', 'E', 'G'); /*TODO: SamsungRAW format */ } else if (codectype == MM_IMAGE_CODEC_PNG) { - fourcc = GST_MAKE_FOURCC ('P', 'N', 'G', ' '); + fourcc = GST_MAKE_FOURCC('P', 'N', 'G', ' '); } else { /* Please let us know what other fourcces are. ex) BMP, GIF?*/ - fourcc = GST_MAKE_FOURCC ('J', 'P', 'E', 'G'); + fourcc = GST_MAKE_FOURCC('J', 'P', 'E', 'G'); } break; case MM_PIXEL_FORMAT_ITLV_JPEG_UYVY: - fourcc = GST_MAKE_FOURCC('I','T','L','V'); + fourcc = GST_MAKE_FOURCC('I', 'T', 'L', 'V'); break; case MM_PIXEL_FORMAT_ENCODED_H264: - fourcc = GST_MAKE_FOURCC('H','2','6','4'); + fourcc = GST_MAKE_FOURCC('H', '2', '6', '4'); break; default: _mmcam_dbg_log("Not proper pixel type[%d]. Set default - I420", pixtype); - if (use_zero_copy_format) { - fourcc = GST_MAKE_FOURCC ('S', '4', '2', '0'); - } else { - fourcc = GST_MAKE_FOURCC ('I', '4', '2', '0'); - } + if (use_zero_copy_format) + fourcc = GST_MAKE_FOURCC('S', '4', '2', '0'); + else + fourcc = GST_MAKE_FOURCC('I', '4', '2', '0'); + break; } @@ -1375,66 +1544,65 @@ int _mmcamcorder_get_pixtype(unsigned int fourcc) char *pfourcc = (char*)&fourcc; _mmcam_dbg_log("fourcc(%c%c%c%c)", - pfourcc[0], pfourcc[1], pfourcc[2], pfourcc[3]); + pfourcc[0], pfourcc[1], pfourcc[2], pfourcc[3]); */ switch (fourcc) { - case GST_MAKE_FOURCC ('S', 'N', '1', '2'): - case GST_MAKE_FOURCC ('N', 'V', '1', '2'): + case GST_MAKE_FOURCC('S', 'N', '1', '2'): + case GST_MAKE_FOURCC('N', 'V', '1', '2'): pixtype = MM_PIXEL_FORMAT_NV12; break; - case GST_MAKE_FOURCC ('S', 'N', '2', '1'): - case GST_MAKE_FOURCC ('N', 'V', '2', '1'): + case GST_MAKE_FOURCC('S', 'N', '2', '1'): + case GST_MAKE_FOURCC('N', 'V', '2', '1'): pixtype = MM_PIXEL_FORMAT_NV21; break; - case GST_MAKE_FOURCC ('S', 'U', 'Y', 'V'): - case GST_MAKE_FOURCC ('Y', 'U', 'Y', 'V'): - case GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'): + case GST_MAKE_FOURCC('S', 'U', 'Y', 'V'): + case GST_MAKE_FOURCC('Y', 'U', 'Y', 'V'): + case GST_MAKE_FOURCC('Y', 'U', 'Y', '2'): pixtype = MM_PIXEL_FORMAT_YUYV; break; - case GST_MAKE_FOURCC ('S', 'Y', 'V', 'Y'): - case GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'): + case GST_MAKE_FOURCC('S', 'Y', 'V', 'Y'): + case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): pixtype = MM_PIXEL_FORMAT_UYVY; break; - case GST_MAKE_FOURCC ('S', '4', '2', '0'): - case GST_MAKE_FOURCC ('I', '4', '2', '0'): + case GST_MAKE_FOURCC('S', '4', '2', '0'): + case GST_MAKE_FOURCC('I', '4', '2', '0'): pixtype = MM_PIXEL_FORMAT_I420; break; - case GST_MAKE_FOURCC ('Y', 'V', '1', '2'): + case GST_MAKE_FOURCC('Y', 'V', '1', '2'): pixtype = MM_PIXEL_FORMAT_YV12; break; - case GST_MAKE_FOURCC ('4', '2', '2', 'P'): + case GST_MAKE_FOURCC('4', '2', '2', 'P'): pixtype = MM_PIXEL_FORMAT_422P; break; - case GST_MAKE_FOURCC ('R', 'G', 'B', 'P'): + case GST_MAKE_FOURCC('R', 'G', 'B', 'P'): pixtype = MM_PIXEL_FORMAT_RGB565; break; - case GST_MAKE_FOURCC ('R', 'G', 'B', '3'): + case GST_MAKE_FOURCC('R', 'G', 'B', '3'): pixtype = MM_PIXEL_FORMAT_RGB888; break; - case GST_MAKE_FOURCC ('A', 'R', 'G', 'B'): - case GST_MAKE_FOURCC ('x', 'R', 'G', 'B'): + case GST_MAKE_FOURCC('A', 'R', 'G', 'B'): + case GST_MAKE_FOURCC('x', 'R', 'G', 'B'): pixtype = MM_PIXEL_FORMAT_ARGB; break; - case GST_MAKE_FOURCC ('B', 'G', 'R', 'A'): - case GST_MAKE_FOURCC ('B', 'G', 'R', 'x'): - case GST_MAKE_FOURCC ('S', 'R', '3', '2'): + case GST_MAKE_FOURCC('B', 'G', 'R', 'A'): + case GST_MAKE_FOURCC('B', 'G', 'R', 'x'): + case GST_MAKE_FOURCC('S', 'R', '3', '2'): pixtype = MM_PIXEL_FORMAT_RGBA; break; - case GST_MAKE_FOURCC ('J', 'P', 'E', 'G'): - case GST_MAKE_FOURCC ('P', 'N', 'G', ' '): + case GST_MAKE_FOURCC('J', 'P', 'E', 'G'): + case GST_MAKE_FOURCC('P', 'N', 'G', ' '): pixtype = MM_PIXEL_FORMAT_ENCODED; break; /*FIXME*/ - case GST_MAKE_FOURCC ('I', 'T', 'L', 'V'): + case GST_MAKE_FOURCC('I', 'T', 'L', 'V'): pixtype = MM_PIXEL_FORMAT_ITLV_JPEG_UYVY; break; - case GST_MAKE_FOURCC ('H', '2', '6', '4'): + case GST_MAKE_FOURCC('H', '2', '6', '4'): pixtype = MM_PIXEL_FORMAT_ENCODED_H264; break; default: - _mmcam_dbg_log("Not supported fourcc type(%c%c%c%c)", - fourcc, fourcc>>8, fourcc>>16, fourcc>>24); + _mmcam_dbg_log("Not supported fourcc type(%c%c%c%c)", fourcc, fourcc>>8, fourcc>>16, fourcc>>24); pixtype = MM_PIXEL_FORMAT_INVALID; break; } @@ -1454,14 +1622,14 @@ gboolean _mmcamcorder_add_elements_to_bin(GstBin *bin, GList *element_list) element = (_MMCamcorderGstElement*)local_list->data; if (element && element->gst) { if (!gst_bin_add(bin, GST_ELEMENT(element->gst))) { - _mmcam_dbg_err( "Add element [%s] to bin [%s] FAILED", - GST_ELEMENT_NAME(GST_ELEMENT(element->gst)), - GST_ELEMENT_NAME(GST_ELEMENT(bin)) ); + _mmcam_dbg_err("Add element [%s] to bin [%s] FAILED", + GST_ELEMENT_NAME(GST_ELEMENT(element->gst)), + GST_ELEMENT_NAME(GST_ELEMENT(bin))); return FALSE; } else { _mmcam_dbg_log("Add element [%s] to bin [%s] OK", - GST_ELEMENT_NAME(GST_ELEMENT(element->gst)), - GST_ELEMENT_NAME(GST_ELEMENT(bin))); + GST_ELEMENT_NAME(GST_ELEMENT(element->gst)), + GST_ELEMENT_NAME(GST_ELEMENT(bin))); } } local_list = local_list->next; @@ -1483,48 +1651,15 @@ 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)), - GST_ELEMENT_NAME(GST_ELEMENT(element->gst))); - } else { - _mmcam_dbg_err("Link [%s] to [%s] FAILED", - GST_ELEMENT_NAME(GST_ELEMENT(pre_element->gst)), - GST_ELEMENT_NAME(GST_ELEMENT(element->gst))); - return FALSE; - } - } - - pre_element = element; - local_list = local_list->next; - } - - return TRUE; -} - -gboolean _mmcamcorder_filtered_link_elements(GList *element_list, GstCaps *caps) -{ - GList *local_list = element_list; - _MMCamcorderGstElement *element = NULL; - _MMCamcorderGstElement *pre_element = NULL; - - mmf_return_val_if_fail(local_list, FALSE); - - pre_element = (_MMCamcorderGstElement*)local_list->data; - local_list = local_list->next; - - while (local_list) { - element = (_MMCamcorderGstElement*)local_list->data; - if (element && element->gst) { - if (_MM_GST_ELEMENT_LINK_FILTERED(GST_ELEMENT(pre_element->gst), GST_ELEMENT(element->gst), caps)) { - _mmcam_dbg_log("Link [%s] to [%s] OK", - GST_ELEMENT_NAME(GST_ELEMENT(pre_element->gst)), - GST_ELEMENT_NAME(GST_ELEMENT(element->gst))); + GST_ELEMENT_NAME(GST_ELEMENT(pre_element->gst)), + GST_ELEMENT_NAME(GST_ELEMENT(element->gst))); } else { _mmcam_dbg_err("Link [%s] to [%s] FAILED", - GST_ELEMENT_NAME(GST_ELEMENT(pre_element->gst)), - GST_ELEMENT_NAME(GST_ELEMENT(element->gst))); + GST_ELEMENT_NAME(GST_ELEMENT(pre_element->gst)), + GST_ELEMENT_NAME(GST_ELEMENT(element->gst))); return FALSE; } } @@ -1537,7 +1672,7 @@ gboolean _mmcamcorder_filtered_link_elements(GList *element_list, GstCaps *caps) } 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; @@ -1545,8 +1680,7 @@ gboolean _mmcamcorder_resize_frame(unsigned char *src_data, unsigned int src_wid unsigned char *dst_tmp_data = NULL; if (!src_data || !dst_data || !dst_width || !dst_height || !dst_length) { - _mmcam_dbg_err("something is NULL %p,%p,%p,%p,%p", - src_data, dst_data, dst_width, dst_height, dst_length); + _mmcam_dbg_err("something is NULL %p,%p,%p,%p,%p", src_data, dst_data, dst_width, dst_height, dst_length); return FALSE; } @@ -1575,8 +1709,7 @@ gboolean _mmcamcorder_resize_frame(unsigned char *src_data, unsigned int src_wid return FALSE; } - _mmcam_dbg_log("src size %dx%d -> dst size %dx%d", - src_width, src_height, *dst_width, *dst_height); + _mmcam_dbg_log("src size %dx%d -> dst size %dx%d", src_width, src_height, *dst_width, *dst_height); /* get length of resized image */ mm_ret = mm_util_get_image_size(input_format, *dst_width, *dst_height, dst_length); @@ -1593,8 +1726,8 @@ gboolean _mmcamcorder_resize_frame(unsigned char *src_data, unsigned int src_wid return FALSE; } - mm_ret = mm_util_resize_image(src_data, src_width, src_height, input_format, - dst_tmp_data, dst_width, dst_height); + mm_ret = mm_util_resize_image(src_data, src_width, src_height, input_format, dst_tmp_data, dst_width, dst_height); + if (mm_ret != MM_ERROR_NONE) { GST_ERROR("mm_util_resize_image failed 0x%x", ret); free(dst_tmp_data); @@ -1610,8 +1743,8 @@ 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; @@ -1624,7 +1757,7 @@ gboolean _mmcamcorder_encode_jpeg(void *src_data, unsigned int src_width, unsign 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); + 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: @@ -1637,12 +1770,12 @@ gboolean _mmcamcorder_encode_jpeg(void *src_data, unsigned int src_width, unsign 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); + 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); + 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: @@ -1684,8 +1817,7 @@ gboolean _mmcamcorder_encode_jpeg(void *src_data, unsigned int src_width, unsign } ret = mm_util_jpeg_encode_to_memory(result_data, (int *)result_length, - converted_src, src_width, src_height, - jpeg_format, jpeg_quality); + converted_src, src_width, src_height, jpeg_format, jpeg_quality); if (converted_src && (converted_src != src_data)) { free(converted_src); @@ -1703,7 +1835,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; @@ -1733,8 +1865,7 @@ gboolean _mmcamcorder_downscale_UYVYorYUYV(unsigned char *src, unsigned int src_ jump_width = ratio_width << 1; _mmcam_dbg_warn("[src %dx%d] [dst %dx%d] [line width %d] [ratio width %d, height %d]", - src_width, src_height, dst_width, dst_height, - line_width, ratio_width, ratio_height); + src_width, src_height, dst_width, dst_height, line_width, ratio_width, ratio_height); for (i = 0 ; i < src_height ; i += ratio_height) { line_base = i * line_width; @@ -1745,11 +1876,11 @@ gboolean _mmcamcorder_downscale_UYVYorYUYV(unsigned char *src, unsigned int src_ j += jump_width; src_index = line_base + j; - if (src_index % 4 == 0) { + if (src_index % 4 == 0) result[k++] = src[src_index+2]; - } else { + else result[k++] = src[src_index]; - } + result[k++] = src[src_index+1]; } } @@ -1764,17 +1895,17 @@ gboolean _mmcamcorder_downscale_UYVYorYUYV(unsigned char *src, unsigned int src_ static guint16 get_language_code(const char *str) { - return (guint16) (((str[0]-0x60) & 0x1F) << 10) + (((str[1]-0x60) & 0x1F) << 5) + ((str[2]-0x60) & 0x1F); + return (guint16)(((str[0]-0x60) & 0x1F) << 10) + (((str[1]-0x60) & 0x1F) << 5) + ((str[2]-0x60) & 0x1F); } static gchar * str_to_utf8(const gchar *str) { - return g_convert (str, -1, "UTF-8", "ASCII", NULL, NULL, NULL); + return g_convert(str, -1, "UTF-8", "ASCII", NULL, NULL, NULL); } static inline gboolean write_tag(FILE *f, const gchar *tag) { - while(*tag) + while (*tag) FPUTC_CHECK(*tag++, f); return TRUE; @@ -1815,44 +1946,41 @@ 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_FILEPATH_CAPTURE_SND, FALSE); + _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: { - struct timespec timeout; - struct timeval tv; - - gettimeofday(&tv, NULL); - timeout.tv_sec = tv.tv_sec + __MMCAMCORDER_CAPTURE_WAIT_TIMEOUT; - timeout.tv_nsec = tv.tv_usec * 1000; + gint64 end_time = 0; _mmcam_dbg_warn("wait for capture data in recording. wait signal..."); - if (!pthread_cond_timedwait(&(hcamcorder->task_thread_cond), &(hcamcorder->task_thread_lock), &timeout)) { + 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; @@ -1879,7 +2007,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"); @@ -1895,23 +2023,16 @@ _mmcamcorder_convert_YUV_to_RGB888(unsigned char *src, int src_fmt, guint width, int dst_cs = MM_UTIL_IMG_FMT_RGB888; unsigned int dst_size = 0; - if (src_fmt == COLOR_FORMAT_YUYV) - { + if (src_fmt == COLOR_FORMAT_YUYV) { _mmcam_dbg_log("Convert YUYV to RGB888\n"); src_cs = MM_UTIL_IMG_FMT_YUYV; - } - else if (src_fmt == COLOR_FORMAT_UYVY) - { + } else if (src_fmt == COLOR_FORMAT_UYVY) { _mmcam_dbg_log("Convert UYVY to RGB888\n"); src_cs = MM_UTIL_IMG_FMT_UYVY; - } - else if (src_fmt == COLOR_FORMAT_NV12) - { + } else if (src_fmt == COLOR_FORMAT_NV12) { _mmcam_dbg_log("Convert NV12 to RGB888\n"); src_cs = MM_UTIL_IMG_FMT_NV12; - } - else - { + } else { _mmcam_dbg_err("NOT supported format [%d]\n", src_fmt); return FALSE; } @@ -1923,21 +2044,17 @@ _mmcamcorder_convert_YUV_to_RGB888(unsigned char *src, int src_fmt, guint width, } *dst = malloc(dst_size); - if (*dst == NULL) - { + if (*dst == NULL) { _mmcam_dbg_err("malloc failed\n"); return FALSE; } *dst_len = dst_size; ret = mm_util_convert_colorspace(src, width, height, src_cs, *dst, dst_cs); - if(ret == 0) - { + if (ret == 0) { _mmcam_dbg_log("Convert [dst_size:%d] OK.\n", dst_size); return TRUE; - } - else - { + } else { free(*dst); *dst = NULL; @@ -1986,11 +2103,10 @@ static gboolean _mmcamcorder_convert_YUYV_to_I420(unsigned char *src, guint widt dst_data[dst_y_offset++] = src[src_offset++]; /*Y*/ if (i % 2 == 0) { - if (j % 4 == 0) { + if (j % 4 == 0) dst_data[dst_u_offset++] = src[src_offset++]; /*U*/ - } else { + else dst_data[dst_v_offset++] = src[src_offset++]; /*V*/ - } } else { src_offset++; } @@ -2000,8 +2116,7 @@ static gboolean _mmcamcorder_convert_YUYV_to_I420(unsigned char *src, guint widt *dst = dst_data; *dst_len = dst_size; - _mmcam_dbg_log("DONE: YUVY -> I420 : %dx%d, dst data %p, size %d", - width, height, *dst, dst_size); + _mmcam_dbg_log("DONE: YUVY -> I420 : %dx%d, dst data %p, size %d", width, height, *dst, dst_size); return TRUE; } @@ -2043,11 +2158,10 @@ static gboolean _mmcamcorder_convert_UYVY_to_I420(unsigned char *src, guint widt for (i = 0 ; i < height ; i++) { for (j = 0 ; j < loop_length ; j += 2) { if (i % 2 == 0) { - if (j % 4 == 0) { + if (j % 4 == 0) dst_data[dst_u_offset++] = src[src_offset++]; /*U*/ - } else { + else dst_data[dst_v_offset++] = src[src_offset++]; /*V*/ - } } else { src_offset++; } @@ -2059,8 +2173,7 @@ static gboolean _mmcamcorder_convert_UYVY_to_I420(unsigned char *src, guint widt *dst = dst_data; *dst_len = dst_size; - _mmcam_dbg_log("DONE: UYVY -> I420 : %dx%d, dst data %p, size %d", - width, height, *dst, dst_size); + _mmcam_dbg_log("DONE: UYVY -> I420 : %dx%d, dst data %p, size %d", width, height, *dst, dst_size); return TRUE; } @@ -2106,38 +2219,39 @@ static gboolean _mmcamcorder_convert_NV12_to_I420(unsigned char *src, guint widt /* set U and V */ for (i = 0 ; i < loop_length ; i++) { - if (i % 2 == 0) { + if (i % 2 == 0) dst_data[dst_u_offset++] = src[src_offset++]; - } else { + else dst_data[dst_v_offset++] = src[src_offset++]; - } } *dst = dst_data; *dst_len = dst_size; - _mmcam_dbg_log("DONE: NV12 -> I420 : %dx%d, dst data %p, size %d", - width, height, *dst, dst_size); + _mmcam_dbg_log("DONE: NV12 -> I420 : %dx%d, dst data %p, size %d", width, height, *dst, dst_size); return TRUE; } -int _mmcamcorder_get_root_directory(char **root_directory) +void _mmcamcorder_emit_dbus_signal(GDBusConnection *conn, const char *object_name, + const char *interface_name, const char *signal_name, int value) { - int ret = STORAGE_ERROR_NONE; - - if (root_directory == NULL) { - _mmcam_dbg_warn("user data is NULL"); - return MM_ERROR_CAMCORDER_INVALID_ARGUMENT; + if (!conn || !object_name || !interface_name || !signal_name) { + _mmcam_dbg_err("NULL pointer %p %p %p %p", + conn, object_name, interface_name, signal_name); + return; } - ret = storage_foreach_device_supported((storage_device_supported_cb)__storage_device_supported_cb, root_directory); - if (ret != STORAGE_ERROR_NONE) { - _mmcam_dbg_err("storage_foreach_device_supported failed 0x%x", ret); - return MM_ERROR_CAMCORDER_INTERNAL; + if (!g_dbus_connection_emit_signal(conn, NULL, + object_name, interface_name, signal_name, + g_variant_new("(i)", value), NULL)) { + _mmcam_dbg_warn("failed to emit signal"); + } else { + _mmcam_dbg_log("emit signal done - value 0x%.8x", value); + g_dbus_connection_flush(conn, NULL, NULL, NULL); + _mmcam_dbg_log("signal flush done"); } - return MM_ERROR_NONE; + return; } -