[libav-devel] [PATCH 09/12] atrac3: use optimized float_interleave() function for stereo interleaving

[Justin Ruggles]

---
 libavcodec/atrac3.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 27919c9..773054b 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -41,6 +41,7 @@
 #include "dsputil.h"
 #include "bytestream.h"
 #include "fft.h"
+#include "fmtconvert.h"
 
 #include "atrac.h"
 #include "atrac3data.h"
@@ -120,6 +121,7 @@ typedef struct {
     //@}
 
     FFTContext          mdct_ctx;
+    FmtConvertContext   fmt_conv;
 } ATRAC3Context;
 
 static DECLARE_ALIGNED(32, float, mdct_window)[512];
@@ -823,7 +825,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx,
     const uint8_t *buf = avpkt->data;
     int buf_size = avpkt->size;
     ATRAC3Context *q = avctx->priv_data;
-    int result = 0, i;
+    int result = 0;
     const uint8_t* databuf;
     float *samples = data;
 
@@ -851,10 +853,8 @@ static int atrac3_decode_frame(AVCodecContext *avctx,
 
     /* interleave */
     if (q->channels == 2) {
-        for (i = 0; i < 1024; i++) {
-            samples[i*2]   = q->outSamples[0][i];
-            samples[i*2+1] = q->outSamples[1][i];
-        }
+        q->fmt_conv.float_interleave(samples, (const float **)q->outSamples,
+                                     1024, 2);
     }
     *data_size = 1024 * q->channels * 
av_get_bytes_per_sample(avctx->sample_fmt);
 
@@ -1002,6 +1002,7 @@ static av_cold int atrac3_decode_init(AVCodecContext 
*avctx)
     }
 
     dsputil_init(&dsp, avctx);
+    ff_fmt_convert_init(&q->fmt_conv, avctx);
 
     q->pUnits = av_mallocz(sizeof(channel_unit)*q->channels);
     if (!q->pUnits) {
-- 
1.7.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel