FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[MOVED FROM GST-P-FARSIGHT] Complete port to basesrc

Browse Source 
20070917003654-3e2dc-db0f84dabd9dd1ac929a0461865b8aaa8ef91a77.gz
This commit is contained in:
Olivier Crete 2007-09-17 00:36:54 +00:00 committed by Edward Hervey
parent dccfa004de
commit 90a23de629
2 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
gst/dtmf/gstrtpdtmfsrc.c
View File

@ -147,8 +147,8 @@
#define MIN_VOLUME 0 #define MIN_VOLUME 0
#define MAX_VOLUME 36 #define MAX_VOLUME 36
#define MIN_INTER_DIGIT_INTERVAL (50 * GST_MSECOND) #define MIN_INTER_DIGIT_INTERVAL 50 /* ms */
#define MIN_PULSE_DURATION (70 * GST_MSECOND) #define MIN_PULSE_DURATION 70 /* ms */
#define DEFAULT_PACKET_REDUNDANCY 1 #define DEFAULT_PACKET_REDUNDANCY 1
#define MIN_PACKET_REDUNDANCY 1 #define MIN_PACKET_REDUNDANCY 1
@ -330,7 +330,7 @@ gst_rtp_dtmf_src_init (GstRTPDTMFSrc * object, GstRTPDTMFSrcClass * g_class)
object->packet_redundancy = DEFAULT_PACKET_REDUNDANCY; object->packet_redundancy = DEFAULT_PACKET_REDUNDANCY;
object->event_queue = g_async_queue_new (); object->event_queue = g_async_queue_new ();
object->last_event = NULL; object->payload = NULL;
GST_DEBUG_OBJECT (object, "init done"); GST_DEBUG_OBJECT (object, "init done");
} }
@ -528,7 +528,7 @@ gst_rtp_dtmf_src_set_stream_lock (GstRTPDTMFSrc *dtmfsrc, gboolean lock)
"lock", G_TYPE_BOOLEAN, lock, NULL); "lock", G_TYPE_BOOLEAN, lock, NULL);
event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure); event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure);
if (!gst_pad_push_event (dtmfsrc->srcpad, event)) { if (!gst_pad_push_event (GST_BASE_SRC_PAD (dtmfsrc), event)) {
GST_WARNING_OBJECT (dtmfsrc, "stream-lock event not handled"); GST_WARNING_OBJECT (dtmfsrc, "stream-lock event not handled");
} }
@ -545,7 +545,7 @@ gst_rtp_dtmf_prepare_timestamps (GstRTPDTMFSrc *dtmfsrc)
clock = gst_element_get_clock (GST_ELEMENT (dtmfsrc)); clock = gst_element_get_clock (GST_ELEMENT (dtmfsrc));
if (clock != NULL) { if (clock != NULL) {
dtmfsrc->timestamp = gst_clock_get_time (clock) dtmfsrc->timestamp = gst_clock_get_time (clock)
+ MIN_INTER_DIGIT_INTERVAL - base_time; + (MIN_INTER_DIGIT_INTERVAL * GST_MSECOND) - base_time;
dtmfsrc->start_timestamp = dtmfsrc->timestamp; dtmfsrc->start_timestamp = dtmfsrc->timestamp;
gst_object_unref (clock); gst_object_unref (clock);
} else { } else {
@ -557,8 +557,8 @@ gst_rtp_dtmf_prepare_timestamps (GstRTPDTMFSrc *dtmfsrc)
dtmfsrc->rtp_timestamp = dtmfsrc->ts_base + dtmfsrc->rtp_timestamp = dtmfsrc->ts_base +
gst_util_uint64_scale_int ( gst_util_uint64_scale_int (
gst_segment_to_running_time (&dtmfsrc->segment, GST_FORMAT_TIME, gst_segment_to_running_time (&GST_BASE_SRC (dtmfsrc)->segment,
dtmfsrc->timestamp), GST_FORMAT_TIME, dtmfsrc->timestamp),
dtmfsrc->clock_rate, GST_SECOND); dtmfsrc->clock_rate, GST_SECOND);
} }
@ -574,6 +574,7 @@ gst_rtp_dtmf_src_add_start_event (GstRTPDTMFSrc *dtmfsrc, gint event_number,
event->payload = g_new0 (GstRTPDTMFPayload, 1); event->payload = g_new0 (GstRTPDTMFPayload, 1);
event->payload->event = CLAMP (event_number, MIN_EVENT, MAX_EVENT); event->payload->event = CLAMP (event_number, MIN_EVENT, MAX_EVENT);
event->payload->volume = CLAMP (event_volume, MIN_VOLUME, MAX_VOLUME); event->payload->volume = CLAMP (event_volume, MIN_VOLUME, MAX_VOLUME);
event->payload->duration = dtmfsrc->interval * dtmfsrc->clock_rate / 1000;
g_async_queue_push (dtmfsrc->event_queue, event); g_async_queue_push (dtmfsrc->event_queue, event);
} }
@ -584,26 +585,21 @@ gst_rtp_dtmf_src_add_stop_event (GstRTPDTMFSrc *dtmfsrc)
GstRTPDTMFSrcEvent * event = g_malloc (sizeof(GstRTPDTMFSrcEvent)); GstRTPDTMFSrcEvent * event = g_malloc (sizeof(GstRTPDTMFSrcEvent));
event->event_type = RTP_DTMF_EVENT_TYPE_STOP; event->event_type = RTP_DTMF_EVENT_TYPE_STOP;
event->payload = g_new0 (GstRTPDTMFPayload, 1);
event->payload->event = 0;
event->payload->volume = 0;
g_async_queue_push (dtmfsrc->event_queue, event); g_async_queue_push (dtmfsrc->event_queue, event);
} }
static void static void
gst_rtp_dtmf_prepare_rtp_headers (GstRTPDTMFSrc *dtmfsrc, gst_rtp_dtmf_prepare_rtp_headers (GstRTPDTMFSrc *dtmfsrc, GstBuffer *buf)
GstRTPDTMFSrcEvent *event, GstBuffer *buf)
{ {
gst_rtp_buffer_set_ssrc (buf, dtmfsrc->current_ssrc); gst_rtp_buffer_set_ssrc (buf, dtmfsrc->current_ssrc);
gst_rtp_buffer_set_payload_type (buf, dtmfsrc->pt); gst_rtp_buffer_set_payload_type (buf, dtmfsrc->pt);
/* Only the very first packet gets a marker */
if (dtmfsrc->first_packet) { if (dtmfsrc->first_packet) {
gst_rtp_buffer_set_marker (buf, TRUE); gst_rtp_buffer_set_marker (buf, TRUE);
dtmfsrc->first_packet = FALSE;
} else if (dtmfsrc->last_packet) { } else if (dtmfsrc->last_packet) {
event->payload->e = 1; dtmfsrc->payload->e = 1;
dtmfsrc->last_packet = FALSE;
} }
dtmfsrc->seqnum++; dtmfsrc->seqnum++;
@ -614,54 +610,60 @@ gst_rtp_dtmf_prepare_rtp_headers (GstRTPDTMFSrc *dtmfsrc,
} }
static void static void
gst_rtp_dtmf_prepare_buffer_data (GstRTPDTMFSrc *dtmfsrc, gst_rtp_dtmf_prepare_buffer_data (GstRTPDTMFSrc *dtmfsrc, GstBuffer *buf)
GstRTPDTMFSrcEvent *event,GstBuffer *buf)
{ {
GstRTPDTMFPayload *payload; GstRTPDTMFPayload *payload;
gst_rtp_dtmf_prepare_rtp_headers (dtmfsrc,event, buf); gst_rtp_dtmf_prepare_rtp_headers (dtmfsrc, buf);
/* duration of DTMF payload */
event->payload->duration +=
dtmfsrc->interval * dtmfsrc->clock_rate / 1000;
/* timestamp and duration of GstBuffer */ /* timestamp and duration of GstBuffer */
/* Redundant buffer have no duration ... */
if (dtmfsrc->redundancy_count > 1)
GST_BUFFER_DURATION (buf) = 0;
else
GST_BUFFER_DURATION (buf) = dtmfsrc->interval * GST_MSECOND; GST_BUFFER_DURATION (buf) = dtmfsrc->interval * GST_MSECOND;
GST_BUFFER_TIMESTAMP (buf) = dtmfsrc->timestamp; GST_BUFFER_TIMESTAMP (buf) = dtmfsrc->timestamp;
dtmfsrc->timestamp += GST_BUFFER_DURATION (buf); dtmfsrc->timestamp += GST_BUFFER_DURATION (buf);
payload = (GstRTPDTMFPayload *) gst_rtp_buffer_get_payload (buf); payload = (GstRTPDTMFPayload *) gst_rtp_buffer_get_payload (buf);
/* copy payload and convert to network-byte order */ /* copy payload and convert to network-byte order */
g_memmove (payload, event->payload, sizeof (GstRTPDTMFPayload)); g_memmove (payload, dtmfsrc->payload, sizeof (GstRTPDTMFPayload));
/* Force the packet duration to a certain minumum /* Force the packet duration to a certain minumum
* if its the end of the event * if its the end of the event
*/ */
if (payload->e && if (payload->e &&
payload->duration < MIN_PULSE_DURATION * dtmfsrc->clock_rate / GST_MSECOND) payload->duration < MIN_PULSE_DURATION * dtmfsrc->clock_rate / 1000 )
payload->duration = MIN_PULSE_DURATION * dtmfsrc->clock_rate / GST_MSECOND; payload->duration = MIN_PULSE_DURATION * dtmfsrc->clock_rate / 1000;
payload->duration = g_htons (payload->duration); payload->duration = g_htons (payload->duration);
/* duration of DTMF payloadfor the NEXT packet */
/* not updated for redundant packets */
if (dtmfsrc->redundancy_count == 0)
dtmfsrc->payload->duration +=
dtmfsrc->interval * dtmfsrc->clock_rate / 1000;
} }
static GstBuffer * static GstBuffer *
gst_rtp_dtmf_src_create_next_rtp_packet (GstRTPDTMFSrc *dtmfsrc, gst_rtp_dtmf_src_create_next_rtp_packet (GstRTPDTMFSrc *dtmfsrc)
GstRTPDTMFSrcEvent *event)
{ {
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
/* create buffer to hold the payload */ /* create buffer to hold the payload */
buf = gst_rtp_buffer_new_allocate (sizeof (GstRTPDTMFPayload), 0, 0); buf = gst_rtp_buffer_new_allocate (sizeof (GstRTPDTMFPayload), 0, 0);
gst_rtp_dtmf_prepare_buffer_data (dtmfsrc, event, buf); gst_rtp_dtmf_prepare_buffer_data (dtmfsrc, buf);
/* Set caps on the buffer before pushing it */ /* Set caps on the buffer before pushing it */
gst_buffer_set_caps (buf, GST_PAD_CAPS (dtmfsrc->srcpad)); gst_buffer_set_caps (buf, GST_PAD_CAPS (GST_BASE_SRC_PAD (dtmfsrc)));
return buf; return buf;
} }
static GstFlowReturn static GstFlowReturn
gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset, gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
guint length, GstBuffer ** buffer) guint length, GstBuffer ** buffer)
@ -676,9 +678,12 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
do { do {
if (dtmfsrc->last_event == NULL) { if (dtmfsrc->payload == NULL) {
GST_DEBUG_OBJECT (dtmfsrc, "popping");
event = g_async_queue_pop (dtmfsrc->event_queue); event = g_async_queue_pop (dtmfsrc->event_queue);
GST_DEBUG_OBJECT (dtmfsrc, "popped %d", event->event_type);
switch (event->event_type) { switch (event->event_type) {
case RTP_DTMF_EVENT_TYPE_STOP: case RTP_DTMF_EVENT_TYPE_STOP:
GST_WARNING_OBJECT (dtmfsrc, GST_WARNING_OBJECT (dtmfsrc,
@ -688,12 +693,14 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
case RTP_DTMF_EVENT_TYPE_START: case RTP_DTMF_EVENT_TYPE_START:
dtmfsrc->first_packet = TRUE; dtmfsrc->first_packet = TRUE;
dtmfsrc->last_packet = FALSE; dtmfsrc->last_packet = FALSE;
/* Set the redundanc on the first packet */
dtmfsrc->redundancy_count = dtmfsrc->packet_redundancy;
gst_rtp_dtmf_prepare_timestamps (dtmfsrc); gst_rtp_dtmf_prepare_timestamps (dtmfsrc);
/* Don't forget to get exclusive access to the stream */ /* Don't forget to get exclusive access to the stream */
gst_rtp_dtmf_src_set_stream_lock (dtmfsrc, TRUE); gst_rtp_dtmf_src_set_stream_lock (dtmfsrc, TRUE);
dtmfsrc->last_event = event; dtmfsrc->payload = event->payload;
break; break;
case RTP_DTMF_EVENT_TYPE_PAUSE_TASK: case RTP_DTMF_EVENT_TYPE_PAUSE_TASK:
@ -709,11 +716,18 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
GST_OBJECT_UNLOCK (dtmfsrc); GST_OBJECT_UNLOCK (dtmfsrc);
break; break;
} }
} else if (dtmfsrc->timestamp - dtmfsrc->start_timestamp >=
g_free (event);
} else if (!dtmfsrc->first_packet && !dtmfsrc->last_packet &&
(dtmfsrc->timestamp - dtmfsrc->start_timestamp)/GST_MSECOND >=
MIN_PULSE_DURATION) { MIN_PULSE_DURATION) {
GST_DEBUG_OBJECT (dtmfsrc, "try popping");
event = g_async_queue_try_pop (dtmfsrc->event_queue); event = g_async_queue_try_pop (dtmfsrc->event_queue);
if (event != NULL) { if (event != NULL) {
GST_DEBUG_OBJECT (dtmfsrc, "try popped %d", event->event_type);
switch (event->event_type) { switch (event->event_type) {
case RTP_DTMF_EVENT_TYPE_START: case RTP_DTMF_EVENT_TYPE_START:
GST_WARNING_OBJECT (dtmfsrc, GST_WARNING_OBJECT (dtmfsrc,
@ -723,6 +737,8 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
case RTP_DTMF_EVENT_TYPE_STOP: case RTP_DTMF_EVENT_TYPE_STOP:
dtmfsrc->first_packet = FALSE; dtmfsrc->first_packet = FALSE;
dtmfsrc->last_packet = TRUE; dtmfsrc->last_packet = TRUE;
/* Set the redundanc on the last packet */
dtmfsrc->redundancy_count = dtmfsrc->packet_redundancy;
break; break;
case RTP_DTMF_EVENT_TYPE_PAUSE_TASK: case RTP_DTMF_EVENT_TYPE_PAUSE_TASK:
@ -739,16 +755,17 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
GST_OBJECT_UNLOCK (dtmfsrc); GST_OBJECT_UNLOCK (dtmfsrc);
break; break;
} }
g_free (event);
} }
} }
} while (dtmfsrc->last_event == NULL); } while (dtmfsrc->payload == NULL);
GST_DEBUG_OBJECT (dtmfsrc, "Processed events, now lets wait on the clock"); GST_DEBUG_OBJECT (dtmfsrc, "Processed events, now lets wait on the clock");
clock = gst_element_get_clock (GST_ELEMENT (basesrc)); clock = gst_element_get_clock (GST_ELEMENT (basesrc));
clockid = gst_clock_new_single_shot_id (clock, dtmfsrc->timestamp - clockid = gst_clock_new_single_shot_id (clock, dtmfsrc->timestamp +
gst_element_get_base_time (GST_ELEMENT (dtmfsrc))); gst_element_get_base_time (GST_ELEMENT (dtmfsrc)));
gst_object_unref (clock); gst_object_unref (clock);
@ -775,40 +792,30 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
send_last: send_last:
if (dtmfsrc->last_event) { if (dtmfsrc->dirty)
if (!gst_rtp_dtmf_src_negotiate (basesrc))
if (dtmfsrc->first_packet == TRUE || dtmfsrc->last_packet == TRUE) { return GST_FLOW_NOT_NEGOTIATED;
dtmfsrc->redundancy_count = dtmfsrc->packet_redundancy;
if(dtmfsrc->first_packet == TRUE) {
GST_DEBUG_OBJECT (dtmfsrc,
"redundancy count set to %d due to dtmf start",
dtmfsrc->redundancy_count);
} else if(dtmfsrc->last_packet == TRUE) {
GST_DEBUG_OBJECT (dtmfsrc,
"redundancy count set to %d due to dtmf stop",
dtmfsrc->redundancy_count);
}
}
/* create buffer to hold the payload */ /* create buffer to hold the payload */
*buffer = gst_rtp_dtmf_src_create_next_rtp_packet (dtmfsrc, *buffer = gst_rtp_dtmf_src_create_next_rtp_packet (dtmfsrc);
dtmfsrc->last_event);
if (dtmfsrc->redundancy_count)
dtmfsrc->redundancy_count--;
/* Only the very first one has a marker */
dtmfsrc->first_packet = FALSE;
/* This is the end of the event */
if (dtmfsrc->last_packet == TRUE && dtmfsrc->redundancy_count == 0) {
if (dtmfsrc->last_event->payload->e) {
/* 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);
g_free (dtmfsrc->last_event->payload); g_free (dtmfsrc->payload);
dtmfsrc->last_event->payload = NULL; dtmfsrc->payload = NULL;
g_free (dtmfsrc->last_event);
dtmfsrc->last_event = NULL;
dtmfsrc->last_packet = FALSE;
} }
}
return GST_FLOW_OK; return GST_FLOW_OK;
@ -818,13 +825,15 @@ gst_rtp_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
paused: paused:
if (dtmfsrc->last_event) { if (dtmfsrc->payload) {
dtmfsrc->first_packet = FALSE; dtmfsrc->first_packet = FALSE;
dtmfsrc->last_packet = TRUE; dtmfsrc->last_packet = TRUE;
/* Set the redundanc on the last packet */
dtmfsrc->redundancy_count = dtmfsrc->packet_redundancy;
goto send_last; goto send_last;
} } else {
return GST_FLOW_WRONG_STATE; return GST_FLOW_WRONG_STATE;
}
} }
@ -950,8 +959,6 @@ gst_rtp_dtmf_src_negotiate (GstBaseSrc * basesrc)
static void static void
gst_rtp_dtmf_src_ready_to_paused (GstRTPDTMFSrc *dtmfsrc) gst_rtp_dtmf_src_ready_to_paused (GstRTPDTMFSrc *dtmfsrc)
{ {
gst_segment_init (&dtmfsrc->segment, GST_FORMAT_UNDEFINED);
if (dtmfsrc->ssrc == -1) if (dtmfsrc->ssrc == -1)
dtmfsrc->current_ssrc = g_random_int (); dtmfsrc->current_ssrc = g_random_int ();
else else

4
gst/dtmf/gstrtpdtmfsrc.h
View File

@ -84,12 +84,10 @@ typedef struct _GstRTPDTMFSrcEvent GstRTPDTMFSrcEvent;
struct _GstRTPDTMFSrc { struct _GstRTPDTMFSrc {
GstBaseSrc basesrc; GstBaseSrc basesrc;
GstPad* srcpad;
GstSegment segment;
GAsyncQueue* event_queue; GAsyncQueue* event_queue;
GstRTPDTMFSrcEvent* last_event;
GstClockID clockid; GstClockID clockid;
gboolean paused; gboolean paused;
GstRTPDTMFPayload* payload;
GstClockTime timestamp; GstClockTime timestamp;
GstClockTime start_timestamp; GstClockTime start_timestamp;