Commit 8a98aad7 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1876_basop_port_mr_1709_parambin_early_part_correction' into 'main' 

[non-BE] [allow regression] Port float MR1709 to BASOP

See merge request !2013
parents a08ffb86 cdb22bc3

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/

#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER            /* FhG: issue 1128: set output ambisonics order to input order for EXT output  */

#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

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



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

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+11 −0
Original line number Diff line number Diff line
@@ -297,7 +297,18 @@ 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_991_PARAMBIN_BINARY_HRTF

#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 );

            }

            ELSE

            {

                set32_fx( hDiracDecBin->earlyPartEneCorrection_fx, ONE_IN_Q28, CLDFB_NO_CHANNELS_MAX );

            }

#else

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

#endif

#else

            Copy32( hHrtfParambin->parametricEarlyPartEneCorrection_fx, hDiracDecBin->earlyPartEneCorrection_fx, nBins );

#endif

lib_rend/lib_rend_fx.c

+11 −0
Original line number Diff line number Diff line
@@ -9780,7 +9780,18 @@ 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_991_PARAMBIN_BINARY_HRTF

#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 );

            }

            ELSE

            {

                set32_fx( hDiracDecBin->earlyPartEneCorrection_fx, ONE_IN_Q28, CLDFB_NO_CHANNELS_MAX );

            }

#else

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

#endif

#else

            Copy32( hHrtfParambin->parametricEarlyPartEneCorrection_fx, hDiracDecBin->earlyPartEneCorrection_fx, nBins );

#endif