mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues1 Projects Releases Wiki Activity

port to new memory API

Browse source
This commit is contained in:
Wim Taymans 2012-01-25 14:50:50 +01:00
parent bc44628831
commit aa0a531c23
3 changed files with 12 additions and 9 deletions

9
gst/dtmf/gstdtmfdetect.c
View file

@ -161,17 +161,16 @@ gst_dtmf_detect_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
gint dtmf_count; gint dtmf_count;
gchar dtmfbuf[MAX_DTMF_DIGITS] = ""; gchar dtmfbuf[MAX_DTMF_DIGITS] = "";
gint i; gint i;
gpointer data; GstMapInfo map;
gsize size;
if (GST_BUFFER_IS_DISCONT (buf)) if (GST_BUFFER_IS_DISCONT (buf))
zap_dtmf_detect_init (&self->dtmf_state); zap_dtmf_detect_init (&self->dtmf_state);
if (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP)) if (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP))
return GST_FLOW_OK; return GST_FLOW_OK;
data = gst_buffer_map (buf, &size, NULL, GST_MAP_READ); gst_buffer_map (buf, &map, GST_MAP_READ);
zap_dtmf_detect (&self->dtmf_state, (gint16 *) data, size / 2, FALSE); zap_dtmf_detect (&self->dtmf_state, (gint16 *) map.data, map.size / 2, FALSE);
dtmf_count = zap_dtmf_get (&self->dtmf_state, dtmfbuf, MAX_DTMF_DIGITS); dtmf_count = zap_dtmf_get (&self->dtmf_state, dtmfbuf, MAX_DTMF_DIGITS);
@ -180,7 +179,7 @@ gst_dtmf_detect_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
else else
GST_LOG_OBJECT (self, "Got no DTMF events"); GST_LOG_OBJECT (self, "Got no DTMF events");
gst_buffer_unmap (buf, data, size); gst_buffer_unmap (buf, &map);
for (i = 0; i < dtmf_count; i++) { for (i = 0; i < dtmf_count; i++) {
GstMessage *dtmf_message = NULL; GstMessage *dtmf_message = NULL;

6
gst/dtmf/gstdtmfsrc.c
View file

@ -541,6 +541,7 @@ gst_dtmf_src_generate_tone (GstDTMFSrcEvent * event, DTMF_KEY key,
float duration, gint sample_rate) float duration, gint sample_rate)
{ {
GstBuffer *buffer; GstBuffer *buffer;
GstMapInfo map;
gint16 *p; gint16 *p;
gint tone_size; gint tone_size;
double i = 0; double i = 0;
@ -552,7 +553,8 @@ gst_dtmf_src_generate_tone (GstDTMFSrcEvent * event, DTMF_KEY key,
buffer = gst_buffer_new_allocate (NULL, tone_size, 1); buffer = gst_buffer_new_allocate (NULL, tone_size, 1);
p = (gint16 *) gst_buffer_map (buffer, NULL, NULL, GST_MAP_READWRITE); gst_buffer_map (buffer, &map, GST_MAP_READWRITE);
p = (gint16 *) map.data;
volume_factor = pow (10, (-event->volume) / 20); volume_factor = pow (10, (-event->volume) / 20);
@ -581,7 +583,7 @@ gst_dtmf_src_generate_tone (GstDTMFSrcEvent * event, DTMF_KEY key,
(event->sample)++; (event->sample)++;
} }
gst_buffer_unmap (buffer, p, tone_size); gst_buffer_unmap (buffer, &map);
return buffer; return buffer;
} }

6
gst/dtmf/gstrtpdtmfdepay.c
View file

@ -333,6 +333,7 @@ gst_dtmf_src_generate_tone (GstRtpDTMFDepay * rtpdtmfdepay,
GstRTPDTMFPayload payload) GstRTPDTMFPayload payload)
{ {
GstBuffer *buf; GstBuffer *buf;
GstMapInfo map;
gint16 *p; gint16 *p;
gint tone_size; gint tone_size;
double i = 0; double i = 0;
@ -351,7 +352,8 @@ gst_dtmf_src_generate_tone (GstRtpDTMFDepay * rtpdtmfdepay,
GST_BUFFER_DURATION (buf) = payload.duration * GST_SECOND / clock_rate; GST_BUFFER_DURATION (buf) = payload.duration * GST_SECOND / clock_rate;
volume = payload.volume; volume = payload.volume;
p = (gint16 *) gst_buffer_map (buf, NULL, NULL, GST_MAP_WRITE); gst_buffer_map (buf, &map, GST_MAP_WRITE);
p = (gint16 *) map.data;
volume_factor = pow (10, (-volume) / 20); volume_factor = pow (10, (-volume) / 20);
@ -382,7 +384,7 @@ gst_dtmf_src_generate_tone (GstRtpDTMFDepay * rtpdtmfdepay,
(rtpdtmfdepay->sample)++; (rtpdtmfdepay->sample)++;
} }
gst_buffer_unmap (buf, p, tone_size); gst_buffer_unmap (buf, &map);
return buf; return buf;
} }