Commit 9617c599 authored by vaclav's avatar vaclav
Browse files

FIX_1500_ISM_MD_DTX

parent 507fd13e

lib_com/options.h

+4 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
/* ################### Start DEBUGGING switches ########################### */



#ifndef RELEASE

/*#define DEBUGGING*/                           /* Activate debugging part of the code */

#define DEBUGGING                           /* Activate debugging part of the code */

#endif

/*#define WMOPS*/                               /* Activate complexity and memory counters */

/*#define WMOPS_PER_FRAME*/                     /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */
@@ -59,7 +59,7 @@ 


#ifdef DEBUGGING

/*#define DBG_BITSTREAM_ANALYSIS*/              /* Write bitstream with annotations to a text file */

/*#define DEBUG_MODE_INFO*/                     /* output most important parameters to the subdirectory "res/" */

#define DEBUG_MODE_INFO                     /* output most important parameters to the subdirectory "res/" */

#ifdef DEBUG_MODE_INFO

/*#define DEBUG_MODE_ACELP*/                    /* output most important ACELP core parameters to the subdirectory "res/" */

/*#define DEBUG_MODE_TCX*/                      /* output most important TCX core parameters to the subdirectory "res/" */
@@ -170,7 +170,7 @@ 
#define FIX_1479_MSAN_SPAR_UNINITIALIZED_VALUE          /* Dolby: Fix for issue 1479, MSAN error due to uninitialized value in SPAR */

#define REMOVE_UNUSED_CODE_IVAS_DEC                     /* VA: remove unused code in ivas_jbm_dec_tc_fx() */

#define REMOVE_CAM_FROM_IVAS                            /* VA: basop issue 210: remove obsoelte CAM code from IVAS */

#define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */

//#define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */

#define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */



/* #################### End BE switches ################################## */
@@ -178,6 +178,7 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */



#define FIX_1500_ISM_MD_DTX                             /* VA: float issue 1500: fix ISM metadata smoothing in DTX */



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

lib_dec/ivas_ism_metadata_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -119,7 +119,11 @@ static void ism_metadata_smooth( 
        /* smooth elevation */

        diff = hIsmMetaData->last_true_elevation - hIsmMetaData->last_elevation;



#ifdef FIX_1500_ISM_MD_DTX

        if ( ism_total_brate > IVAS_SID_5k2 && fabsf( diff ) > IVAS_ISM_DTX_HO_MAX * CNG_MD_MAX_DIFF_ELEVATION )

#else

        if ( ism_total_brate > IVAS_SID_5k2 && diff > IVAS_ISM_DTX_HO_MAX * CNG_MD_MAX_DIFF_ELEVATION )

#endif

        {

            /* skip the smoothing */

        }