Commit f925ad10 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Merge branch... 

Merge branch '107-rendering-enable-5ms-rendering-by-default-for-parametric-binaural-renderer' into 'main'

[non-BE] Use 5ms subframes everywhere by default

See merge request !441
parents 82d6a555 7ac246da

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 


#define FIX_343_TO_UPPER                                /* VA: issue 343: safeguard for function to_upper() */



#define FIX_107_5MS_SUBFRAME_RENDERING                  /* Issue 107: use 5ms subframes everywhere in parametric binauralizer */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_dirac_dec_binaural_functions.c

+4 −0
Original line number Diff line number Diff line
@@ -138,6 +138,9 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
    set_zero( hBinaural->ChCrossImOutPrev, nBins );

    hBinaural->renderStereoOutputInsteadOfBinaural = 0;



#ifdef FIX_107_5MS_SUBFRAME_RENDERING

    hBinaural->useSubframeMode = 1;

#else

    if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) /* Use subframe-mode with SPAR, since the metadata is not in sync on a frame level */

    {

        hBinaural->useSubframeMode = 1;
@@ -150,6 +153,7 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
        hBinaural->useSubframeMode = 0; /* Default to 20 ms mode. */

#endif

    }

#endif



    hBinaural->useTdDecorr = 0;

    if ( st_ivas->ivas_format == SBA_FORMAT )

lib_rend/lib_rend.c

+4 −0
Original line number Diff line number Diff line
@@ -2192,7 +2192,9 @@ static ivas_error initMasaDummyDecForMcOut( input_masa *inputMasa, IVAS_REND_Aud 
        {

            return error;

        }

#ifndef FIX_107_5MS_SUBFRAME_RENDERING

        decDummy->hDiracDecBin->useSubframeMode = 0; /* Todo Nokia: This will disappear in later work but needs to be this now. */

#endif

    }



    numCldfbAnalyses = decDummy->nchan_transport;
@@ -2347,7 +2349,9 @@ static ivas_error initMasaDummyDecForBinauralOut( input_masa *inputMasa, IVAS_RE 
        return error;

    }



#ifndef FIX_107_5MS_SUBFRAME_RENDERING

    decDummy->hDiracDecBin->useSubframeMode = 0; /* Todo Nokia: This will disappear in later work but needs to be this now. */

#endif



    for ( i = 0; i < BINAURAL_CHANNELS; i++ )

    {