mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-03 10:43:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

adpcmdec: port to 0.11

Browse source
This commit is contained in:
Mark Nauwelaerts 2012-01-26 23:28:28 +01:00
parent 936bee00f4
commit 498e4df9d9
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -313,7 +313,7 @@ AG_GST_DEFAULT_ELEMENTS
dnl *** plug-ins to include *** dnl *** plug-ins to include ***
dnl Non ported plugins (non-dependant, then dependant) dnl Non ported plugins (non-dependant, then dependant)
dnl Make sure you have a space before and after all plugins dnl Make sure you have a space before and after all plugins
GST_PLUGINS_NONPORTED=" adpcmdec aiff asfmux \ GST_PLUGINS_NONPORTED=" aiff asfmux \
camerabin cdxaparse coloreffects \ camerabin cdxaparse coloreffects \
dccp debugutils faceoverlay festival \ dccp debugutils faceoverlay festival \
fieldanalysis freeverb freeze frei0r gaudieffects geometrictransform h264parse \ fieldanalysis freeverb freeze frei0r gaudieffects geometrictransform h264parse \

20
gst/adpcmdec/adpcmdec.c
View file

@ -336,6 +336,7 @@ adpcmdec_decode_block (ADPCMDec * dec, const guint8 * data, int blocksize)
GstBuffer *outbuf = NULL; GstBuffer *outbuf = NULL;
int outsize; int outsize;
int samples; int samples;
GstMapInfo omap;
if (dec->layout == LAYOUT_ADPCM_MICROSOFT) { if (dec->layout == LAYOUT_ADPCM_MICROSOFT) {
/* Each block has a 3 byte header per channel, plus 4 bytes per channel to /* Each block has a 3 byte header per channel, plus 4 bytes per channel to
@ -347,8 +348,9 @@ adpcmdec_decode_block (ADPCMDec * dec, const guint8 * data, int blocksize)
outsize = 2 * samples; outsize = 2 * samples;
outbuf = gst_buffer_new_and_alloc (outsize); outbuf = gst_buffer_new_and_alloc (outsize);
res = adpcmdec_decode_ms_block (dec, samples, data, gst_buffer_map (outbuf, &omap, GST_MAP_WRITE);
(gint16 *) (GST_BUFFER_DATA (outbuf))); res = adpcmdec_decode_ms_block (dec, samples, data, (gint16 *) omap.data);
gst_buffer_unmap (outbuf, &omap);
} else if (dec->layout == LAYOUT_ADPCM_DVI) { } else if (dec->layout == LAYOUT_ADPCM_DVI) {
/* Each block has a 4 byte header per channel, include an initial sample. /* Each block has a 4 byte header per channel, include an initial sample.
Then the remainder gives two samples per byte */ Then the remainder gives two samples per byte */
@ -358,8 +360,9 @@ adpcmdec_decode_block (ADPCMDec * dec, const guint8 * data, int blocksize)
outsize = 2 * samples; outsize = 2 * samples;
outbuf = gst_buffer_new_and_alloc (outsize); outbuf = gst_buffer_new_and_alloc (outsize);
res = adpcmdec_decode_ima_block (dec, samples, data, gst_buffer_map (outbuf, &omap, GST_MAP_WRITE);
(gint16 *) (GST_BUFFER_DATA (outbuf))); res = adpcmdec_decode_ima_block (dec, samples, data, (gint16 *) omap.data);
gst_buffer_unmap (outbuf, &omap);
} else { } else {
GST_WARNING_OBJECT (dec, "Unknown layout"); GST_WARNING_OBJECT (dec, "Unknown layout");
} }
@ -394,7 +397,7 @@ adpcmdec_parse (GstAudioDecoder * bdec, GstAdapter * adapter,
*offset = 0; *offset = 0;
*length = dec->blocksize; *length = dec->blocksize;
} else { } else {
return GST_FLOW_UNEXPECTED; return GST_FLOW_EOS;
} }
} }
@ -406,7 +409,7 @@ adpcmdec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buffer)
{ {
ADPCMDec *dec = (ADPCMDec *) (bdec); ADPCMDec *dec = (ADPCMDec *) (bdec);
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
guint8 *data; GstMapInfo map;
GstBuffer *outbuf = NULL; GstBuffer *outbuf = NULL;
/* no fancy draining */ /* no fancy draining */
@ -416,8 +419,9 @@ adpcmdec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buffer)
if (!dec->blocksize) if (!dec->blocksize)
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
data = GST_BUFFER_DATA (buffer); gst_buffer_map (buffer, &map, GST_MAP_READ);
outbuf = adpcmdec_decode_block (dec, data, dec->blocksize); outbuf = adpcmdec_decode_block (dec, map.data, dec->blocksize);
gst_buffer_unmap (buffer, &map);
if (outbuf == NULL) { if (outbuf == NULL) {
GST_AUDIO_DECODER_ERROR (bdec, 1, STREAM, DECODE, (NULL), GST_AUDIO_DECODER_ERROR (bdec, 1, STREAM, DECODE, (NULL),