Commit 129d3ef6 authored by vaclav's avatar vaclav
Browse files

Merge branch '1858-ref-PortFlpMr1617' into 'ivas-float-update' 

[non-BE] Port MR1617 from float to FLP-ref

See merge request !2062
parents 20f66bcc a9e07317

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ 
#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */



#define NONBE_1894_OSBA_SCALING                         /* FhG: port OSBA scaling MRs (298,355,360) jointly */

lib_dec/ivas_binRenderer_internal.c

+5 −2
Original line number Diff line number Diff line
@@ -950,8 +950,7 @@ static void ivas_binaural_obtain_DMX( 
 * Allocate and initialize CLDFB fast conv renderer handle

 *------------------------------------------------------------------------*/



ivas_error

ivas_rend_openCldfbRend(

ivas_error ivas_rend_openCldfbRend(

    CLDFB_REND_WRAPPER *pCldfbRend,

    const AUDIO_CONFIG inConfig,

    const AUDIO_CONFIG outConfig,
@@ -1027,7 +1026,11 @@ ivas_rend_openCldfbRend( 
        return error;

    }



#ifdef FIX_1113_CLDFB_REND_IN_ISAR

    pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f );

#else

    pCldfbRend->binaural_latency_ns = (int32_t) ( FASTCONV_HOA3_latency_s * 1000000000.f );

#endif

    hBinRenderer->hReverb = NULL;

    hBinRenderer->hEFAPdata = NULL;