Commit 2f3b6cfa authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_265_MC_BRATE_SWITCHING

parent 64847311

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
#endif

#define FIX_I59_DELAY_ROUNDING                          /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */

#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */

#define FIX_265_MC_BRATE_SWITCHING                      /* Issue 265: fix use-of-uninitialized-value in MC bitrate switching */

#define FIX_ANGLE_WRAPPING                              /* Issue 244: Problems with angle wrapping*/

#define FIX_245_RANGE_CODER_VOIP_MSAN                   /* Issue 245: fix use-of-uninitialized-value in range coder in VoIP mode */

#define FIX_272_COV                                     /* Issue 272: Cleanup for code coverage related to calls to ivas_binaural_cldfb() */

lib_debug/coan_out_000003

0 → 100644
+924 −0

File added.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_corecoder_dec_reconfig.c

+0 −2
Original line number Diff line number Diff line
@@ -201,12 +201,10 @@ ivas_error ivas_corecoder_dec_reconfig( 
        }

        for ( ; cpe_id < st_ivas->nCPE; cpe_id++ )

        {

#ifdef FIX_265_MC_BRATE_SWITCHING

            if ( st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->hOutSetup.separateChannelEnabled )

            {

                st_ivas->element_mode_init = IVAS_CPE_MDCT;

            }

#endif

            if ( ( error = create_cpe_dec( st_ivas, cpe_id, brate_CPE ) ) != IVAS_ERR_OK )

            {

                return error;

lib_dec/ivas_stereo_switching_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -40,9 +40,7 @@ 
#include "prot.h"

#include "ivas_prot.h"

#include "ivas_rom_com.h"

#ifdef FIX_265_MC_BRATE_SWITCHING

#include "assert.h"

#endif

#include "wmc_auto.h"

#include <math.h>
@@ -355,9 +353,7 @@ ivas_error stereo_memory_dec( 


    error = IVAS_ERR_OK;



#ifdef FIX_265_MC_BRATE_SWITCHING

    assert( hCPE->last_element_mode >= IVAS_CPE_DFT && "Switching from SCE to CPE is not a valid configuration!" );

#endif





    hCPE->hCoreCoder[0]->element_mode = hCPE->element_mode;

lib_enc/ivas_stereo_switching_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ 
#include "prot.h"

#include "ivas_prot.h"

#include "ivas_rom_com.h"

#ifdef FIX_265_MC_BRATE_SWITCHING

#include "assert.h"

#endif

#include "wmc_auto.h"

#ifdef DEBUGGING

#include "debug.h"
@@ -233,9 +231,7 @@ ivas_error stereo_memory_enc( 


    error = IVAS_ERR_OK;



#ifdef FIX_265_MC_BRATE_SWITCHING

    assert( hCPE->last_element_mode >= IVAS_CPE_DFT && "Switching from SCE to CPE is not a valid configuration!" );

#endif



    /*--------------------------------------------------------------*

     * save parameters from structures that will be freed