Remove unused code - MM_DISPLAY_SURFACE_REMOTE

[Version] 0.10.264
[Issue Type] Clean up

Change-Id: Ib1d7f73f0b1915e63308f4940ea2e3f5b41205d4
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index 42334ea..e095f4d 100755 (executable)
--- a/packaging/libmm-camcorder.spec
+++ b/packaging/libmm-camcorder.spec
@@ -1,6 +1,6 @@
 Name:       libmm-camcorder
 Summary:    Camera and recorder library
-Version:    0.10.263
+Version:    0.10.264
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c
index f4a15de..1fc55c7 100644 (file)
--- a/src/mm_camcorder_gstcommon.c
+++ b/src/mm_camcorder_gstcommon.c
@@ -497,8 +497,6 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
        const char *decoder_conf_name = NULL;
        char videodecoder_name_final[32] = {'\0',};
        char *err_name = NULL;
-       char *socket_path = NULL;
-       int socket_path_len;
 #ifdef _MMCAMCORDER_RM_SUPPORT
        int decoder_index = 0;
 #endif /* _MMCAMCORDER_RM_SUPPORT */
@@ -556,7 +554,6 @@ 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_SOCKET_PATH, &socket_path, &socket_path_len,
                MMCAM_DISPLAY_SURFACE, &display_surface_type,
                MMCAM_EXTRA_PREVIEW_ENABLE, &extra_preview_enable,
                NULL);
@@ -730,67 +727,50 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle)
 
        MMCAM_LOG_INFO("videosink_name: %s", videosink_name);
 
-       if (display_surface_type == MM_DISPLAY_SURFACE_REMOTE) {
-               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, videosink_name, "ipc_sink", element_list, err);
+       if (hcamcorder->use_videoconvert && (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "directvideosink"))) {
+               /* get video convert name */
+               _mmcamcorder_conf_get_value_element_name(sc->VideoconvertElement, &videoconvert_name);
 
-               _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, sc->VideosinkElement);
-
-               err = mm_camcorder_get_attributes(handle, &err_name,
-                       MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_len,
-                       NULL);
-               if (err != MM_ERROR_NONE) {
-                       MMCAM_LOG_WARNING("Get socket path failed 0x%x", err);
-                       SAFE_FREE(err_name);
-                       goto pipeline_creation_error;
-               }
-
-               g_object_set(G_OBJECT(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), "socket-path", socket_path, NULL);
-       } else {
-               if (hcamcorder->use_videoconvert && (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "directvideosink"))) {
-                       /* get video convert name */
-                       _mmcamcorder_conf_get_value_element_name(sc->VideoconvertElement, &videoconvert_name);
-
-                       if (videoconvert_name) {
-                               MMCAM_LOG_INFO("videoconvert element name : %s", videoconvert_name);
-                               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_CLS, videoconvert_name, "videosink_cls", element_list, err);
-                       } else
-                               MMCAM_LOG_ERROR("failed to get videoconvert element name");
-               }
+               if (videoconvert_name) {
+                       MMCAM_LOG_INFO("videoconvert element name : %s", videoconvert_name);
+                       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_CLS, videoconvert_name, "videosink_cls", element_list, err);
+               } else
+                       MMCAM_LOG_ERROR("failed to get videoconvert element name");
+       }
 
-               /* check sink element in attribute */
-               mm_camcorder_get_attributes(handle, NULL,
-                       MMCAM_DISPLAY_REUSE_ELEMENT, &sink_element, &sink_element_size,
-                       NULL);
+       /* check sink element in attribute */
+       mm_camcorder_get_attributes(handle, NULL,
+               MMCAM_DISPLAY_REUSE_ELEMENT, &sink_element, &sink_element_size,
+               NULL);
 
-               if (sink_element) {
-                       int attr_index = 0;
-                       MMHandleType attrs = MMF_CAMCORDER_ATTRS(handle);
+       if (sink_element) {
+               int attr_index = 0;
+               MMHandleType attrs = MMF_CAMCORDER_ATTRS(handle);
 
-                       MMCAM_LOG_INFO("reuse sink element %p in attribute", sink_element);
+               MMCAM_LOG_INFO("reuse sink element %p in attribute", sink_element);
 
-                       _MMCAMCORDER_ELEMENT_ADD(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, sink_element, element_list, err);
+               _MMCAMCORDER_ELEMENT_ADD(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, sink_element, element_list, err);
 
-                       /* reset attribute */
-                       if (attrs) {
-                               mm_attrs_get_index((MMHandleType)attrs, MMCAM_DISPLAY_REUSE_ELEMENT, &attr_index);
-                               mm_attrs_set_data(attrs, attr_index, NULL, 0);
-                               mm_attrs_commit(attrs, attr_index);
-                       } else {
-                               MMCAM_LOG_WARNING("attribute is NULL");
-                               err = MM_ERROR_CAMCORDER_NOT_INITIALIZED;
-                               goto pipeline_creation_error;
-                       }
+               /* reset attribute */
+               if (attrs) {
+                       mm_attrs_get_index((MMHandleType)attrs, MMCAM_DISPLAY_REUSE_ELEMENT, &attr_index);
+                       mm_attrs_set_data(attrs, attr_index, NULL, 0);
+                       mm_attrs_commit(attrs, attr_index);
                } else {
-                       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, videosink_name, "videosink_sink", element_list, err);
-
-                       _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, sc->VideosinkElement);
-               }
-
-               if (_mmcamcorder_videosink_window_set(handle, sc->VideosinkElement) != MM_ERROR_NONE) {
-                       MMCAM_LOG_ERROR("_mmcamcorder_videosink_window_set error");
-                       err = MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
+                       MMCAM_LOG_WARNING("attribute is NULL");
+                       err = MM_ERROR_CAMCORDER_NOT_INITIALIZED;
                        goto pipeline_creation_error;
                }
+       } else {
+               _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, videosink_name, "videosink_sink", element_list, err);
+
+               _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, sc->VideosinkElement);
+       }
+
+       if (_mmcamcorder_videosink_window_set(handle, sc->VideosinkElement) != MM_ERROR_NONE) {
+               MMCAM_LOG_ERROR("_mmcamcorder_videosink_window_set error");
+               err = MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
+               goto pipeline_creation_error;
        }
 
        /* Set caps by rotation */

diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c
index c7e3f23..ca9bf9b 100644 (file)
--- a/src/mm_camcorder_internal.c
+++ b/src/mm_camcorder_internal.c
@@ -904,8 +904,6 @@ int _mmcamcorder_realize(MMHandleType handle)
        double motion_rate = _MMCAMCORDER_DEFAULT_RECORDING_MOTION_RATE;
        char *videosink_element_type = NULL;
        const char *videosink_name = NULL;
-       char *socket_path = NULL;
-       int socket_path_len = 0;
        int conn_size = 0;
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
@@ -996,17 +994,6 @@ int _mmcamcorder_realize(MMHandleType handle)
        case MM_DISPLAY_SURFACE_NULL:
                videosink_element_type = strdup("VideosinkElementNull");
                break;
-       case MM_DISPLAY_SURFACE_REMOTE:
-               mm_camcorder_get_attributes(handle, NULL,
-                       MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_len,
-                       NULL);
-               if (socket_path == NULL) {
-                       MMCAM_LOG_WARNING("REMOTE surface, but socket path is NULL -> to NullSink");
-                       videosink_element_type = strdup("VideosinkElementNull");
-               } else {
-                       videosink_element_type = strdup("VideosinkElementRemote");
-               }
-               break;
        default:
                videosink_element_type = strdup("VideosinkElementOverlay");
                break;
@@ -1021,7 +1008,7 @@ int _mmcamcorder_realize(MMHandleType handle)
                free(videosink_element_type);
                videosink_element_type = NULL;
        } else {
-               MMCAM_LOG_WARNING("strdup failed(display_surface_type %d). Use default X type",
+               MMCAM_LOG_WARNING("strdup failed(display_surface_type %d). Use default Overlay type",
                        display_surface_type);
 
                _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,