mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-08 18:39:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM GST-P-FARSIGHT] Make sure to unlock the thread when going to ready and to flush the queue when moving to paused or playing

Browse source 
20070913192053-4f0f6-76c3925380d1a30988286170535a65dea64a5583.gz
This commit is contained in:
Youness Alaoui 2007-09-13 19:20:53 +00:00 committed by Edward Hervey
parent 1ab6c9c1ea
commit de61d9c533
1 changed files with 39 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
gst/dtmf/gstdtmfsrc.c
View file

@ -715,9 +715,25 @@ gst_dtmf_src_change_state (GstElement * element, GstStateChange transition)
GstDTMFSrc *dtmfsrc; GstDTMFSrc *dtmfsrc;
GstStateChangeReturn result; GstStateChangeReturn result;
gboolean no_preroll = FALSE; gboolean no_preroll = FALSE;
GstDTMFSrcEvent *event = NULL;
dtmfsrc = GST_DTMF_SRC (element); dtmfsrc = GST_DTMF_SRC (element);
switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED:
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
/* Flushing the event queue */
event = g_async_queue_try_pop (dtmfsrc->event_queue);
while (event != NULL) {
g_free (event);
event = g_async_queue_try_pop (dtmfsrc->event_queue);
}
break;
default:
break;
}
if ((result = if ((result =
GST_ELEMENT_CLASS (parent_class)->change_state (element, GST_ELEMENT_CLASS (parent_class)->change_state (element,
transition)) == GST_STATE_CHANGE_FAILURE) transition)) == GST_STATE_CHANGE_FAILURE)
@ -725,30 +741,30 @@ gst_dtmf_src_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
{ if (dtmfsrc->last_event) {
GstDTMFSrcEvent *event = NULL; /* Don't forget to release the stream lock */
gst_dtmf_src_set_stream_lock (dtmfsrc, FALSE);
/* TODO lock the element */ g_free (dtmfsrc->last_event);
dtmfsrc->last_event = NULL;
if (dtmfsrc->last_event) {
/* Don't forget to release the stream lock */
gst_dtmf_src_set_stream_lock (dtmfsrc, FALSE);
g_free (dtmfsrc->last_event);
dtmfsrc->last_event = NULL;
}
/* Flushing the event queue */
event = g_async_queue_try_pop (dtmfsrc->event_queue);
while (event != NULL) {
g_free (event);
event = g_async_queue_try_pop (dtmfsrc->event_queue);
}
/* Indicate that we don't do PRE_ROLL */
no_preroll = TRUE;
break;
} }
/* Flushing the event queue */
event = g_async_queue_try_pop (dtmfsrc->event_queue);
while (event != NULL) {
g_free (event);
event = g_async_queue_try_pop (dtmfsrc->event_queue);
}
/* Indicate that we don't do PRE_ROLL */
no_preroll = TRUE;
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
event = g_malloc (sizeof(GstDTMFSrcEvent));
event->event_type = DTMF_EVENT_TYPE_PAUSE_TASK;
g_async_queue_push (dtmfsrc->event_queue, event);
event = NULL;
default: default:
break; break;
} }