Synchronize changes from 1.6 master branch [ci skip]

d5f8468 update libspeex, libspeexdsp (Pull in relevant changes)

Author: github-actions[bot]

vendor/libspeex/libspeex/nb_celp.c

@@ -264,6 +264,10 @@ int nb_encoder_ctl(void *state, int request, void *ptr)
 #if !defined(DISABLE_VBR) && !defined(DISABLE_FLOAT_API)
    case SPEEX_SET_VBR_QUALITY:
       st->vbr_quality = (*(float*)ptr);
+      if (st->vbr_quality < 0)
+          st->vbr_quality = 0;
+      else if (st->vbr_quality > 10)
+          st->vbr_quality = 10;
       break;
    case SPEEX_GET_VBR_QUALITY:
       (*(float*)ptr) = st->vbr_quality;

vendor/libspeex/libspeexdsp/smallft.c

@@ -38,8 +38,8 @@
 #include "os_support.h"
 
 static void drfti1(int n, float *wa, int *ifac){
-  static int ntryh[4] = { 4,2,3,5 };
-  static float tpi = 6.28318530717958648f;
+  static const int ntryh[4] = { 4,2,3,5 };
+  static const float tpi = 6.28318530717958648f;
   float arg,argh,argld,fi;
   int ntry=0,i,j=-1;
   int k1, l1, l2, ib;
@@ -170,7 +170,7 @@ static void dradf2(int ido,int l1,float *cc,float *ch,float *wa1){
 
 static void dradf4(int ido,int l1,float *cc,float *ch,float *wa1,
 	    float *wa2,float *wa3){
-  static float hsqt2 = .70710678118654752f;
+  static const float hsqt2 = .70710678118654752f;
   int i,k,t0,t1,t2,t3,t4,t5,t6;
   float ci2,ci3,ci4,cr2,cr3,cr4,ti1,ti2,ti3,ti4,tr1,tr2,tr3,tr4;
   t0=l1*ido;
@@ -273,7 +273,7 @@ static void dradf4(int ido,int l1,float *cc,float *ch,float *wa1,
 static void dradfg(int ido,int ip,int l1,int idl1,float *cc,float *c1,
                           float *c2,float *ch,float *ch2,float *wa){
 
-  static float tpi=6.283185307179586f;
+  static const float tpi=6.283185307179586f;
   int idij,ipph,i,j,k,l,ic,ik,is;
   int t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
   float dc2,ai1,ai2,ar1,ar2,ds2;
@@ -687,8 +687,8 @@ static void dradb2(int ido,int l1,float *cc,float *ch,float *wa1){
 
 static void dradb3(int ido,int l1,float *cc,float *ch,float *wa1,
                           float *wa2){
-  static float taur = -.5f;
-  static float taui = .8660254037844386f;
+  static const float taur = -.5f;
+  static const float taui = .8660254037844386f;
   int i,k,t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
   float ci2,ci3,di2,di3,cr2,cr3,dr2,dr3,ti2,tr2;
   t0=l1*ido;
@@ -750,7 +750,7 @@ static void dradb3(int ido,int l1,float *cc,float *ch,float *wa1,
 
 static void dradb4(int ido,int l1,float *cc,float *ch,float *wa1,
 			  float *wa2,float *wa3){
-  static float sqrt2=1.414213562373095f;
+  static const float sqrt2=1.414213562373095f;
   int i,k,t0,t1,t2,t3,t4,t5,t6,t7,t8;
   float ci2,ci3,ci4,cr2,cr3,cr4,ti1,ti2,ti3,ti4,tr1,tr2,tr3,tr4;
   t0=l1*ido;
@@ -841,7 +841,7 @@ static void dradb4(int ido,int l1,float *cc,float *ch,float *wa1,
 
 static void dradbg(int ido,int ip,int l1,int idl1,float *cc,float *c1,
             float *c2,float *ch,float *ch2,float *wa){
-  static float tpi=6.283185307179586f;
+  static const float tpi=6.283185307179586f;
   int idij,ipph,i,j,k,l,ik,is,t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,
       t11,t12;
   float dc2,ai1,ai2,ar1,ar2,ds2;

vendor/libspeex/libspeexdsp/testresample2.c

@@ -30,17 +30,19 @@
    POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define _USE_MATH_DEFINES
-#include <math.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "speex/speex_resampler.h"
 #include <stdio.h>
+#include <math.h>
 #include <stdlib.h>
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 #define PERIOD 32
 #define INBLOCK 1024
 #define RATE 48000