Commit 12de3d7c authored by multrus's avatar multrus
Browse files

[cleanup] accept CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE

parent 66a31adc

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -1212,13 +1212,11 @@ void ivas_get_ism_sid_quan_bitbudget( 
    int16_t *nBits_sce_id                                       /* o  : number of Q bits for sce_id_dtx             */

);



#ifdef CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE

void ivas_ism_dtx_limit_noise_energy_for_near_silence(

    SCE_DEC_HANDLE hSCE[],                                      /* i/o: SCE encoder structures                      */

    const int16_t sce_id_dtx,                                   /* i  : SCE DTX ID                                  */

    const int16_t nchan_transport                               /* i  : number of transport channels                */

);

#endif



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

 * DFT Stereo prototypes

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ 
/* any switch which is non-be wrt operation points tested in selection */

/* all switches in this category should start with "CR_" */



#define CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE /* FhG: fix for cng in ISM DTX on sudden silence periods */

#define CR_FIX_698_SBA_MSAN                             /* Dlb: issue 698: Uninitialized memory read in SBA init */



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

lib_dec/ivas_dec.c

+0 −9
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ ivas_error ivas_dec( 
            {

                return error;

            }

#ifdef CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE



            /* decode dominant object first so the noise energy of the other objects can be limited */

            if ( ( error = ivas_sce_dec( st_ivas, st_ivas->hISMDTX.sce_id_dtx, &output[st_ivas->hISMDTX.sce_id_dtx], output_frame, nb_bits_metadata[st_ivas->hISMDTX.sce_id_dtx] ) ) != IVAS_ERR_OK )
@@ -234,7 +233,6 @@ ivas_error ivas_dec( 
            }



            ivas_ism_dtx_limit_noise_energy_for_near_silence( st_ivas->hSCE, st_ivas->hISMDTX.sce_id_dtx, st_ivas->nchan_transport );

#endif

        }

        else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {
@@ -255,7 +253,6 @@ ivas_error ivas_dec( 


        for ( n = 0; n < st_ivas->nchan_transport; n++ )

        {

#ifdef CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE

            /* for DTX frames, dominant object has already been decoded before */

            if ( !( ( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) && n == st_ivas->hISMDTX.sce_id_dtx ) )

            {
@@ -264,12 +261,6 @@ ivas_error ivas_dec( 
                    return error;

                }

            }

#else

            if ( ( error = ivas_sce_dec( st_ivas, n, &output[n], output_frame, nb_bits_metadata[n] ) ) != IVAS_ERR_OK )

            {

                return error;

            }

#endif



            /* HP filtering */

            hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );

lib_dec/ivas_ism_dtx_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ ivas_error ivas_ism_dtx_dec( 
}





#ifdef CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE

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

 * ivs_ism_dtx_limit_noise_energy_for_near_silence()

 *
@@ -208,4 +207,3 @@ void ivas_ism_dtx_limit_noise_energy_for_near_silence( 


    return;

}
 
#endif