Commit 15d6f279 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_185_REDUCE_MD_BITS

parent e39edccd

lib_com/ivas_dirac_com.c

+0 −4
Original line number Diff line number Diff line
@@ -372,11 +372,7 @@ ivas_error ivas_dirac_sba_config( 
        else if ( sba_total_brate <= IVAS_24k4 )

        {

            hQMetaData->bits_frame_nominal = ACELP_16k40 / FRAMES_PER_SEC;

#ifdef FIX_185_REDUCE_MD_BITS

            hQMetaData->metadata_max_bits = 103;

#else

            hQMetaData->metadata_max_bits = 106;

#endif

        }

        else if ( sba_total_brate <= IVAS_32k )

        {

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -149,10 +149,7 @@ 
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define FIX_ITD                                         /* Contribution 16: TD renderer ITD improvement and code cleanup */

#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

#define FIX_185_REDUCE_MD_BITS                          /* Issue 185: Crash in SBA encoder for 24.4 kbps HOA3 input with longer testvector */

#ifdef FIX_185_REDUCE_MD_BITS

#define CLEANUP_185_NO_AGC_EXCEPTION                    /* Issue 185: Cleanup AGC EXCEPTION code */

#endif

#define FIX_I220_PARAMMC_CPROTO                         /* Issue 220: sanitizer error in the svd due to NaNs coming from negative energies in Cproto */

#define FIX_221_BR_SWITCH_STEREO                        /* Issue 221: Fix missing initialization when switchin from TD to MDCT stereo*/

#define FIX_DTX_RANGE                                   /* Issue 118: fix the DTX usage: default DTX up to 64 kbps, otherwise only in silence */

lib_dec/ivas_agc_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -300,12 +300,8 @@ void ivas_agc_read_bits( 
            if ( per_ch_bit[i] == 1 )

            {

                pState->gain_data[i].absGainExpCurr = get_next_indice( st0, (int16_t) pState->agc_com.betaE );

#ifdef FIX_185_REDUCE_MD_BITS

#ifndef CLEANUP_185_NO_AGC_EXCEPTION

                pState->gain_data[i].gainException = false;

#endif

#else

                pState->gain_data[i].gainException = get_next_indice( st0, 1 );

#endif

            }

            else

lib_enc/ivas_agc_enc.c

+0 −3
Original line number Diff line number Diff line
@@ -528,9 +528,6 @@ void ivas_agc_enc_process( 
            if ( per_ch_bit[i] == 1 )

            {

                push_next_indice( hMetaData, (uint16_t) pState->gain_data[i].absGainExpCurr, (int16_t) pState->agc_com.betaE );

#ifndef FIX_185_REDUCE_MD_BITS

                push_next_indice( hMetaData, (uint16_t) pState->gain_data[i].gainException, 1 );

#endif

#ifndef CLEANUP_185_NO_AGC_EXCEPTION

                assert( pState->gain_data[i].gainException == FALSE );

#endif