From: Jeongmo Yang Date: Tue, 5 Jan 2016 08:37:08 +0000 (+0900) Subject: [Release version 0.10.24] Support tizenipcsrc and rename some internal APIs X-Git-Tag: submit/tizen/20160105.085903^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git;a=commitdiff_plain;h=470e07a7177a25d1680adc16024cfbc17bc07575 [Release version 0.10.24] Support tizenipcsrc and rename some internal APIs Change-Id: I81da934d32f38bcbe15fb29296f41ab74e4be8eb Signed-off-by: Jeongmo Yang --- diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index bdeb87c..ea80a87 100644 --- a/packaging/libmm-camcorder.spec +++ b/packaging/libmm-camcorder.spec @@ -2,7 +2,7 @@ Name: libmm-camcorder Summary: Camera and recorder library -Version: 0.10.23 +Version: 0.10.24 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_camcorder.h b/src/include/mm_camcorder.h index bf7af90..347e2da 100644 --- a/src/include/mm_camcorder.h +++ b/src/include/mm_camcorder.h @@ -1230,7 +1230,7 @@ extern "C" { /** * Determines the socket stream path */ -#define MMCAM_DISPLAY_SHM_SOCKET_PATH "display-shm-socket-path" +#define MMCAM_DISPLAY_SOCKET_PATH "display-socket-path" /** * PID for sound focus diff --git a/src/include/mm_camcorder_attribute.h b/src/include/mm_camcorder_attribute.h index 43bf852..43b5859 100644 --- a/src/include/mm_camcorder_attribute.h +++ b/src/include/mm_camcorder_attribute.h @@ -172,7 +172,7 @@ typedef enum MM_CAM_SUPPORT_ZERO_COPY_FORMAT, MM_CAM_SUPPORT_MEDIA_PACKET_PREVIEW_CB, MM_CAM_RECORDER_TAG_ENABLE, - MM_CAM_DISPLAY_SHM_SOCKET_PATH, + MM_CAM_DISPLAY_SOCKET_PATH, MM_CAM_PID_FOR_SOUND_FOCUS, MM_CAM_ROOT_DIRECTORY, MM_CAM_ATTRIBUTE_NUM diff --git a/src/include/mm_camcorder_client.h b/src/include/mm_camcorder_client.h index bcb3974..bbf808d 100644 --- a/src/include/mm_camcorder_client.h +++ b/src/include/mm_camcorder_client.h @@ -33,7 +33,7 @@ */ typedef enum { - MM_CAM_CLIENT_DISPLAY_SHM_SOCKET_PATH, + MM_CAM_CLIENT_DISPLAY_SOCKET_PATH, MM_CAM_CLIENT_DISPLAY_HANDLE, MM_CAM_CLIENT_DISPLAY_DEVICE, MM_CAM_CLIENT_DISPLAY_SURFACE, @@ -134,7 +134,7 @@ int mm_camcorder_client_unrealize(MMHandleType handle); int mm_camcorder_client_get_video_caps(MMHandleType handle, char **caps); /** - * This function set "socket-path" element property of shmsink/src. + * This function set "socket-path" element property of ipc sink/src. * To be used by both server and client. * * @param handle [in] Handle of camera. @@ -145,7 +145,7 @@ int mm_camcorder_client_get_video_caps(MMHandleType handle, char **caps); * @see * @since */ -int mm_camcorder_client_set_shm_socket_path(MMHandleType handle, const char *path); +int mm_camcorder_client_set_socket_path(MMHandleType handle, const char *path); /** * This function get root directory of current process. diff --git a/src/mm_camcorder_attribute.c b/src/mm_camcorder_attribute.c index 478215b..47321f8 100644 --- a/src/mm_camcorder_attribute.c +++ b/src/mm_camcorder_attribute.c @@ -1423,8 +1423,8 @@ _mmcamcorder_alloc_attribute( MMHandleType handle, MMCamPreset *info ) NULL, }, { - MM_CAM_DISPLAY_SHM_SOCKET_PATH, - "display-shm-socket-path", + MM_CAM_DISPLAY_SOCKET_PATH, + "display-socket-path", MMF_VALUE_TYPE_STRING, MM_ATTRS_FLAG_RW, {(void*)NULL}, diff --git a/src/mm_camcorder_client.c b/src/mm_camcorder_client.c index d131ab3..10322ac 100644 --- a/src/mm_camcorder_client.c +++ b/src/mm_camcorder_client.c @@ -793,8 +793,8 @@ MMHandleType _mmcamcorder_client_alloc_attribute(MMHandleType handle) /* basic attributes' info */ mm_cam_attr_construct_info temp_info[] = { { - MM_CAM_CLIENT_DISPLAY_SHM_SOCKET_PATH, - MMCAM_DISPLAY_SHM_SOCKET_PATH, + MM_CAM_CLIENT_DISPLAY_SOCKET_PATH, + MMCAM_DISPLAY_SOCKET_PATH, MMF_VALUE_TYPE_STRING, MM_ATTRS_FLAG_RW, {(void*)NULL}, @@ -1214,18 +1214,21 @@ int _mmcamcorder_client_create_preview_elements(MMHandleType handle, const char _MMCAMCORDER_PIPELINE_MAKE(sc, sc->element, _MMCAMCORDER_CLIENT_MAIN_PIPE, "camera_client", ret); /* create source */ - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_CLIENT_VIDEOSRC_SRC, "shmsrc", "shmsrc", element_list, ret); + if (hcamcorder->use_zero_copy_format) + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_CLIENT_VIDEOSRC_SRC, "tizenipcsrc", "camera_client_src", element_list, ret); + else + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_CLIENT_VIDEOSRC_SRC, "shmsrc", "camera_client_src", element_list, ret); mm_camcorder_get_attributes(handle, NULL, - MMCAM_DISPLAY_SHM_SOCKET_PATH, &socket_path, &socket_path_length, + MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_length, NULL); if (socket_path == NULL ) { - _mmcam_dbg_err("shmsink's socket path is not set"); + _mmcam_dbg_err("socket path is not set"); goto set_videosrc_error; } - _mmcam_dbg_err("shm src socket path : %s", socket_path); + _mmcam_dbg_err("ipc src socket path : %s", socket_path); g_object_set(sc->element[_MMCAMCORDER_CLIENT_VIDEOSRC_SRC].gst, "socket-path", socket_path, @@ -1253,8 +1256,9 @@ int _mmcamcorder_client_create_preview_elements(MMHandleType handle, const char /* create sink */ _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_CLIENT_VIDEOSINK_SINK, videosink_name, "videosink_sink", element_list, ret); - if (strcmp(videosink_name, "fakesink") != 0 && strcmp(videosink_name, "shmsink") != 0) { - + if (strcmp(videosink_name, "fakesink") && + strcmp(videosink_name, "tizenipcsink") && + strcmp(videosink_name, "shmsink")) { if (_mmcamcorder_client_videosink_window_set(handle, sc->VideosinkElement) != MM_ERROR_NONE) { _mmcam_dbg_err("_mmcamcorder_videosink_window_set error"); ret = MM_ERROR_CAMCORDER_INVALID_ARGUMENT; @@ -1496,12 +1500,14 @@ _ERR_CAMCORDER_CMD_PRECON: return ret; } -static int _mm_camcorder_client_set_shm_socket_path(MMHandleType handle, const char *path) +static int _mm_camcorder_client_set_socket_path(MMHandleType handle, const char *path) { int ret = MM_ERROR_NONE; + _mmcam_dbg_log("handle : 0x%x, path:%s", handle, path); + mm_camcorder_set_attributes(handle, NULL, - MMCAM_DISPLAY_SHM_SOCKET_PATH, path, strlen(path), + MMCAM_DISPLAY_SOCKET_PATH, path, strlen(path), NULL); return ret; @@ -1654,11 +1660,11 @@ int mm_camcorder_client_unrealize(MMHandleType handle) return ret; } -int mm_camcorder_client_set_shm_socket_path(MMHandleType handle, const char *path) +int mm_camcorder_client_set_socket_path(MMHandleType handle, const char *path) { int ret = MM_ERROR_NONE; _mmcam_dbg_log("Entered "); - ret = _mm_camcorder_client_set_shm_socket_path(handle, path); + ret = _mm_camcorder_client_set_socket_path(handle, path); return ret; } diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c index 9479302..130d76c 100644 --- a/src/mm_camcorder_gstcommon.c +++ b/src/mm_camcorder_gstcommon.c @@ -234,7 +234,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) MMCAM_CAMERA_HDR_CAPTURE, &sc->info_image->hdr_capture_mode, MMCAM_IMAGE_ENCODER, &codectype, MMCAM_IMAGE_ENCODER_QUALITY, &capture_jpg_quality, - MMCAM_DISPLAY_SHM_SOCKET_PATH, &socket_path, &socket_path_len, + MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_len, MMCAM_DISPLAY_SURFACE, &display_surface_type, NULL); if (err != MM_ERROR_NONE) { @@ -308,7 +308,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, videosink_name, "ipc_sink", element_list, err); err = mm_camcorder_get_attributes(handle, &err_name, - MMCAM_DISPLAY_SHM_SOCKET_PATH, &socket_path, &socket_path_len, + MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_len, NULL); if (err != MM_ERROR_NONE) { _mmcam_dbg_warn("Get socket path failed 0x%x", err); diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c index b8adb7e..c1847d8 100644 --- a/src/mm_camcorder_internal.c +++ b/src/mm_camcorder_internal.c @@ -905,7 +905,7 @@ int _mmcamcorder_realize(MMHandleType handle) mm_camcorder_get_attributes(handle, NULL, MMCAM_DISPLAY_SURFACE, &display_surface_type, MMCAM_CAMERA_RECORDING_MOTION_RATE, &motion_rate, - MMCAM_DISPLAY_SHM_SOCKET_PATH, &socket_path, &socket_path_len, + MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_len, NULL); /* set camera/recorder state to vconf key */