mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-05-29 05:38:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

dtmf: drop use of GSlice

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3695>
This commit is contained in:
Tim-Philipp Müller 2023-01-08 17:27:21 +00:00 committed by GStreamer Marge Bot
parent 2a3513ef6c
commit 9f4c514c52
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
subprojects/gst-plugins-good/gst/dtmf/gstdtmfsrc.c
View file

@ -247,7 +247,7 @@ static void
event_free (GstDTMFSrcEvent * event)
{
if (event)
g_slice_free (GstDTMFSrcEvent, event);
g_free (event);
}
static void
@ -481,7 +481,7 @@ gst_dtmf_src_add_start_event (GstDTMFSrc * dtmfsrc, gint event_number,
gint event_volume)
{
GstDTMFSrcEvent *event = g_slice_new0 (GstDTMFSrcEvent);
GstDTMFSrcEvent *event = g_new0 (GstDTMFSrcEvent, 1);
event->event_type = DTMF_EVENT_TYPE_START;
event->sample = 0;
event->event_number = CLAMP (event_number, MIN_EVENT, MAX_EVENT);
@ -494,7 +494,7 @@ static void
gst_dtmf_src_add_stop_event (GstDTMFSrc * dtmfsrc)
{
GstDTMFSrcEvent *event = g_slice_new0 (GstDTMFSrcEvent);
GstDTMFSrcEvent *event = g_new0 (GstDTMFSrcEvent, 1);
event->event_type = DTMF_EVENT_TYPE_STOP;
event->sample = 0;
event->event_number = 0;
@ -689,7 +689,7 @@ gst_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
break;
}
if (event)
g_slice_free (GstDTMFSrcEvent, event);
g_free (event);
} else if (dtmfsrc->last_event->packet_count * dtmfsrc->interval >=
MIN_DUTY_CYCLE) {
event = g_async_queue_try_pop (dtmfsrc->event_queue);
@ -703,7 +703,7 @@ gst_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
break;
case DTMF_EVENT_TYPE_STOP:
g_slice_free (GstDTMFSrcEvent, dtmfsrc->last_event);
g_free (dtmfsrc->last_event);
dtmfsrc->last_event = NULL;
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-processed", event);
break;
@ -723,7 +723,7 @@ gst_dtmf_src_create (GstBaseSrc * basesrc, guint64 offset,
break;
}
g_slice_free (GstDTMFSrcEvent, event);
g_free (event);
}
}
} while (dtmfsrc->last_event == NULL);
@ -773,7 +773,7 @@ paused:
if (dtmfsrc->last_event) {
GST_DEBUG_OBJECT (dtmfsrc, "Stopping current event");
/* Don't forget to release the stream lock */
g_slice_free (GstDTMFSrcEvent, dtmfsrc->last_event);
g_free (dtmfsrc->last_event);
dtmfsrc->last_event = NULL;
}
@ -797,7 +797,7 @@ gst_dtmf_src_unlock (GstBaseSrc * src)
GST_OBJECT_UNLOCK (dtmfsrc);
GST_DEBUG_OBJECT (dtmfsrc, "Pushing the PAUSE_TASK event on unlock request");
event = g_slice_new0 (GstDTMFSrcEvent);
event = g_new0 (GstDTMFSrcEvent, 1);
event->event_type = DTMF_EVENT_TYPE_PAUSE_TASK;
g_async_queue_push (dtmfsrc->event_queue, event);
@ -902,7 +902,7 @@ gst_dtmf_src_change_state (GstElement * element, GstStateChange transition)
while (event != NULL) {
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
g_slice_free (GstDTMFSrcEvent, event);
g_free (event);
event = g_async_queue_try_pop (dtmfsrc->event_queue);
}
dtmfsrc->last_event_was_start = FALSE;
@ -929,7 +929,7 @@ gst_dtmf_src_change_state (GstElement * element, GstStateChange transition)
while (event != NULL) {
gst_dtmf_src_post_message (dtmfsrc, "dtmf-event-dropped", event);
g_slice_free (GstDTMFSrcEvent, event);
g_free (event);
event = g_async_queue_try_pop (dtmfsrc->event_queue);
}
dtmfsrc->last_event_was_start = FALSE;

14
subprojects/gst-plugins-good/gst/dtmf/gstrtpdtmfsrc.c
View file

@ -245,8 +245,8 @@ gst_rtp_dtmf_src_event_free (GstRTPDTMFSrcEvent * event)
{
if (event) {
if (event->payload)
g_slice_free (GstRTPDTMFPayload, event->payload);
g_slice_free (GstRTPDTMFSrcEvent, event);
g_free (event->payload);
g_free (event);
}
}
@ -508,10 +508,10 @@ gst_rtp_dtmf_src_add_start_event (GstRTPDTMFSrc * dtmfsrc, gint event_number,
gint event_volume)
{
GstRTPDTMFSrcEvent *event = g_slice_new0 (GstRTPDTMFSrcEvent);
GstRTPDTMFSrcEvent *event = g_new0 (GstRTPDTMFSrcEvent, 1);
event->event_type = RTP_DTMF_EVENT_TYPE_START;
event->payload = g_slice_new0 (GstRTPDTMFPayload);
event->payload = g_new0 (GstRTPDTMFPayload, 1);
event->payload->event = CLAMP (event_number, MIN_EVENT, MAX_EVENT);
event->payload->volume = CLAMP (event_volume, MIN_VOLUME, MAX_VOLUME);
@ -522,7 +522,7 @@ static void
gst_rtp_dtmf_src_add_stop_event (GstRTPDTMFSrc * dtmfsrc)
{
GstRTPDTMFSrcEvent *event = g_slice_new0 (GstRTPDTMFSrcEvent);
GstRTPDTMFSrcEvent *event = g_new0 (GstRTPDTMFSrcEvent, 1);
event->event_type = RTP_DTMF_EVENT_TYPE_STOP;
g_async_queue_push (dtmfsrc->event_queue, event);
@ -808,7 +808,7 @@ send_last:
/* This is the end of the event */
if (dtmfsrc->last_packet == TRUE && dtmfsrc->redundancy_count == 0) {
g_slice_free (GstRTPDTMFPayload, dtmfsrc->payload);
g_free (dtmfsrc->payload);
dtmfsrc->payload = NULL;
dtmfsrc->last_packet = FALSE;
@ -1121,7 +1121,7 @@ gst_rtp_dtmf_src_unlock (GstBaseSrc * src)
GST_OBJECT_UNLOCK (dtmfsrc);
GST_DEBUG_OBJECT (dtmfsrc, "Pushing the PAUSE_TASK event on unlock request");
event = g_slice_new0 (GstRTPDTMFSrcEvent);
event = g_new0 (GstRTPDTMFSrcEvent, 1);
event->event_type = RTP_DTMF_EVENT_TYPE_PAUSE_TASK;
g_async_queue_push (dtmfsrc->event_queue, event);