Commit a9ddc392 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS

parent 11d8e651

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ 
#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */



//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS             /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF */             /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/

#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO             /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

lib_dec/ivas_masa_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -142,12 +142,10 @@ ivas_error ivas_masa_decode( 
        st->next_bit_pos = (int16_t) ( ( masa_brate / FRAMES_PER_SEC ) - 1 );

    }



#ifdef NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS

    if ( ivas_format == MASA_FORMAT && ( masa_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) )

    {

        hMasa->config.numberOfDirections = 1;

    }

#endif



    if ( !st->bfi && ivas_total_brate > IVAS_SID_5k2 )

    {