[FFmpeg-cvslog] r22414 - trunk/libavcodec/wmadec.c

[cehoyos]

Author: cehoyos
Date: Wed Mar 10 00:35:57 2010
New Revision: 22414

Log:
SIMD optimization using float_to_int16_interleave.

Patch by Zhou Zongyi, zhouzy A os D pku D edu D cn

Modified:
   trunk/libavcodec/wmadec.c

Modified: trunk/libavcodec/wmadec.c
==============================================================================
--- trunk/libavcodec/wmadec.c	Tue Mar  9 22:50:10 2010	(r22413)
+++ trunk/libavcodec/wmadec.c	Wed Mar 10 00:35:57 2010	(r22414)
@@ -790,6 +790,7 @@ static int wma_decode_frame(WMACodecCont
     /* convert frame to integer */
     n = s->frame_len;
     incr = s->nb_channels;
+    if (s->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) {
     for(ch = 0; ch < s->nb_channels; ch++) {
         ptr = samples + ch;
         iptr = s->frame_out[ch];
@@ -802,6 +803,16 @@ static int wma_decode_frame(WMACodecCont
         memmove(&s->frame_out[ch][0], &s->frame_out[ch][s->frame_len],
                 s->frame_len * sizeof(float));
     }
+    } else {
+        float *output[MAX_CHANNELS];
+        for (ch = 0; ch < MAX_CHANNELS; ch++)
+            output[ch] = s->frame_out[ch];
+        s->dsp.float_to_int16_interleave(samples, (const float **)output, n, incr);
+        for(ch = 0; ch < incr; ch++) {
+            /* prepare for next block */
+            memmove(&s->frame_out[ch][0], &s->frame_out[ch][n], n * sizeof(float));
+        }
+    }
 
 #ifdef TRACE
     dump_shorts(s, "samples", samples, n * s->nb_channels);