Commit 9c9a7e07 authored by emerit's avatar emerit
Browse files

Copy_Scale_sig_16_32_no_sat

parent 7ed2471f

lib_rend/ivas_dirac_dec_binaural_functions.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx( 
#ifdef FIX_POINT_HRTF_FILE_FORMAT

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

        /* Check if value can remain 16bit */

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

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

        hDiracDecBin->q_earlyPartEneCorrection = Q12;

#else

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

lib_rend/ivas_reverb.c

+7 −7
Original line number Diff line number Diff line
@@ -1788,7 +1788,7 @@ ivas_error ivas_reverb_open_fx( 
    }



#ifdef FIX_POINT_HRTF_FILE_FORMAT_REVERB

    Copy_Scale_sig_16_32( params.pHrtf_inter_aural_coherence_const_fx, params.pHrtf_inter_aural_coherence_fx, nr_fc_fft_filter, params.factor_Q_energy ); /*Scaling ( *hReverb )->fft_filter_color_0.fft_spectrum_fx to Q31*/

    Copy_Scale_sig_16_32_no_sat( params.pHrtf_inter_aural_coherence_const_fx, params.pHrtf_inter_aural_coherence_fx, nr_fc_fft_filter, params.factor_Q_energy ); /*Scaling ( *hReverb )->fft_filter_color_0.fft_spectrum_fx to Q31*/

#else

    Scale_sig32( params.pHrtf_inter_aural_coherence_fx, nr_fc_fft_filter, 4 ); /*Scaling ( *hReverb )->fft_filter_color_0.fft_spectrum_fx to Q31*/

#endif
@@ -2554,8 +2554,8 @@ ivas_error ivas_binaural_reverb_init_fx( 
#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

        revTimes = t60;

        revEne = ene;

        Copy_Scale_sig_16_32( defaultTimes, t60, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32( defaultEne, ene, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32_no_sat( defaultTimes, t60, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32_no_sat( defaultEne, ene, CLDFB_NO_CHANNELS_MAX, 16 );

#else

        revTimes = defaultTimes;

        revEne = defaultEne;
@@ -2626,8 +2626,8 @@ ivas_error ivas_binaural_reverb_open_fastconv_fx( 
#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

        revTimes = t60;

        revEne = ene;

        Copy_Scale_sig_16_32( hHrtfFastConv->fastconvReverberationTimes_fx, t60, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32( hHrtfFastConv->fastconvReverberationEneCorrections_fx, ene, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32_no_sat( hHrtfFastConv->fastconvReverberationTimes_fx, t60, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32_no_sat( hHrtfFastConv->fastconvReverberationEneCorrections_fx, ene, CLDFB_NO_CHANNELS_MAX, 16 );

#else

        revTimes = hHrtfFastConv->fastconvReverberationTimes_fx;        /*Q31*/

        revEne = hHrtfFastConv->fastconvReverberationEneCorrections_fx; /*Q31*/
@@ -2676,8 +2676,8 @@ ivas_error ivas_binaural_reverb_open_parambin( 
#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

        revTimes = t60;

        revEne = ene;

        Copy_Scale_sig_16_32( hHrtfParambin->parametricReverberationTimes_fx, t60, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32( hHrtfParambin->parametricReverberationEneCorrections_fx, ene, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32_no_sat( hHrtfParambin->parametricReverberationTimes_fx, t60, CLDFB_NO_CHANNELS_MAX, 16 );

        Copy_Scale_sig_16_32_no_sat( hHrtfParambin->parametricReverberationEneCorrections_fx, ene, CLDFB_NO_CHANNELS_MAX, 16 );

#else

        revTimes = hHrtfParambin->parametricReverberationTimes_fx;        /*Q31*/

        revEne = hHrtfParambin->parametricReverberationEneCorrections_fx; /*Q31*/

lib_rend/lib_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -8152,7 +8152,7 @@ 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 FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

        Copy_Scale_sig_16_32( hHrtfParambin->parametricEarlyPartEneCorrection_fx, hDiracDecBin->earlyPartEneCorrection_fx, nBins, 16 );

        Copy_Scale_sig_16_32_no_sat( hHrtfParambin->parametricEarlyPartEneCorrection_fx, hDiracDecBin->earlyPartEneCorrection_fx, nBins, 16 );

#else

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

#endif