Commit 30f63cb9 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

make OSBA X-over BR configurable with IVAS_OSBA_DISCRETE_ISM_MIN_BR

parent 15499265

lib_com/ivas_cnst.h

+3 −1
Original line number Diff line number Diff line
@@ -363,7 +363,9 @@ typedef enum 
#define ISM_DTX_ELE_BITS_LOW                    5

#define ISM_Q_STEP_LOW                          (ISM_Q_STEP * 2)

#define ISM_Q_STEP_BORDER_LOW                   (ISM_Q_STEP_BORDER * 2)



#ifdef NONBE_FIX_ISM_XOVER_BR

#define IVAS_OSBA_DISCRETE_ISM_MIN_BR           IVAS_256k

#endif

/* ISM modes */

typedef enum 

{

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ 
#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_ISM_XOVER_BR





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

lib_dec/ivas_init_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -495,8 +495,11 @@ ivas_error ivas_dec_setup( 
                    st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1;

                }

            }



#ifdef NONBE_FIX_ISM_XOVER_BR

            if ( ivas_total_brate >= IVAS_OSBA_DISCRETE_ISM_MIN_BR )

#else

            if ( ivas_total_brate >= IVAS_256k )

#endif

            {

                st_ivas->ism_mode = ISM_SBA_MODE_DISC;

            }

lib_dec/ivas_sba_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -143,7 +143,11 @@ ivas_error ivas_sba_dec_reconfigure( 


    if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

    {

#ifdef NONBE_FIX_ISM_XOVER_BR

        if ( ivas_total_brate >= IVAS_OSBA_DISCRETE_ISM_MIN_BR )

#else

        if ( ivas_total_brate >= IVAS_256k )

#endif

	    {

            st_ivas->ism_mode = ISM_SBA_MODE_DISC;

        }

lib_enc/ivas_init_enc.c

+5 −1
Original line number Diff line number Diff line
@@ -674,7 +674,11 @@ ivas_error ivas_init_encoder( 
    {

        st_ivas->ism_mode = ISM_MODE_NONE;



#ifdef NONBE_FIX_ISM_XOVER_BR

        if ( ivas_total_brate >= IVAS_OSBA_DISCRETE_ISM_MIN_BR )

#else

        if ( ivas_total_brate >= IVAS_256k )

#endif 

		{

            st_ivas->ism_mode = ISM_SBA_MODE_DISC;

        }