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);
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);
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_element_add_pad (GST_ELEMENT (self), self->sinkpad);
self->srcpad = gst_pad_new_from_static_template (&src_pad_template, "src");
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->sinkpad);
+ gst_pad_use_fixed_caps (self->srcpad);
gst_element_add_pad (GST_ELEMENT (self), self->srcpad);
+ self->lock = g_mutex_new ();
+
gst_image_freeze_reset (self);
}
gst_image_freeze_reset (self);
+ if (self->lock)
+ g_mutex_free (self->lock);
+ self->lock = NULL;
+
G_OBJECT_CLASS (parent_class)->finalize (object);
}
{
GST_DEBUG_OBJECT (self, "Resetting internal state");
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
gst_buffer_replace (&self->buffer, NULL);
gst_segment_init (&self->segment, GST_FORMAT_TIME);
self->fps_n = self->fps_d = 0;
self->offset = 0;
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
+
+ g_atomic_int_set (&self->seeking, 0);
}
static gboolean
gst_structure_fixate_field_nearest_fraction (s, "framerate", 25, 1)) {
gst_structure_get_fraction (s, "framerate", &fps_n, &fps_d);
if (fps_d != 0) {
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
self->fps_n = fps_n;
self->fps_d = fps_d;
- GST_OBJECT_UNLOCK (self);
+ 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);
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_WRONG_STATE
+ && 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_UNEXPECTED;
+ }
+
+ gst_object_unref (self);
+
+ return ret;
+}
+
static gboolean
gst_image_freeze_convert (GstImageFreeze * self,
GstFormat src_format, gint64 src_value,
case GST_FORMAT_DEFAULT:{
switch (*dest_format) {
case GST_FORMAT_TIME:
- GST_OBJECT_LOCK (self);
+ 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);
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
ret = TRUE;
break;
default:
case GST_FORMAT_TIME:{
switch (*dest_format) {
case GST_FORMAT_DEFAULT:
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
*dest_value =
gst_util_uint64_scale (src_value, self->fps_n,
self->fps_d * GST_SECOND);
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
ret = TRUE;
break;
default:
gst_query_parse_position (query, &format, NULL);
switch (format) {
case GST_FORMAT_DEFAULT:{
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
position = self->offset;
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
ret = TRUE;
}
case GST_FORMAT_TIME:{
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
position = self->segment.last_stop;
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
ret = TRUE;
}
default:
gst_query_parse_duration (query, &format, NULL);
switch (format) {
case GST_FORMAT_TIME:{
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
duration = self->segment.stop;
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
ret = TRUE;
}
case GST_FORMAT_DEFAULT:{
- GST_OBJECT_LOCK (self);
+ 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);
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
ret = TRUE;
}
default:
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS:
+ if (!self->buffer) {
+ /* if we receive EOS before a buffer arrives, then let it pass */
+ GST_DEBUG_OBJECT (self, "EOS without input buffer, passing on");
+ ret = gst_pad_push_event (self->srcpad, event);
+ break;
+ }
+ /* fall-through */
case GST_EVENT_NEWSEGMENT:
GST_DEBUG_OBJECT (pad, "Dropping event");
gst_event_unref (event);
gint64 start, stop;
gint64 last_stop;
gboolean start_task;
+ gboolean flush;
gst_event_parse_seek (event, &rate, &format, &flags, &start_type, &start,
&stop_type, &stop);
gst_event_unref (event);
+ flush = !!(flags & GST_SEEK_FLAG_FLUSH);
+
if (format != GST_FORMAT_TIME && format != GST_FORMAT_DEFAULT) {
GST_ERROR_OBJECT (pad, "Seek in invalid format: %s",
gst_format_get_name (format));
}
}
- if ((flags & GST_SEEK_FLAG_FLUSH)) {
+ if (flush) {
GstEvent *e;
+ g_atomic_int_set (&self->seeking, 1);
e = gst_event_new_flush_start ();
gst_pad_push_event (self->srcpad, e);
} else {
GST_PAD_STREAM_LOCK (self->srcpad);
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
gst_event_replace (&self->close_segment, NULL);
- if (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 {
- 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);
+ 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);
+ }
}
gst_segment_set_seek (&self->segment, rate, format, flags, start_type,
last_stop = self->segment.last_stop;
start_task = self->buffer != NULL;
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
- if ((flags & GST_SEEK_FLAG_FLUSH)) {
+ if (flush) {
GstEvent *e;
e = gst_event_new_flush_stop ();
gst_pad_push_event (self->srcpad, e);
+ g_atomic_int_set (&self->seeking, 0);
}
if (flags & GST_SEEK_FLAG_SEGMENT) {
GST_DEBUG_OBJECT (pad, "Seek successful");
- if (start_task)
- gst_pad_start_task (self->srcpad,
- (GstTaskFunction) gst_image_freeze_src_loop, self->srcpad);
+ if (start_task) {
+ 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);
+ }
+
ret = TRUE;
break;
}
gst_image_freeze_sink_chain (GstPad * pad, GstBuffer * buffer)
{
GstImageFreeze *self = GST_IMAGE_FREEZE (GST_PAD_PARENT (pad));
- GstFlowReturn ret = GST_FLOW_OK;
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
if (self->buffer) {
GST_DEBUG_OBJECT (pad, "Already have a buffer, dropping");
gst_buffer_unref (buffer);
- GST_OBJECT_UNLOCK (self);
- return ret;
+ g_mutex_unlock (self->lock);
+ return GST_FLOW_UNEXPECTED;
}
self->buffer = buffer;
- GST_OBJECT_UNLOCK (self);
gst_pad_start_task (self->srcpad, (GstTaskFunction) gst_image_freeze_src_loop,
self->srcpad);
- return ret;
+ g_mutex_unlock (self->lock);
+ return GST_FLOW_OK;
}
static void
GstImageFreeze *self = GST_IMAGE_FREEZE (GST_PAD_PARENT (pad));
GstBuffer *buffer;
guint64 offset;
- GstClockTime timestamp, duration;
+ GstClockTime timestamp, timestamp_end;
gint64 cstart, cstop;
gboolean in_seg, eos;
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
if (!self->buffer) {
GST_ERROR_OBJECT (pad, "Have no buffer yet");
- GST_OBJECT_UNLOCK (self);
+ 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);
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
if (self->close_segment) {
GST_DEBUG_OBJECT (pad, "Closing previous segment");
self->segment.applied_rate, self->segment.format, self->segment.start,
self->segment.stop, self->segment.start);
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
if (self->segment.rate >= 0) {
self->offset =
gst_util_uint64_scale (self->segment.start, self->fps_n,
gst_util_uint64_scale (self->segment.stop, self->fps_n,
self->fps_d * GST_SECOND);
}
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
self->need_segment = FALSE;
gst_pad_push_event (self->srcpad, e);
}
- GST_OBJECT_LOCK (self);
+ g_mutex_lock (self->lock);
offset = self->offset;
if (self->fps_n != 0) {
timestamp =
gst_util_uint64_scale (offset, self->fps_d * GST_SECOND, self->fps_n);
- duration = gst_util_uint64_scale_int (GST_SECOND, self->fps_d, self->fps_n);
+ timestamp_end =
+ gst_util_uint64_scale (offset + 1, self->fps_d * GST_SECOND,
+ self->fps_n);
} else {
timestamp = self->segment.start;
- duration = GST_CLOCK_TIME_NONE;
+ timestamp_end = GST_CLOCK_TIME_NONE;
}
+
eos = (self->fps_n == 0 && offset > 0) ||
(self->segment.rate >= 0 && self->segment.stop != -1
&& timestamp > self->segment.stop) || (self->segment.rate < 0
&& offset == 0) || (self->segment.rate < 0
- && self->segment.start != -1
- && timestamp + duration < self->segment.start);
+ && self->segment.start != -1 && timestamp_end < self->segment.start);
if (self->fps_n == 0 && offset > 0)
in_seg = FALSE;
else
in_seg =
gst_segment_clip (&self->segment, GST_FORMAT_TIME, timestamp,
- timestamp + duration, &cstart, &cstop);
+ timestamp_end, &cstart, &cstop);
if (in_seg)
gst_segment_set_last_stop (&self->segment, GST_FORMAT_TIME, cstart);
self->offset++;
else
self->offset--;
- GST_OBJECT_UNLOCK (self);
+ g_mutex_unlock (self->lock);
GST_DEBUG_OBJECT (pad, "Handling buffer with timestamp %" GST_TIME_FORMAT,
GST_TIME_ARGS (timestamp));
projects / platform / upstream / gstreamer.git / blobdiff