Commit 5c5c6f1c authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART

parent 961a6031

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
/* #################### Start BASOP porting switches ############################ */



#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART       /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define FIX_587_DEFAULT_REVERB                          /* Philips: issue 587: inconsistent default reverb parameters across renderers */

#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC      /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx( 
        }

        ELSE IF( EQ_32( renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) /* Indication of binaural rendering with room effect */

        {

#ifdef NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART

            IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )

            {

                Copy32( ( *phHrtfParambin )->parametricEarlyPartEneCorrection_fx, hDiracDecBin->earlyPartEneCorrection_fx, nBins );
@@ -302,9 +301,6 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx( 
                pRoomAcoustics = &( st_ivas->hRenderConfig->roomAcoustics );

#endif

            }

#else

            Copy32( ( *phHrtfParambin )->parametricEarlyPartEneCorrection_fx, hDiracDecBin->earlyPartEneCorrection_fx, nBins );

#endif

            hDiracDecBin->q_earlyPartEneCorrection = Q28;

            move16();

            /* reconfiguration needed when Reverb. parameters are changed -> close and open the handle again */

lib_rend/lib_rend_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -10010,7 +10010,6 @@ static ivas_error ivas_masa_ext_rend_parambin_init( 
        }

        ELSE IF( EQ_16( renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) /* Indication of binaural rendering with room effect */

        {

#ifdef NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART

            IF( EQ_32( *inputMasa->base.ctx.pOutConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )

            {

                Copy32( ( *phHrtfParambin )->parametricEarlyPartEneCorrection_fx, hDiracDecBin->earlyPartEneCorrection_fx, nBins );
@@ -10025,9 +10024,6 @@ static ivas_error ivas_masa_ext_rend_parambin_init( 
                pRoomAcoustics = &( hRendCfg->roomAcoustics );

#endif

            }

#else

            Copy32( ( *phHrtfParambin )->parametricEarlyPartEneCorrection_fx, hDiracDecBin->earlyPartEneCorrection_fx, nBins );

#endif

            hDiracDecBin->q_earlyPartEneCorrection = Q28;

            move16();