Commit d029b583 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1876_ref_port_mr_1709_parambin_early_part_correction' into 'ivas-float-update' 

[non-BE] Port float MR1709 to float reference

See merge request !2012
parents 3bbe8f40 1429d3fd

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -202,6 +202,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.c

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

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

            }

            else

            {

                set_f( hDiracDecBin->earlyPartEneCorrection, 1.0f, CLDFB_NO_CHANNELS_MAX );

            }

#else

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

#endif

#else

            mvr2r( hHrtfParambin->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );

#endif

lib_rend/lib_rend.c

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

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

            }

            else

            {

                set_f( hDiracDecBin->earlyPartEneCorrection, 1.0f, CLDFB_NO_CHANNELS_MAX );

            }

#else

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

#endif

#else

            mvr2r( hHrtfParambin->parametricEarlyPartEneCorrection, hDiracDecBin->earlyPartEneCorrection, nBins );

#endif