From: Jeongmo Yang Date: Tue, 26 Jan 2016 05:26:36 +0000 (+0900) Subject: [Release version 0.10.32] Replace display enum X-Git-Tag: accepted/tizen/mobile/20160127.004319^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git;a=commitdiff_plain;h=14ac398e0d968d39de2693cbb1383e27dd85d054 [Release version 0.10.32] Replace display enum Change-Id: Ie9ed4c459e64d1b20320be4d6b287635c77c6f9f Signed-off-by: Jeongmo Yang --- diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index fb7673d..1172658 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.31 +Version: 0.10.32 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_camcorder_internal.h b/src/include/mm_camcorder_internal.h index d363bdf..96ef090 100644 --- a/src/include/mm_camcorder_internal.h +++ b/src/include/mm_camcorder_internal.h @@ -255,7 +255,7 @@ extern "C" { /** * Default videosink type */ -#define _MMCAMCORDER_DEFAULT_VIDEOSINK_TYPE "VideosinkElementX" +#define _MMCAMCORDER_DEFAULT_VIDEOSINK_TYPE "VideosinkElementOverlay" /** * Default recording motion rate diff --git a/src/mm_camcorder_attribute.c b/src/mm_camcorder_attribute.c index e60bf6a..a5a88e4 100644 --- a/src/mm_camcorder_attribute.c +++ b/src/mm_camcorder_attribute.c @@ -698,7 +698,7 @@ _mmcamcorder_alloc_attribute( MMHandleType handle, MMCamPreset *info ) "display-surface", MMF_VALUE_TYPE_INT, MM_ATTRS_FLAG_RW, - {(void*)MM_DISPLAY_SURFACE_X}, + {(void*)MM_DISPLAY_SURFACE_OVERLAY}, MM_ATTRS_VALID_TYPE_INT_ARRAY, {0}, {0}, diff --git a/src/mm_camcorder_client.c b/src/mm_camcorder_client.c index 2044d8f..4439d60 100644 --- a/src/mm_camcorder_client.c +++ b/src/mm_camcorder_client.c @@ -832,7 +832,7 @@ MMHandleType _mmcamcorder_client_alloc_attribute(MMHandleType handle) "display-surface", MMF_VALUE_TYPE_INT, MM_ATTRS_FLAG_RW, - {(void*)MM_DISPLAY_SURFACE_X}, + {(void*)MM_DISPLAY_SURFACE_OVERLAY}, MM_ATTRS_VALID_TYPE_INT_ARRAY, {0}, {0}, @@ -1339,7 +1339,7 @@ int _mmcamcorder_client_realize(MMHandleType handle, char *string_caps) mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); _MMCamcorderSubContext *sc; - int display_surface_type = MM_DISPLAY_SURFACE_X; + int display_surface_type = MM_DISPLAY_SURFACE_OVERLAY; char *videosink_element_type = NULL; const char *videosink_name = NULL; char *err_name = NULL; @@ -1375,8 +1375,8 @@ int _mmcamcorder_client_realize(MMHandleType handle, char *string_caps) _mmcam_dbg_warn("display_surface_type : %d", display_surface_type); switch (display_surface_type) { - case MM_DISPLAY_SURFACE_X: - videosink_element_type = strdup("VideosinkElementX"); + case MM_DISPLAY_SURFACE_OVERLAY: + videosink_element_type = strdup("VideosinkElementOverlay"); break; case MM_DISPLAY_SURFACE_EVAS: videosink_element_type = strdup("VideosinkElementEvas"); @@ -1388,7 +1388,7 @@ int _mmcamcorder_client_realize(MMHandleType handle, char *string_caps) videosink_element_type = strdup("VideosinkElementNull"); break; default: - videosink_element_type = strdup("VideosinkElementX"); + videosink_element_type = strdup("VideosinkElementOverlay"); break; } diff --git a/src/mm_camcorder_configure.c b/src/mm_camcorder_configure.c index 2119fc9..9a4c705 100644 --- a/src/mm_camcorder_configure.c +++ b/src/mm_camcorder_configure.c @@ -116,9 +116,9 @@ void _mmcamcorder_conf_init(MMHandleType handle, int type, camera_conf** configu &___videosink_default_rotation, }; static type_string* __videosink_default_string_array[] = { NULL }; - static type_element _videosink_element_x_default = { - "VideosinkElementX", - "xvimagesink", + static type_element _videosink_element_overlay_default = { + "VideosinkElementOverlay", + "waylandsink", __videosink_default_int_array, sizeof( __videosink_default_int_array ) / sizeof( type_int* ), __videosink_default_string_array, @@ -637,17 +637,17 @@ void _mmcamcorder_conf_init(MMHandleType handle, int type, camera_conf** configu /* [VideoOutput] matching table */ static conf_info_table conf_main_video_output_table[] = { - { "DisplayDevice", CONFIGURE_VALUE_INT_ARRAY, {NULL} }, - { "DisplayMode", CONFIGURE_VALUE_INT_ARRAY, {NULL} }, - { "Videosink", CONFIGURE_VALUE_INT_ARRAY, {NULL} }, - { "VideosinkElementX", CONFIGURE_VALUE_ELEMENT, {&_videosink_element_x_default} }, - { "VideosinkElementEvas", CONFIGURE_VALUE_ELEMENT, {&_videosink_element_evas_default} }, - { "VideosinkElementGL", CONFIGURE_VALUE_ELEMENT, {&_videosink_element_gl_default} }, - { "VideosinkElementRemote",CONFIGURE_VALUE_ELEMENT, {&_videosink_element_remote_default} }, - { "VideosinkElementNull", CONFIGURE_VALUE_ELEMENT, {&_videosink_element_null_default} }, - { "UseVideoscale", CONFIGURE_VALUE_INT, {.value_int = 0} }, - { "VideoscaleElement", CONFIGURE_VALUE_ELEMENT, {&_videoscale_element_default} }, - { "VideoconvertElement", CONFIGURE_VALUE_ELEMENT, {&_videoconvert_element_default} }, + { "DisplayDevice", CONFIGURE_VALUE_INT_ARRAY, {NULL} }, + { "DisplayMode", CONFIGURE_VALUE_INT_ARRAY, {NULL} }, + { "Videosink", CONFIGURE_VALUE_INT_ARRAY, {NULL} }, + { "VideosinkElementOverlay", CONFIGURE_VALUE_ELEMENT, {&_videosink_element_overlay_default} }, + { "VideosinkElementEvas", CONFIGURE_VALUE_ELEMENT, {&_videosink_element_evas_default} }, + { "VideosinkElementGL", CONFIGURE_VALUE_ELEMENT, {&_videosink_element_gl_default} }, + { "VideosinkElementRemote", CONFIGURE_VALUE_ELEMENT, {&_videosink_element_remote_default} }, + { "VideosinkElementNull", CONFIGURE_VALUE_ELEMENT, {&_videosink_element_null_default} }, + { "UseVideoscale", CONFIGURE_VALUE_INT, {.value_int = 0} }, + { "VideoscaleElement", CONFIGURE_VALUE_ELEMENT, {&_videoscale_element_default} }, + { "VideoconvertElement", CONFIGURE_VALUE_ELEMENT, {&_videoconvert_element_default} }, }; /* [Capture] matching table */ diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c index 8b1892b..df28056 100644 --- a/src/mm_camcorder_internal.c +++ b/src/mm_camcorder_internal.c @@ -787,7 +787,7 @@ int _mmcamcorder_realize(MMHandleType handle) int state = MM_CAMCORDER_STATE_NONE; int state_FROM = MM_CAMCORDER_STATE_NULL; int state_TO = MM_CAMCORDER_STATE_READY; - int display_surface_type = MM_DISPLAY_SURFACE_X; + int display_surface_type = MM_DISPLAY_SURFACE_OVERLAY; int pid_for_sound_focus = 0; double motion_rate = _MMCAMCORDER_DEFAULT_RECORDING_MOTION_RATE; char *videosink_element_type = NULL; @@ -920,8 +920,8 @@ int _mmcamcorder_realize(MMHandleType handle) videosink_element_type = strdup("VideosinkElementNull"); } else { switch (display_surface_type) { - case MM_DISPLAY_SURFACE_X: - videosink_element_type = strdup("VideosinkElementX"); + case MM_DISPLAY_SURFACE_OVERLAY: + videosink_element_type = strdup("VideosinkElementOverlay"); break; case MM_DISPLAY_SURFACE_EVAS: videosink_element_type = strdup("VideosinkElementEvas"); @@ -936,7 +936,7 @@ int _mmcamcorder_realize(MMHandleType handle) videosink_element_type = strdup("VideosinkElementRemote"); break; default: - videosink_element_type = strdup("VideosinkElementX"); + videosink_element_type = strdup("VideosinkElementOverlay"); break; } } @@ -986,7 +986,7 @@ int _mmcamcorder_realize(MMHandleType handle) mm_camcorder_get_attributes(handle, NULL, MMCAM_DISPLAY_SURFACE, &display_surface_type, NULL); - if(display_surface_type == MM_DISPLAY_SURFACE_X) { + if(display_surface_type == MM_DISPLAY_SURFACE_OVERLAY) { if((_mmcamcorder_resource_manager_prepare(&hcamcorder->resource_manager, RESOURCE_TYPE_VIDEO_OVERLAY))) { _mmcam_dbg_err("could not prepare for video overlay resource"); ret = MM_ERROR_CAMCORDER_INTERNAL; diff --git a/test/mm_camcorder_testsuite.c b/test/mm_camcorder_testsuite.c index ce3ddec..8f7c12f 100644 --- a/test/mm_camcorder_testsuite.c +++ b/test/mm_camcorder_testsuite.c @@ -2141,7 +2141,7 @@ static gboolean init(int type) MMCAM_TAG_LATITUDE, 35.3036944, MMCAM_TAG_LONGITUDE, 176.67837, MMCAM_TAG_ALTITUDE, 190.3455, - MMCAM_DISPLAY_SURFACE, MM_DISPLAY_SURFACE_X, + MMCAM_DISPLAY_SURFACE, MM_DISPLAY_SURFACE_OVERLAY, MMCAM_DISPLAY_GEOMETRY_METHOD, MM_DISPLAY_METHOD_LETTER_BOX, MMCAM_CAPTURE_COUNT, IMAGE_CAPTURE_COUNT_STILL, MMCAM_TAG_GPS_ENABLE, TRUE,