mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 13:02:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

appsink: rename GstBuffer *preroll to preroll_buffer

Browse source 
priv->preroll can be confused with basesink_class->preroll

https://bugzilla.gnome.org/show_bug.cgi?id=786740
This commit is contained in:
Julien Isorce 2017-09-13 14:06:43 +01:00
parent 925a4fe6a4
commit c134a3c21b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst-libs/gst/app/gstappsink.c
View file

@ -87,7 +87,7 @@ struct _GstAppSinkPrivate
GCond cond; GCond cond;
GMutex mutex; GMutex mutex;
GQueue *queue; GQueue *queue;
GstBuffer *preroll; GstBuffer *preroll_buffer;
GstCaps *preroll_caps; GstCaps *preroll_caps;
GstCaps *last_caps; GstCaps *last_caps;
GstSegment preroll_segment; GstSegment preroll_segment;
@ -482,7 +482,7 @@ gst_app_sink_dispose (GObject * obj)
g_mutex_lock (&priv->mutex); g_mutex_lock (&priv->mutex);
while ((queue_obj = g_queue_pop_head (priv->queue))) while ((queue_obj = g_queue_pop_head (priv->queue)))
gst_mini_object_unref (queue_obj); gst_mini_object_unref (queue_obj);
gst_buffer_replace (&priv->preroll, NULL); gst_buffer_replace (&priv->preroll_buffer, NULL);
gst_caps_replace (&priv->preroll_caps, NULL); gst_caps_replace (&priv->preroll_caps, NULL);
gst_caps_replace (&priv->last_caps, NULL); gst_caps_replace (&priv->last_caps, NULL);
g_mutex_unlock (&priv->mutex); g_mutex_unlock (&priv->mutex);
@ -615,7 +615,7 @@ gst_app_sink_flush_unlocked (GstAppSink * appsink)
GST_DEBUG_OBJECT (appsink, "flush stop appsink"); GST_DEBUG_OBJECT (appsink, "flush stop appsink");
priv->is_eos = FALSE; priv->is_eos = FALSE;
gst_buffer_replace (&priv->preroll, NULL); gst_buffer_replace (&priv->preroll_buffer, NULL);
while ((obj = g_queue_pop_head (priv->queue))) while ((obj = g_queue_pop_head (priv->queue)))
gst_mini_object_unref (obj); gst_mini_object_unref (obj);
priv->num_buffers = 0; priv->num_buffers = 0;
@ -650,7 +650,7 @@ gst_app_sink_stop (GstBaseSink * psink)
priv->flushing = TRUE; priv->flushing = TRUE;
priv->started = FALSE; priv->started = FALSE;
gst_app_sink_flush_unlocked (appsink); gst_app_sink_flush_unlocked (appsink);
gst_buffer_replace (&priv->preroll, NULL); gst_buffer_replace (&priv->preroll_buffer, NULL);
gst_caps_replace (&priv->preroll_caps, NULL); gst_caps_replace (&priv->preroll_caps, NULL);
gst_caps_replace (&priv->last_caps, NULL); gst_caps_replace (&priv->last_caps, NULL);
gst_segment_init (&priv->preroll_segment, GST_FORMAT_UNDEFINED); gst_segment_init (&priv->preroll_segment, GST_FORMAT_UNDEFINED);
@ -669,7 +669,7 @@ gst_app_sink_setcaps (GstBaseSink * sink, GstCaps * caps)
g_mutex_lock (&priv->mutex); g_mutex_lock (&priv->mutex);
GST_DEBUG_OBJECT (appsink, "receiving CAPS"); GST_DEBUG_OBJECT (appsink, "receiving CAPS");
g_queue_push_tail (priv->queue, gst_event_new_caps (caps)); g_queue_push_tail (priv->queue, gst_event_new_caps (caps));
if (!priv->preroll) if (!priv->preroll_buffer)
gst_caps_replace (&priv->preroll_caps, caps); gst_caps_replace (&priv->preroll_caps, caps);
g_mutex_unlock (&priv->mutex); g_mutex_unlock (&priv->mutex);
@ -687,7 +687,7 @@ gst_app_sink_event (GstBaseSink * sink, GstEvent * event)
g_mutex_lock (&priv->mutex); g_mutex_lock (&priv->mutex);
GST_DEBUG_OBJECT (appsink, "receiving SEGMENT"); GST_DEBUG_OBJECT (appsink, "receiving SEGMENT");
g_queue_push_tail (priv->queue, gst_event_ref (event)); g_queue_push_tail (priv->queue, gst_event_ref (event));
if (!priv->preroll) if (!priv->preroll_buffer)
gst_event_copy_segment (event, &priv->preroll_segment); gst_event_copy_segment (event, &priv->preroll_segment);
g_mutex_unlock (&priv->mutex); g_mutex_unlock (&priv->mutex);
break; break;
@ -751,7 +751,7 @@ gst_app_sink_preroll (GstBaseSink * psink, GstBuffer * buffer)
goto flushing; goto flushing;
GST_DEBUG_OBJECT (appsink, "setting preroll buffer %p", buffer); GST_DEBUG_OBJECT (appsink, "setting preroll buffer %p", buffer);
gst_buffer_replace (&priv->preroll, buffer); gst_buffer_replace (&priv->preroll_buffer, buffer);
g_cond_signal (&priv->cond); g_cond_signal (&priv->cond);
emit = priv->emit_signals; emit = priv->emit_signals;
@ -1460,7 +1460,7 @@ gst_app_sink_try_pull_preroll (GstAppSink * appsink, GstClockTime timeout)
if (!priv->started) if (!priv->started)
goto not_started; goto not_started;
if (priv->preroll != NULL) if (priv->preroll_buffer != NULL)
break; break;
if (priv->is_eos) if (priv->is_eos)
@ -1476,8 +1476,8 @@ gst_app_sink_try_pull_preroll (GstAppSink * appsink, GstClockTime timeout)
} }
} }
sample = sample =
gst_sample_new (priv->preroll, priv->preroll_caps, &priv->preroll_segment, gst_sample_new (priv->preroll_buffer, priv->preroll_caps,
NULL); &priv->preroll_segment, NULL);
GST_DEBUG_OBJECT (appsink, "we have the preroll sample %p", sample); GST_DEBUG_OBJECT (appsink, "we have the preroll sample %p", sample);
g_mutex_unlock (&priv->mutex); g_mutex_unlock (&priv->mutex);