Commit c09dfebd authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main-pc' into knj/test_testcase_compatibility

parents b4d3594a 78e44917

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ 
#define FIX_1741_REVERB_TIMES_Q_FORMAT                  /* Philips: reverberation times in Q26 format instead of Q31 */

#define NONBE_FIX_1034_DRY_MASA_RATIOS                  /* Nokia: Fix issue 1034, use of wrong numDir state. */

#define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH                /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/

#define FIX_1035_HT_OSBA                                /* Dlb: issue 1035: Issue with headtracking in OSBA*/



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_binRenderer_internal_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1204,7 +1204,11 @@ ivas_error ivas_binRenderer_open_fx( 
    hBinRenderer->rotInCldfb = 0;

    move16();

    test();

#ifdef FIX_1035_HT_OSBA

    if ( EQ_32( st_ivas->ivas_format, MC_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

#else

    if ( EQ_32( st_ivas->ivas_format, MC_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_FORMAT ) )

#endif

    {

        hBinRenderer->rotInCldfb = 1;

        move16();