diff options
| author | Hyunil <hyunil46.park@samsung.com> | 2016-02-04 15:37:57 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2016-02-04 15:53:24 +0900 |
| commit | 82c2496f7c00323b5b781d558447bd9d977e31a9 (patch) | |
| tree | 2be1264b3ea53d8cde478a121d0591c9be4265ec | |
| parent | a4ede73f7d91a55c808df6b0f8dbb06b5c2af8d9 (diff) | |
| download | libmm-camcorder-82c2496f7c00323b5b781d558447bd9d977e31a9.tar.gz libmm-camcorder-82c2496f7c00323b5b781d558447bd9d977e31a9.tar.bz2 libmm-camcorder-82c2496f7c00323b5b781d558447bd9d977e31a9.zip | |
[Release version 0.10.36] Add new video overlay interface for wl_surface idsubmit/tizen_common/20160218.142243submit/tizen/20160216.102007submit/tizen/20160216.083712accepted/tizen/wearable/20160217.011044accepted/tizen/tv/20160217.011033accepted/tizen/mobile/20160217.011013
Change-Id: Ia27bc7eda607c13e41d25b044766404fa26001fe
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
| -rw-r--r-- | packaging/libmm-camcorder.spec | 2 | ||||
| -rw-r--r-- | src/include/mm_camcorder.h | 2 | ||||
| -rw-r--r-- | src/mm_camcorder_attribute.c | 4 | ||||
| -rw-r--r-- | src/mm_camcorder_gstcommon.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index 61f6c44..447857e 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.35 +Version: 0.10.36 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_camcorder.h b/src/include/mm_camcorder.h index c5f3b30..10f589c 100644 --- a/src/include/mm_camcorder.h +++ b/src/include/mm_camcorder.h @@ -1797,7 +1797,7 @@ typedef struct _MMCamFaceDetectInfo { * Wayland information */ typedef struct _MMCamWaylandInfo { - int parent_id; + int global_surface_id; int window_x; int window_y; int window_width; diff --git a/src/mm_camcorder_attribute.c b/src/mm_camcorder_attribute.c index 64fec71..fbec727 100644 --- a/src/mm_camcorder_attribute.c +++ b/src/mm_camcorder_attribute.c @@ -3266,9 +3266,9 @@ bool _mmcamcorder_commit_display_handle(MMHandleType handle, int attr_idx, const } else if (!strcmp(videosink_name, "waylandsink")) { MMCamWaylandInfo *wl_info = (MMCamWaylandInfo *)p_handle; - _mmcam_dbg_log("parent id : %d", wl_info->parent_id); + _mmcam_dbg_log("wayland global surface id : %d", wl_info->global_surface_id); - gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), (guintptr)wl_info->parent_id); + gst_video_overlay_set_wl_window_wl_surface_id(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), (guintptr)wl_info->global_surface_id); gst_video_overlay_set_render_rectangle(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), wl_info->window_x, wl_info->window_y, wl_info->window_width, wl_info->window_height); #endif /* HAVE_WAYLAND */ diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c index 8f0da1d..3ad6ec2 100644 --- a/src/mm_camcorder_gstcommon.c +++ b/src/mm_camcorder_gstcommon.c @@ -1266,8 +1266,8 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi } else if (!strcmp(videosink_name, "waylandsink")) { MMCamWaylandInfo *wl_info = (MMCamWaylandInfo *)overlay; if (wl_info) { - _mmcam_dbg_log("parent id : %d", wl_info->parent_id); - gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(vsink), (guintptr)wl_info->parent_id); + _mmcam_dbg_log("wayland global surface id : %d", wl_info->global_surface_id); + gst_video_overlay_set_wl_window_wl_surface_id(GST_VIDEO_OVERLAY(vsink), (guintptr)wl_info->global_surface_id); gst_video_overlay_set_render_rectangle(GST_VIDEO_OVERLAY(vsink), wl_info->window_x, wl_info->window_y, wl_info->window_width, wl_info->window_height); } else { |