mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-26 09:50:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

State change cleanups

Browse source 
Original commit message from CVS:
State change cleanups
This commit is contained in:
Wim Taymans 2002-09-15 13:53:08 +00:00
parent c2e64f65da
commit a70416bcd8
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/elements/gstfakesrc.c
View file

@ -757,8 +757,7 @@ gst_fakesrc_get(GstPad *pad)
GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++; GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++;
if (!src->silent) { if (!src->silent) {
if (src->last_message) g_free (src->last_message);
g_free (src->last_message);
src->last_message = g_strdup_printf ("get ******* (%s:%s)> (%d bytes, %llu) %p", src->last_message = g_strdup_printf ("get ******* (%s:%s)> (%d bytes, %llu) %p",
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf); GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf);
@ -818,19 +817,19 @@ gst_fakesrc_change_state (GstElement *element)
fakesrc = GST_FAKESRC (element); fakesrc = GST_FAKESRC (element);
switch (GST_STATE_TRANSITION (element)) { switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_PAUSED_TO_READY:
case GST_STATE_NULL_TO_READY: case GST_STATE_NULL_TO_READY:
break;
case GST_STATE_READY_TO_PAUSED:
fakesrc->buffer_count = 0; fakesrc->buffer_count = 0;
fakesrc->pattern_byte = 0x00; fakesrc->pattern_byte = 0x00;
fakesrc->need_flush = FALSE; fakesrc->need_flush = FALSE;
fakesrc->eos = FALSE; fakesrc->eos = FALSE;
fakesrc->rt_num_buffers = fakesrc->num_buffers; fakesrc->rt_num_buffers = fakesrc->num_buffers;
break; break;
case GST_STATE_READY_TO_PAUSED:
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_PAUSED_TO_PLAYING:
case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_PLAYING_TO_PAUSED:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_PAUSED_TO_READY:
if (fakesrc->parent) { if (fakesrc->parent) {
gst_buffer_unref (fakesrc->parent); gst_buffer_unref (fakesrc->parent);
fakesrc->parent = NULL; fakesrc->parent = NULL;
@ -839,8 +838,10 @@ gst_fakesrc_change_state (GstElement *element)
gst_buffer_pool_unref (fakesrc->pool); gst_buffer_pool_unref (fakesrc->pool);
fakesrc->pool = NULL; fakesrc->pool = NULL;
} }
if (fakesrc->last_message) g_free (fakesrc->last_message);
g_free (fakesrc->last_message); fakesrc->last_message = NULL;
break;
case GST_STATE_READY_TO_NULL:
break; break;
default: default:
g_assert_not_reached (); g_assert_not_reached ();

15
plugins/elements/gstfakesrc.c
View file

@ -757,8 +757,7 @@ gst_fakesrc_get(GstPad *pad)
GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++; GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++;
if (!src->silent) { if (!src->silent) {
if (src->last_message) g_free (src->last_message);
g_free (src->last_message);
src->last_message = g_strdup_printf ("get ******* (%s:%s)> (%d bytes, %llu) %p", src->last_message = g_strdup_printf ("get ******* (%s:%s)> (%d bytes, %llu) %p",
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf); GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf);
@ -818,19 +817,19 @@ gst_fakesrc_change_state (GstElement *element)
fakesrc = GST_FAKESRC (element); fakesrc = GST_FAKESRC (element);
switch (GST_STATE_TRANSITION (element)) { switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_PAUSED_TO_READY:
case GST_STATE_NULL_TO_READY: case GST_STATE_NULL_TO_READY:
break;
case GST_STATE_READY_TO_PAUSED:
fakesrc->buffer_count = 0; fakesrc->buffer_count = 0;
fakesrc->pattern_byte = 0x00; fakesrc->pattern_byte = 0x00;
fakesrc->need_flush = FALSE; fakesrc->need_flush = FALSE;
fakesrc->eos = FALSE; fakesrc->eos = FALSE;
fakesrc->rt_num_buffers = fakesrc->num_buffers; fakesrc->rt_num_buffers = fakesrc->num_buffers;
break; break;
case GST_STATE_READY_TO_PAUSED:
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_PAUSED_TO_PLAYING:
case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_PLAYING_TO_PAUSED:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_PAUSED_TO_READY:
if (fakesrc->parent) { if (fakesrc->parent) {
gst_buffer_unref (fakesrc->parent); gst_buffer_unref (fakesrc->parent);
fakesrc->parent = NULL; fakesrc->parent = NULL;
@ -839,8 +838,10 @@ gst_fakesrc_change_state (GstElement *element)
gst_buffer_pool_unref (fakesrc->pool); gst_buffer_pool_unref (fakesrc->pool);
fakesrc->pool = NULL; fakesrc->pool = NULL;
} }
if (fakesrc->last_message) g_free (fakesrc->last_message);
g_free (fakesrc->last_message); fakesrc->last_message = NULL;
break;
case GST_STATE_READY_TO_NULL:
break; break;
default: default:
g_assert_not_reached (); g_assert_not_reached ();