Merge branch 'xiph:main' into main

Author: akiraveliara

celt/_kiss_fft_guts.h

@@ -55,8 +55,8 @@
 #define SAMP_MIN -SAMP_MAX
 
 #ifdef ENABLE_QEXT
-#   define S_MUL(a,b) MULT32_32_P31(b, a)
-#   define S_MUL2(a,b) MULT32_32_P31(b, a)
+#   define S_MUL(a,b) MULT32_32_P31_ovflw(b, a)
+#   define S_MUL2(a,b) MULT32_32_P31_ovflw(b, a)
 #else
 #   define S_MUL(a,b) MULT16_32_Q15(b, a)
 #   define S_MUL2(a,b) MULT16_32_Q16(b, a)

celt/arch.h

@@ -177,7 +177,6 @@ typedef opus_val16 opus_res;
 #endif
 
 #define RES2VAL16(a)    RES2INT16(a)
-#define FLOAT2SIG(a)    float2int(((opus_int32)32768<<SIG_SHIFT)*(a))
 #define INT16TOSIG(a)   SHL32(EXTEND32(a), SIG_SHIFT)
 #define INT24TOSIG(a)   SHL32(a, SIG_SHIFT-8)
 
@@ -348,6 +347,7 @@ static OPUS_INLINE int celt_isnan(float x)
 #define MULT32_32_Q16(a,b)     ((a)*(b))
 #define MULT32_32_Q31(a,b)     ((a)*(b))
 #define MULT32_32_P31(a,b)     ((a)*(b))
+#define MULT32_32_P31_ovflw(a,b) ((a)*(b))
 
 #define MAC16_32_Q15(c,a,b)     ((c)+(a)*(b))
 #define MAC16_32_Q16(c,a,b)     ((c)+(a)*(b))

celt/celt.h

@@ -54,10 +54,6 @@
 #include "lpcnet.h"
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define CELTEncoder OpusCustomEncoder
 #define CELTDecoder OpusCustomDecoder
 #define CELTMode OpusCustomMode
@@ -275,8 +271,4 @@ void celt_synthesis(const CELTMode *mode, celt_norm *X, celt_sig * out_syn[],
 #define QEXT_SCALE2(x, qext_scale) (x)
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* CELT_H */

celt/celt_encoder.c

@@ -595,6 +595,13 @@ void celt_preemphasis(const opus_res * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTR
       for (i=0;i<Nu;i++)
          inp[i*upsample] = MAX32(-65536.f, MIN32(65536.f,inp[i*upsample]));
    }
+#elif defined(ENABLE_RES24)
+   if (clip)
+   {
+      /* Clip input to avoid encoding non-portable files */
+      for (i=0;i<Nu;i++)
+         inp[i*upsample] = MAX32(-(65536<<SIG_SHIFT), MIN32(65536<<SIG_SHIFT,inp[i*upsample]));
+   }
 #else
    (void)clip; /* Avoids a warning about clip being unused. */
 #endif
@@ -1363,7 +1370,7 @@ static opus_val16 tone_detect(const celt_sig *in, int CC, int N, opus_val32 *ton
    ALLOC(x, N, opus_val16);
    /* Shift by SIG_SHIFT+2 (+3 for stereo) to account for HF gain of the preemphasis filter. */
    if (CC==2) {
-      for (i=0;i<N;i++) x[i] = PSHR32(ADD32(in[i], in[i+N]), SIG_SHIFT+3);
+      for (i=0;i<N;i++) x[i] = PSHR32(ADD32(SHR32(in[i], 1), SHR32(in[i+N], 1)), SIG_SHIFT+2);
    } else {
       for (i=0;i<N;i++) x[i] = PSHR32(in[i], SIG_SHIFT+2);
    }
@@ -2000,7 +2007,9 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
    }
    c=0; do {
       int need_clip=0;
-#ifndef FIXED_POINT
+#ifdef FIXED_POINT
+      need_clip = st->clip && sample_max>65536<<RES_SHIFT;
+#else
       need_clip = st->clip && sample_max>65536.f;
 #endif
       celt_preemphasis(pcm+c, in+c*(N+overlap)+overlap, N, CC, st->upsample,

celt/fixed_debug.h

@@ -45,6 +45,7 @@ extern opus_int64 celt_mips;
 #define MULT16_16SU(a,b) ((opus_val32)(opus_val16)(a)*(opus_val32)(opus_uint16)(b))
 #define MULT32_32_Q31(a,b) ADD32(ADD32(SHL32(MULT16_16(SHR32((a),16),SHR((b),16)),1), SHR32(MULT16_16SU(SHR32((a),16),((b)&0x0000ffff)),15)), SHR32(MULT16_16SU(SHR32((b),16),((a)&0x0000ffff)),15))
 #define MULT32_32_P31(a,b) ADD32(SHL32(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(opus_int32)(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff))>>(16+7)) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
+#define MULT32_32_P31_ovflw(a,b) ADD32_ovflw(SHL32(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(opus_int32)(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff))>>(16+7)) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
 #define MULT32_32_Q32(a,b) ADD32(ADD32(MULT16_16(SHR((a),16),SHR((b),16)), SHR(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),16)), SHR(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),16))
 
 /** 16x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */

celt/fixed_generic.h

@@ -74,9 +74,11 @@
 /** 32x32 multiplication, followed by a 31-bit shift right (with rounding). Results fits in 32 bits */
 #if OPUS_FAST_INT64
 #define MULT32_32_P31(a,b) ((opus_val32)SHR(1073741824+(opus_int64)(a)*(opus_int64)(b),31))
+#define MULT32_32_P31_ovflw(a,b) MULT32_32_P31(a,b)
 #else
 #define MULT16_16U(a,b) ((opus_uint32)(a)*(opus_uint32)(b))
 #define MULT32_32_P31(a,b) ADD32(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(opus_int32)SHR(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff)),16+7) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
+#define MULT32_32_P31_ovflw(a,b) ADD32_ovflw(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR32(128+(opus_int32)SHR(MULT16_16U(((a)&0x0000ffff),((b)&0x0000ffff)),16+7) + SHR32(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),7) + SHR32(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),7), 8) )
 #endif
 
 /** 32x32 multiplication, followed by a 32-bit shift right. Results fits in 32 bits */

celt/float_cast.h

@@ -162,6 +162,15 @@ static OPUS_INLINE opus_int32 FLOAT2INT24(float x)
    x = MIN32(x, 16777216);
    return float2int(x);
 }
+#ifdef FIXED_POINT
+static OPUS_INLINE opus_int32 FLOAT2SIG(float x)
+{
+   x = x*((opus_int32)32768<<SIG_SHIFT);
+   x = MAX32(x, -(65536<<SIG_SHIFT));
+   x = MIN32(x, 65536<<SIG_SHIFT);
+   return float2int(x);
+}
+#endif
 #endif /* DISABLE_FLOAT_API */
 
 #endif /* FLOAT_CAST_H */

celt/kiss_fft.h

@@ -34,10 +34,6 @@
 #include "arch.h"
 #include "cpu_support.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifdef USE_SIMD
 # include <xmmintrin.h>
 # define kiss_fft_scalar __m128
@@ -210,8 +206,4 @@ extern void (*const OPUS_IFFT[OPUS_ARCHMASK+1])(const kiss_fft_state *cfg,
 #endif /* end if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
 #endif /* end if !defined(OVERRIDE_OPUS_FFT) */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

celt/tests/test_unit_mathops.c

@@ -45,8 +45,8 @@
 
 #ifdef FIXED_POINT
 #define WORD "%d"
-#define FIX_INT_TO_DOUBLE(x,q) ((double)(x) / (double)(1L << q))
-#define DOUBLE_TO_FIX_INT(x,q) (((double)x * (double)(1L << q)))
+#define FIX_INT_TO_DOUBLE(x,q) (ldexp((double)(x), -(q)))
+#define DOUBLE_TO_FIX_INT(x,q) (ldexp((double)(x), (q)))
 #else
 #define WORD "%f"
 #endif
@@ -68,7 +68,7 @@ void testdiv(void)
 #endif
       if (fabs(prod-1) > .00025)
       {
-         fprintf (stderr, "div failed: 1/%d="WORD" (product = %f)\n", i, val, prod);
+         fprintf (stderr, "div failed: 1/%d=" WORD " (product = %f)\n", i, val, prod);
          ret = 1;
       }
    }
@@ -85,7 +85,7 @@ void testsqrt(void)
       ratio = val/sqrt(i);
       if (fabs(ratio - 1) > .0005 && fabs(val-sqrt(i)) > 2)
       {
-         fprintf (stderr, "sqrt failed: sqrt(%d)="WORD" (ratio = %f)\n", i, val, ratio);
+         fprintf (stderr, "sqrt failed: sqrt(%d)=" WORD " (ratio = %f)\n", i, val, ratio);
          ret = 1;
       }
       i+= i>>10;
@@ -178,7 +178,7 @@ void testexp2(void)
    float max_error = 0;
    for (x=-11.0;x<24.0;x+=0.0007f)
    {
-      float error = fabs(x-(1.442695040888963387*log(celt_exp2(x))));
+      float error = fabs(x-(1.442695040888963387*log((double)celt_exp2(x))));
       if (max_error < error)
       {
          max_error = error;
@@ -259,7 +259,7 @@ void test_atan2(void) {
             /* atan2(0,0) is undefined behavior. */
             continue;
          }
-         float error = fabs(0.636619772367581f*(float)atan2(y, x) - celt_atan2p_norm(y, x));
+         float error = fabs(0.636619772367581f*(float)atan2((double)y, (double)x) - celt_atan2p_norm(y, x));
          if (max_error < error)
          {
             max_error = error;
@@ -332,7 +332,7 @@ void testexp2(void)
       float error2 = fabs(exp(0.6931471805599453094*x/1024.0)-celt_exp2(x)/65536.0);
       if (error1>0.0002&&error2>0.00004)
       {
-         fprintf (stderr, "celt_exp2 failed: x = "WORD", error1 = %f, error2 = %f\n", x,error1,error2);
+         fprintf (stderr, "celt_exp2 failed: x = " WORD ", error1 = %f, error2 = %f\n", x,error1,error2);
          ret = 1;
       }
    }
@@ -425,7 +425,7 @@ void testrsqrt(void)
       x = DOUBLE_TO_FIX_INT(fx, 31);
       quantized_fx = FIX_INT_TO_DOUBLE(x, 31);
       error = fabs(FIX_INT_TO_DOUBLE(celt_rsqrt_norm32(x), 29) -
-                   1/sqrt(quantized_fx));
+                   1/sqrt((double)quantized_fx));
       if (max_error < error)
       {
          max_error = error;

configure.ac

@@ -23,7 +23,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 # For libtool.
 dnl Please update these for releases.
 OPUS_LT_CURRENT=11
-OPUS_LT_REVISION=0
+OPUS_LT_REVISION=1
 OPUS_LT_AGE=11
 
 AC_SUBST(OPUS_LT_CURRENT)