Commit 774abf81 authored by emerit's avatar emerit
Browse files

bug fix rend masa + BRIR

parent 6c8e1ff6

lib_rend/ivas_dirac_dec_binaural_functions.c

+4 −2
Original line number Diff line number Diff line
@@ -291,10 +291,8 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx( 
#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

        /* Check if value can remain 16bit */

        Copy_Scale_sig_16_32_no_sat( ( *phHrtfParambin )->parametricEarlyPartEneCorrection_fx, hDiracDecBin->earlyPartEneCorrection_fx, nBins, Q13 + ( Q15 - ( *phHrtfParambin )->factor_Q_EarlyPartEneCorrection_fx ) );

        hDiracDecBin->q_earlyPartEneCorrection = Q12;

#else

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

        hDiracDecBin->q_earlyPartEneCorrection = Q28;

#endif

#else

        Copy32( hHrtfParambin->parametricEarlyPartEneCorrection_fx, hDiracDecBin->earlyPartEneCorrection_fx, nBins );
@@ -313,7 +311,11 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx( 
        IF( hDiracDecBin->hReverb == NULL )

        {

            /* Todo Philips: Room acoustics should be passed here once the underlying part works. Probably enough to pick it from st_ivas but you know best. */

#ifdef FIX_POINT_HRTF_FILE_FORMAT_REVERB

            IF( NE_32( error = ivas_binaural_reverb_init_fx( &( hDiracDecBin->hReverb ), st_ivas->hHrtfStatistics, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfParambin->parametricReverberationTimes_fx, st_ivas->hHrtfParambin->factor_Q_reverberationTimes_fx, st_ivas->hHrtfParambin->parametricReverberationEneCorrections_fx, st_ivas->hHrtfParambin->factor_Q_reverberationEneCorrections_fx ), IVAS_ERR_OK ) )

#else

            IF( NE_32( ( error = ivas_binaural_reverb_open_parambin( &hDiracDecBin->hReverb, nBins, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, NULL, output_Fs, st_ivas->hHrtfParambin ) ), IVAS_ERR_OK ) )

#endif

            {

                return error;

            }