Commit 7c2d4e8e authored by emerit's avatar emerit
Browse files

version OK

parent 5d8311ca

lib_rend/ivas_objectRenderer.c

+4 −0
Original line number Diff line number Diff line
@@ -268,7 +268,11 @@ ivas_error ivas_td_binaural_open_unwrap_fx( 


    IF( NE_16( ivas_format, MASA_ISM_FORMAT ) && NE_16( ivas_format, SBA_ISM_FORMAT ) )

    {

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

        *binaural_latency_ns = L_shr_r( Mult_32_32( ( *hBinRendererTd )->HrFiltSet_p->latency_s_fx, 1000000000 ), ( *hBinRendererTd )->HrFiltSet_p->factor_Q_latency_s_fx );

#else

        *binaural_latency_ns = Mult_32_32( ( *hBinRendererTd )->HrFiltSet_p->latency_s_fx, 1000000000 );

#endif

    }



    return error;

lib_rend/ivas_objectRenderer_mix.c

+5 −0
Original line number Diff line number Diff line
@@ -1032,6 +1032,11 @@ static ivas_error DefaultBSplineModel_fx( 


    HRTF_model_precalc( model );



    HrFiltSet_p->factor_Q_latency_s_fx = defaultHRIR_rom_latency_s_Q_fx;

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

    HrFiltSet_p->factor_Q_latency_s_fx = sub( HrFiltSet_p->factor_Q_latency_s_fx, 31 );

#endif

    move16();

    HrFiltSet_p->latency_s_fx = defaultHRIR_rom_latency_s_fx;

    move32();

    HrFiltSet_p->SampleRate = output_Fs;

lib_rend/ivas_rom_TdBinauralRenderer.c

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ 
 *------------------------------------------------------------------------*/

/* TD renderer default HRIR model */

#ifdef IVAS_FLOAT_FIXED

const Word16 defaultHRIR_rom_latency_s_Q_fx = 31;

const Word32 defaultHRIR_rom_latency_s_fx = 44741;

const Word16 defaultHRIR_rom_latency_s_Q_fx = 46;

const Word32 defaultHRIR_rom_latency_s_fx = 1466062416;

#endif // IVAS_FLOAT_FIXED

const float defaultHRIR_rom_latency_s = 0.000020834f;

const int16_t defaultHRIR_rom_model_configuration[6] = {

lib_rend/ivas_stat_rend.h

+4 −3
Original line number Diff line number Diff line
@@ -1856,6 +1856,7 @@ typedef struct TDREND_HRFILT_FiltSet_struct 
    float *lr_energy_and_iac_dyn[3];

#endif

#else

    Word16 factor_Q_latency_s_fx;          /* Q31 */

    Word32 latency_s_fx;                   /* Q31 */

    const Word32 *lr_energy_and_iac_fx[3]; /* left/right energy and interaural coherence for late reverb */

    Word32 *lr_energy_and_iac_dyn_fx[3];

lib_rend/lib_rend.c

+3 −3
Original line number Diff line number Diff line
@@ -4570,13 +4570,13 @@ static ivas_error setRendInputActiveMc( 














    inputMc->customLsInput = defaultCustomLs();















    inputMc->tdRendWrapper = defaultTdRendWrapper();













#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT













#ifdef FIX_TDREND_HRTF_FILE_FORMAT















    if ( hrtfs->hHrtfTD )















    {













        inputMc->tdRendWrapper.binaural_latency_ns = hrtfs->hHrtfTD->latency_s_fx;













        inputMc->tdRendWrapper.binaural_latency_ns = L_shr_r( Mult_32_32( hrtfs->hHrtfTD->latency_s_fx, 1000000000 ), hrtfs->hHrtfTD->factor_Q_latency_s_fx );















    }













    inputMc->tdRendWrapper.hHrtfTD = &hrtfs->hHrtfTD;















#endif













    inputMc->tdRendWrapper.hHrtfTD = &hrtfs->hHrtfTD;















    inputMc->crendWrapper = NULL;















    inputMc->hReverb = NULL;















    inputMc->hMcMasa = NULL;