Commit 230ea69f authored by vaclav's avatar vaclav
Browse files

- fix logic around FIX_ISM2_64KBPS / FIX_ISM2_64KBPS_COMBINED_FORMAT

- clang format
parent f71e33c3
Loading
Loading
Loading
Loading
+21 −26
Original line number Diff line number Diff line
@@ -363,10 +363,6 @@ ivas_error ivas_ism_config(
        }

        /* limitation to avoid too high bitrate in one active TCX channel */
#ifdef FIX_ISM2_64KBPS_COMBINED_FORMAT
        /* Todo: the alternative is to make sure there are less than n_ism -1 objects inactive; but this way is simpler (Todo VE to check )*/
        if ( element_brate[0] >= SCE_CORE_16k_LOW_LIMIT && element_brate[0] <= IVAS_32k && combined_format_flag == 0 )
#else
        if ( element_brate[0] >= SCE_CORE_16k_LOW_LIMIT && element_brate[0] <= IVAS_32k )
        {
            diff = 0;
@@ -380,7 +376,6 @@ ivas_error ivas_ism_config(
                bits_CoreCoder[ch] = tmp;
            }
        }
#endif

        if ( diff > 0 )
        {
+4 −2
Original line number Diff line number Diff line
@@ -210,7 +210,8 @@
#define FIX_626_VARIABLE_TYPE_MDCT_CONC                 /* FhG: trivial fix to fix USAN error */
#define FIX_616_DIV_ZERO_MCT                            /*FhG : Fix UBSAN division by zero error of issue 616*/

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

/* OMASA */
#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */
#ifdef MASA_AND_OBJECTS
#define MASAISM_EDIT_OBJECTS                            /* Nokia: Temporary command line editing of object directions in the decoder */
@@ -220,10 +221,11 @@
#define OMASA_BIT_BUFF_SZ                               /* Nokia: increase bitstream index buffer initial size */
#define OMASA_EXT_OUTPUT                                /* VA: support of EXT output configuration for OMASA DISC mode */
#define OMASA_BIT_BUFF_SZ1                              /* Nokia: increase bitstream index buffer initial size */
#define FIX_ISM2_64KBPS_COMBINED_FORMAT                 /* Nokia: Making the fix_562 work with combined format */
#define OMASA_OBJ_REND_CLOSE                            /* Nokia: close OMASA separate object renderer */
#endif

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

/* #################### Start NON-BE CR switches ########################## */
/* any switch which is non-be wrt operation points tested in selection */
/* all switches in this category should start with "CR_" */
+6 −4
Original line number Diff line number Diff line
@@ -933,7 +933,8 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric
    const int16_t subframe,
    const int16_t isHeadtracked
#ifdef MASA_AND_OBJECTS
    , const MASA_ISM_DATA_HANDLE hMasaIsmData
    ,
    const MASA_ISM_DATA_HANDLE hMasaIsmData
#endif
)
{
@@ -1441,7 +1442,8 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices(
    float Rmat[3][3],
    const int16_t isHeadtracked
#ifdef MASA_AND_OBJECTS
    , const int16_t nchanSeparateChannels,
    ,
    const int16_t nchanSeparateChannels,
    const MASA_ISM_DATA_HANDLE hMasaIsmData
#endif
)
+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+2 −2

File changed.

Contains only whitespace changes.

Loading