Commit e70fe695 authored by PLAINSI's avatar PLAINSI
Browse files

Merge branch 'main' into dlb_mc_160kbps

parents 11dd99b7 9f8ea886

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ 
#define FIX_355_REFACTOR_PARAMBIN_TO_5MS                /* Nokia: Fixes issue 355 by refactoring parametric binauralizer code to 5 ms mode */

#define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING         /* Eri: Fix incorrect use of stack variable used for channel aware config file */

#define COMBINED_FORMAT_SIGNALING                       /* VA: Introduce a signaling bit for combined format coding */



#define FIX_386_CORECODER_RECONFIG_2                    /* VA: Issue 386: Resolve remaining ToDo comments in CoreCoder reconfig. */

#define FIX_440_PARAM_ISM_DIR_NOISE                     /* FhG: Issue 440: Fix directional background noise becoming diffuse in ParamISM */



#define FIX_447_PARAMBIN_MASA_REGU_FAC                  /* Nokia: Issue 447: Fix issue by adjusting regularization factor minimum value. */

lib_enc/ivas_corecoder_enc_reconfig.c

+4 −0
Original line number Diff line number Diff line
@@ -321,7 +321,11 @@ ivas_error ivas_corecoder_enc_reconfig( 
                {

                    if ( n_CoreCoder_existing > cpe_id * CPE_CHANNELS + n )

                    {

#ifdef FIX_386_CORECODER_RECONFIG_2

                        mvr2r( input_buff[n], st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff, len_inp_memory );

#else

                        mvr2r( input_buff[n], st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, len_inp_memory ); /* TODO VoiceAge: Please check if this should be hCoreCoder[n] */

#endif

                    }

                }