From 98c681fe5b3799a5cf5e94e2699fb038991e083b Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Wed, 14 Mar 2012 17:07:50 +0100 Subject: [PATCH] imagefreeze: port to 0.11 --- configure.ac | 2 +- gst/imagefreeze/gstimagefreeze.c | 311 +++++++++++++++------------------------ gst/imagefreeze/gstimagefreeze.h | 3 +- 3 files changed, 121 insertions(+), 195 deletions(-) diff --git a/configure.ac b/configure.ac index ef29a19..0d31edf 100644 --- a/configure.ac +++ b/configure.ac @@ -312,7 +312,7 @@ dnl *** plug-ins to include *** dnl Non ported plugins (non-dependant, then dependant) dnl Make sure you have a space before and after all plugins GST_PLUGINS_NONPORTED="deinterlace interleave flx \ - imagefreeze smpte \ + smpte \ videobox \ cairo cairo_gobject dv1394 \ oss oss4 \ diff --git a/gst/imagefreeze/gstimagefreeze.c b/gst/imagefreeze/gstimagefreeze.c index d96954f..a7dc81d 100644 --- a/gst/imagefreeze/gstimagefreeze.c +++ b/gst/imagefreeze/gstimagefreeze.c @@ -53,37 +53,47 @@ static GstStateChangeReturn gst_image_freeze_change_state (GstElement * element, GstStateChange transition); static GstFlowReturn gst_image_freeze_sink_chain (GstPad * pad, - GstBuffer * buffer); -static gboolean gst_image_freeze_sink_event (GstPad * pad, GstEvent * event); -static gboolean gst_image_freeze_sink_setcaps (GstPad * pad, GstCaps * caps); -static GstCaps *gst_image_freeze_sink_getcaps (GstPad * pad); -static gboolean gst_image_freeze_sink_query (GstPad * pad, GstQuery * query); -static GstFlowReturn gst_image_freeze_sink_bufferalloc (GstPad * pad, - guint64 offset, guint size, GstCaps * caps, GstBuffer ** buf); + GstObject * parent, GstBuffer * buffer); +static gboolean gst_image_freeze_sink_event (GstPad * pad, GstObject * parent, + GstEvent * event); +static gboolean gst_image_freeze_sink_setcaps (GstImageFreeze * self, + GstCaps * caps); +static GstCaps *gst_image_freeze_sink_getcaps (GstImageFreeze * self, + GstCaps * filter); +static gboolean gst_image_freeze_sink_query (GstPad * pad, GstObject * parent, + GstQuery * query); static void gst_image_freeze_src_loop (GstPad * pad); -static gboolean gst_image_freeze_src_event (GstPad * pad, GstEvent * event); -static gboolean gst_image_freeze_src_query (GstPad * pad, GstQuery * query); -static const GstQueryType *gst_image_freeze_src_query_type (GstPad * pad); +static gboolean gst_image_freeze_src_event (GstPad * pad, GstObject * parent, + GstEvent * event); +static gboolean gst_image_freeze_src_query (GstPad * pad, GstObject * parent, + GstQuery * query); static GstStaticPadTemplate sink_pad_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb; video/x-raw-gray")); + GST_STATIC_CAPS ("video/x-raw")); static GstStaticPadTemplate src_pad_template = - GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb; video/x-raw-gray")); +GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, + GST_STATIC_CAPS ("video/x-raw")); GST_DEBUG_CATEGORY_STATIC (gst_image_freeze_debug); #define GST_CAT_DEFAULT gst_image_freeze_debug -GST_BOILERPLATE (GstImageFreeze, gst_image_freeze, GstElement, - GST_TYPE_ELEMENT); +#define gst_image_freeze_parent_class parent_class +G_DEFINE_TYPE (GstImageFreeze, gst_image_freeze, GST_TYPE_ELEMENT); + static void -gst_image_freeze_base_init (gpointer g_class) +gst_image_freeze_class_init (GstImageFreezeClass * klass) { - GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class); + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); + + gobject_class->finalize = gst_image_freeze_finalize; + + gstelement_class->change_state = + GST_DEBUG_FUNCPTR (gst_image_freeze_change_state); gst_element_class_set_details_simple (gstelement_class, "Still frame stream generator", @@ -98,19 +108,7 @@ gst_image_freeze_base_init (gpointer g_class) } static void -gst_image_freeze_class_init (GstImageFreezeClass * klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); - - gobject_class->finalize = gst_image_freeze_finalize; - - gstelement_class->change_state = - GST_DEBUG_FUNCPTR (gst_image_freeze_change_state); -} - -static void -gst_image_freeze_init (GstImageFreeze * self, GstImageFreezeClass * g_class) +gst_image_freeze_init (GstImageFreeze * self) { self->sinkpad = gst_pad_new_from_static_template (&sink_pad_template, "sink"); gst_pad_set_chain_function (self->sinkpad, @@ -119,12 +117,7 @@ gst_image_freeze_init (GstImageFreeze * self, GstImageFreezeClass * g_class) GST_DEBUG_FUNCPTR (gst_image_freeze_sink_event)); gst_pad_set_query_function (self->sinkpad, GST_DEBUG_FUNCPTR (gst_image_freeze_sink_query)); - gst_pad_set_setcaps_function (self->sinkpad, - GST_DEBUG_FUNCPTR (gst_image_freeze_sink_setcaps)); - gst_pad_set_getcaps_function (self->sinkpad, - GST_DEBUG_FUNCPTR (gst_image_freeze_sink_getcaps)); - gst_pad_set_bufferalloc_function (self->sinkpad, - GST_DEBUG_FUNCPTR (gst_image_freeze_sink_bufferalloc)); + GST_PAD_SET_PROXY_ALLOCATION (self->sinkpad); gst_element_add_pad (GST_ELEMENT (self), self->sinkpad); self->srcpad = gst_pad_new_from_static_template (&src_pad_template, "src"); @@ -132,12 +125,10 @@ gst_image_freeze_init (GstImageFreeze * self, GstImageFreezeClass * g_class) GST_DEBUG_FUNCPTR (gst_image_freeze_src_event)); gst_pad_set_query_function (self->srcpad, GST_DEBUG_FUNCPTR (gst_image_freeze_src_query)); - gst_pad_set_query_type_function (self->srcpad, - GST_DEBUG_FUNCPTR (gst_image_freeze_src_query_type)); gst_pad_use_fixed_caps (self->srcpad); gst_element_add_pad (GST_ELEMENT (self), self->srcpad); - self->lock = g_mutex_new (); + g_mutex_init (&self->lock); gst_image_freeze_reset (self); } @@ -149,9 +140,7 @@ gst_image_freeze_finalize (GObject * object) gst_image_freeze_reset (self); - if (self->lock) - g_mutex_free (self->lock); - self->lock = NULL; + g_mutex_clear (&self->lock); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -161,30 +150,30 @@ gst_image_freeze_reset (GstImageFreeze * self) { GST_DEBUG_OBJECT (self, "Resetting internal state"); - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); gst_buffer_replace (&self->buffer, NULL); gst_segment_init (&self->segment, GST_FORMAT_TIME); self->need_segment = TRUE; - gst_event_replace (&self->close_segment, NULL); self->fps_n = self->fps_d = 0; self->offset = 0; - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); g_atomic_int_set (&self->seeking, 0); } static gboolean -gst_image_freeze_sink_setcaps (GstPad * pad, GstCaps * caps) +gst_image_freeze_sink_setcaps (GstImageFreeze * self, GstCaps * caps) { - GstImageFreeze *self = GST_IMAGE_FREEZE (gst_pad_get_parent (pad)); gboolean ret = FALSE; GstStructure *s; gint fps_n, fps_d; GstCaps *othercaps, *intersection; guint i, n; + GstPad *pad; + pad = self->sinkpad; caps = gst_caps_make_writable (gst_caps_ref (caps)); GST_DEBUG_OBJECT (pad, "Setting caps: %" GST_PTR_FORMAT, caps); @@ -207,7 +196,7 @@ gst_image_freeze_sink_setcaps (GstPad * pad, GstCaps * caps) intersection = othercaps = NULL; /* 3. Intersect with downstream peer caps */ - othercaps = gst_pad_peer_get_caps (self->srcpad); + othercaps = gst_pad_peer_query_caps (self->srcpad, NULL); if (othercaps) { intersection = gst_caps_intersect (caps, othercaps); GST_DEBUG_OBJECT (pad, "Intersecting: %" GST_PTR_FORMAT, caps); @@ -227,15 +216,15 @@ gst_image_freeze_sink_setcaps (GstPad * pad, GstCaps * caps) GstStructure *s = gst_structure_copy (gst_caps_get_structure (caps, i)); gst_caps_append_structure (candidate, s); - if (gst_pad_peer_accept_caps (self->srcpad, candidate)) { + if (gst_pad_peer_query_accept_caps (self->srcpad, candidate)) { if (gst_structure_has_field_typed (s, "framerate", GST_TYPE_FRACTION) || gst_structure_fixate_field_nearest_fraction (s, "framerate", 25, 1)) { gst_structure_get_fraction (s, "framerate", &fps_n, &fps_d); if (fps_d != 0) { - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); self->fps_n = fps_n; self->fps_d = fps_d; - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); GST_DEBUG_OBJECT (pad, "Setting caps %" GST_PTR_FORMAT, candidate); gst_pad_set_caps (self->srcpad, candidate); gst_caps_unref (candidate); @@ -255,24 +244,26 @@ done: GST_ERROR_OBJECT (pad, "No usable caps found"); gst_caps_unref (caps); - gst_object_unref (self); return ret; } static GstCaps * -gst_image_freeze_sink_getcaps (GstPad * pad) +gst_image_freeze_sink_getcaps (GstImageFreeze * self, GstCaps * filter) { - GstImageFreeze *self = GST_IMAGE_FREEZE (gst_pad_get_parent (pad)); GstCaps *ret, *tmp; guint i, n; + GstPad *pad; - if (GST_PAD_CAPS (pad)) { - ret = gst_caps_copy (GST_PAD_CAPS (pad)); + pad = self->sinkpad; + if (gst_pad_has_current_caps (pad)) { + ret = gst_pad_get_current_caps (pad); + gst_caps_replace (&ret, gst_caps_copy (ret)); + gst_caps_unref (ret); goto done; } - tmp = gst_pad_peer_get_caps (self->srcpad); + tmp = gst_pad_peer_query_caps (self->srcpad, filter); if (tmp) { ret = gst_caps_intersect (tmp, gst_pad_get_pad_template_caps (pad)); gst_caps_unref (tmp); @@ -290,17 +281,15 @@ gst_image_freeze_sink_getcaps (GstPad * pad) } done: - gst_object_unref (self); - GST_LOG_OBJECT (pad, "Returning caps: %" GST_PTR_FORMAT, ret); return ret; } static gboolean -gst_image_freeze_sink_query (GstPad * pad, GstQuery * query) +gst_image_freeze_sink_query (GstPad * pad, GstObject * parent, GstQuery * query) { - GstImageFreeze *self = GST_IMAGE_FREEZE (gst_pad_get_parent (pad)); + GstImageFreeze *self = GST_IMAGE_FREEZE (parent); gboolean ret; GstPad *peer = gst_pad_get_peer (self->srcpad); @@ -311,52 +300,24 @@ gst_image_freeze_sink_query (GstPad * pad, GstQuery * query) GST_INFO_OBJECT (pad, "No peer yet, dropping query"); ret = FALSE; } else { - ret = gst_pad_query (peer, query); + switch (GST_QUERY_TYPE (query)) { + case GST_QUERY_CAPS: + { + GstCaps *caps; + + gst_query_parse_caps (query, &caps); + caps = gst_image_freeze_sink_getcaps (self, caps); + gst_query_set_caps_result (query, caps); + gst_caps_unref (caps); + ret = TRUE; + break; + } + default: + ret = gst_pad_query_default (peer, parent, query); + } gst_object_unref (peer); } - gst_object_unref (self); - return ret; -} - -static GstFlowReturn -gst_image_freeze_sink_bufferalloc (GstPad * pad, guint64 offset, guint size, - GstCaps * caps, GstBuffer ** buf) -{ - GstImageFreeze *self = GST_IMAGE_FREEZE (gst_pad_get_parent (pad)); - GstFlowReturn ret; - gboolean do_alloc; - - GST_LOG_OBJECT (pad, "Allocating buffer with offset 0x%" G_GINT64_MODIFIER - "x and size %u with caps: %" GST_PTR_FORMAT, offset, size, caps); - - *buf = NULL; - - g_mutex_lock (self->lock); - do_alloc = self->buffer == NULL; - g_mutex_unlock (self->lock); - - if (do_alloc) { - gboolean seeking = FALSE; - - do { - GST_PAD_STREAM_LOCK (self->srcpad); - ret = gst_pad_alloc_buffer (self->srcpad, offset, size, caps, buf); - - seeking = ret == GST_FLOW_FLUSHING && g_atomic_int_get (&self->seeking); - GST_PAD_STREAM_UNLOCK (self->srcpad); - } while (seeking); - - if (G_UNLIKELY (ret != GST_FLOW_OK)) - GST_ERROR_OBJECT (pad, "Allocating buffer failed: %s", - gst_flow_get_name (ret)); - } else { - /* Let upstream go EOS if we already have a buffer */ - ret = GST_FLOW_EOS; - } - - gst_object_unref (self); - return ret; } @@ -381,14 +342,14 @@ gst_image_freeze_convert (GstImageFreeze * self, case GST_FORMAT_DEFAULT:{ switch (*dest_format) { case GST_FORMAT_TIME: - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); if (self->fps_n == 0) *dest_value = -1; else *dest_value = gst_util_uint64_scale (src_value, GST_SECOND * self->fps_d, self->fps_n); - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); ret = TRUE; break; default: @@ -399,11 +360,11 @@ gst_image_freeze_convert (GstImageFreeze * self, case GST_FORMAT_TIME:{ switch (*dest_format) { case GST_FORMAT_DEFAULT: - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); *dest_value = gst_util_uint64_scale (src_value, self->fps_n, self->fps_d * GST_SECOND); - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); ret = TRUE; break; default: @@ -418,24 +379,10 @@ gst_image_freeze_convert (GstImageFreeze * self, return ret; } -static const GstQueryType * -gst_image_freeze_src_query_type (GstPad * pad) -{ - static const GstQueryType types[] = { - GST_QUERY_POSITION, - GST_QUERY_DURATION, - GST_QUERY_SEEKING, - GST_QUERY_CONVERT, - 0 - }; - - return types; -} - static gboolean -gst_image_freeze_src_query (GstPad * pad, GstQuery * query) +gst_image_freeze_src_query (GstPad * pad, GstObject * parent, GstQuery * query) { - GstImageFreeze *self = GST_IMAGE_FREEZE (gst_pad_get_parent (pad)); + GstImageFreeze *self = GST_IMAGE_FREEZE (parent); gboolean ret = FALSE; GST_LOG_OBJECT (pad, "Handling query of type '%s'", @@ -463,16 +410,16 @@ gst_image_freeze_src_query (GstPad * pad, GstQuery * query) gst_query_parse_position (query, &format, NULL); switch (format) { case GST_FORMAT_DEFAULT:{ - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); position = self->offset; - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); ret = TRUE; break; } case GST_FORMAT_TIME:{ - g_mutex_lock (self->lock); - position = self->segment.last_stop; - g_mutex_unlock (self->lock); + g_mutex_lock (&self->lock); + position = self->segment.position; + g_mutex_unlock (&self->lock); ret = TRUE; break; } @@ -497,20 +444,20 @@ gst_image_freeze_src_query (GstPad * pad, GstQuery * query) gst_query_parse_duration (query, &format, NULL); switch (format) { case GST_FORMAT_TIME:{ - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); duration = self->segment.stop; - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); ret = TRUE; break; } case GST_FORMAT_DEFAULT:{ - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); duration = self->segment.stop; if (duration != -1) duration = gst_util_uint64_scale (duration, self->fps_n, GST_SECOND * self->fps_d); - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); ret = TRUE; break; } @@ -544,20 +491,29 @@ gst_image_freeze_src_query (GstPad * pad, GstQuery * query) break; } - gst_object_unref (self); return ret; } static gboolean -gst_image_freeze_sink_event (GstPad * pad, GstEvent * event) +gst_image_freeze_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) { - GstImageFreeze *self = GST_IMAGE_FREEZE (gst_pad_get_parent (pad)); + GstImageFreeze *self = GST_IMAGE_FREEZE (parent); gboolean ret; GST_LOG_OBJECT (pad, "Got %s event", GST_EVENT_TYPE_NAME (event)); switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_CAPS: + { + GstCaps *caps; + + gst_event_parse_caps (event, &caps); + gst_image_freeze_sink_setcaps (self, caps); + gst_event_unref (event); + ret = TRUE; + break; + } case GST_EVENT_EOS: if (!self->buffer) { /* if we receive EOS before a buffer arrives, then let it pass */ @@ -566,7 +522,7 @@ gst_image_freeze_sink_event (GstPad * pad, GstEvent * event) break; } /* fall-through */ - case GST_EVENT_NEWSEGMENT: + case GST_EVENT_SEGMENT: GST_DEBUG_OBJECT (pad, "Dropping event"); gst_event_unref (event); ret = TRUE; @@ -579,14 +535,13 @@ gst_image_freeze_sink_event (GstPad * pad, GstEvent * event) break; } - gst_object_unref (self); return ret; } static gboolean -gst_image_freeze_src_event (GstPad * pad, GstEvent * event) +gst_image_freeze_src_event (GstPad * pad, GstObject * parent, GstEvent * event) { - GstImageFreeze *self = GST_IMAGE_FREEZE (gst_pad_get_parent (pad)); + GstImageFreeze *self = GST_IMAGE_FREEZE (parent); gboolean ret; GST_LOG_OBJECT (pad, "Got %s event", GST_EVENT_TYPE_NAME (event)); @@ -649,39 +604,20 @@ gst_image_freeze_src_event (GstPad * pad, GstEvent * event) GST_PAD_STREAM_LOCK (self->srcpad); - g_mutex_lock (self->lock); - gst_event_replace (&self->close_segment, NULL); - if (!flush) { - if (!self->need_segment && self->segment.rate >= 0) { - self->close_segment = - gst_event_new_new_segment_full (TRUE, self->segment.rate, - self->segment.applied_rate, self->segment.format, - self->segment.start, self->segment.last_stop, self->segment.time); - } else if (!self->need_segment) { - gint64 stop; - - if ((stop = self->segment.stop) == -1) - stop = self->segment.duration; - - self->close_segment = - gst_event_new_new_segment_full (TRUE, self->segment.rate, - self->segment.applied_rate, self->segment.format, - self->segment.last_stop, stop, self->segment.last_stop); - } - } + g_mutex_lock (&self->lock); - gst_segment_set_seek (&self->segment, rate, format, flags, start_type, + gst_segment_do_seek (&self->segment, rate, format, flags, start_type, start, stop_type, stop, NULL); self->need_segment = TRUE; - last_stop = self->segment.last_stop; + last_stop = self->segment.position; start_task = self->buffer != NULL; - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); if (flush) { GstEvent *e; - e = gst_event_new_flush_stop (); + e = gst_event_new_flush_stop (TRUE); gst_pad_push_event (self->srcpad, e); g_atomic_int_set (&self->seeking, 0); } @@ -699,13 +635,13 @@ gst_image_freeze_src_event (GstPad * pad, GstEvent * event) GST_DEBUG_OBJECT (pad, "Seek successful"); if (start_task) { - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); if (self->buffer != NULL) gst_pad_start_task (self->srcpad, (GstTaskFunction) gst_image_freeze_src_loop, self->srcpad); - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); } ret = TRUE; @@ -719,20 +655,20 @@ gst_image_freeze_src_event (GstPad * pad, GstEvent * event) break; } - gst_object_unref (self); return ret; } static GstFlowReturn -gst_image_freeze_sink_chain (GstPad * pad, GstBuffer * buffer) +gst_image_freeze_sink_chain (GstPad * pad, GstObject * parent, + GstBuffer * buffer) { - GstImageFreeze *self = GST_IMAGE_FREEZE (GST_PAD_PARENT (pad)); + GstImageFreeze *self = GST_IMAGE_FREEZE (parent); - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); if (self->buffer) { GST_DEBUG_OBJECT (pad, "Already have a buffer, dropping"); gst_buffer_unref (buffer); - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); return GST_FLOW_EOS; } @@ -740,7 +676,7 @@ gst_image_freeze_sink_chain (GstPad * pad, GstBuffer * buffer) gst_pad_start_task (self->srcpad, (GstTaskFunction) gst_image_freeze_src_loop, self->srcpad); - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); return GST_FLOW_OK; } @@ -751,36 +687,28 @@ gst_image_freeze_src_loop (GstPad * pad) GstBuffer *buffer; guint64 offset; GstClockTime timestamp, timestamp_end; - gint64 cstart, cstop; + guint64 cstart, cstop; gboolean in_seg, eos; - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); if (!self->buffer) { GST_ERROR_OBJECT (pad, "Have no buffer yet"); - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); gst_pad_pause_task (self->srcpad); return; } buffer = gst_buffer_ref (self->buffer); - buffer = gst_buffer_make_metadata_writable (buffer); - g_mutex_unlock (self->lock); - - if (self->close_segment) { - GST_DEBUG_OBJECT (pad, "Closing previous segment"); - gst_pad_push_event (self->srcpad, self->close_segment); - self->close_segment = NULL; - } + buffer = gst_buffer_make_writable (buffer); + g_mutex_unlock (&self->lock); if (self->need_segment) { GstEvent *e; GST_DEBUG_OBJECT (pad, "Pushing NEWSEGMENT event: %" GST_SEGMENT_FORMAT, &self->segment); - e = gst_event_new_new_segment_full (FALSE, self->segment.rate, - self->segment.applied_rate, self->segment.format, self->segment.start, - self->segment.stop, self->segment.start); + e = gst_event_new_segment (&self->segment); - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); if (self->segment.rate >= 0) { self->offset = gst_util_uint64_scale (self->segment.start, self->fps_n, @@ -790,14 +718,14 @@ gst_image_freeze_src_loop (GstPad * pad) gst_util_uint64_scale (self->segment.stop, self->fps_n, self->fps_d * GST_SECOND); } - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); self->need_segment = FALSE; gst_pad_push_event (self->srcpad, e); } - g_mutex_lock (self->lock); + g_mutex_lock (&self->lock); offset = self->offset; if (self->fps_n != 0) { @@ -825,13 +753,13 @@ gst_image_freeze_src_loop (GstPad * pad) timestamp_end, &cstart, &cstop); if (in_seg) - gst_segment_set_last_stop (&self->segment, GST_FORMAT_TIME, cstart); + self->segment.position = cstart; if (self->segment.rate >= 0) self->offset++; else self->offset--; - g_mutex_unlock (self->lock); + g_mutex_unlock (&self->lock); GST_DEBUG_OBJECT (pad, "Handling buffer with timestamp %" GST_TIME_FORMAT, GST_TIME_ARGS (timestamp)); @@ -843,7 +771,6 @@ gst_image_freeze_src_loop (GstPad * pad) GST_BUFFER_DURATION (buffer) = cstop - cstart; GST_BUFFER_OFFSET (buffer) = offset; GST_BUFFER_OFFSET_END (buffer) = offset + 1; - gst_buffer_set_caps (buffer, GST_PAD_CAPS (self->srcpad)); ret = gst_pad_push (self->srcpad, buffer); GST_DEBUG_OBJECT (pad, "Pushing buffer resulted in %s", gst_flow_get_name (ret)); diff --git a/gst/imagefreeze/gstimagefreeze.h b/gst/imagefreeze/gstimagefreeze.h index d5b1449..4a00d1c 100644 --- a/gst/imagefreeze/gstimagefreeze.h +++ b/gst/imagefreeze/gstimagefreeze.h @@ -47,13 +47,12 @@ struct _GstImageFreeze GstPad *sinkpad; GstPad *srcpad; - GMutex *lock; + GMutex lock; GstBuffer *buffer; gint fps_n, fps_d; GstSegment segment; gboolean need_segment; - GstEvent *close_segment; guint64 offset; -- 2.7.4