[meta-freescale] [meta-fsl-arm][PATCH v2 2/3] gstreamer1.0-plugins-bad: Support video crop for glimagesink
Carlos Rafael Giani
dv at pseudoterminal.org
Tue Mar 29 00:14:26 PDT 2016
This seems to be quite useful to me. But it is not i.MX specific - I
could for example even use this on the PC.
However, modifying the global vertices array is not good, for two reasons:
1. This will not work well in a multithreaded environment (with multiple
glimagesink instances)
2. The vertex data is not reset properly when the state change goes back
to READY
So, instead, I'd keep this array const, and instead copy it & modify and
upload the local copy. Crop metas are not updated so often, so the costs
for a copy are negligible.
Once this is fixed, I strongly recommend to put this on GStreamer's
bugzilla.
On 2016-02-02 15:01, Yuqing Zhu wrote:
> 1. Add video crop meta copy in glupload.
> 2. Calculate the new texture coordinate in vertices array and bind to buffer object.
> 3. Make glimagesink only updating vertices array when video crop meta changed.
>
> Signed-off-by: Yuqing Zhu <b54851 at freescale.com>
> ---
> ...plugin-support-video-crop-for-glimagesink.patch | 155 +++++++++++++++++++++
> .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 1 +
> 2 files changed, 156 insertions(+)
> create mode 100755 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-glplugin-support-video-crop-for-glimagesink.patch
>
> diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-glplugin-support-video-crop-for-glimagesink.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-glplugin-support-video-crop-for-glimagesink.patch
> new file mode 100755
> index 0000000..0d0ade7
> --- /dev/null
> +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-glplugin-support-video-crop-for-glimagesink.patch
> @@ -0,0 +1,155 @@
> +From 1a917447c3749f0a6d3ff98b8dcbc7439b48293d Mon Sep 17 00:00:00 2001
> +From: Haihua Hu <b55597 at freescale.com>
> +Date: Fri, 13 Nov 2015 10:51:25 +0800
> +Subject: [PATCH] [glplugin] support video crop for glimagesink
> +
> +1.Add video crop meta copy in glupload
> +2.Calculate the new texture coordinate in vertices array and bind to buffer object
> +3.Make glimagesink only updating vertices array when video crop meta changed
> +
> +Upstream-Status: Inappropriate [i.MX specific]
> +
> +Signed-off-by: Haihua Hu <b55597 at freescale.com>
> +---
> + ext/gl/gstglimagesink.c | 53 ++++++++++++++++++++++++++++++++++++++++-
> + ext/gl/gstglimagesink.h | 3 +++
> + gst-libs/gst/gl/gstglupload.c | 10 ++++++++
> + 3 files changed, 65 insertions(+), 1 deletion(-)
> +
> +diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c
> +index 1e5dc05..6fc0f9e 100644
> +--- a/ext/gl/gstglimagesink.c
> ++++ b/ext/gl/gstglimagesink.c
> +@@ -585,6 +585,8 @@ gst_glimage_sink_init (GstGLImageSink * glimage_sink)
> + glimage_sink->handle_events = TRUE;
> + glimage_sink->ignore_alpha = TRUE;
> + glimage_sink->overlay_compositor = NULL;
> ++ glimage_sink->cropmeta = NULL;
> ++ glimage_sink->prev_cropmeta = NULL;
> +
> + glimage_sink->mview_output_mode = DEFAULT_MULTIVIEW_MODE;
> + glimage_sink->mview_output_flags = DEFAULT_MULTIVIEW_FLAGS;
> +@@ -1039,6 +1041,12 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition)
> + gst_object_unref (glimage_sink->display);
> + glimage_sink->display = NULL;
> + }
> ++
> ++ glimage_sink->cropmeta = NULL;
> ++ if (glimage_sink->prev_cropmeta)
> ++ g_slice_free(GstVideoCropMeta, glimage_sink->prev_cropmeta);
> ++ glimage_sink->prev_cropmeta = NULL;
> ++
> + break;
> + default:
> + break;
> +@@ -1452,6 +1460,8 @@ gst_glimage_sink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
> + GST_VIDEO_SINK_WIDTH (glimage_sink),
> + GST_VIDEO_SINK_HEIGHT (glimage_sink));
> +
> ++ glimage_sink->cropmeta = gst_buffer_get_video_crop_meta (buf);
> ++
> + /* Ask the underlying window to redraw its content */
> + if (!gst_glimage_sink_redisplay (glimage_sink))
> + goto redisplay_failed;
> +@@ -1638,7 +1648,7 @@ config_failed:
> + }
> +
> + /* *INDENT-OFF* */
> +-static const GLfloat vertices[] = {
> ++static GLfloat vertices[] = {
> + 1.0f, 1.0f, 0.0f, 1.0f, 0.0f,
> + -1.0f, 1.0f, 0.0f, 0.0f, 0.0f,
> + -1.0f, -1.0f, 0.0f, 0.0f, 1.0f,
> +@@ -1898,6 +1908,47 @@ gst_glimage_sink_on_draw (GstGLImageSink * gl_sink)
> +
> + gst_gl_shader_use (gl_sink->redisplay_shader);
> +
> ++ if (gl_sink->cropmeta) {
> ++ gint width = GST_VIDEO_SINK_WIDTH (gl_sink);
> ++ gint height = GST_VIDEO_SINK_HEIGHT (gl_sink);
> ++
> ++ if (!gl_sink->prev_cropmeta){
> ++ /* Initialize the previous crop meta and set all memroy to zero */
> ++ gl_sink->prev_cropmeta = (GstVideoCropMeta *) g_slice_new0(GstVideoCropMeta);
> ++ }
> ++
> ++ /* If crop meta not equal to the previous, recalculate the vertices */
> ++ if (gl_sink->prev_cropmeta->x != gl_sink->cropmeta->x
> ++ || gl_sink->prev_cropmeta->y != gl_sink->cropmeta->y
> ++ || gl_sink->prev_cropmeta->width != gl_sink->cropmeta->width
> ++ || gl_sink->prev_cropmeta->height != gl_sink->cropmeta->height){
> ++
> ++ vertices[8] = (float)(gl_sink->cropmeta->x) / width;
> ++ vertices[9] = (float)(gl_sink->cropmeta->y) / height;
> ++
> ++ vertices[3] = (float)(gl_sink->cropmeta->width + gl_sink->cropmeta->x) / width;
> ++ vertices[4] = vertices[9];
> ++
> ++ vertices[13] = vertices[8];
> ++ vertices[14] = (float)(gl_sink->cropmeta->height + gl_sink->cropmeta->y) / height;
> ++
> ++ vertices[18] = vertices[3];
> ++ vertices[19] = vertices[14];
> ++
> ++ gl->BindBuffer (GL_ARRAY_BUFFER, gl_sink->vertex_buffer);
> ++ gl->BufferData (GL_ARRAY_BUFFER, 4 * 5 * sizeof (GLfloat), vertices,
> ++ GL_STATIC_DRAW);
> ++
> ++ gl->BindBuffer (GL_ARRAY_BUFFER, 0);
> ++
> ++ /* Store the previous crop meta */
> ++ gl_sink->prev_cropmeta->x = gl_sink->cropmeta->x;
> ++ gl_sink->prev_cropmeta->y = gl_sink->cropmeta->y;
> ++ gl_sink->prev_cropmeta->width = gl_sink->cropmeta->width;
> ++ gl_sink->prev_cropmeta->height = gl_sink->cropmeta->height;
> ++ }
> ++ }
> ++
> + if (gl->GenVertexArrays)
> + gl->BindVertexArray (gl_sink->vao);
> + else
> +diff --git a/ext/gl/gstglimagesink.h b/ext/gl/gstglimagesink.h
> +index f7b3bfb..a26ca4b 100644
> +--- a/ext/gl/gstglimagesink.h
> ++++ b/ext/gl/gstglimagesink.h
> +@@ -102,6 +102,9 @@ struct _GstGLImageSink
> + guint window_width;
> + guint window_height;
> +
> ++ GstVideoCropMeta *cropmeta;
> ++ GstVideoCropMeta *prev_cropmeta;
> ++
> + GstVideoRectangle display_rect;
> +
> + GstGLShader *redisplay_shader;
> +diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c
> +index acaa329..0d36248 100644
> +--- a/gst-libs/gst/gl/gstglupload.c
> ++++ b/gst-libs/gst/gl/gstglupload.c
> +@@ -756,6 +756,7 @@ _physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **ou
> + {
> + struct PhyBufferUpload *phyBuffer = impl;
> + GstVideoInfo *info;
> ++ GstVideoCropMeta *incropmeta, *outcropmeta;
> + gint n_mem;
> +
> + info = &phyBuffer->upload->priv->out_info;
> +@@ -774,6 +775,15 @@ _physical_buffer_upload_perform(gpointer impl, GstBuffer *buffer, GstBuffer **ou
> + gst_buffer_add_video_meta_full (*outbuf, 0,
> + GST_VIDEO_INFO_FORMAT (info), GST_VIDEO_INFO_WIDTH (info),
> + GST_VIDEO_INFO_HEIGHT (info), n_mem, info->offset, info->stride);
> ++ /* add video crop meta to out buffer if need */
> ++ incropmeta = gst_buffer_get_video_crop_meta(buffer);
> ++ if(incropmeta){
> ++ outcropmeta = gst_buffer_add_video_crop_meta(*outbuf);
> ++ outcropmeta->x = incropmeta->x;
> ++ outcropmeta->y = incropmeta->y;
> ++ outcropmeta->width = incropmeta->width;
> ++ outcropmeta->height = incropmeta->height;
> ++ }
> +
> + return GST_GL_UPLOAD_DONE;
> + }
> +--
> +1.7.9.5
> +
> diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
> index 0728009..9ce22eb 100644
> --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
> +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
> @@ -12,6 +12,7 @@ PACKAGECONFIG_GL_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
>
> IMX_PATCHES = " file://0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch \
> file://0002-glplugin-Add-directviv-to-glimagesink-to-improve-playback-performance.patch \
> + file://0003-glplugin-support-video-crop-for-glimagesink.patch \
> "
>
> SRC_URI_append_mx6 = "${IMX_PATCHES}"
More information about the meta-freescale
mailing list