[FFmpeg-cvslog] avcodec/opusdec: Use avpriv_float_dsp_alloc()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec  3 14:39:43 2014 +0100| [e316caf712b24fecbc1688c25e858618bca69e02] | committer: Michael Niedermayer

avcodec/opusdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e316caf712b24fecbc1688c25e858618bca69e02
---

 libavcodec/opus.h    |    2 +-
 libavcodec/opusdec.c |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libavcodec/opus.h b/libavcodec/opus.h
index 6b02b55..1faa7d3 100644
--- a/libavcodec/opus.h
+++ b/libavcodec/opus.h
@@ -176,7 +176,7 @@ typedef struct OpusContext {
     int             nb_streams;
     int      nb_stereo_streams;
 
-    AVFloatDSPContext fdsp;
+    AVFloatDSPContext *fdsp;
     int16_t gain_i;
     float   gain;
 
diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
index 3ce519d..759eaa5 100644
--- a/libavcodec/opusdec.c
+++ b/libavcodec/opusdec.c
@@ -535,7 +535,7 @@ static int opus_decode_packet(AVCodecContext *avctx, void *data,
         }
 
         if (c->gain_i) {
-            c->fdsp.vector_fmul_scalar((float*)frame->extended_data[i],
+            c->fdsp->vector_fmul_scalar((float*)frame->extended_data[i],
                                        (float*)frame->extended_data[i],
                                        c->gain, FFALIGN(decoded_samples, 8));
         }
@@ -589,6 +589,7 @@ static av_cold int opus_decode_close(AVCodecContext *avctx)
     c->nb_streams = 0;
 
     av_freep(&c->channel_maps);
+    av_freep(&c->fdsp);
 
     return 0;
 }
@@ -601,7 +602,9 @@ static av_cold int opus_decode_init(AVCodecContext *avctx)
     avctx->sample_fmt  = AV_SAMPLE_FMT_FLTP;
     avctx->sample_rate = 48000;
 
-    avpriv_float_dsp_init(&c->fdsp, 0);
+    c->fdsp = avpriv_float_dsp_alloc(0);
+    if (!c->fdsp)
+        return AVERROR(ENOMEM);
 
     /* find out the channel configuration */
     ret = ff_opus_parse_extradata(avctx, c);
@@ -630,7 +633,7 @@ static av_cold int opus_decode_init(AVCodecContext *avctx)
             s->redundancy_output[j] = s->redundancy_buf[j];
         }
 
-        s->fdsp = &c->fdsp;
+        s->fdsp = c->fdsp;
 
         s->swr =swr_alloc();
         if (!s->swr)