Commit 3f2a5cda authored by Devansh Kandpal's avatar Devansh Kandpal
Browse files

Merge branch 'main-pc' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into... 

Merge branch 'main-pc' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into 1582_basop_port_fl1280
parents d3cb8fcc c06bdd95

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */

#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: (no changes needed in BASOP) fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#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 */



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

lib_dec/ivas_masa_dec_fx.c

+10 −0
Original line number Diff line number Diff line
@@ -166,6 +166,16 @@ ivas_error ivas_masa_decode_fx( 
    }

    move16();



#ifdef NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS

    test();

    test();

    IF( EQ_32( ivas_format, MASA_FORMAT ) && ( EQ_32( masa_brate, IVAS_SID_5k2 ) || EQ_32( ivas_total_brate, FRAME_NO_DATA ) ) )

    {

        hMasa->config.numberOfDirections = 1;

        move16();

    }

#endif



    test();

    test();

    test();