mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-10 16:45:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

dtmf: Post messages when starting to send/receive DTMF

Browse source 
This way, the UI can display the DTMF events as they as being sent.
This commit is contained in:
Olivier Crête 2011-10-29 18:24:26 +02:00
parent 9e521e2b6d
commit 479ab0db68
2 changed files with 88 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gst/dtmf/gstdtmfsrc.c
View file

@ -110,6 +110,12 @@
* gst_element_send_event (pipeline, event);
* </programlisting>
*
* When a DTMF tone actually starts or stop, a "dtmf-event-processed"
* element #GstMessage with the same fields as the "dtmf-event"
* #GstEvent that was used to request the event. Also, if any event
* has not been processed when the element goes from the PAUSED to the
* READY state, then a "dtmf-event-dropped" message is posted on the
* #GstBus in the order that they were received.
*/
#ifdef HAVE_CONFIG_H
@ -625,6 +631,34 @@ gst_dtmf_src_create_next_tone_packet (GstDTMFSrc * dtmfsrc,
return buf;
}
static void
gst_dtmf_src_post_message (GstDTMFSrc * dtmfsrc, const gchar * message_name,
GstDTMFSrcEvent * event)
{
GstStructure *s;
switch (event->event_type) {
case DTMF_EVENT_TYPE_START:
s = gst_structure_new (message_name,
"type", G_TYPE_INT, 1,
"method", G_TYPE_INT, 2,
"start", G_TYPE_BOOLEAN, TRUE,
"number", G_TYPE_INT, event->event_number,
"volume", G_TYPE_INT, event->volume, NULL);
break;
case DTMF_EVENT_TYPE_STOP:
s = gst_structure_new (message_name,
"type", G_TYPE_INT, 1, "method", G_TYPE_INT, 2,
"start", G_TYPE_BOOLEAN, FALSE, NULL);
break;
case DTMF_EVENT_TYPE_PAUSE_TASK:
return;
}
gst_element_post_message (GST_ELEMENT (dtmfsrc),
gst_message_new_element (GST_OBJECT (dtmfsrc), s));
}
static GstFlowReturn
gst_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
guint length, GstBuffer ** buffer)
@ -650,6 +684,7 @@ gst_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
case DTMF_EVENT_TYPE_STOP:
GST_WARNING_OBJECT (dtmfsrc,
"Received a DTMF stop event when already stopped");
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
break;
case DTMF_EVENT_TYPE_START:
gst_dtmf_prepare_timestamps (dtmfsrc);
@ -657,6 +692,8 @@ gst_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
event->packet_count = 0;
dtmfsrc->last_event = event;
event = NULL;
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-processed",
dtmfsrc->last_event);
break;
case DTMF_EVENT_TYPE_PAUSE_TASK:
/*
@ -684,10 +721,12 @@ gst_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
case DTMF_EVENT_TYPE_START:
GST_WARNING_OBJECT (dtmfsrc,
"Received two consecutive DTMF start events");
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
break;
case DTMF_EVENT_TYPE_STOP:
g_slice_free (GstDTMFSrcEvent, dtmfsrc->last_event);
dtmfsrc->last_event = NULL;
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-processed", event);
break;
case DTMF_EVENT_TYPE_PAUSE_TASK:
/*
@ -853,6 +892,7 @@ gst_dtmf_src_change_state (GstElement * element, GstStateChange transition)
event = g_async_queue_try_pop (dtmfsrc->event_queue);
while (event != NULL) {
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
g_slice_free (GstDTMFSrcEvent, event);
event = g_async_queue_try_pop (dtmfsrc->event_queue);
}
@ -878,6 +918,7 @@ gst_dtmf_src_change_state (GstElement * element, GstStateChange transition)
event = g_async_queue_try_pop (dtmfsrc->event_queue);
while (event != NULL) {
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
g_slice_free (GstDTMFSrcEvent, event);
event = g_async_queue_try_pop (dtmfsrc->event_queue);
}

50
gst/dtmf/gstrtpdtmfsrc.c
View file

@ -108,7 +108,13 @@
* gst_element_send_event (pipeline, event);
* </programlisting>
*
*/
* When a DTMF tone actually starts or stop, a "dtmf-event-processed"
* element #GstMessage with the same fields as the "dtmf-event"
* #GstEvent that was used to request the event. Also, if any event
* has not been processed when the element goes from the PAUSED to the
* READY state, then a "dtmf-event-dropped" message is posted on the
* #GstBus in the order that they were received.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@ -644,6 +650,36 @@ gst_rtp_dtmf_src_create_next_rtp_packet (GstRTPDTMFSrc * dtmfsrc)
return buf;
}
static void
gst_dtmf_src_post_message (GstRTPDTMFSrc * dtmfsrc, const gchar * message_name,
GstRTPDTMFSrcEvent * event)
{
GstStructure *s;
switch (event->event_type) {
case RTP_DTMF_EVENT_TYPE_START:
s = gst_structure_new (message_name,
"type", G_TYPE_INT, 1,
"method", G_TYPE_INT, 1,
"start", G_TYPE_BOOLEAN, TRUE,
"number", G_TYPE_INT, event->payload->event,
"volume", G_TYPE_INT, event->payload->volume, NULL);
break;
case RTP_DTMF_EVENT_TYPE_STOP:
s = gst_structure_new (message_name,
"type", G_TYPE_INT, 1, "method", G_TYPE_INT, 1,
"start", G_TYPE_BOOLEAN, FALSE, NULL);
break;
case RTP_DTMF_EVENT_TYPE_PAUSE_TASK:
return;
}
gst_element_post_message (GST_ELEMENT (dtmfsrc),
gst_message_new_element (GST_OBJECT (dtmfsrc), s));
}
static GstFlowReturn
gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
guint length, GstBuffer ** buffer)
@ -668,6 +704,7 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
case RTP_DTMF_EVENT_TYPE_STOP:
GST_WARNING_OBJECT (dtmfsrc,
"Received a DTMF stop event when already stopped");
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
break;
case RTP_DTMF_EVENT_TYPE_START:
@ -678,6 +715,7 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
if (!gst_rtp_dtmf_prepare_timestamps (dtmfsrc))
goto no_clock;
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-processed", event);
dtmfsrc->payload = event->payload;
event->payload = NULL;
break;
@ -711,6 +749,7 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
case RTP_DTMF_EVENT_TYPE_START:
GST_WARNING_OBJECT (dtmfsrc,
"Received two consecutive DTMF start events");
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
break;
case RTP_DTMF_EVENT_TYPE_STOP:
@ -718,6 +757,7 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
dtmfsrc->last_packet = TRUE;
/* Set the redundancy on the last packet */
dtmfsrc->redundancy_count = dtmfsrc->packet_redundancy;
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-processed", event);
break;
case RTP_DTMF_EVENT_TYPE_PAUSE_TASK:
@ -1004,8 +1044,10 @@ gst_rtp_dtmf_src_change_state (GstElement * element, GstStateChange transition)
gst_rtp_dtmf_src_ready_to_paused (dtmfsrc);
/* Flushing the event queue */
while ((event = g_async_queue_try_pop (dtmfsrc->event_queue)) != NULL)
while ((event = g_async_queue_try_pop (dtmfsrc->event_queue)) != NULL) {
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
gst_rtp_dtmf_src_event_free (event);
}
no_preroll = TRUE;
break;
@ -1025,8 +1067,10 @@ gst_rtp_dtmf_src_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PAUSED_TO_READY:
/* Flushing the event queue */
while ((event = g_async_queue_try_pop (dtmfsrc->event_queue)) != NULL)
while ((event = g_async_queue_try_pop (dtmfsrc->event_queue)) != NULL) {
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
gst_rtp_dtmf_src_event_free (event);
}
/* Indicate that we don't do PRE_ROLL */
break;