Commit fe705771 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART

parent db12a8ab

lib_com/options.h

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


#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#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 NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC      /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

lib_rend/ivas_dirac_dec_binaural_functions.c

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

        else if ( renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) /* Indication of binaural rendering with room effect */

        {

#ifdef NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

            {

                mvr2r( ( *phHrtfParambin )->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );
@@ -233,9 +232,6 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
                pRoomAcoustics = &( st_ivas->hRenderConfig->roomAcoustics );

#endif

            }

#else

            mvr2r( ( *phHrtfParambin )->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );

#endif



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

            if ( hDiracDecBin->hReverb != NULL && ( ( hDiracDecBin->hReverb->numBins != nBins ) ||

lib_rend/lib_rend.c

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

        else if ( renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) /* Indication of binaural rendering with room effect */

        {

#ifdef NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART

            if ( *inputMasa->base.ctx.pOutConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

            {

                mvr2r( ( *phHrtfParambin )->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );
@@ -8487,9 +8486,6 @@ static ivas_error ivas_masa_ext_rend_parambin_init( 
                pRoomAcoustics = &( hRendCfg->roomAcoustics );

#endif

            }

#else

            mvr2r( ( *phHrtfParambin )->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );

#endif



            if ( hDiracDecBin->hReverb == NULL && pos_idx == 0 ) /* open reverb only for the main direction */

            {