Commit 53287621 authored by bayers's avatar bayers
Browse files

fix for #974, make sure the subframe info is correctly transferred on a RS with OSBA JBM

parent 0d466098

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ 
#define NONBE_FIX_967_ISM_MONO_DMX                            /* FhG: issue 967: accumulating energies in ISM mono DMX */

#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

#define NONBE_FIX_977_OSBA_GAIN_MISMATCH                      /* Dlb : issue 977 : Output gain mismatch for different bit rates in OSBA */

#define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN                   /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_sba_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -258,7 +258,11 @@ ivas_error ivas_sba_dec_reconfigure( 
    }



    /* save old */

#ifdef NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN

    if ( ism_mode_old != ISM_SBA_MODE_DISC && st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER )

#else

    if ( ism_mode_old != ISM_SBA_MODE_DISC )

#endif

    {

        if ( st_ivas->hDirAC == NULL && st_ivas->hSpar != NULL )

        {