Commit e9efb892 authored by det's avatar det
Browse files

patched MR1266 into basop.

parent 7847d456

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
#define FIX_QMETADATA_PENALTY /* Nokia: transform penalty calculation in qmetadata into integer operations */

#define FIX_1013_CRASH_HQ_CORE_DEC /* Ittiam: Saturation added on the lines of EVS */

#define NONE_BE_FIX_BASOP_1044_OSBA_PRERENDER_MIX_GAINS /* DLB: adjust prerendering and mixing gain in OSBA encoder. This is fix to float codes*/

#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */

#define NONBE_1233_HQ_CLASSIFIER_DIV_BY_ZERO            /* Eri: issue 1233: Address possible division by zero in hf_spectrum_sparseness() */

#define FIX_ISSUE_1062_AND_1068_TON_ENE_EST_FX

#define FIX_ISSUE_987

lib_dec/ivas_jbm_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -3259,7 +3259,11 @@ Word16 ivas_jbm_dec_get_num_tc_channels_fx( 


        test();

        test();

#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA 

        if ( EQ_16( num_tc, 3 ) )

#else

        if ( ( st_ivas->sba_planar && GE_16( num_tc, 3 ) ) || EQ_16( num_tc, 3 ) )

#endif

        {

            num_tc = add( num_tc, 1 );

        }