mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 14:36:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM GST-P-FARSIGHT] Fixes the deadlock when pausing the dtmfsrc and rtpdtmfsrc. Had to push something on the async queue to release the blocking async_queue_pop(). Thanks to Olivier for the solution.

Browse source 
20070831234413-4f0f6-793cf35fc43636e7275258cc7063fc068f5efa0a.gz
This commit is contained in:
Youness Alaoui 2007-08-31 23:44:13 +00:00 committed by Edward Hervey
parent 102570fe4d
commit 886a695daa
4 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/dtmf/gstdtmfsrc.c
View file

@ -554,6 +554,16 @@ gst_dtmf_src_stop (GstDTMFSrc *dtmfsrc)
dtmfsrc->clock_id = NULL; dtmfsrc->clock_id = NULL;
} }
g_async_queue_lock (dtmfsrc->event_queue);
event = g_malloc (sizeof(GstRTPDTMFSrcEvent));
event->event_type = RTP_DTMF_EVENT_TYPE_PAUSE_TASK;
g_async_queue_push_unlocked (dtmfsrc->event_queue, event);
g_async_queue_unlock (dtmfsrc->event_queue);
event = NULL;
if (!gst_pad_pause_task (dtmfsrc->srcpad)) { if (!gst_pad_pause_task (dtmfsrc->srcpad)) {
GST_ERROR_OBJECT (dtmfsrc, "Failed to pause task on src pad"); GST_ERROR_OBJECT (dtmfsrc, "Failed to pause task on src pad");
return; return;
@ -768,6 +778,10 @@ gst_dtmf_src_push_next_tone_packet (GstDTMFSrc *dtmfsrc)
event->packet_count = 0; event->packet_count = 0;
dtmfsrc->last_event = event; dtmfsrc->last_event = event;
} else if (event->event_type == RTP_DTMF_EVENT_TYPE_PAUSE_TASK) {
g_free (event);
g_async_queue_unref (dtmfsrc->event_queue);
return;
} }
} else if (dtmfsrc->last_event->packet_count * dtmfsrc->interval >= } else if (dtmfsrc->last_event->packet_count * dtmfsrc->interval >=
MIN_DUTY_CYCLE) { MIN_DUTY_CYCLE) {

3
gst/dtmf/gstdtmfsrc.h
View file

@ -52,7 +52,8 @@ typedef struct _GstDTMFSrcClass GstDTMFSrcClass;
enum _GstDTMFEventType { enum _GstDTMFEventType {
DTMF_EVENT_TYPE_START, DTMF_EVENT_TYPE_START,
DTMF_EVENT_TYPE_STOP DTMF_EVENT_TYPE_STOP,
DTMF_EVENT_TYPE_PAUSE_TASK
}; };
typedef enum _GstDTMFEventType GstDTMFEventType; typedef enum _GstDTMFEventType GstDTMFEventType;

17
gst/dtmf/gstrtpdtmfsrc.c
View file

@ -612,11 +612,20 @@ gst_rtp_dtmf_src_stop (GstRTPDTMFSrc *dtmfsrc)
dtmfsrc->clock_id = NULL; dtmfsrc->clock_id = NULL;
} }
g_async_queue_lock (dtmfsrc->event_queue);
event = g_malloc (sizeof(GstRTPDTMFSrcEvent));
event->event_type = RTP_DTMF_EVENT_TYPE_PAUSE_TASK;
g_async_queue_push_unlocked (dtmfsrc->event_queue, event);
g_async_queue_unlock (dtmfsrc->event_queue);
event = NULL;
if (!gst_pad_pause_task (dtmfsrc->srcpad)) { if (!gst_pad_pause_task (dtmfsrc->srcpad)) {
GST_ERROR_OBJECT (dtmfsrc, "Failed to pause task on src pad"); GST_ERROR_OBJECT (dtmfsrc, "Failed to pause task on src pad");
return; return;
} }
if (dtmfsrc->last_event) { if (dtmfsrc->last_event) {
/* Don't forget to release the stream lock */ /* Don't forget to release the stream lock */
gst_rtp_dtmf_src_set_stream_lock (dtmfsrc, FALSE); gst_rtp_dtmf_src_set_stream_lock (dtmfsrc, FALSE);
@ -632,10 +641,6 @@ gst_rtp_dtmf_src_stop (GstRTPDTMFSrc *dtmfsrc)
event = g_async_queue_try_pop (dtmfsrc->event_queue); event = g_async_queue_try_pop (dtmfsrc->event_queue);
} }
if (dtmfsrc->last_event) {
g_free (dtmfsrc->last_event);
dtmfsrc->last_event = NULL;
}
} }
@ -813,6 +818,10 @@ gst_rtp_dtmf_src_push_next_rtp_packet (GstRTPDTMFSrc *dtmfsrc)
event->sent_packets = 0; event->sent_packets = 0;
dtmfsrc->last_event = event; dtmfsrc->last_event = event;
} else if (event->event_type == RTP_DTMF_EVENT_TYPE_PAUSE_TASK) {
g_free (event);
g_async_queue_unref (dtmfsrc->event_queue);
return;
} }
} else if (dtmfsrc->last_event->sent_packets * dtmfsrc->interval >= } else if (dtmfsrc->last_event->sent_packets * dtmfsrc->interval >=
MIN_PULSE_DURATION){ MIN_PULSE_DURATION){

3
gst/dtmf/gstrtpdtmfsrc.h
View file

@ -61,7 +61,8 @@ typedef struct _GstRTPDTMFSrcClass GstRTPDTMFSrcClass;
enum _GstRTPDTMFEventType { enum _GstRTPDTMFEventType {
RTP_DTMF_EVENT_TYPE_START, RTP_DTMF_EVENT_TYPE_START,
RTP_DTMF_EVENT_TYPE_STOP RTP_DTMF_EVENT_TYPE_STOP,
RTP_DTMF_EVENT_TYPE_PAUSE_TASK
}; };
typedef enum _GstRTPDTMFEventType GstRTPDTMFEventType; typedef enum _GstRTPDTMFEventType GstRTPDTMFEventType;