X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Flpcm.c;h=9ba3ef825c7118420eb5331e64bb959db92322ab;hb=5ccbfaa710c8d86a59e5d07f10e2667ea3619ab0;hp=d8c279e8d9e25f7afdfebc581441bd5ceffdd28f;hpb=6da14aaeb755e6205631a8734542c82b5a7ba470;p=fdkaac.git

diff --git a/src/lpcm.c b/src/lpcm.c
index d8c279e..9ba3ef8 100644
--- a/src/lpcm.c
+++ b/src/lpcm.c
@@ -13,8 +13,7 @@
 #include "lpcm.h"
 #include "m4af_endian.h"
 
-#ifdef _MSC_VER
-#  define inline __inline
+#if defined(_MSC_VER) && _MSC_VER < 1800
 #  ifdef _M_IX86
 inline int lrint(double x)
 {
@@ -34,6 +33,7 @@ inline int lrint(double x)
 #  endif
 #endif
 
+static
 inline double pcm_clip(double n, double min_value, double max_value)
 {
     if (n < min_value)
@@ -42,6 +42,7 @@ inline double pcm_clip(double n, double min_value, double max_value)
         return max_value;
     return n;
 }
+static
 inline float pcm_i2f(int32_t n)
 {
     union {
@@ -51,6 +52,7 @@ inline float pcm_i2f(int32_t n)
     u.ivalue = n;
     return u.fvalue;
 }
+static
 inline double pcm_i2d(int64_t n)
 {
     union {
@@ -60,99 +62,123 @@ inline double pcm_i2d(int64_t n)
     u.ivalue = n;
     return u.fvalue;
 }
+static
 inline int16_t pcm_quantize_s32(int32_t n)
 {
     n = ((n >> 15) + 1) >> 1;
     return (n == 0x8000) ? 0x7fff : n;
 }
+static
 inline int16_t pcm_quantize_f64(double v)
 {
     return (int16_t)lrint(pcm_clip(v * 32768.0, -32768.0, 32767.0));
 }
+static
 inline int16_t pcm_s8_to_s16(int8_t n)
 {
     return n << 8;
 }
+static
 inline int16_t pcm_u8_to_s16(uint8_t n)
 {
     return (n << 8) ^ 0x8000;
 }
+static
 inline int16_t pcm_s16le_to_s16(int16_t n)
 {
     return m4af_ltoh16(n);
 }
+static
 inline int16_t pcm_s16be_to_s16(int16_t n)
 {
     return m4af_btoh16(n);
 }
+static
 inline int16_t pcm_u16le_to_s16(uint16_t n)
 {
     return m4af_ltoh16(n) ^ 0x8000;
 }
+static
 inline int16_t pcm_u16be_to_s16(uint16_t n)
 {
     return m4af_btoh16(n) ^ 0x8000;
 }
+static
 inline int32_t pcm_s24le_to_s32(uint8_t *p)
 {
     return p[0]<<8 | p[1]<<16 | p[2]<<24;
 }
+static
 inline int32_t pcm_s24be_to_s32(uint8_t *p)
 {
     return p[0]<<24 | p[1]<<16 | p[2]<<8;
 }
+static
 inline int32_t pcm_u24le_to_s32(uint8_t *p)
 {
     return pcm_s24le_to_s32(p) ^ 0x80000000;
 }
+static
 inline int32_t pcm_u24be_to_s32(uint8_t *p)
 {
     return pcm_s24be_to_s32(p) ^ 0x80000000;
 }
+static
 inline int16_t pcm_s24le_to_s16(uint8_t *p)
 {
     return pcm_quantize_s32(pcm_s24le_to_s32(p));
 }
+static
 inline int16_t pcm_s24be_to_s16(uint8_t *p)
 {
     return pcm_quantize_s32(pcm_s24be_to_s32(p));
 }
+static
 inline int16_t pcm_u24le_to_s16(uint8_t *p)
 {
     return pcm_quantize_s32(pcm_u24le_to_s32(p));
 }
+static
 inline int16_t pcm_u24be_to_s16(uint8_t *p)
 {
     return pcm_quantize_s32(pcm_u24be_to_s32(p));
 }
+static
 inline int16_t pcm_s32le_to_s16(int32_t n)
 {
     return pcm_quantize_s32(m4af_ltoh32(n));
 }
+static
 inline int16_t pcm_s32be_to_s16(int32_t n)
 {
     return pcm_quantize_s32(m4af_btoh32(n));
 }
+static
 inline int16_t pcm_u32le_to_s16(int32_t n)
 {
     return pcm_quantize_s32(m4af_ltoh32(n) ^ 0x80000000);
 }
+static
 inline int16_t pcm_u32be_to_s16(int32_t n)
 {
     return pcm_quantize_s32(m4af_btoh32(n) ^ 0x80000000);
 }
+static
 inline int16_t pcm_f32le_to_s16(int32_t n)
 {
     return pcm_quantize_f64(pcm_i2f(m4af_ltoh32(n)));
 }
+static
 inline int16_t pcm_f32be_to_s16(int32_t n)
 {
     return pcm_quantize_f64(pcm_i2f(m4af_btoh32(n)));
 }
+static
 inline int16_t pcm_f64le_to_s16(int64_t n)
 {
     return pcm_quantize_f64(pcm_i2d(m4af_ltoh64(n)));
 }
+static
 inline int16_t pcm_f64be_to_s16(int64_t n)
 {
     return pcm_quantize_f64(pcm_i2d(m4af_btoh64(n)));
@@ -160,14 +186,14 @@ inline int16_t pcm_f64be_to_s16(int64_t n)
 
 int pcm_convert_to_native_sint16(const pcm_sample_description_t *format,
                                  const void *input, uint32_t nframes,
-                                 int16_t **result, uint32_t *osize)
+                                 int16_t *result)
 {
 #define CONVERT(type, conv) \
     do { \
         unsigned i; \
         type *ip = (type *)input; \
         for (i = 0; i < count; ++i) { \
-            (*result)[i] = conv(ip[i]); \
+            result[i] = conv(ip[i]); \
         } \
     } while(0)
 
@@ -177,7 +203,7 @@ int pcm_convert_to_native_sint16(const pcm_sample_description_t *format,
         uint8_t *ip = (uint8_t *)input; \
         bytes_per_channel = PCM_BYTES_PER_CHANNEL(format); \
         for (i = 0; i < count; ++i) { \
-            (*result)[i] = conv(ip); \
+            result[i] = conv(ip); \
             ip += bytes_per_channel; \
         } \
     } while(0)
@@ -185,11 +211,6 @@ int pcm_convert_to_native_sint16(const pcm_sample_description_t *format,
     uint32_t count = nframes * format->channels_per_frame;
     if (!count)
         return 0;
-    if (!*result || *osize < count) {
-        *osize  = count;
-        *result = realloc(*result, count * sizeof(int16_t));
-    }
-
     switch (PCM_BYTES_PER_CHANNEL(format) | format->sample_type<<4) {
     case 1 | PCM_TYPE_SINT<<4:
         CONVERT(int8_t, pcm_s8_to_s16); break;