Commit 4fada684 authored by vasilache's avatar vasilache
Browse files

fix 1338

parent 477a3584

lib_com/options.h

+7 −6
Original line number Diff line number Diff line
@@ -43,9 +43,10 @@ 


/*#define DEBUGGING */                             /* Allows debugging message to be printed out during runtime */

#ifdef DEBUGGING 

#define DEBUG_MODE_INFO                       /* Define to output most important parameters to the subdirectory "res/" */

#define DEBUG_MODE_INFO_TWEAK                 /* Enable command line switch to specify subdirectory for debug info output inside "./res/" */

#define DEBUG_FORCE_MDCT_STEREO_MODE          /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */

/*#define DEBUG_MODE_INFO */                       /* Define to output most important parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_INFO_TWEAK */                /* Enable command line switch to specify subdirectory for debug info output inside "./res/" */

/*#define DEBUG_FORCE_MDCT_STEREO_MODE */          /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */

#define DEBUG_MODE_QMETADATA

/*#define DEBUG_FORCE_DIR*/                       /* Force modes/parameters by reading from external binary files */

/*#define DBG_WAV_WRITER*/                    /* Enable dbgwrite_wav() function for generating ".wav" files */

#define SUPPORT_FORCE_TCX10_TCX20             /* VA: Enable -force tcx10|tcx20 command-line option */
@@ -72,5 +73,5 @@ 
#define OPT_AVOID_STATE_BUF_RESCALE             /* Optimization made to avoid rescale of synth state buffer */

#define FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx                 /*FhG: WMOPS tuning, nonbe*/

#define FIX_1310_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot   /*FhG: WMOPS tuning, nonbe*/

#define FIX_1338_DIFFERENT_CORE_BRATE_MASA      /* Nok: constant threshold FP value correction */

#define FIX_1338_DIFFERENT_CORE_BRATE_MASA      /* Nok: remove one division , nonbe */

#endif

lib_enc/ivas_masa_enc_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -2469,7 +2469,6 @@ static void reduce_metadata_further_fx( 
        exp = sub( 31, sub( hMasa->data.q_energy, 1 ) );



        IF( BASOP_Util_Cmp_Mant32Exp( totalEnergySum, sub( exp, tmp2 ), meanRatio, exp ) > 0 )

        //  IF( BASOP_Util_Cmp_Mant32Exp( hqmetadata->q_direction[0].band_data[selectedBand].energy_ratio_fx[0], 1, meanRatio, exp ) > 0 )

        {

            mergeOverFreqBands = 1;

            move16();