mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 18:22:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

imagefreeze: handle reconfigure events on the srcpad

Browse source
This commit is contained in:
Matthew Waters 2020-03-10 21:07:12 +11:00
parent 07a8a1c484
commit dacdc74043
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/imagefreeze/gstimagefreeze.c
View file

@ -186,7 +186,6 @@ gst_image_freeze_reset (GstImageFreeze * self)
gst_buffer_replace (&self->buffer, NULL);
gst_caps_replace (&self->buffer_caps, NULL);
gst_caps_replace (&self->current_caps, NULL);
self->buffer_caps_updated = FALSE;
self->num_buffers_left = self->num_buffers;
gst_segment_init (&self->segment, GST_FORMAT_TIME);
@ -790,8 +789,9 @@ gst_image_freeze_sink_chain (GstPad * pad, GstObject * parent,
}
gst_buffer_replace (&self->buffer, buffer);
self->buffer_caps_updated = !self->buffer_caps
|| !gst_caps_is_equal (self->buffer_caps, self->current_caps);
if (!self->buffer_caps
|| !gst_caps_is_equal (self->buffer_caps, self->current_caps))
gst_pad_mark_reconfigure (self->srcpad);
gst_caps_replace (&self->buffer_caps, self->current_caps);
gst_buffer_unref (buffer);
@ -822,12 +822,12 @@ gst_image_freeze_src_loop (GstPad * pad)
goto pause_task;
}
if (self->buffer_caps_updated) {
if (gst_pad_check_reconfigure (self->srcpad)) {
GstCaps *buffer_caps = gst_caps_ref (self->buffer_caps);
self->buffer_caps_updated = FALSE;
g_mutex_unlock (&self->lock);
if (!gst_image_freeze_sink_setcaps (self, buffer_caps)) {
gst_caps_unref (buffer_caps);
gst_pad_mark_reconfigure (self->srcpad);
flow_ret = GST_FLOW_NOT_NEGOTIATED;
goto pause_task;
}

1
gst/imagefreeze/gstimagefreeze.h
View file

@ -50,7 +50,6 @@ struct _GstImageFreeze
GMutex lock;
GstBuffer *buffer;
GstCaps *buffer_caps, *current_caps;
gboolean buffer_caps_updated;
gboolean negotiated_framerate;
gint fps_n, fps_d;