X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ffmtconvert.c;h=f94d438ba297ce6a65c05f55fb95a2954ab1dde0;hb=0cf86fabfa5820596cca2cfead63c6f8df76c3f2;hp=642e1d2309e9ca203414c3e925b9764279180391;hpb=f101eab1be1a296a1a048cd905edfcacc3b546ed;p=ffmpeg

diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c
index 642e1d2309e..f94d438ba29 100644
--- a/libavcodec/fmtconvert.c
+++ b/libavcodec/fmtconvert.c
@@ -24,66 +24,43 @@
 #include "fmtconvert.h"
 #include "libavutil/common.h"
 
-static void int32_to_float_fmul_scalar_c(float *dst, const int *src, float mul, int len){
+static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src,
+                                         float mul, int len)
+{
     int i;
     for(i=0; i<len; i++)
         dst[i] = src[i] * mul;
 }
 
-static av_always_inline int float_to_int16_one(const float *src){
-    return av_clip_int16(lrintf(*src));
-}
-
-static void float_to_int16_c(int16_t *dst, const float *src, long len)
+static void int32_to_float_c(float *dst, const int32_t *src, intptr_t len)
 {
     int i;
-    for(i=0; i<len; i++)
-        dst[i] = float_to_int16_one(src+i);
-}
 
-static void float_to_int16_interleave_c(int16_t *dst, const float **src,
-                                        long len, int channels)
-{
-    int i,j,c;
-    if(channels==2){
-        for(i=0; i<len; i++){
-            dst[2*i]   = float_to_int16_one(src[0]+i);
-            dst[2*i+1] = float_to_int16_one(src[1]+i);
-        }
-    }else{
-        for(c=0; c<channels; c++)
-            for(i=0, j=c; i<len; i++, j+=channels)
-                dst[j] = float_to_int16_one(src[c]+i);
-    }
+    for (i = 0; i < len; i++)
+        dst[i] = (float)src[i];
 }
 
-void ff_float_interleave_c(float *dst, const float **src, unsigned int len,
-                           int channels)
+static void int32_to_float_fmul_array8_c(FmtConvertContext *c, float *dst,
+                                         const int32_t *src, const float *mul,
+                                         int len)
 {
-    int j, c;
-    unsigned int i;
-    if (channels == 2) {
-        for (i = 0; i < len; i++) {
-            dst[2*i]   = src[0][i];
-            dst[2*i+1] = src[1][i];
-        }
-    } else if (channels == 1 && len < INT_MAX / sizeof(float)) {
-        memcpy(dst, src[0], len * sizeof(float));
-    } else {
-        for (c = 0; c < channels; c++)
-            for (i = 0, j = c; i < len; i++, j += channels)
-                dst[j] = src[c][i];
-    }
+    int i;
+    for (i = 0; i < len; i += 8)
+        c->int32_to_float_fmul_scalar(&dst[i], &src[i], *mul++, 8);
 }
 
 av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx)
 {
+    c->int32_to_float             = int32_to_float_c;
     c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_c;
-    c->float_to_int16             = float_to_int16_c;
-    c->float_to_int16_interleave  = float_to_int16_interleave_c;
-    c->float_interleave           = ff_float_interleave_c;
+    c->int32_to_float_fmul_array8 = int32_to_float_fmul_array8_c;
 
-    if (ARCH_ARM) ff_fmt_convert_init_arm(c, avctx);
-    if (HAVE_ALTIVEC) ff_fmt_convert_init_altivec(c, avctx);
-    if (ARCH_X86) ff_fmt_convert_init_x86(c, avctx);
+    if (ARCH_AARCH64)
+        ff_fmt_convert_init_aarch64(c, avctx);
+    if (ARCH_ARM)
+        ff_fmt_convert_init_arm(c, avctx);
+    if (ARCH_PPC)
+        ff_fmt_convert_init_ppc(c, avctx);
+    if (ARCH_X86)
+        ff_fmt_convert_init_x86(c, avctx);
 }