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
/**
* Default videosink type
*/
-#define _MMCAMCORDER_DEFAULT_VIDEOSINK_TYPE "VideosinkElementX"
+#define _MMCAMCORDER_DEFAULT_VIDEOSINK_TYPE "VideosinkElementOverlay"
/**
* Default recording motion rate
"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},
"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},
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;
_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");
videosink_element_type = strdup("VideosinkElementNull");
break;
default:
- videosink_element_type = strdup("VideosinkElementX");
+ videosink_element_type = strdup("VideosinkElementOverlay");
break;
}
&___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,
/* [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 */
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;
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");
videosink_element_type = strdup("VideosinkElementRemote");
break;
default:
- videosink_element_type = strdup("VideosinkElementX");
+ videosink_element_type = strdup("VideosinkElementOverlay");
break;
}
}
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;
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,