#endif
#include "gstwaylandsink.h"
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
#include <mm_types.h>
#include "tizen-wlvideoformat.h"
#endif
#include <stdlib.h>
#include <string.h>
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+#define GST_APP_EVENT_FLUSH_BUFFER_NAME "application/flush-buffer"
+
#define GST_TYPE_WAYLANDSINK_DISPLAY_GEOMETRY_METHOD (gst_waylandsink_display_geometry_method_get_type())
#define GST_TYPE_WAYLANDSINK_ROTATE_ANGLE (gst_waylandsink_rotate_angle_get_type())
#define GST_TYPE_WAYLANDSINK_FLIP (gst_waylandsink_flip_get_type())
{2, "Full-screen", "FULL_SCREEN"},
{3, "Cropped full-screen", "CROPPED_FULL_SCREEN"},
{4, "Origin size(if screen size is larger than video size(width/height)) or Letter box(if video size(width/height) is larger than screen size)", "ORIGIN_SIZE_OR_LETTER_BOX"},
- {5, NULL, NULL},
+ {5, "Specially described destination ROI", "DISP_GEO_METHOD_CUSTOM_ROI"},
+ {6, NULL, NULL},
};
if (!waylandsink_display_geometry_method_type) {
enum
{
SIGNAL_0,
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ SIGNAL_HANDOFF,
+ SIGNAL_PREROLL_HANDOFF,
+#endif
LAST_SIGNAL
};
{
PROP_0,
PROP_DISPLAY,
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ PROP_SIGNAL_HANDOFFS,
+ PROP_USE_GAPLESS,
+ PROP_KEEP_CAMERA_PREVIEW,
PROP_USE_TBM,
PROP_ROTATE_ANGLE,
PROP_DISPLAY_GEOMETRY_METHOD,
- PROP_ORIENTATION,
- PROP_FLIP
+ PROP_FLIP,
+ PROP_VISIBLE,
+ PROP_FOLLOW_PARENT_TRANSFORM,
+ PROP_CROP_X,
+ PROP_CROP_Y,
+ PROP_CROP_WIDTH,
+ PROP_CROP_HEIGHT,
+ PROP_RATIO_WIDTH,
+ PROP_RATIO_HEIGHT,
+ PROP_SCALE_WIDTH,
+ PROP_SCALE_HEIGHT,
+ PROP_OFFSET_X,
+ PROP_OFFSET_Y,
+ PROP_OFFSET_WIDTH,
+ PROP_OFFSET_HEIGHT,
+ PROP_ALIGN_WIDTH,
+ PROP_ALIGN_HEIGHT
#endif
};
int dump__cnt = 0;
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE
("{ BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, "
"RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, "
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
"SN12, ST12, "
#endif
"YUV9, YVU9, Y41B, I420, YV12, Y42B, v308 }"))
iface);
static void gst_wayland_sink_begin_geometry_change (GstWaylandVideo * video);
static void gst_wayland_sink_end_geometry_change (GstWaylandVideo * video);
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+static gboolean gst_wayland_sink_event (GstBaseSink * bsink, GstEvent * event);
static void gst_wayland_sink_update_window_geometry (GstWaylandSink * sink);
static void render_last_buffer (GstWaylandSink * sink);
+
+static guint gst_waylandsink_signals[LAST_SIGNAL] = { 0 };
+
#endif
#define gst_wayland_sink_parent_class parent_class
G_DEFINE_TYPE_WITH_CODE (GstWaylandSink, gst_wayland_sink, GST_TYPE_VIDEO_SINK,
gstbasesink_class->propose_allocation =
GST_DEBUG_FUNCPTR (gst_wayland_sink_propose_allocation);
gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_wayland_sink_render);
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_wayland_sink_event);
+#endif
g_object_class_install_property (gobject_class, PROP_DISPLAY,
g_param_spec_string ("display", "Wayland Display name", "Wayland "
"display name to connect to, if not supplied via the GstContext",
NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-#ifdef GST_WLSINK_ENHANCEMENT
+
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ g_object_class_install_property (gobject_class, PROP_KEEP_CAMERA_PREVIEW,
+ g_param_spec_boolean ("keep-camera-preview", "use flush buffer mechanism",
+ "Last tbm buffer is copied and returned to camerasrc immediately "
+ "when state change(PAUSED_TO_READY)", FALSE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
g_object_class_install_property (gobject_class, PROP_USE_TBM,
- g_param_spec_boolean ("use-tbm",
- "Use Tizen Buffer Memory insted of Shared memory",
- "When enabled, Memory is alloced by TBM insted of SHM ", TRUE,
+ g_param_spec_boolean ("use-tbm", "use tbm buffer",
+ "Use Tizen Buffer Memory insted of Shared memory, "
+ "Memory is alloced by TBM insted of SHM when enabled", TRUE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_ROTATE_ANGLE,
DEF_DISPLAY_GEOMETRY_METHOD,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (gobject_class, PROP_ORIENTATION,
- g_param_spec_enum ("orientation",
- "Orientation information used for ROI/ZOOM",
- "Orientation information for display",
- GST_TYPE_WAYLANDSINK_ROTATE_ANGLE, DEGREE_0,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
g_object_class_install_property (gobject_class, PROP_FLIP,
g_param_spec_enum ("flip", "Display flip",
"Flip for display",
GST_TYPE_WAYLANDSINK_FLIP, DEF_DISPLAY_FLIP,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (gobject_class, PROP_VISIBLE,
+ g_param_spec_boolean ("visible", "Visible",
+ "Draws screen or blacks out, true means visible, false blacks out",
+ TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+#ifdef ENABLE_FUNCTION
+ g_object_class_install_property (gobject_class, PROP_SCALE_WIDTH,
+ g_param_spec_double ("scale-w", "ratio width",
+ "scale width for rendering video,"
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0.0,
+ G_MAXDOUBLE, 1.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_SCALE_HEIGHT,
+ g_param_spec_double ("scale-h", "scale height",
+ "scale width for rendering video, "
+ "Function is not support in DISP_GEO_METHOD_CUSTOM_ROI. ", 0.0,
+ G_MAXDOUBLE, 1.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_FOLLOW_PARENT_TRANSFORM,
+ g_param_spec_boolean ("follow-parent-transform",
+ "follow parent transform",
+ "Video is rotated automatically without setting rotate property by rotating Display"
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", TRUE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_CROP_X,
+ g_param_spec_uint ("crop-x", "crop x",
+ "x-coordinate for cropping video. "
+ "Please set crop-x, crop-y, crop-w and crop-h togethrer. "
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0,
+ G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_CROP_Y,
+ g_param_spec_uint ("crop-y", "crop y",
+ "y-coordinate for cropping video. "
+ "Please set crop-x, crop-y, crop-w and crop-h togethrer. "
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0,
+ G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_CROP_WIDTH,
+ g_param_spec_uint ("crop-w", "crop width",
+ "width for cropping video. "
+ "If value is not set or is set 0, Width is set to video width after set_caps. "
+ "Please set crop-x, crop-y, crop-w and crop-h togethrer. "
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0,
+ G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_CROP_HEIGHT,
+ g_param_spec_uint ("crop-h", "crop height",
+ "height for cropping video. "
+ "If value is not set or is set 0, Hight is set to video height after set_caps. "
+ "Please set crop-x, crop-y, crop-w and crop-h togethrer. "
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0,
+ G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_RATIO_WIDTH,
+ g_param_spec_double ("ratio-w", "ratio width",
+ "ratio width for rendering video,"
+ "If value is set, Original video ratio is ignored. to restore original size, set to -1"
+ "Please set ratio-w and ratio-h togethrer. "
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", -1.0,
+ G_MAXDOUBLE, -1.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_RATIO_HEIGHT,
+ g_param_spec_double ("ratio-h", "ratio height",
+ "ratio width for rendering video, "
+ "If value is set, Original video ratio is ignored. to restore original size, set to -1"
+ "Please set ratio-w and ratio-h togethrer. "
+ "Function is not support in DISP_GEO_METHOD_CUSTOM_ROI. ", -1.0,
+ G_MAXDOUBLE, -1.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_OFFSET_X,
+ g_param_spec_uint ("offset-x", "offset x",
+ "x offset for moving x-coordinate of video pixel, "
+ "Please set x, y, w and h offset togethrer"
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0,
+ G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_OFFSET_Y,
+ g_param_spec_uint ("offset-y", "offset y",
+ "y offset for moving y-coordinate of video pixel, "
+ "Please set x, y, w and h offset togethrer"
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0,
+ G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_OFFSET_WIDTH,
+ g_param_spec_uint ("offset-w", "offset width",
+ "width offset for adjusting width of of video pixel, "
+ "Please set x, y, w and h offset togethrer"
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0,
+ G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_OFFSET_HEIGHT,
+ g_param_spec_uint ("offset-h", "offset height",
+ "height offset for adjusting height of of video pixel"
+ "Please set x, y, w and h offset togethrer"
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0,
+ G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_ALIGN_WIDTH,
+ g_param_spec_double ("align-w", "align width",
+ "Align with, Left: 0.0, Middle: 0.5, Right: 1.0, "
+ "Please set align-w and align-h togethrer"
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0.0,
+ 1.0, 0.5, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ g_object_class_install_property (gobject_class, PROP_ALIGN_HEIGHT,
+ g_param_spec_double ("align-h", "align height",
+ "Align height, Left: 0.0, Middle: 0.5, Right: 1.0, "
+ "Please set align-w and align-h togethrer"
+ "Function is not supported in DISP_GEO_METHOD_CUSTOM_ROI. ", 0.0,
+ 1.0, 0.5, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+#endif
+
+ /* fakesink function for stream callback of MSL with browser */
+ g_object_class_install_property (gobject_class, PROP_SIGNAL_HANDOFFS,
+ g_param_spec_boolean ("signal-handoffs", "Signal handoffs",
+ "Send a signal before unreffing the buffer", FALSE,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+ gst_waylandsink_signals[SIGNAL_HANDOFF] =
+ g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstWaylandSinkClass, handoff), NULL, NULL,
+ g_cclosure_marshal_generic, G_TYPE_NONE, 2,
+ GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE, GST_TYPE_PAD);
+
+ gst_waylandsink_signals[SIGNAL_PREROLL_HANDOFF] =
+ g_signal_new ("preroll-handoff", G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstWaylandSinkClass, preroll_handoff),
+ NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 2,
+ GST_TYPE_BUFFER | G_SIGNAL_TYPE_STATIC_SCOPE, GST_TYPE_PAD);
+
#endif
}
gst_wayland_sink_init (GstWaylandSink * sink)
{
FUNCTION;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ sink->signal_handoffs = FALSE;
+ sink->request_camera_flush_buf = FALSE;
+ sink->keep_camera_preview = FALSE;
+ sink->got_costum_event = FALSE;
sink->USE_TBM = TRUE;
sink->display_geometry_method = DEF_DISPLAY_GEOMETRY_METHOD;
sink->flip = DEF_DISPLAY_FLIP;
sink->rotate_angle = DEGREE_0;
- sink->orientation = DEGREE_0;
+ sink->visible = TRUE;
+ sink->crop_x = sink->crop_y = sink->crop_w = sink->crop_h = 0;
+#ifdef ENABLE_FUNCTION
+ sink->follow_parent_transform = FALSE;
+ sink->ratio_w = sink->ratio_h = -1.0; //need to set -1.0 for original video ratio
+ sink->align_w = sink->align_h = 0.5;
+ sink->scale_w = sink->scale_h = 1.0;
+ sink->offset_x = sink->offset_y = sink->offset_w = sink->offset_h = 0;
+#endif
#endif
g_mutex_init (&sink->display_lock);
g_mutex_init (&sink->render_lock);
}
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+static void
+gst_wayland_sink_stop_video (GstWaylandSink * sink)
+{
+ FUNCTION;
+ g_return_if_fail (sink != NULL);
+ gst_wl_window_render (sink->window, NULL, NULL);
+}
+
+static int
+gst_wayland_sink_check_use_gapless (GstWaylandSink * sink)
+{
+ g_return_val_if_fail (sink != NULL, FALSE);
+ g_return_val_if_fail (sink->display != NULL, FALSE);
+
+ if (sink->got_costum_event && sink->USE_TBM
+ && sink->display->is_native_format)
+ return TRUE;
+
+ return FALSE;
+}
+
+static int
+gst_wayland_sink_need_to_make_flush_buffer (GstWaylandSink * sink)
+{
+ g_return_val_if_fail (sink != NULL, FALSE);
+ g_return_val_if_fail (sink->display != NULL, FALSE);
+
+ if ((gst_wayland_sink_check_use_gapless (sink))
+ || sink->request_camera_flush_buf || sink->display->flush_request) {
+ sink->display->flush_request = TRUE;
+ return TRUE;
+ }
+ return FALSE;
+}
+
static void
gst_wayland_sink_update_last_buffer_geometry (GstWaylandSink * sink)
{
GstWlBuffer *wlbuffer;
+ gboolean no_render_buffer = FALSE;
FUNCTION;
g_return_if_fail (sink != NULL);
-
+ g_return_if_fail (sink->last_buffer != NULL);
wlbuffer = gst_buffer_get_wl_buffer (sink->last_buffer);
- wlbuffer->used_by_compositor = FALSE;
- /*need to render last buffer */
- /* reuse current GstWlBuffer */
- render_last_buffer (sink);
- /* ref count is incresed in gst_wl_buffer_attach() of render_last_buffer(),
- to call gst_wl_buffer_finalize(), we need to decrease buffer ref count */
- gst_buffer_unref (wlbuffer->gstbuffer);
+ g_return_if_fail (wlbuffer != NULL);
+
+ if (wlbuffer->used_by_compositor) {
+ /* used last buffer by compositor don't receive buffer-release-event when attach */
+ wlbuffer->used_by_compositor = FALSE;
+ } else {
+ /* unused last buffer by compositor will receive buffer release event when attach */
+ no_render_buffer = TRUE;
+ }
+
+ GST_LOG ("gstbuffer(%p) ref_count(%d)", sink->last_buffer,
+ GST_OBJECT_REFCOUNT_VALUE (sink->last_buffer));
+
+ if (sink->visible) {
+ /* need to render last buffer, reuse current GstWlBuffer */
+ render_last_buffer (sink);
+
+ /* ref count is incresed in gst_wl_buffer_attach() of render_last_buffer(),
+ to call gst_wl_buffer_finalize(), we need to decrease buffer ref count.
+ wayland server can not release buffer if we attach same buffer and
+ videosink can not receive buffer-release-event. if we use no visible,
+ we need to attach null buffer and videosink can receive buffer-release-event */
+
+ /* need to decrease buffer ref_count, if no_render_buffer is TRUE,
+ buffer is attached firstly so, videosink can receive buffer-release-event */
+ if (no_render_buffer) {
+ GST_LOG ("skip unref.. will get buffer-release-event");
+ } else {
+ gst_buffer_unref (wlbuffer->gstbuffer);
+ }
+
+ } else {
+ GST_LOG ("skip rendering");
+ }
+
+ GST_LOG ("gstbuffer(%p) ref_count(%d)", sink->last_buffer,
+ GST_OBJECT_REFCOUNT_VALUE (sink->last_buffer));
+
}
+
#ifdef USE_WL_FLUSH_BUFFER
static int
-gst_wayland_sink_make_flush_buffer (GstWlDisplay * display, MMVideoBuffer * mm_video_buf)
+gst_wayland_sink_make_flush_buffer (GstWlDisplay * display,
+ MMVideoBuffer * mm_video_buf)
{
GstWlFlushBuffer *flush_buffer = NULL;
tbm_bo bo = NULL;
g_return_val_if_fail (display != NULL, FALSE);
g_return_val_if_fail (mm_video_buf != NULL, FALSE);
- flush_buffer = (GstWlFlushBuffer *)malloc(sizeof(GstWlFlushBuffer));
- if (!flush_buffer){
+ flush_buffer = (GstWlFlushBuffer *) malloc (sizeof (GstWlFlushBuffer));
+ if (!flush_buffer) {
GST_ERROR ("GstWlFlushBuffer alloc faile");
return FALSE;
}
- memset (flush_buffer, 0x0, sizeof(GstWlFlushBuffer));
+ memset (flush_buffer, 0x0, sizeof (GstWlFlushBuffer));
- display->flush_tbm_bufmgr = wayland_tbm_client_get_bufmgr (display->tbm_client);
- g_return_if_fail (display->flush_tbm_bufmgr != NULL);
+ display->flush_tbm_bufmgr =
+ wayland_tbm_client_get_bufmgr (display->tbm_client);
+ g_return_val_if_fail (display->flush_tbm_bufmgr != NULL, FALSE);
- for (i=0; i<NV_BUF_PLANE_NUM; i++){
- if (mm_video_buf->handle.bo[i] != NULL){
+ for (i = 0; i < NV_BUF_PLANE_NUM; i++) {
+ if (mm_video_buf->handle.bo[i] != NULL) {
tbm_bo_handle src;
tbm_bo_handle dst;
/* alloc bo */
bo = tbm_bo_alloc (display->flush_tbm_bufmgr, bo_size, TBM_DEVICE_CPU);
if (!bo) {
- GST_ERROR ("alloc tbm bo(size:%d) failed: %s", bo_size, strerror(errno));
+ GST_ERROR ("alloc tbm bo(size:%d) failed: %s", bo_size,
+ strerror (errno));
return FALSE;
}
- GST_INFO ("flush buffer tbm_bo =(%p)", bo);
+ GST_LOG ("flush buffer tbm_bo =(%p)", bo);
flush_buffer->bo[i] = bo;
/* get virtual address */
src.ptr = dst.ptr = NULL;
src = tbm_bo_get_handle (mm_video_buf->handle.bo[i], TBM_DEVICE_CPU);
dst = tbm_bo_get_handle (bo, TBM_DEVICE_CPU);
if (!src.ptr || !dst.ptr) {
- GST_ERROR ("get tbm bo handle failed src(%p) dst(%p): %s", src.ptr, dst.ptr, strerror (errno));
+ GST_ERROR ("get tbm bo handle failed src(%p) dst(%p): %s", src.ptr,
+ dst.ptr, strerror (errno));
tbm_bo_unref (mm_video_buf->handle.bo[i]);
tbm_bo_unref (bo);
return FALSE;
}
static int
-gst_wayland_sink_copy_mm_video_buf_info_to_flush (GstWlDisplay * display, MMVideoBuffer * mm_video_buf)
+gst_wayland_sink_copy_mm_video_buf_info_to_flush (GstWlDisplay * display,
+ MMVideoBuffer * mm_video_buf)
{
int ret = FALSE;
g_return_val_if_fail (display != NULL, FALSE);
g_return_val_if_fail (mm_video_buf != NULL, FALSE);
FUNCTION;
- ret = gst_wayland_sink_make_flush_buffer(display, mm_video_buf);
- if (ret){
+ ret = gst_wayland_sink_make_flush_buffer (display, mm_video_buf);
+ if (ret) {
int i;
for (i = 0; i < NV_BUF_PLANE_NUM; i++) {
if (display->flush_buffer->bo[i] != NULL) {
display->bo[i] = display->flush_buffer->bo[i];
- GST_LOG("bo %p", display->bo[i]);
+ GST_LOG ("bo %p", display->bo[i]);
} else {
display->bo[i] = 0;
}
display->stride_height[i] = mm_video_buf->stride_height[i];
display->native_video_size += display->plane_size[i];
}
+ memset (mm_video_buf, 0, sizeof (MMVideoBuffer));
}
return ret;
}
#endif
static void
-gst_wayland_sink_add_mm_video_buf_info (GstWlDisplay * display, MMVideoBuffer * mm_video_buf)
+gst_wayland_sink_add_mm_video_buf_info (GstWlDisplay * display,
+ MMVideoBuffer * mm_video_buf)
{
int i;
g_return_if_fail (display != NULL);
}
static int
-gst_wayland_sink_get_mm_video_buf_info(GstWlDisplay * display, GstBuffer * buffer)
+gst_wayland_sink_get_mm_video_buf_info (GstWaylandSink * sink,
+ GstBuffer * buffer)
{
+ GstWlDisplay *display;
GstMemory *mem;
GstMapInfo mem_info = GST_MAP_INFO_INIT;
MMVideoBuffer *mm_video_buf = NULL;
- g_return_val_if_fail (display != NULL, FALSE);
+ g_return_val_if_fail (sink != NULL, FALSE);
g_return_val_if_fail (buffer != NULL, FALSE);
FUNCTION;
+ display = sink->display;
+ g_return_val_if_fail (sink->display != NULL, FALSE);
mem = gst_buffer_peek_memory (buffer, 1);
gst_memory_map (mem, &mem_info, GST_MAP_READ);
}
/* assign mm_video_buf info */
if (mm_video_buf->type == MM_VIDEO_BUFFER_TYPE_TBM_BO) {
- GST_DEBUG ("TBM bo %p %p %p", mm_video_buf->handle.bo[0],
- mm_video_buf->handle.bo[1], mm_video_buf->handle.bo[2]);
+ GST_DEBUG ("TBM bo %p %p", mm_video_buf->handle.bo[0],
+ mm_video_buf->handle.bo[1]);
display->native_video_size = 0;
+ display->flush_request = 0;
display->flush_request = mm_video_buf->flush_request;
- GST_DEBUG ("flush_request value is %d",display->flush_request);
+ GST_DEBUG ("flush_request value is %d", display->flush_request);
#ifdef USE_WL_FLUSH_BUFFER
- if (display->flush_request) {
- if(!gst_wayland_sink_copy_mm_video_buf_info_to_flush(display, mm_video_buf)){
- GST_ERROR("cat not copy mm_video_buf info to flush");
+ if (gst_wayland_sink_need_to_make_flush_buffer (sink)) {
+ if (!gst_wayland_sink_copy_mm_video_buf_info_to_flush (display,
+ mm_video_buf)) {
+ GST_ERROR ("cat not copy mm_video_buf info to flush");
return FALSE;
- }
+ }
} else
#endif
/* normal routine */
- gst_wayland_sink_add_mm_video_buf_info(display, mm_video_buf);
+ gst_wayland_sink_add_mm_video_buf_info (display, mm_video_buf);
} else {
GST_ERROR ("Buffer type is not TBM");
return FALSE;
return TRUE;
}
+static void
+gst_wayland_sink_render_flush_buffer (GstBaseSink * bsink)
+{
+ GstWaylandSink *sink;
+ GstBuffer *buffer;
+ sink = GST_WAYLAND_SINK (bsink);
+ FUNCTION;
+ g_return_if_fail (sink != NULL);
+ g_return_if_fail (sink->last_buffer != NULL);
+
+ buffer = gst_buffer_copy_deep (sink->last_buffer);
+
+ gst_wayland_sink_render (bsink, buffer);
+ if (buffer)
+ gst_buffer_unref (buffer);
+}
+
+static void
+gst_wayland_sink_gapless_render (GstBaseSink * bsink)
+{
+ g_return_if_fail (bsink != NULL);
+ FUNCTION;
+ gst_wayland_sink_render_flush_buffer (bsink);
+}
+
+static void
+gst_wayland_sink_keep_camera_preview (GstBaseSink * bsink)
+{
+ g_return_if_fail (bsink != NULL);
+ FUNCTION;
+ gst_wayland_sink_render_flush_buffer (bsink);
+}
+
#endif
+
static void
gst_wayland_sink_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec)
g_value_set_string (value, sink->display_name);
GST_OBJECT_UNLOCK (sink);
break;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ case PROP_KEEP_CAMERA_PREVIEW:
+ g_value_set_boolean (value, sink->keep_camera_preview);
+ break;
+ case PROP_SIGNAL_HANDOFFS:
+ g_value_set_boolean (value, sink->signal_handoffs);
+ break;
case PROP_USE_TBM:
g_value_set_boolean (value, sink->USE_TBM);
break;
case PROP_DISPLAY_GEOMETRY_METHOD:
g_value_set_enum (value, sink->display_geometry_method);
break;
- case PROP_ORIENTATION:
- g_value_set_enum (value, sink->orientation);
- break;
case PROP_FLIP:
g_value_set_enum (value, sink->flip);
break;
+ case PROP_VISIBLE:
+ g_value_set_boolean (value, sink->visible);
+ break;
+#ifdef ENABLE_FUNCTION
+ case PROP_SCALE_WIDTH:
+ g_value_set_double (value, sink->scale_w);
+ break;
+ case PROP_SCALE_HEIGHT:
+ g_value_set_double (value, sink->scale_h);
+ break;
+ case PROP_FOLLOW_PARENT_TRANSFORM:
+ g_value_set_boolean (value, sink->follow_parent_transform);
+ break;
+ case PROP_CROP_X:
+ g_value_set_uint (value, sink->crop_x);
+ break;
+ case PROP_CROP_Y:
+ g_value_set_uint (value, sink->crop_y);
+ break;
+ case PROP_CROP_WIDTH:
+ g_value_set_uint (value, sink->crop_w);
+ break;
+ case PROP_CROP_HEIGHT:
+ g_value_set_uint (value, sink->crop_h);
+ break;
+ case PROP_RATIO_WIDTH:
+ g_value_set_double (value, sink->ratio_w);
+ break;
+ case PROP_RATIO_HEIGHT:
+ g_value_set_double (value, sink->ratio_h);
+ break;
+ case PROP_OFFSET_X:
+ g_value_set_uint (value, sink->offset_x);
+ break;
+ case PROP_OFFSET_Y:
+ g_value_set_uint (value, sink->offset_y);
+ break;
+ case PROP_OFFSET_WIDTH:
+ g_value_set_uint (value, sink->offset_w);
+ break;
+ case PROP_OFFSET_HEIGHT:
+ g_value_set_uint (value, sink->offset_h);
+ break;
+ case PROP_ALIGN_WIDTH:
+ g_value_set_double (value, sink->align_w);
+ break;
+ case PROP_ALIGN_HEIGHT:
+ g_value_set_double (value, sink->align_h);
+ break;
+#endif
#endif
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
sink->display_name = g_value_dup_string (value);
GST_OBJECT_UNLOCK (sink);
break;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ case PROP_SIGNAL_HANDOFFS:
+ sink->signal_handoffs = g_value_get_boolean (value);
+ GST_LOG ("set signal_handoffs(%d)", sink->signal_handoffs);
+ if (sink->signal_handoffs && sink->window) {
+ /* overlay -> hand-off */
+ gst_wayland_sink_stop_video (sink);
+ }
+ break;
+ case PROP_KEEP_CAMERA_PREVIEW:
+ sink->keep_camera_preview = g_value_get_boolean (value);
+ GST_LOG ("keep_camera_preview (%d)", sink->keep_camera_preview);
+ break;
case PROP_USE_TBM:
sink->USE_TBM = g_value_get_boolean (value);
GST_LOG ("1:USE TBM 0: USE SHM set(%d)", sink->USE_TBM);
break;
-
case PROP_ROTATE_ANGLE:
if (sink->rotate_angle == g_value_get_enum (value))
break;
gst_wl_window_set_rotate_angle (sink->window, sink->rotate_angle);
}
break;
-
case PROP_DISPLAY_GEOMETRY_METHOD:
if (sink->display_geometry_method == g_value_get_enum (value))
break;
sink->display_geometry_method);
sink->video_info_changed = TRUE;
if (sink->window) {
- gst_wl_window_set_disp_geo_method (sink->window,
+ gst_wl_window_set_destination_mode (sink->window,
sink->display_geometry_method);
}
break;
-
- case PROP_ORIENTATION:
- if (sink->orientation == g_value_get_enum (value))
- break;
- sink->orientation = g_value_get_enum (value);
- GST_WARNING_OBJECT (sink, "Orientation is set (%d)", sink->orientation);
- sink->video_info_changed = TRUE;
- if (sink->window) {
- gst_wl_window_set_orientation (sink->window, sink->orientation);
- }
- break;
-
case PROP_FLIP:
if (sink->flip == g_value_get_enum (value))
break;
gst_wl_window_set_flip (sink->window, sink->flip);
}
break;
+ case PROP_VISIBLE:
+ if (sink->visible == g_value_get_boolean (value))
+ break;
+ sink->visible = g_value_get_boolean (value);
+ GST_WARNING_OBJECT (sink, "visible is set (%d)", sink->visible);
+ if (sink->visible && GST_STATE (sink) == GST_STATE_PAUSED) {
+ /* need to attatch last buffer */
+ sink->video_info_changed = TRUE;
+ } else if (!sink->visible && GST_STATE (sink) >= GST_STATE_PAUSED) {
+ /* video stop */
+ if (sink->window) {
+ gst_wayland_sink_stop_video (sink);
+ }
+ }
+ break;
+#ifdef ENABLE_FUNCTION
+ case PROP_SCALE_WIDTH:
+ if (sink->scale_w == g_value_get_double (value)
+ || sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->scale_w = g_value_get_double (value);
+ GST_WARNING_OBJECT (sink, "scale-w is set (%f)", sink->scale_w);
+ sink->video_info_changed = TRUE;
+ if (sink->window)
+ gst_wl_window_set_destination_mode_scale (sink->window, sink->scale_w,
+ sink->scale_h);
+ break;
+ case PROP_SCALE_HEIGHT:
+ if (sink->scale_h == g_value_get_double (value)
+ || sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->scale_h = g_value_get_double (value);
+ GST_WARNING_OBJECT (sink, "scale-h is set (%f)", sink->scale_h);
+ sink->video_info_changed = TRUE;
+ if (sink->window)
+ gst_wl_window_set_destination_mode_scale (sink->window, sink->scale_w,
+ sink->scale_h);
+ break;
+ case PROP_FOLLOW_PARENT_TRANSFORM:
+ if (sink->follow_parent_transform == g_value_get_boolean (value)
+ || sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->follow_parent_transform = g_value_get_boolean (value);
+ GST_WARNING_OBJECT (sink, "follow parent transform is set (%d)",
+ sink->follow_parent_transform);
+ sink->video_info_changed = TRUE;
+ if (sink->window) {
+ gst_wl_window_set_destination_mode_follow_parent_transform
+ (sink->window, sink->follow_parent_transform);
+ }
+ break;
+ case PROP_CROP_X:
+ if (sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->crop_x = g_value_get_uint (value);
+ GST_WARNING_OBJECT (sink, "crop-x is set (%d)", sink->crop_x);
+ break;
+ case PROP_CROP_Y:
+ if (sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->crop_y = g_value_get_uint (value);
+ GST_WARNING_OBJECT (sink, "crop-y is set (%d)", sink->crop_y);
+ break;
+ case PROP_CROP_WIDTH:
+ if (sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->crop_w = g_value_get_uint (value);
+ GST_WARNING_OBJECT (sink, "crop_w is set (%d)", sink->crop_w);
+ /* crop-w is unset by 0, set to video width size */
+ if (sink->crop_w == 0 && sink->video_info.width > 0) {
+ sink->crop_w =
+ gst_util_uint64_scale_int_round (sink->video_info.width,
+ sink->video_info.par_n, sink->video_info.par_d);
+ GST_LOG ("crop-w is unset by 0, set to video width size(%d)",
+ sink->crop_w);
+ }
+ break;
+ case PROP_CROP_HEIGHT:
+ if (sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->crop_h = g_value_get_uint (value);
+ GST_WARNING_OBJECT (sink, "crop-h is set (%d)", sink->crop_h);
+ /* crop-h unset by 0, set to video height size */
+ if (sink->crop_h == 0 && sink->video_info.height > 0) {
+ sink->crop_h = sink->video_info.height;
+ GST_LOG ("crop-h is unset by 0, set to video height size(%d)",
+ sink->crop_h);
+ }
+ sink->video_info_changed = TRUE;
+ if (sink->window && sink->crop_w > 0 && sink->crop_h > 0) {
+ gst_wl_window_set_destination_mode_crop_wl_buffer (sink->window,
+ sink->crop_x, sink->crop_y, sink->crop_w, sink->crop_h);
+ }
+ break;
+ case PROP_RATIO_WIDTH:
+ if (sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->ratio_w = g_value_get_double (value);
+ GST_WARNING_OBJECT (sink, "ratio-w is set (%f)", sink->ratio_w);
+ break;
+ case PROP_RATIO_HEIGHT:
+ if (sink->scale_w == g_value_get_double (value)
+ || sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->ratio_h = g_value_get_double (value);
+ GST_WARNING_OBJECT (sink, "ratio-h is set (%f)", sink->ratio_h);
+ sink->video_info_changed = TRUE;
+ if (sink->window)
+ gst_wl_window_set_destination_mode_ratio (sink->window, sink->ratio_w,
+ sink->ratio_h);
+ break;
+ case PROP_OFFSET_X:
+ if (sink->offset_x == g_value_get_uint (value)
+ || sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->offset_x = g_value_get_uint (value);
+ GST_WARNING_OBJECT (sink, "offset-x is set (%d)", sink->offset_x);
+ break;
+ case PROP_OFFSET_Y:
+ if (sink->offset_y == g_value_get_uint (value)
+ || sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->offset_y = g_value_get_uint (value);
+ GST_WARNING_OBJECT (sink, "offset-y is set (%d)", sink->offset_y);
+ break;
+ case PROP_OFFSET_WIDTH:
+ if (sink->offset_w == g_value_get_uint (value)
+ || sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->offset_w = g_value_get_uint (value);
+ GST_WARNING_OBJECT (sink, "offset-w is set (%d)", sink->offset_w);
+ break;
+ case PROP_OFFSET_HEIGHT:
+ if (sink->offset_h == g_value_get_uint (value)
+ || sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->offset_h = g_value_get_uint (value);
+ GST_WARNING_OBJECT (sink, "offset-h is set (%d)", sink->offset_h);
+ sink->video_info_changed = TRUE;
+ if (sink->window)
+ gst_wl_window_set_destination_mode_offset (sink->window, sink->offset_x,
+ sink->offset_y, sink->offset_w, sink->offset_h);
+ break;
+ case PROP_ALIGN_WIDTH:
+ if (sink->align_w == g_value_get_double (value)
+ || sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->align_w = g_value_get_double (value);
+ GST_WARNING_OBJECT (sink, "align_w is set (%f)", sink->align_w);
+ break;
+ case PROP_ALIGN_HEIGHT:
+ if (sink->align_h == g_value_get_double (value)
+ || sink->display_geometry_method == DISP_GEO_METHOD_CUSTOM_ROI)
+ break;
+ sink->align_h = g_value_get_double (value);
+ GST_WARNING_OBJECT (sink, "align_h is set (%f)", sink->align_h);
+ sink->video_info_changed = TRUE;
+ if (sink->window)
+ gst_wl_window_set_destination_mode_align (sink->window, sink->align_w,
+ sink->align_h);
+ break;
+#endif
#endif
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
- if (sink->video_info_changed && sink->window
- && GST_STATE (sink) == GST_STATE_PAUSED) {
- gst_wayland_sink_update_last_buffer_geometry (sink);
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ if (sink->video_info_changed && sink->window) {
+ gst_wl_window_set_video_info_change (sink->window, TRUE);
+ if (GST_STATE (sink) == GST_STATE_PAUSED)
+ gst_wayland_sink_update_last_buffer_geometry (sink);
}
+#endif
g_mutex_unlock (&sink->render_lock);
}
G_OBJECT_CLASS (parent_class)->finalize (object);
}
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+static gboolean
+gst_wayland_sink_event (GstBaseSink * bsink, GstEvent * event)
+{
+ GstWaylandSink *sink;
+ const GstStructure *s;
+
+ sink = GST_WAYLAND_SINK (bsink);
+
+ switch (GST_EVENT_TYPE (event)) {
+ case GST_EVENT_EOS:
+ GST_LOG ("get GST_EVENT_EOS event..state is %d", GST_STATE (sink));
+ break;
+ case GST_EVENT_CUSTOM_DOWNSTREAM:
+ s = gst_event_get_structure (event);
+ if (s == NULL
+ || !gst_structure_has_name (s, GST_APP_EVENT_FLUSH_BUFFER_NAME))
+ break;
+
+ GST_LOG ("get GST_EVENT_CUSTOM_DOWNSTREAM EVENT: %s..state is %d",
+ gst_structure_get_name (s), GST_STATE (sink));
+
+ sink->got_costum_event = TRUE;
+ if (gst_wayland_sink_check_use_gapless (sink)) {
+ gst_wayland_sink_gapless_render (bsink);
+ sink->got_costum_event = FALSE;
+ }
+ sink->got_costum_event = FALSE;
+ break;
+ default:
+ break;
+ }
+ return GST_BASE_SINK_CLASS (parent_class)->event (bsink, event);
+}
+#endif
+
/* must be called with the display_lock */
static void
gst_wayland_sink_set_display_from_context (GstWaylandSink * sink,
("Failed to use the external wayland display: '%s'", error->message));
g_error_free (error);
}
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
sink->display->USE_TBM = sink->USE_TBM;
#endif
}
g_error_free (error);
ret = FALSE;
}
-#ifdef GST_WLSINK_ENHANCEMENT
- sink->display->USE_TBM = sink->USE_TBM;
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ if (sink->display)
+ sink->display->USE_TBM = sink->USE_TBM;
#endif
}
}
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
+ GST_LOG ("WAYLANDSINK TRANSITION: NULL_TO_READY");
if (!gst_wayland_sink_find_display (sink))
return GST_STATE_CHANGE_FAILURE;
break;
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
+ GST_LOG ("WAYLANDSINK TRANSITION: READY_TO_PAUSED");
+ break;
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+ GST_LOG ("WAYLANDSINK TRANSITION: PAUSED_TO_PLAYING");
+ break;
default:
break;
}
return ret;
switch (transition) {
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+ GST_LOG ("WAYLANDSINK TRANSITION: PLAYING_TO_PAUSED");
+ break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
+ GST_LOG ("WAYLANDSINK TRANSITION: PAUSED_TO_READY");
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ if (sink->keep_camera_preview) {
+ if (sink->window) {
+ if (!gst_wl_window_is_toplevel (sink->window)) {
+ GstBaseSink *bsink = GST_BASE_SINK (element);
+ sink->request_camera_flush_buf = TRUE;
+ gst_wayland_sink_keep_camera_preview (bsink);
+ sink->request_camera_flush_buf = FALSE;
+ break;
+ }
+ }
+ }
+#endif
gst_buffer_replace (&sink->last_buffer, NULL);
if (sink->window) {
if (gst_wl_window_is_toplevel (sink->window)) {
+ GST_DEBUG ("internal window");
g_clear_object (&sink->window);
} else {
/* remove buffer from surface, show nothing */
-#ifdef USE_WL_FLUSH_BUFFER
- sink->display->flush_request = 0;
-#endif
+ GST_DEBUG ("external window");
gst_wl_window_render (sink->window, NULL, NULL);
}
}
break;
case GST_STATE_CHANGE_READY_TO_NULL:
+ GST_LOG ("WAYLANDSINK TRANSITION: READY_TO_NULL");
g_mutex_lock (&sink->display_lock);
/* If we had a toplevel window, we most likely have our own connection
* to the display too, and it is a good idea to disconnect and allow
gst_wayland_sink_set_display_from_context (sink, context);
else {
GST_WARNING_OBJECT (element, "changing display handle is not supported");
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
g_mutex_unlock (&sink->display_lock);
return;
#endif
GValue value = G_VALUE_INIT;
GArray *formats;
gint i;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
uint32_t tbm_fmt;
#endif
enum wl_shm_format fmt;
g_value_init (&list, GST_TYPE_LIST);
g_value_init (&value, G_TYPE_STRING);
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
if (sink->display->USE_TBM)
formats = sink->display->tbm_formats;
else /* SHM */
formats = sink->display->formats;
for (i = 0; i < formats->len; i++) {
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
if (sink->USE_TBM) {
tbm_fmt = g_array_index (formats, uint32_t, i);
g_value_set_string (&value, gst_wl_tbm_format_to_string (tbm_fmt));
gst_value_list_append_value (&list, &value);
- /* TBM doesn't support SN12. So we add SN12 manually as supported format.
- * SN12 is exactly same with NV12.
+ /* TBM doesn't support SN12 and ST12. So we add SN12 and ST12 manually as supported format.
+ * SN12 is same with NV12, ST12 is same with NV12MT
*/
if (tbm_fmt == TBM_FORMAT_NV12) {
g_value_set_string (&value,
gst_video_format_to_string (GST_VIDEO_FORMAT_SN12));
gst_value_list_append_value (&list, &value);
+ } else if (tbm_fmt == TBM_FORMAT_NV12MT) {
+ g_value_set_string (&value,
+ gst_video_format_to_string (GST_VIDEO_FORMAT_ST12));
+ gst_value_list_append_value (&list, &value);
}
} else { /* USE SHM */
fmt = g_array_index (formats, uint32_t, i);
gst_structure_set_value (gst_caps_get_structure (caps, 0), "format", &list);
GST_DEBUG_OBJECT (sink, "display caps: %" GST_PTR_FORMAT, caps);
+ g_value_unset (&value);
+ g_value_unset (&list);
+
}
g_mutex_unlock (&sink->display_lock);
GstWaylandSink *sink;
GstBufferPool *newpool;
GstVideoInfo info;
-#ifdef GST_WLSINK_ENHANCEMENT
- uint32_t tbm_format;
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ uint32_t tbm_format = -1;
#endif
- enum wl_shm_format format;
+ enum wl_shm_format format = -1;
GArray *formats;
gint i;
/* extract info from caps */
if (!gst_video_info_from_caps (&info, caps))
goto invalid_format;
-#ifdef GST_WLSINK_ENHANCEMENT
- sink->caps = gst_caps_copy (caps);
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
if (sink->USE_TBM) {
tbm_format =
gst_video_format_to_wl_tbm_format (GST_VIDEO_INFO_FORMAT (&info));
#endif
/* verify we support the requested format */
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
if (sink->display->USE_TBM) {
- GST_INFO ("USE TBM FORMAT");
+ GST_LOG ("USE TBM FORMAT");
formats = sink->display->tbm_formats;
for (i = 0; i < formats->len; i++) {
if (g_array_index (formats, uint32_t, i) == tbm_format)
break;
}
} else { /* USE SHM */
- GST_INFO ("USE SHM FORMAT");
+ GST_LOG ("USE SHM FORMAT");
formats = sink->display->formats;
for (i = 0; i < formats->len; i++) {
if (g_array_index (formats, uint32_t, i) == format)
if (i >= formats->len)
goto unsupported_format;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ /* init value for set source */
+ sink->crop_x = sink->crop_y = sink->crop_w = sink->crop_h = 0;
+
if (sink->USE_TBM) {
if (GST_VIDEO_INFO_FORMAT (&info) == GST_VIDEO_FORMAT_SN12 ||
GST_VIDEO_INFO_FORMAT (&info) == GST_VIDEO_FORMAT_ST12) {
gst_object_replace ((GstObject **) & sink->pool, (GstObject *) newpool);
gst_object_unref (newpool);
}
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ if (sink->window)
+ gst_wayland_sink_update_window_geometry (sink);
+#endif
+
#else /*open source */
/* create a new pool for the new configuration */
newpool = gst_video_buffer_pool_new ();
}
unsupported_format:
{
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
if (sink->USE_TBM)
GST_DEBUG_OBJECT (sink, "Format %s is not available on the display",
gst_wl_tbm_format_to_string (tbm_format));
GstWaylandSink *sink = GST_WAYLAND_SINK (bsink);
GstStructure *config;
guint size, min_bufs, max_bufs;
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
gboolean need_pool;
GstCaps *caps;
FUNCTION;
static GstFlowReturn
gst_wayland_sink_preroll (GstBaseSink * bsink, GstBuffer * buffer)
{
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ GstWaylandSink *sink = GST_WAYLAND_SINK (bsink);
FUNCTION;
+
GST_DEBUG_OBJECT (bsink, "preroll buffer %p", buffer);
+
+ if (sink->signal_handoffs) {
+ GST_LOG ("g_signal_emit: preroll-handoff");
+ g_signal_emit (sink,
+ gst_waylandsink_signals[SIGNAL_PREROLL_HANDOFF], 0, buffer,
+ bsink->sinkpad);
+
+ return GST_FLOW_OK;
+ }
+#endif
return gst_wayland_sink_render (bsink, buffer);
}
GST_LOG ("frame_redraw_cb");
g_atomic_int_set (&sink->redraw_pending, FALSE);
+ GST_INFO ("wl_callback_destroy (wl_callback@%p)", callback);
wl_callback_destroy (callback);
}
frame_redraw_callback
};
-#ifdef GST_WLSINK_ENHANCEMENT
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
static void
gst_wayland_sink_update_window_geometry (GstWaylandSink * sink)
{
g_return_if_fail (sink->window != NULL);
gst_wl_window_set_rotate_angle (sink->window, sink->rotate_angle);
- gst_wl_window_set_disp_geo_method (sink->window,
+ gst_wl_window_set_destination_mode (sink->window,
sink->display_geometry_method);
- gst_wl_window_set_orientation (sink->window, sink->orientation);
gst_wl_window_set_flip (sink->window, sink->flip);
+ if (sink->crop_w == 0 && sink->crop_h == 0) {
+ sink->crop_w =
+ gst_util_uint64_scale_int_round (sink->video_info.width,
+ sink->video_info.par_n, sink->video_info.par_d);
+ sink->crop_h = sink->video_info.height;
+ }
+ gst_wl_window_set_destination_mode_crop_wl_buffer (sink->window, sink->crop_x,
+ sink->crop_y, sink->crop_w, sink->crop_h);
+#ifdef ENABLE_FUNCTION
+ gst_wl_window_set_destination_mode_follow_parent_transform (sink->window,
+ sink->follow_parent_transform);
+ gst_wl_window_set_destination_mode_ratio (sink->window, sink->ratio_w,
+ sink->ratio_h);
+ gst_wl_window_set_destination_mode_scale (sink->window, sink->scale_w,
+ sink->scale_h);
+ gst_wl_window_set_destination_mode_offset (sink->window, sink->offset_x,
+ sink->offset_y, sink->offset_w, sink->offset_h);
+ gst_wl_window_set_destination_mode_align (sink->window, sink->align_w,
+ sink->align_h);
+#endif
}
#endif
/* must be called with the render lock */
struct wl_surface *surface;
struct wl_callback *callback;
FUNCTION;
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ g_return_if_fail (sink->last_buffer != NULL);
+ g_return_if_fail (sink->window != NULL);
+#endif
wlbuffer = gst_buffer_get_wl_buffer (sink->last_buffer);
surface = gst_wl_window_get_wl_surface (sink->window);
g_atomic_int_set (&sink->redraw_pending, TRUE);
callback = wl_surface_frame (surface);
+ GST_INFO ("wl_callback@%p = wl_surface_frame (video_surface@%p)", callback,
+ surface);
+
/* frame_callback_listener is called when wayland-client finish rendering the wl_buffer */
+ GST_INFO
+ ("wl_callback_add_listener (wl_callback@%p, wl_callback_listener@%p, GstWaylandSink@%p)",
+ callback, &frame_callback_listener, sink);
wl_callback_add_listener (callback, &frame_callback_listener, sink);
if (G_UNLIKELY (sink->video_info_changed)) {
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ gst_wl_window_set_video_info_change (sink->window, TRUE);
+#endif
info = &sink->video_info;
sink->video_info_changed = FALSE;
}
-#ifdef GST_WLSINK_ENHANCEMENT
- if (sink->last_buffer)
- gst_wl_window_render (sink->window, wlbuffer, info);
- else {
- if (G_UNLIKELY (info)) {
- gst_wl_window_set_video_info (sink->window, &info);
- }
- }
-#else
gst_wl_window_render (sink->window, wlbuffer, info);
-#endif
}
static GstFlowReturn
g_mutex_lock (&sink->render_lock);
- GST_LOG_OBJECT (sink, "render buffer %p", buffer);
+ GST_LOG_OBJECT (sink, "render gstbuffer %p, ref_count(%d)", buffer,
+ GST_OBJECT_REFCOUNT_VALUE (buffer));
if (G_UNLIKELY (!sink->window)) {
/* ask for window handle. Unlock render_lock while doing that because
sink->window =
gst_wl_window_new_toplevel (sink->display, &sink->video_info);
}
- }
-#ifdef GST_WLSINK_ENHANCEMENT
- gst_wayland_sink_update_window_geometry (sink);
- sink->video_info_changed = TRUE;
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+ gst_wayland_sink_update_window_geometry (sink);
#endif
+ }
+
+ if (sink->signal_handoffs) {
+ GST_LOG ("g_signal_emit: hand-off ");
+ g_signal_emit (sink, gst_waylandsink_signals[SIGNAL_HANDOFF], 0, buffer,
+ bsink->sinkpad);
+ goto done;
+ }
+
/* drop buffers until we get a frame callback */
- if (g_atomic_int_get (&sink->redraw_pending) == TRUE)
+ if (g_atomic_int_get (&sink->redraw_pending) == TRUE
+ && !gst_wayland_sink_check_use_gapless (sink))
goto done;
+
+#ifndef TIZEN_FEATURE_WLSINK_ENHANCEMENT /* for tizen view_port, we don't know window size */
/* make sure that the application has called set_render_rectangle() */
if (G_UNLIKELY (sink->window->render_rectangle.w == 0))
goto no_window_size;
-
-#ifdef GST_WLSINK_ENHANCEMENT
+#endif
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
wlbuffer = gst_buffer_get_wl_buffer (buffer);
- if (G_LIKELY (wlbuffer && wlbuffer->display == sink->display)) {
+ if (G_LIKELY (wlbuffer && wlbuffer->display == sink->display)
+ && !(gst_wayland_sink_check_use_gapless (sink))
+ && !sink->request_camera_flush_buf) {
GST_LOG_OBJECT (sink, "buffer %p has a wl_buffer from our display, " "writing directly", buffer); //buffer is from our pool and have wl_buffer
- GST_INFO ("wl_buffer (%p)", wlbuffer->wlbuffer);
+ GST_LOG ("wl_buffer (%p)", wlbuffer->wlbuffer);
to_render = buffer;
#ifdef DUMP_BUFFER
GstMemory *mem;
if (ret) {
GST_ERROR ("_write_rawdata() failed");
}
- GST_INFO ("DUMP IMAGE %d, size (%d)", dump__cnt, size);
+ GST_LOG ("DUMP IMAGE %d, size (%d)", dump__cnt, size);
gst_memory_unmap (mem, &mem_info);
#endif
} else {
if (sink->USE_TBM && sink->display->is_native_format) {
/* in case of SN12 or ST12 */
- if (!gst_wayland_sink_get_mm_video_buf_info(sink->display, buffer))
+ if (!gst_wayland_sink_get_mm_video_buf_info (sink, buffer))
return GST_FLOW_ERROR;
wlbuffer = gst_buffer_get_wl_buffer (buffer);
- if (G_UNLIKELY (!wlbuffer)) {
+ /* last_buffer from gaplasee have wlbuffer */
+ if (G_UNLIKELY (!wlbuffer)
+ || (gst_wayland_sink_check_use_gapless (sink))
+ || sink->request_camera_flush_buf) {
wbuf =
gst_wl_shm_memory_construct_wl_buffer (mem, sink->display,
&sink->video_info);
goto no_wl_buffer;
gst_buffer_add_wl_buffer (buffer, wbuf, sink->display);
}
- }
- else if (sink->USE_TBM && !sink->display->is_native_format) {
+ } else if (sink->USE_TBM && !sink->display->is_native_format) {
/* sink->pool always exists (created in set_caps), but it may not
* be active if upstream is not using it */
//GstMemory *mem;
//mem = gst_buffer_peek_memory (to_render, 0);
//if (gst_is_wl_shm_memory (mem)) {
- GST_INFO ("to_render buffer is our buffer");
+ GST_LOG ("to_render buffer is our buffer");
//}
/* the first time we acquire a buffer,
* we need to attach a wl_buffer on it */
}
if (sink->USE_TBM && sink->display->is_native_format) {
- if (G_UNLIKELY (buffer == sink->last_buffer)) {
+ if ((G_UNLIKELY (buffer == sink->last_buffer)
+ && !(gst_wayland_sink_check_use_gapless (sink)))
+ || (G_UNLIKELY (buffer == sink->last_buffer)
+ && !sink->request_camera_flush_buf)) {
GST_LOG_OBJECT (sink, "Buffer already being rendered");
goto done;
}
+
+ GST_LOG_OBJECT (sink, "replace last_buffer: (%p) -> (%p)",
+ sink->last_buffer, buffer);
gst_buffer_replace (&sink->last_buffer, buffer);
- render_last_buffer (sink);
+
+ GST_LOG_OBJECT (sink, "after gst_buffer_replace buffer %p, ref_count(%d)",
+ buffer, GST_OBJECT_REFCOUNT_VALUE (buffer));
+
+ if (sink->visible) {
+ render_last_buffer (sink);
+ } else {
+ GST_LOG ("skip rendering");
+ }
goto done;
+
} else { /* USE SHM or normal format */
/* drop double rendering */
if (G_UNLIKELY (buffer == sink->last_buffer)) {
goto done;
}
gst_buffer_replace (&sink->last_buffer, to_render);
- render_last_buffer (sink);
+
+ if (sink->visible) {
+ render_last_buffer (sink);
+ } else {
+ GST_LOG ("skip rendering");
+ }
if (buffer != to_render)
gst_buffer_unref (to_render);
GST_LOG_OBJECT (sink,
"buffer %p has a wl_buffer from our display, " "writing directly",
buffer);
- GST_INFO ("wl_buffer (%p)", wlbuffer->wlbuffer);
+ GST_LOG ("wl_buffer (%p)", wlbuffer->wlbuffer);
to_render = buffer;
} else {
goto done;
-#endif /* GST_WLSINK_ENHANCEMENT */
+#endif /* TIZEN_FEATURE_WLSINK_ENHANCEMENT */
+#ifndef TIZEN_FEATURE_WLSINK_ENHANCEMENT
no_window_size:
{
GST_ELEMENT_ERROR (sink, RESOURCE, WRITE,
ret = GST_FLOW_ERROR;
goto done;
}
+#endif
no_buffer:
{
GST_WARNING_OBJECT (sink, "could not create buffer");
iface->set_window_handle = gst_wayland_sink_set_window_handle;
iface->set_render_rectangle = gst_wayland_sink_set_render_rectangle;
iface->expose = gst_wayland_sink_expose;
-#ifdef GST_WLSINK_ENHANCEMENT /* use unique_id */
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT /* use unique_id */
iface->set_wl_window_wl_surface_id =
gst_wayland_sink_set_wl_window_wl_surface_id;
#endif
}
-#ifdef GST_WLSINK_ENHANCEMENT /* use unique_id */
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+/* use unique_id */
static void
gst_wayland_sink_set_wl_window_wl_surface_id (GstVideoOverlay * overlay,
guintptr wl_surface_id)
g_mutex_lock (&sink->render_lock);
g_clear_object (&sink->window);
- GST_INFO ("wl_surface_id %d %p", (int) wl_surface_id, (guintptr)wl_surface_id);
+ GST_LOG ("wl_surface_id %d %x", (int) wl_surface_id,
+ (guintptr) wl_surface_id);
if (wl_surface_id) {
if (G_LIKELY (gst_wayland_sink_find_display (sink))) {
"ignoring window handle");
}
}
- gst_wayland_sink_update_window_geometry (sink);
-
g_mutex_unlock (&sink->render_lock);
}
g_return_if_fail (sink != NULL);
-#ifdef GST_WLSINK_ENHANCEMENT /* use unique_id */
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT /* use unique_id */
if (sink->window != NULL) {
GST_WARNING_OBJECT (sink, "changing window handle is not supported");
return;
if (G_LIKELY (gst_wayland_sink_find_display (sink))) {
/* we cannot use our own display with an external window handle */
if (G_UNLIKELY (sink->display->own_display)) {
- GST_ELEMENT_WARNING (sink, RESOURCE, OPEN_READ_WRITE,
- ("Application did not provide a wayland display handle"),
- ("Now waylandsink use internal display handle "
- "which is created ourselves. Consider providing a "
- "display handle from your application with GstContext"));
- sink->window = gst_wl_window_new_in_surface (sink->display, surface);
+ GST_ELEMENT_WARNING (sink, RESOURCE, OPEN_READ_WRITE,
+ ("Application did not provide a wayland display handle"),
+ ("Now waylandsink use internal display handle "
+ "which is created ourselves. Consider providing a "
+ "display handle from your application with GstContext"));
+ sink->window = gst_wl_window_new_in_surface (sink->display, surface);
} else {
sink->window = gst_wl_window_new_in_surface (sink->display, surface);
}
}
}
g_mutex_unlock (&sink->render_lock);
-
}
static void
projects / platform / upstream / gstreamer.git / blobdiff