Commit 09572a64 authored by vaillancour's avatar vaillancour
Browse files

possible fix for 1984

parent 8d974424

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
#define FIX_1319_STACK_SBA_DECODER                      /* VA: issue 1319: Optimize the definition of buffer lengths in the SBA decoder */

#define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */



#define FIX_1984_SAT_IN_PSYCHAD                         /* VA: Issue 1984: proposal to fix an assert */



/* #################### End BASOP porting switches ############################ */

lib_com/tcx_utils_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1446,7 +1446,11 @@ void PsychAdaptLowFreqDeemph( 
        tmp_e = min_e;

        move16();

        tmp = Inv16( min, &tmp_e );                                   /*Q15 - tmp_e*/

#ifdef FIX_1984_SAT_IN_PSYCHAD

        L_tmp = L_shl_sat( L_mult_sat( tmp, max_val ), add( tmp_e, max_e ) ); /* Q31 */

#else

        L_tmp = L_shl( L_mult( tmp, max_val ), add( tmp_e, max_e ) ); /* Q31 */

#endif

        L_tmp = BASOP_Util_Log2( L_tmp );                             /* Q25 */

        L_tmp = L_shr( L_tmp, 7 );                                    /* 0.0078125f = 1.f/(1<<7) */

        L_tmp = BASOP_Util_InvLog2( L_tmp );                          /* Q31 */