- more fixes for EVS enabled

src/engine/media/MT_EvsCodec.cpp

@@ -7,8 +7,8 @@
 *
 * lookup AMRWB IO mode
 *-------------------------------------------------------------------*/
-
-static Word16 rate2AMRWB_IOmode(
+namespace evs {
+extern Word16 rate2AMRWB_IOmode(
     Word32 rate                    /* i: bit rate */
 );
 
@@ -35,6 +35,7 @@ extern Word16 EVSmode2rate(
 #define CMR_ON		0
 #define CMR_ONLY	1
 
+}
 
 static const std::map<int, std::set<int>> BitrateToBandwidth_Tab{
     {5900,     {NB, WB}},
@@ -144,7 +145,7 @@ EVSCodec::EVSCodec(const StreamParameters &sp)
 {
 	EVSCodec::sp = sp;
 
-    if ((st_dec = (Decoder_State*)malloc(sizeof(Decoder_State))) == NULL)
+    if ((st_dec = (evs::Decoder_State*)malloc(sizeof(evs::Decoder_State))) == NULL)
 	{
 		std::stringstream out;
 		out << "Can not allocate memory for decoder state structure\n";
@@ -217,7 +218,7 @@ int EVSCodec::decode(const void* input, int input_length, void* output, int outp
 	/*if we have FixedPayload without ToC*/
     if (FixedPayload_EVSPrimary.find(input_length * 8) != FixedPayload_EVSPrimary.end())
     {
-        char c = rate2EVSmode(FixedPayload_EVSPrimary.find(input_length * 8)->second);
+        char c = evs::rate2EVSmode(FixedPayload_EVSPrimary.find(input_length * 8)->second);
         /* Add ToC byte.
          * WARNING maybe it will be work incorrect with 56bit payload,
          * see 3GPP TS 26.445 Annex A, A.2.1.3 */
@@ -233,7 +234,7 @@ int EVSCodec::decode(const void* input, int input_length, void* output, int outp
     /* Decode process */
     size_t buffer_processed = 0;
 
-    while (st_dec->bitstreamformat == G192 ? read_indices(st_dec, buffer.c_str(), buffer.size(), &buffer_processed, 0) : read_indices_mime(st_dec, buffer.c_str(), buffer.size(), &buffer_processed, 0))
+    while (st_dec->bitstreamformat == evs::G192 ? read_indices(st_dec, buffer.c_str(), buffer.size(), &buffer_processed, 0) : read_indices_mime(st_dec, buffer.c_str(), buffer.size(), &buffer_processed, 0))
 	{
 		if (st_dec->codec_mode == MODE1)
 		{
@@ -243,23 +244,23 @@ int EVSCodec::decode(const void* input, int input_length, void* output, int outp
 			}
 			else
 			{
-                evs_dec(st_dec, data, FRAMEMODE_NORMAL);
+                evs_dec(st_dec, data, evs::FRAMEMODE_NORMAL);
 			}
 		}
 		else
 		{
             if (!st_dec->bfi)
 			{
-                evs_dec(st_dec, data, FRAMEMODE_NORMAL);
+                evs_dec(st_dec, data, evs::FRAMEMODE_NORMAL);
 			}
 			else
 			{
-                evs_dec(st_dec, data, FRAMEMODE_MISSING);
+                evs_dec(st_dec, data, evs::FRAMEMODE_MISSING);
 			}
 		}
 
 		/* convert 'float' output data to 'short' */
-        syn_output(data, this->pcmLength(), static_cast<short*>(output) + offset);
+        evs::syn_output(data, this->pcmLength(), static_cast<short*>(output) + offset);
 		offset += this->pcmLength();
         if (st_dec->ini_frame < MAX_FRAME_COUNTER)
 		{
@@ -284,12 +285,12 @@ void EVSCodec::initDecoder(const StreamParameters& sp)
     st_dec->Opt_AMR_WB = 0;
     st_dec->Opt_VOIP = 0;
 
-	st_dec->bitstreamformat = G192;
+    st_dec->bitstreamformat = evs::G192;
 	st_dec->amrwb_rfc4867_flag = -1;
 
 	/*Set MIME type*/
 	if (sp.mime) {
-		st_dec->bitstreamformat = MIME;
+        st_dec->bitstreamformat = evs::MIME;
 		st_dec->amrwb_rfc4867_flag = 0;
 	}
 	/*Set Bandwidth*/
@@ -318,7 +319,6 @@ void EVSCodec::initDecoder(const StreamParameters& sp)
     reset_indices_dec(st_dec);
 
     srand(static_cast<unsigned int>(time(nullptr)));
-
 }
 
 } // end of namespace MT

src/engine/media/MT_EvsCodec.h

@@ -63,7 +63,7 @@ public:
     int plc(int lostFrames, void* output, int outputCapacity) ;
 
 private:
-    Decoder_State* st_dec;
+    evs::Decoder_State* st_dec;
     //Encoder_State_fx* st_enc;
     StreamParameters sp;
     void initDecoder(const StreamParameters& sp);

src/libs/libevs/lib_com/basop32.cpp

@@ -132,7 +132,6 @@ HISTORY:
 
 namespace evs {
 
-}
 /*___________________________________________________________________________
  |                                                                           |
  |   Local Functions                                                         |

src/libs/libevs/lib_com/basop32.h

@@ -46,6 +46,7 @@
 #ifndef _BASIC_OP_H
 #define _BASIC_OP_H
 
+namespace evs {
 /* #define BASOP_OVERFLOW2 */
 
 /*___________________________________________________________________________
@@ -132,6 +133,7 @@ Word32 L_mult0(Word16 v1, Word16 v2); /* 32-bit Multiply w/o shift         1 */
 Word32 L_mac0(Word32 L_v3, Word16 v1, Word16 v2); /* 32-bit Mac w/o shift  1 */
 Word32 L_msu0(Word32 L_v3, Word16 v1, Word16 v2); /* 32-bit Msu w/o shift  1 */
 
+}
 
 #endif /* ifndef _BASIC_OP_H */
 

src/libs/libevs/lib_com/basop_com_lpc.cpp

@@ -14,6 +14,9 @@
 #include "basop_util.h"
 #include "stl.h"
 
+namespace evs { 
+
+
 #define UNROLL_CHEBYSHEV_INNER_LOOP
 #define NC_MAX 8
 #define GUESS_TBL_SZ 256
@@ -235,3 +238,5 @@ void basop_lsf2lsp(const Word16 lsf[], Word16 lsp[])
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/basop_lsf_tools.cpp

@@ -10,6 +10,9 @@
 #include "control.h"
 #include "basop_util.h"
 
+namespace evs { 
+
+
 #define NC_MAX 8
 
 static Word16 E_LPC_f_lsp_pol_get(const Word16 lsp[], Word32 f[],  const Word16 n, const Word16 past_Ovf, const Word16 isMODE1);
@@ -260,3 +263,5 @@ Word16 E_LPC_f_lsp_pol_get(const Word16 lsp[], Word32 f[],  const Word16 n, cons
     }
     return Ovf;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/basop_mpy.cpp

@@ -6,6 +6,9 @@
 #include "basop_mpy.h"
 #include "options.h"
 
+namespace evs { 
+
+
 Word32 Mpy_32_16_1(Word32 x, Word16 y)
 {
     Word32 mh;
@@ -52,3 +55,5 @@ Word32 Mpy_32_32(Word32 x, Word32 y)
     return (mh);
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/basop_mpy.h

@@ -8,6 +8,7 @@
 #include "stl.h"
 #include "options.h"
 
+namespace evs {
 /**
  * \brief   32*16 Bit fractional Multiplication using 40 bit OPS
  *          Performs a multiplication of a 32-bit variable x by
@@ -64,4 +65,5 @@ Word32 Mpy_32_16_r(Word32 x, Word16 y);
 Word32 Mpy_32_32(Word32 x,
                  Word32 y);
 
+}
 #endif /* __BASOP_SETTINGS_H */

src/libs/libevs/lib_com/basop_proto_func.h

@@ -8,6 +8,7 @@
 #include "stl.h"
 #include "basop_util.h"
 
+namespace evs {
 
 /* tcx_lpc_cdk.h */
 #define LSF_GAP_VAL(x) (Word16)((x)*2.0f*1.28f)
@@ -35,5 +36,6 @@ void basop_lpc2mdct(Word16 *lpcCoeffs, Word16 lpcOrder,
 void basop_PsychAdaptLowFreqDeemph(Word32 x[], const Word16 lpcGains[], const Word16 lpcGains_e[], Word16 lf_deemph_factors[]);
 void basop_mdct_noiseShaping_interp(Word32 x[], Word16 lg, Word16 gains[], Word16 gains_exp[]);
 
+} // end of namespace
 
 #endif

src/libs/libevs/lib_com/basop_settings.h

@@ -8,6 +8,8 @@
 #include "stl.h"
 #include "basop_mpy.h"
 
+namespace evs {
+
 #define _LONG                long
 #define _SHORT               short
 #ifdef _WIN32
@@ -82,4 +84,6 @@ typedef struct
     } v;
 } PWord16;
 
+} // end of namespace
+
 #endif /* __BASOP_SETTINGS_H */

src/libs/libevs/lib_com/basop_tcx_utils.cpp

@@ -13,6 +13,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /* compare two positive normalized 16 bit mantissa/exponent values */
 /* return value: positive if first value greater, negative if second value greater, zero if equal */
 static Word16 compMantExp16Unorm(Word16 m1, Word16 e1, Word16 m2, Word16 e2)
@@ -405,3 +408,5 @@ void basop_PsychAdaptLowFreqDeemph(Word32 x[],
 
 
 
+
+} // end of namespace

src/libs/libevs/lib_com/basop_util.cpp

@@ -13,7 +13,61 @@
 #include "control.h"
 #include "cnst.h"
 
-extern const Word32 SqrtTable[32];
+namespace evs { 
+
+/* square root tables */
+const Word32 SqrtTable[32] =   /* Q31 */
+{
+    0x5A82D429, 0x5BEA10FE, 0x5D4BE6E5, 0x5EA89270, 0x60004BE2, 0x615347A1, 0x62A1B68C, 0x63EBC651,
+    0x6531A1B5, 0x667370D4, 0x67B1595F, 0x68EB7EC8, 0x6A220277, 0x6B5503F0, 0x6C84A0F9, 0x6DB0F5BD,
+    0x6EDA1CE9, 0x70002FC7, 0x7123465A, 0x72437773, 0x7360D8C5, 0x747B7EFA, 0x75937DC4, 0x76A8E7EB,
+    0x77BBCF60, 0x78CC4545, 0x79DA5A00, 0x7AE61D3E, 0x7BEF9E07, 0x7CF6EAC2, 0x7DFC113F, 0x7EFF1EC0
+};
+
+const Word16 SqrtDiffTable[32] =   /* Q21 */
+{
+    0x59CF, 0x5875, 0x572B, 0x55EE, 0x54BF, 0x539C, 0x5284, 0x5177,
+    0x5074, 0x4F7A, 0x4E89, 0x4DA1, 0x4CC0, 0x4BE7, 0x4B15, 0x4A4A,
+    0x4985, 0x48C6, 0x480C, 0x4758, 0x46AA, 0x4600, 0x455B, 0x44BA,
+    0x441D, 0x4385, 0x42F1, 0x4260, 0x41D3, 0x414A, 0x40C3, 0x4040
+};
+
+
+const Word32 ISqrtTable[32] =   /* Q31 */
+{
+    0x7FFE7F85, 0x7E0A4E25, 0x7C2C56C7, 0x7A63002C, 0x78ACD922, 0x7708939D, 0x75750088, 0x73F10C2D,
+    0x727BBB1A, 0x71142774, 0x6FB97EA5, 0x6E6AFF54, 0x6D27F79D, 0x6BEFC388, 0x6AC1CBA4, 0x699D83DA,
+    0x68826A53, 0x6770068E, 0x6665E882, 0x6563A7DF, 0x6468E364, 0x63754043, 0x62886999, 0x61A20FEE,
+    0x60C1E8C8, 0x5FE7AE45, 0x5F131EBE, 0x5E43FC76, 0x5D7A0D4F, 0x5CB51A81, 0x5BF4F061, 0x5B395E26
+};
+
+const Word16 ISqrtDiffTable[32] =   /* Q21 */
+{
+    0x7D0C, 0x777E, 0x7256, 0x6D8A, 0x6911, 0x64E5, 0x60FD, 0x5D54,
+    0x59E5, 0x56AA, 0x53A0, 0x50C2, 0x4E0D, 0x4B7E, 0x4912, 0x46C6,
+    0x4499, 0x4288, 0x4090, 0x3EB1, 0x3CE9, 0x3B36, 0x3996, 0x380A,
+    0x368F, 0x3524, 0x33C9, 0x327C, 0x313D, 0x300B, 0x2EE5, 0x2DCA
+};
+
+/* 1/x tables */
+const Word32 InvTable[32] =   /* Q31 */
+{
+    0x7FFBFE40, 0x7C1B608E, 0x78752176, 0x750440BA, 0x71C44C49, 0x6EB14D0A, 0x6BC7B6B4, 0x69045A19,
+    0x6664598A, 0x63E51EE2, 0x61845308, 0x5F3FD698, 0x5D15BB8E, 0x5B043FD0, 0x5909C861, 0x5724DD3C,
+    0x555425B2, 0x53966532, 0x51EA787F, 0x504F5331, 0x4EC3FD84, 0x4D479267, 0x4BD93DBE, 0x4A783ADC,
+    0x4923D31D, 0x47DB5CAE, 0x469E3974, 0x456BD608, 0x4443A8D9, 0x43253159, 0x420FF746, 0x41038A01
+};
+
+const Word16 InvDiffTable[32] =   /* Q20 */
+{
+    0x7C14, 0x74C8, 0x6E1C, 0x67FF, 0x6260, 0x5D33, 0x586C, 0x5400,
+    0x4FE7, 0x4C19, 0x4890, 0x4543, 0x422F, 0x3F4F, 0x3C9D, 0x3A17,
+    0x37B8, 0x357E, 0x3365, 0x316B, 0x2F8D, 0x2DCB, 0x2C20, 0x2A8D,
+    0x290F, 0x27A4, 0x264C, 0x2506, 0x23CF, 0x22A7, 0x218E, 0x2081
+};
+
+
+/*extern const Word32 SqrtTable[32];
 extern const Word16 SqrtDiffTable[32];
 
 extern const Word32 ISqrtTable[32];
@@ -21,7 +75,7 @@ extern const Word16 ISqrtDiffTable[32];
 
 extern const Word32 InvTable[32];
 extern const Word16 InvDiffTable[32];
-
+*/
 
 Word32 BASOP_Util_Log2(Word32 x)
 {
@@ -1040,3 +1094,5 @@ Word32 Sqrt_l(     /* o : output value,                          Q31 */
 
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/basop_util.h

@@ -10,6 +10,7 @@
 #include "basop32.h"
 #include "basop_mpy.h"
 
+namespace evs {
 
 #define LD_DATA_SCALE     (6)
 
@@ -383,4 +384,6 @@ Word32 dotWord32_16_guards(const Word32 * X, const Word16 * Y, Word16 n, Word16
 
 Word32 Sqrt_l(Word32 L_x, Word16 *exp);
 
+} // end of namespace
+
 #endif /* __BASOP_UTIL_H__ */

src/libs/libevs/lib_com/bastypes.h

@@ -5,6 +5,9 @@
 #ifndef __BASTYPES_H
 #define __BASTYPES_H
 
+namespace evs {
+
+
 typedef unsigned char  BYTE;
 typedef unsigned short WORD;
 #if defined(__alpha__) || defined(__alpha) || defined(__sgi)
@@ -43,4 +46,6 @@ typedef unsigned long int ULINT;
 
 #define INVALID_HANDLE NULL
 
+} // end of namespace
+
 #endif

src/libs/libevs/lib_com/bitalloc.cpp

@@ -9,6 +9,9 @@
 #include "basop_util.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------
  * bitalloc()
@@ -971,3 +974,5 @@ short BitAllocWB (
 
     return (Word16)t_fx;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/bitallocsum.cpp

@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------
  *  bitallocsum()
@@ -58,3 +61,5 @@ void bitallocsum(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/bits_alloc.cpp

@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
 * Local function
 *--------------------------------------------------------------------*/
@@ -306,3 +309,5 @@ static int BITS_ALLOC_adjust_acelp_fixed_cdk(
 
     return bitsused;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/bitstream.cpp

@@ -12,6 +12,9 @@
 #include "rom_com.h"
 #include "mime.h"
 
+namespace evs { 
+
+
 
 
 
@@ -20,7 +23,7 @@
 *
 * insert a bit into packed octet
 *-------------------------------------------------------------------*/
-static void pack_bit(
+void pack_bit(
     const Word16 bit,    /* i:   bit to be packed */
     UWord8 **pt,         /* i/o: pointer to octet array into which bit will be placed */
     UWord8 *omask        /* i/o: output mask to indicate where in the octet the bit is to be written */
@@ -49,7 +52,7 @@ static void pack_bit(
 *
 * unpack a bit from packed octet
 *-------------------------------------------------------------------*/
-static Word16 unpack_bit(
+Word16 unpack_bit(
     UWord8 **pt,         /* i/o: pointer to octet array from which bit will be read */
     UWord8 *mask         /* i/o: mask to indicate the bit in the octet */
 )
@@ -73,7 +76,7 @@ static Word16 unpack_bit(
 * lookup AMRWB IO mode
 *-------------------------------------------------------------------*/
 
-static Word16 rate2AMRWB_IOmode(
+Word16 rate2AMRWB_IOmode(
     Word32 rate                    /* i: bit rate */
 )
 {
@@ -110,7 +113,7 @@ static Word16 rate2AMRWB_IOmode(
 *
 * lookup EVS mode
 *-------------------------------------------------------------------*/
-static Word16 rate2EVSmode(
+Word16 rate2EVSmode(
     Word32 rate                    /* i: bit rate */
 )
 {
@@ -2192,3 +2195,5 @@ void evs_dec_previewFrame(
     return;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/calc_st_com.cpp

@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 /*----------------------------------------------------------------------------
@@ -271,3 +274,5 @@ void blend_subfr2( float *sigIn1, float *sigIn2, float *sigOut)
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/cb_shape.cpp

@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * cb_shape()
@@ -86,3 +89,5 @@ void cb_shape(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/cldfb.cpp

@@ -10,6 +10,9 @@
 #include "string.h"
 #include <assert.h>
 
+namespace evs { 
+
+
 #if defined __ICL
 #define restrict __restrict
 #else
@@ -801,3 +804,5 @@ int cldfb_reset_memory(
 
     return 0;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/cng_exc.cpp

@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local constants
  *---------------------------------------------------------------------*/
@@ -555,3 +558,5 @@ void cng_params_upd(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/cnst.h

@@ -7,6 +7,7 @@
 
 #include "options.h"
 
+namespace evs {
 /*----------------------------------------------------------------------------------*
  * General constants
  *----------------------------------------------------------------------------------*/
@@ -1998,4 +1999,6 @@ enum
     MIME
 };
 
+} // end of namespace
+
 #endif /* CNST_H */

src/libs/libevs/lib_com/codec_tcx_common.cpp

@@ -6,6 +6,9 @@
 #include "prot.h"
 #include "options.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * tcxGetNoiseFillingTilt()
  *
@@ -171,3 +174,5 @@ void tcxInvertWindowGrouping(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/control.h

@@ -9,6 +9,9 @@
 
 #include "stl.h"
 
+namespace evs {
+
+
 #define FOR( a) if( incrFor(), 0); else for( a)
 static __inline void incrFor( void)
 {
@@ -39,4 +42,6 @@ static __inline void incrSwitch( void)
 
 #define GOTO goto
 
+}
+
 #endif /* _CONTROL_H */

src/libs/libevs/lib_com/core_com_config.cpp

@@ -11,6 +11,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * getTcxonly()
  *
@@ -417,3 +420,5 @@ short getTcxLpcShapedAri(
 
     return tcx_lpc_shaped_ari;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/deemph.cpp

@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * deemph()
  *
@@ -35,3 +38,5 @@ void deemph(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/delay_comp.cpp

@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------
  *  get_delay()
@@ -37,3 +40,5 @@ float get_delay(                /* o  : delay value in ms
 
     return delay;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/disclaimer.cpp

@@ -6,6 +6,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 int print_disclaimer(FILE *fPtr)
 {
 
@@ -15,3 +18,5 @@ int print_disclaimer(FILE *fPtr)
 
     return 0;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/dlpc_bfi.cpp

@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*---------------------------------------------------------------------*
 * routine:   dlpc_bfi()
@@ -46,3 +49,5 @@ void dlpc_bfi(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/edct.cpp

@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 static float const * get_edct_table(short length)
 {
     float const * edct_table = NULL;
@@ -191,3 +194,5 @@ void iedct_short(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/enh1632.cpp

@@ -58,6 +58,9 @@
 #include <stdlib.h>
 #include "stl.h"
 
+namespace evs { 
+
+
 /*****************************************************************************
  *
  *   Constants and Globals
@@ -633,3 +636,5 @@ Word32 L_rotl( Word32 L_var1, Word16 var2, Word16 *var3)
 
 
 /* end of file */
+
+} // end of namespace

src/libs/libevs/lib_com/enh1632.h

@@ -36,6 +36,7 @@
 #include "stl.h"
 
 
+namespace evs {
 /*****************************************************************************
  *
  *  Prototypes for enhanced 16/32 bit arithmetic operators
@@ -508,7 +509,7 @@ static __inline Word32 L_xor( Word32 L_var1, Word32 L_var2)
 
 
 
-
+} // end of namespace
 
 
 

src/libs/libevs/lib_com/enh40.cpp

@@ -65,6 +65,9 @@
 #include <stdlib.h>
 #include "stl.h"
 
+namespace evs { 
+
+
 /*****************************************************************************
  *
  *  Local Functions
@@ -1067,3 +1070,5 @@ Word40 L40_shl_r( Word40 L40_var1, Word16 var2)
 
 
 /* end of file */
+
+} // end of namespace

src/libs/libevs/lib_com/enh40.h

@@ -25,6 +25,7 @@
 
 #include "stl.h"
 
+namespace evs {
 
 #ifdef _MSC_VER
 #define MAX_40 (0x0000007fffffffff)
@@ -336,41 +337,7 @@ static __inline Word16 msu_r40( Word40 L40_var1, Word16 var2, Word16 var3)
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+} // end of namespace
 
 
 

src/libs/libevs/lib_com/enhancer.cpp

@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local functions
  *---------------------------------------------------------------------*/
@@ -241,3 +244,5 @@ static void agc2(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/enr_1_az.cpp

@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * enr_1_Az()
  *
@@ -28,3 +31,5 @@ float enr_1_Az(        /* o  : impulse response energy */
 
     return enr_LP;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/env_adj.cpp

@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * env_adj()
@@ -131,3 +134,5 @@ void env_adj (
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/env_stab.cpp

@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include <math.h>
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * Local constants
  *--------------------------------------------------------------------------*/
@@ -166,3 +169,5 @@ float env_stab_smo(
 
     return state;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/env_stab_trans.cpp

@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include <math.h>
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * env_stab_transient_detect()
@@ -121,3 +124,5 @@ void env_stab_transient_detect(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/est_tilt.cpp

@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * est_tilt()
@@ -55,3 +58,5 @@ float est_tilt(             /* o  : tilt of the code             */
     return tilt_code;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/fd_cng_com.cpp

@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 
 /*-------------------------------------------------------------------
@@ -1072,3 +1075,5 @@ void FdCng_exc(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/fft.cpp

@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local functions
  *-----------------------------------------------------------------*/
@@ -3596,3 +3599,5 @@ void BASOP_cfft(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/fft_cldfb.cpp

@@ -6,6 +6,9 @@
 #include <assert.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 #if defined __ICL
@@ -1192,3 +1195,5 @@ void fft_cldfb (
     }
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/fft_rel.cpp

@@ -6,6 +6,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * Local constants
  *---------------------------------------------------------------------*/
@@ -264,3 +267,5 @@ void fft_rel(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/fill_spectrum.cpp

@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * fill_spectrum()
  *
@@ -234,3 +237,5 @@ void fill_spectrum(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/findpulse.cpp

@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "cnst.h"
 
+namespace evs { 
+
+
 
 /*----------------------------------------------------------------------------------*
  *  findpulse()
@@ -104,3 +107,5 @@ short findpulse(              /* o  : pulse position        */
 
     return(maxi);
 }
+
+} // end of namespace

src/libs/libevs/lib_com/fine_gain_bits.cpp

@@ -6,6 +6,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------
  * subband_gain_bits()
@@ -98,3 +101,5 @@ short assign_gain_bits(              /* o  : Number of assigned gain bits      *
 
     return gain_bits_tot;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/frame_ener.cpp

@@ -7,6 +7,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*----------------------------------------------------------------------------------*
 * fer_energy()
@@ -94,3 +97,5 @@ float frame_energy(
 
     return enern;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/g192.cpp

@@ -23,6 +23,9 @@ typedef signed __int64     int64_t;
 #include "options.h"
 #include "g192.h"
 
+namespace evs { 
+
+
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4996 )
@@ -251,3 +254,5 @@ G192_Reader_Close(G192_HANDLE* phG192)
     return G192_NO_ERROR;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/g192.h

@@ -7,6 +7,8 @@
 
 #include <stdio.h>
 
+namespace evs {
+
 /*
  * ENUMS
  */
@@ -63,4 +65,6 @@ G192_ReadVoipFrame_short(G192_HANDLE const hG192,
 G192_ERROR
 G192_Reader_Close(G192_HANDLE* phG192);
 
+} // end of namespace
+
 #endif /* G192_H */

src/libs/libevs/lib_com/get_gain.cpp

@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*----------------------------------------------------------------------------------*
 *  get_gain()
@@ -35,3 +38,5 @@ float get_gain(     /* output: codebook gain (adaptive or fixed)    */
 
     return(corr/ener);
 }
+
+} // end of namespace

src/libs/libevs/lib_com/gs_bitallocation.cpp

@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local functions
@@ -449,3 +452,5 @@ static float Find_bit_frac(
 
     return (var_out);
 }
+
+} // end of namespace

src/libs/libevs/lib_com/gs_gains.cpp

@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local functions
@@ -569,3 +572,5 @@ static short VDQ_vec(
 
     return index;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/gs_inact_switching.cpp

@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -105,3 +108,5 @@ void inact_switch_ematch(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/gs_noisefill.cpp

@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * gs_noisf()
@@ -684,3 +687,5 @@ void highband_exc_dct_in(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/gs_preech.cpp

@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local constants
@@ -92,3 +95,5 @@ void pre_echo_att(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/guided_plc_util.cpp

@@ -5,6 +5,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local function
@@ -299,3 +302,5 @@ static void reorder_lsfs(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/hp50.cpp

@@ -7,6 +7,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 
@@ -103,3 +106,5 @@ void hp20(Float32 signal[], Word32 lg, Float32 mem[], Word32 fs)
     return;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/hq2_bit_alloc.cpp

@@ -10,6 +10,9 @@
 #include "basop_mpy.h"
 #include "stl.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------
  * Local constants
@@ -991,3 +994,5 @@ void hq2_bit_alloc (
 }
 
 
+
+} // end of namespace

src/libs/libevs/lib_com/hq2_core_com.cpp

@@ -11,6 +11,9 @@
 #include "basop_util.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * mdct_spectrum_denorm()
  *
@@ -548,3 +551,5 @@ void spt_swb_peakpos_tmp_save(
     }
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/hq2_noise_inject.cpp

@@ -6,6 +6,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * hq2_noise_inject()
  *
@@ -241,3 +244,5 @@ void hq2_noise_inject(
     return;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/hq_bit_allocation.cpp

@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * hq_bit_allocation()
@@ -187,3 +190,5 @@ void hq_bit_allocation(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/hq_conf.cpp

@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * hq_configure()
@@ -204,3 +207,5 @@ void hq_configure(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/hq_tools.cpp

@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * Local functions
  *--------------------------------------------------------------------------*/
@@ -1729,3 +1732,5 @@ void floating_point_add(
     return;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/hvq_pvq_bitalloc.cpp

@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*/
 /*  Function  hvq_pvq_bitalloc                                              */
 /*  ~~~~~~~~~~~~~~~~~~~~~~~~                                                */
@@ -155,3 +158,5 @@ short hvq_pvq_bitalloc(
     return num_bands;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/ifft_rel.cpp

@@ -6,6 +6,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * Local constants
@@ -253,3 +256,5 @@ void ifft_rel(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/igf_base.cpp

@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * IGF_ApplyTransFac()
  *
@@ -638,3 +641,5 @@ int IGFCommonFuncsIGFGetCFTables(            /**< out:    | error value: 0 -> er
 
     return retValue;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/index_pvq_opt.cpp

@@ -10,6 +10,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  *  LOCAL DEFINITIONS
@@ -1157,3 +1160,5 @@ void mpvq_decode_vec(               /* o :  void                        */
 
 
 #endif
+
+} // end of namespace

src/libs/libevs/lib_com/int_lsp.cpp

@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * int_lsp()
  *
@@ -137,3 +140,5 @@ void int_lsp4(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/interleave_spectrum.cpp

@@ -7,6 +7,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------*
  * interleave_spectrum()
  *
@@ -160,3 +163,5 @@ void de_interleave_spectrum(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/interpol.cpp

@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * interpolation()
@@ -39,3 +42,5 @@ float interpolation(      /* o  : interpolated value   */
 
     return s;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/isf_dec_amr_wb.cpp

@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
 * isf_dec_amr_wb()
 *
@@ -251,3 +254,5 @@ void disf_2s_36b(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/lag_wind.cpp

@@ -8,6 +8,9 @@
 #include "cnst.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local constants
  *-------------------------------------------------------------------*/
@@ -128,3 +131,5 @@ void adapt_lag_wind(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/lerp.cpp

@@ -6,6 +6,9 @@
 #include <stdlib.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------*
  * procedure lerp()                                            *
@@ -140,3 +143,5 @@ void lerp_proc(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/limit_t0.cpp

@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------*
  * Local constants
  *-------------------------------------------------*/
@@ -198,3 +201,5 @@ void limit_T0_voiced(
 }
 
 
+
+} // end of namespace

src/libs/libevs/lib_com/logqnorm.cpp

@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"        /* Function prototypes                      */
 
+namespace evs { 
+
+
 /*--------------------------------------------------------------------------
  * logqnorm()
  *
@@ -161,3 +164,5 @@ void calc_norm(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/longarith.cpp

@@ -6,6 +6,9 @@
 #include <assert.h>
 #include "prot.h"
 
+namespace evs { 
+
+
 
 
 
@@ -160,3 +163,5 @@ void longshiftleft(unsigned short a[], int b, unsigned short d[], int len)
     }
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/low_rate_band_att.cpp

@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*--------------------------------------------------------------------------*
  * fine_gain_pred()
@@ -161,3 +164,5 @@ void fine_gain_dec
 }
 
 
+
+} // end of namespace

src/libs/libevs/lib_com/lpc_tools.cpp

@@ -9,6 +9,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------*
  * Local constants
@@ -298,3 +301,5 @@ int E_LPC_lsp_unweight(
     return 0;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/lsf_dec_bfi.cpp

@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
 * routine:   lsf_dec_bfi()
 *
@@ -265,3 +268,5 @@ float const * PlcGetlsfBase(
     /* narrowBand == 1 is left */
     return GENB_Ave;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/lsf_msvq_ma.cpp

@@ -12,6 +12,9 @@
 #include "stl.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*---------------------------------------------------------------------*
  * midlsf_dec()
  *
@@ -145,3 +148,5 @@ int lsf_ind_is_active(
 
     return sub(min_distance, min_distance_thr[narrowband][cdk]) < 0;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/lsf_tools.cpp

@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "basop_proto_func.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local functions
  *-------------------------------------------------------------------*/
@@ -2312,3 +2315,5 @@ void a2isf(
     return;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/lsp_conv_poly.cpp

@@ -8,6 +8,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local constants
@@ -627,3 +630,5 @@ static void cheb2poly(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/mime.h

@@ -2,6 +2,7 @@
     EVS Codec 3GPP TS26.443 Nov 13, 2018. Version 12.11.0 / 13.7.0 / 14.3.0 / 15.1.0
   ====================================================================================*/
 
+namespace evs {
 
 #define AMRWB_MAGIC_NUMBER "#!AMR-WB\n"             /* defined in  RFC4867  */
 #define EVS_MAGIC_NUMBER   "#!EVS_MC1.0\n"          /* defined in 26.445    */
@@ -421,3 +422,5 @@ static const Word16 amrwb_4bit_cmr[8] =
     0x05,  /* AMRWB_1825 */
     0x0f   /* invalid */
 };
+
+} // end of namespace

src/libs/libevs/lib_com/modif_fs.cpp

@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * modify_Fs()
@@ -855,3 +858,5 @@ void retro_interp5_4( float *pst_old_syn )
     return;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/move.h

@@ -9,6 +9,9 @@
 
 #include "stl.h"
 
+namespace evs {
+
+
 static __inline void move16( void)
 {
 }
@@ -39,4 +42,6 @@ static __inline void logic32( void)
 
 #define cast16 move16
 
+}
+
 #endif /* _MOVE_H */

src/libs/libevs/lib_com/mslvq_com.cpp

@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-----------------------------------------------------------------*
  * Local functions
  *-----------------------------------------------------------------*/
@@ -731,3 +734,5 @@ static void divide_64_32(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/nelp.cpp

@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * dequantize_uvg()
  *
@@ -118,3 +121,5 @@ void generate_nelp_excitation(
     }
 
 }
+
+} // end of namespace

src/libs/libevs/lib_com/parameter_bitmaping.cpp

@@ -6,6 +6,9 @@
 #include "prot.h"
 #include <assert.h>
 
+namespace evs { 
+
+
 
 
 
@@ -169,3 +172,5 @@ void ReadFromBitstream(ParamsBitMap const * paramsBitMap, int nArrayLength, Deco
     }
     *pnSize += nParams*nArrayLength;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/phase_dispersion.cpp

@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-----------------------------------------------------------------------*
  * phase_dispersion()
@@ -121,3 +124,5 @@ void phase_dispersion(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/ppp.cpp

@@ -8,6 +8,9 @@
 #include "prot.h"
 #include "rom_com.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Interpol_delay()
@@ -81,3 +84,5 @@ void deemph_lpc(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/pred_lt4.cpp

@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * pred_lt4()
@@ -123,3 +126,5 @@ void pred_lt4_tc(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/preemph.cpp

@@ -5,6 +5,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------*
  * preemph()
@@ -33,3 +36,5 @@ void preemph(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/prot.h

@@ -15,6 +15,7 @@
 #include "cnst.h"
 #include "stl.h"
 
+namespace evs {
 
 /*----------------------------------------------------------------------------------*
  * Prototypes of global macros
@@ -9772,5 +9773,6 @@ void blend_subfr2(
 );
 
 
+} // end of namespace
 
 #endif

src/libs/libevs/lib_com/pvq_com.cpp

@@ -10,6 +10,9 @@
 #include "prot.h"
 #include "stl.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local definitions
  *-------------------------------------------------------------------*/
@@ -886,3 +889,5 @@ Word16 atan2_fx(  /* o: Angle between 0 and EVS_PI/2 radian (Q14) */
     }
     return angle;  /* Q14 between 0 and EVS_PI/2 radian. */
 }
+
+} // end of namespace

src/libs/libevs/lib_com/range_com.cpp

@@ -9,6 +9,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * rc_get_bits2()
  *
@@ -70,3 +73,5 @@ void rangeCoderFinalizationFBits(
     return;
 }
 
+
+} // end of namespace

src/libs/libevs/lib_com/re8_ppv.cpp

@@ -6,6 +6,9 @@
 #include "cnst.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * Local functions
  *-------------------------------------------------------------------*/
@@ -176,3 +179,5 @@ static void nearest_neighbor_2D8(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/re8_util.cpp

@@ -7,6 +7,9 @@
 #include "rom_com.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 
 /*-------------------------------------------------------------------*
  * Local functions
@@ -398,3 +401,5 @@ void re8_k2y(
 
     return;
 }
+
+} // end of namespace

src/libs/libevs/lib_com/realft.cpp

@@ -7,6 +7,9 @@
 #include "options.h"
 #include "prot.h"
 
+namespace evs { 
+
+
 /*-------------------------------------------------------------------*
  * four1()
  *
@@ -162,3 +165,5 @@ void realft(
 
     return;
 }
+
+} // end of namespace