mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:56:14 +00:00
Code Issues 1 Projects Releases Wiki Activity

gdkpixbufoverlay: update composition in _before_transform

Browse source 
... since we need to determine passthrough mode for buffer preparation before
calling into _transform_ip.
This commit is contained in:
Mark Nauwelaerts 2017-01-21 20:48:22 +01:00
parent 2715daebf3
commit 387da78da3
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/gdk_pixbuf/gstgdkpixbufoverlay.c
View file

@ -610,12 +610,28 @@ gst_gdk_pixbuf_overlay_before_transform (GstBaseTransform * trans,
GstBuffer * outbuf) GstBuffer * outbuf)
{ {
GstClockTime stream_time; GstClockTime stream_time;
GstGdkPixbufOverlay *overlay = GST_GDK_PIXBUF_OVERLAY (trans);
gboolean set_passthrough = FALSE;
stream_time = gst_segment_to_stream_time (&trans->segment, GST_FORMAT_TIME, stream_time = gst_segment_to_stream_time (&trans->segment, GST_FORMAT_TIME,
GST_BUFFER_TIMESTAMP (outbuf)); GST_BUFFER_TIMESTAMP (outbuf));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (GST_OBJECT (trans), stream_time); gst_object_sync_values (GST_OBJECT (trans), stream_time);
/* now properties have been sync'ed; maybe need to update composition */
GST_OBJECT_LOCK (overlay);
if (G_UNLIKELY (overlay->update_composition)) {
gst_gdk_pixbuf_overlay_update_composition (overlay);
overlay->update_composition = FALSE;
set_passthrough = TRUE;
}
GST_OBJECT_UNLOCK (overlay);
/* determine passthrough mode so the buffer is writable if needed
* when passed into _transform_ip */
if (G_UNLIKELY (set_passthrough))
gst_base_transform_set_passthrough (trans, overlay->comp == NULL);
} }
static GstFlowReturn static GstFlowReturn
@ -624,15 +640,6 @@ gst_gdk_pixbuf_overlay_transform_frame_ip (GstVideoFilter * filter,
{ {
GstGdkPixbufOverlay *overlay = GST_GDK_PIXBUF_OVERLAY (filter); GstGdkPixbufOverlay *overlay = GST_GDK_PIXBUF_OVERLAY (filter);
GST_OBJECT_LOCK (overlay);
if (G_UNLIKELY (overlay->update_composition)) {
gst_gdk_pixbuf_overlay_update_composition (overlay);
overlay->update_composition = FALSE;
}
GST_OBJECT_UNLOCK (overlay);
if (overlay->comp != NULL) if (overlay->comp != NULL)
gst_video_overlay_composition_blend (overlay->comp, frame); gst_video_overlay_composition_blend (overlay->comp, frame);