Commit 8a79c66a authored by emerit's avatar emerit
Browse files

fix

parent 1ba2e349

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -312,6 +312,11 @@ typedef enum 
#define ADJUST_ISM_BRATE_POS                    8000



#define ISM_AZIMUTH_NBITS                       7

#ifdef FIX_2570_BUF_OVFL   

#define ISM_AZIMUTH_MIN_NON_DIEGETIC_FX         32                          /* 90.0f in ism metadata */

#define ISM_AZIMUTH_ZERO_NON_DIEGETIC_FX        64                          /* 0.0f in ism metadata */

#define ISM_AZIMUTH_MAX_NON_DIEGETIC_FX         96                          /* 90.0f in ism metadata */

#endif

#define ISM_AZIMUTH_MIN                         -180.0f

#define ISM_AZIMUTH_MAX                         180.0f

#define ISM_AZIMUTH_LOW_BORDER                  -140.0f

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA: float issue 1585: alternative fix memory leaks with format switching */

#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */



/* #################### End BE switches ################################## */
@@ -179,7 +180,6 @@ 
#define FIX_1559                                        /* Eri/FhG: fix for Issue 1559 in FD CNG with bitrate/bw switching */

#define FIX_FMSW_DEC                                    /* float issue 1542: fix JBM issue in format switching */

#define FIX_FMSW_DEC_2                                  /* float issue 1575: fix crash for format switching when bitsream starts with EVS */

#define FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW     /* Orange: float issue 1548: Harmonize non diegetic panning law in ISM and renderers */

#define FIX_FLOAT_1578_OMASA_REND_SPIKES                /* Nokia: Float issue 1578: Fix spikes and collapsed perception in OMASA/MASA rendering to FOA/HOA */



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

lib_dec/ivas_ism_metadata_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -871,6 +871,17 @@ static void decode_angle_indices( 
    }

    else

    {

#ifdef FIX_2570_BUF_OVFL

        /* azimuth/yaw is on a circle - check for diff coding for -90 -> 90 and vice versa changes */

        if ( idx_angle1 > ISM_AZIMUTH_MAX_NON_DIEGETIC_FX )

        {

            idx_angle1 = ISM_AZIMUTH_MIN_NON_DIEGETIC_FX;

        }

        else if ( idx_angle1 < ISM_AZIMUTH_MIN_NON_DIEGETIC_FX )

        {

            idx_angle1 = ISM_AZIMUTH_MIN_NON_DIEGETIC_FX;

        }

#endif

        idx_angle2 = angle->last_angle2_idx; /* second MD parameter is not transmitted for non-diegetic object */

    }