Commit c3f8d024 authored by multrus's avatar multrus
Browse files

Merge branch 'main' into increase-lc3plus-coverage

parents 38b24cac 7ce64eab

ivas_be_conf_test_gen.sh

+5 −1
Original line number Diff line number Diff line 
#! /bin/sh



set -e



make -f Makefile clean

make -f Makefile -j CLANG=0

make -f Makefile -j"$(nproc)" CLANG=0

cp IVAS_cod IVAS_cod_ref

cp IVAS_dec IVAS_dec_ref

cp IVAS_rend IVAS_rend_ref

lib_com/ivas_cnst.h

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

lib_com/ivas_prot.h

100755 → 100644
+1 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ void ivas_param_ism_dec_render( 
    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested             */

    uint16_t *nSamplesRendered,                                 /* o  : number of CLDFB slots rendered              */

    uint16_t *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render       */

    float *output_f[]                                           /* o  : rendered time signal                        */

    float *output_f[]                                           /* i/o: synthesized core-coder TCs / rendered signal*/

);



void ivas_param_ism_params_to_masa_param_mapping(

lib_com/options.h

+2 −3
Original line number Diff line number Diff line
@@ -189,9 +189,8 @@ 
#define NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG       /* FhG: Fix MDCT-Stereo comfort noise for certain noise types */

#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS    /* FhG: fix non-BE in DFT stereo encoder between optimization levels */

#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2  /* FhG: fix even more non-BEnesses */



/*#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP*/               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */



#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define FIX_1330_JBM_MEMORY_FIX                         /* VA: basop issue: 2179 fix non-BE difference in FIX_1330_JBM_MEMORY */

#define NONBE_1380_OMASA_BUILD_DIFF                     /* Nokia: Fix for issue #1380: Large differences in OMASA output between Debug and Release builds */



/* ##################### End NON-BE switches ########################### */

lib_com/rom_com.c

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file