From 83ddc153ec0abe894f3925cf445bef5e55858e0e Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Thu, 16 Nov 2017 16:50:22 +0900 Subject: [PATCH] Replace "waylandsink" by "tizenwlsink" [Version] 0.10.143 [Profile] Common [Issue Type] Update [Dependency module] N/A Change-Id: If479881f21cc6a03d7fc4be9a30dbfa192118d77 Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/mm_camcorder_attribute.c | 14 +++++++------- src/mm_camcorder_configure.c | 2 +- src/mm_camcorder_gstcommon.c | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index 52b45b6..17e63b8 100644 --- 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.142 +Version: 0.10.143 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_camcorder_attribute.c b/src/mm_camcorder_attribute.c index c92fcc8..58c98af 100644 --- a/src/mm_camcorder_attribute.c +++ b/src/mm_camcorder_attribute.c @@ -3729,7 +3729,7 @@ bool _mmcamcorder_commit_display_handle(MMHandleType handle, int attr_idx, const } else if (!strcmp(videosink_name, "evasimagesink") || !strcmp(videosink_name, "evaspixmapsink")) { _mmcam_dbg_log("Commit : Set evas object [%p]", p_handle); MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "evas-object", p_handle); - } else if (!strcmp(videosink_name, "waylandsink")) { + } else if (!strcmp(videosink_name, "tizenwlsink")) { MMCamWaylandInfo *wl_info = (MMCamWaylandInfo *)p_handle; _mmcam_dbg_log("wayland global surface id : %d", wl_info->global_surface_id); @@ -3783,7 +3783,7 @@ bool _mmcamcorder_commit_display_mode(MMHandleType handle, int attr_idx, const m _mmcam_dbg_log("Commit : videosinkname[%s]", videosink_name); - if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink")) { + if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink")) { _mmcam_dbg_log("Commit : display mode [%d]", value->value.i_val); MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "display-mode", value->value.i_val); } else { @@ -3876,7 +3876,7 @@ bool _mmcamcorder_commit_display_visible(MMHandleType handle, int attr_idx, cons return FALSE; } - if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink") || + if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "evaspixmapsink") || !strcmp(videosink_name, "evasimagesink")) { MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "visible", value->value.i_val); _mmcam_dbg_log("Set visible [%d] done.", value->value.i_val); @@ -3921,7 +3921,7 @@ bool _mmcamcorder_commit_display_geometry_method(MMHandleType handle, int attr_i return FALSE; } - if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink") || + if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "evaspixmapsink") || !strcmp(videosink_name, "evasimagesink")) { method = value->value.i_val; MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "display-geometry-method", method); @@ -3976,7 +3976,7 @@ bool _mmcamcorder_commit_display_rect(MMHandleType handle, int attr_idx, const m return FALSE; } - if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink") || + if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "evaspixmapsink")) { int rect_x = 0; int rect_y = 0; @@ -4030,7 +4030,7 @@ bool _mmcamcorder_commit_display_rect(MMHandleType handle, int attr_idx, const m if (!(flags & MM_ATTRS_FLAG_MODIFIED)) { _mmcam_dbg_log("RECT(x,y,w,h) = (%d,%d,%d,%d)", rect_x, rect_y, rect_width, rect_height); - if (!strcmp(videosink_name, "waylandsink")) { + if (!strcmp(videosink_name, "tizenwlsink")) { ret = gst_video_overlay_set_render_rectangle(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), rect_x, rect_y, rect_width, rect_height); if (!ret) { @@ -4089,7 +4089,7 @@ bool _mmcamcorder_commit_display_scale(MMHandleType handle, int attr_idx, const } zoom = value->value.i_val; - if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink")) { + if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink")) { vs_element = sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst; MMCAMCORDER_G_OBJECT_SET(vs_element, "zoom", (float)(zoom + 1)); diff --git a/src/mm_camcorder_configure.c b/src/mm_camcorder_configure.c index f140d6e..c37a213 100644 --- a/src/mm_camcorder_configure.c +++ b/src/mm_camcorder_configure.c @@ -120,7 +120,7 @@ int _mmcamcorder_conf_init(MMHandleType handle, int type, camera_conf *configure static type_string* __videosink_default_string_array[] = {NULL}; static type_element _videosink_element_overlay_default = { "VideosinkElementOverlay", - "waylandsink", + "tizenwlsink", __videosink_default_int_array, sizeof(__videosink_default_int_array) / sizeof(type_int*), __videosink_default_string_array, diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c index 1af154a..318d271 100644 --- a/src/mm_camcorder_gstcommon.c +++ b/src/mm_camcorder_gstcommon.c @@ -375,7 +375,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) g_object_set(G_OBJECT(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), "socket-path", socket_path, NULL); } else { - if (hcamcorder->use_videoconvert && (!strcmp(videosink_name, "waylandsink") || !strcmp(videosink_name, "directvideosink"))) { + 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); @@ -1404,7 +1404,7 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi _mmcam_dbg_err("display handle(eavs object) is NULL"); return MM_ERROR_CAMCORDER_INVALID_ARGUMENT; } - } else if (!strcmp(videosink_name, "waylandsink") || !strcmp(videosink_name, "directvideosink")) { + } else if (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "directvideosink")) { MMCamWaylandInfo *wl_info = (MMCamWaylandInfo *)overlay; if (wl_info) { @@ -1423,7 +1423,7 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi videosink_name, display_geometry_method, origin_size, visible, rotation, flip); /* Set attribute */ - if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink") || + if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "evaspixmapsink") || !strcmp(videosink_name, "directvideosink")) { /* set rotation */ MMCAMCORDER_G_OBJECT_SET(vsink, "rotate", rotation); @@ -1453,7 +1453,7 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi MMCAMCORDER_G_OBJECT_SET(vsink, "zoom", zoom_level); if (display_geometry_method == MM_DISPLAY_METHOD_CUSTOM_ROI) { - if (!strcmp(videosink_name, "waylandsink")) { + if (!strcmp(videosink_name, "tizenwlsink")) { gst_video_overlay_set_render_rectangle(GST_VIDEO_OVERLAY(vsink), rect_x, rect_y, rect_width, rect_height); } else { @@ -2276,7 +2276,7 @@ bool _mmcamcorder_set_display_rotation(MMHandleType handle, int display_rotate, return FALSE; } - if (!strcmp(videosink_name, "waylandsink") || !strcmp(videosink_name, "xvimagesink") || + if (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "evasimagesink") || !strcmp(videosink_name, "evaspixmapsink") || !strcmp(videosink_name, "directvideosink")) { MMCAMCORDER_G_OBJECT_SET(sc->element[videosink_index].gst, "rotate", display_rotate); @@ -2315,7 +2315,7 @@ bool _mmcamcorder_set_display_flip(MMHandleType handle, int display_flip, int vi return FALSE; } - if (!strcmp(videosink_name, "waylandsink") || !strcmp(videosink_name, "xvimagesink") || + if (!strcmp(videosink_name, "tizenwlsink") || !strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "evasimagesink") || !strcmp(videosink_name, "evaspixmapsink") || !strcmp(videosink_name, "directvideosink")) { MMCAMCORDER_G_OBJECT_SET(sc->element[videosink_index].gst, "flip", display_flip); -- 2.7.4