Commit e6c14172 authored by vaillancour's avatar vaillancour
Browse files

possible fix to the issue uncovered by FIX_2015_PREMPH_SAT_ALT

parent 8bfe0ef1

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 


#define FIX_2176_ASSERT_DEC_MAP_PARAMS_DIRAC2STEREO          /* FhG: Reduce hStereoDft->q_smooth_buf_fx by one to prevent overflow in the subframe_band_nrg[][] calculation */

#define FIX_2015_PREMPH_SAT_ALT                              /* VA: saturation can happen during preemphasis filtering due to a too aggressive scaling factor, allows preemphis to get 1 more bit headroom */

#define FIX_2015_PREMPH_SAT_ALT_PART2                        /* VA: Possible fix to an issue discovered when activating FIX_2015_PREMPH_SAT_ALT */

#define FIX_2178_FL_TO_FX_WITH_OBJ_EDIT_FILE_INTERFACE       /* Nokia: Fixes float  to fx conversion in decoder app with object edit file interface */

#define FIX_2070_JBM_TC_CHANNEL_RESCALING_ISSUE              /* Eri/Orange: scale_sig32 problem on p_tc_fx[] */

lib_enc/enc_higher_acelp_fx.c

+4 −2
Original line number Diff line number Diff line
@@ -489,9 +489,11 @@ void transf_cdbk_enc_ivas_fx( 
    /*--------------------------------------------------------------*

     * Split algebraic vector quantizer based on RE8 lattice

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



#ifndef FIX_2015_PREMPH_SAT_ALT_PART2

    AVQ_cod_fx( x_tran, x_norm, nBits, Nsv, 0 );



#else

    AVQ_cod_fx( x_tran, x_norm, nBits, Nsv, Qdct );

#endif

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

     * Find prequantizer excitation gain

     * Quantize the gain