Commit 1fa7e174 authored by multrus's avatar multrus
Browse files

[cleanup] accept DIRAC_DRCT_GAIN_TUNING

parent 7fd3fe4f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/





#define DIRAC_DRCT_GAIN_TUNING                          /* issue 64: tuning of DirAC energy-compensation gains */

#define MDFT_ROM_OPTIMIZE                               /*Optimise ROM tables for MDFT/iMDFT*/

#define LFE_NO_ENTROPY_CODING                           /* issue 65: changes to add no entropy coding in LFE */

#define FIX_79_MASA2TC_BITRATE_SWITCHING                /* Nokia: Fix issue 79 on MASA 2TC bitrate switching crash in decoder. */

lib_dec/ivas_dirac_output_synthesis_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -729,13 +729,8 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( 
            g1 = 0.3679f + onset_filter[l] * ( 0.1175f - 0.3679f );

            g2 = ( 1.f - g1 ) * *( p_gains_dir );

            g2 += g1 * ( *( p_cy_cross_dir_smooth++ ) );

#ifdef DIRAC_DRCT_GAIN_TUNING

            g2 = max( g2, 0.85f );

            g2 = min( g2, 1.15f );

#else

            g2 = max( g2, 0.5f );

            g2 = min( g2, 2.f );

#endif

            *( p_gains_dir++ ) = g2;

        }

    }