Commit 55d65654 authored by vaclav's avatar vaclav
Browse files

activate again TD5 and TD5_FIX_INVALID_MEMORY_ACCESS

parent 958f8709

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ 
#define FIX_350_MASA_DELAY_COMP                         /* Nokia: Issue 350: MASA audio/meta delay compensation */

#define FIX_372_LIB_REND_VALIDATE_IO                    /* FhG: Issue 372: IVAS_rend segfaults with unsupported I/O configs - add validation checks of I/O config */

#define FIX_376_SBA_ROTATE                              /*DLB: Fix for issue 376*/

//#define TD5                                             /* Eri: Contribution 17: Extended metadata for 6 DoF rendering in TD renderer */

//#define TD5_FIX_INVALID_MEMORY_ACCESS                   /* FhG: Resolves segfault in case IVAS_REND_InitConfig gets initialized with rendererConfigEnabled:=false && ISM are being rendered */

#define TD5                                             /* Eri: Contribution 17: Extended metadata for 6 DoF rendering in TD renderer */

#define TD5_FIX_INVALID_MEMORY_ACCESS                   /* FhG: Resolves segfault in case IVAS_REND_InitConfig gets initialized with rendererConfigEnabled:=false && ISM are being rendered */

#define FIX_371_DELAY_REPORT                            /* Issue 371: div. by zero with -no_delay_cmp */

#define FIX_373_MASA_DELAY_COMP_MSAN                    /* Nokia: Issue 373: MASA audio/meta delay compensation. MSAN bugfix */

lib_dec/ivas_ism_metadata_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ void ivas_ism_metadata_sid_dec( 
                /* update last indexes to correspond to active frames coding */

                if ( nBits_azimuth > ISM_AZIMUTH_NBITS )

                {

#ifdef MD5

#ifdef TD5

                    hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS );

                    hIsmMetaData->angle[0].last_elevation_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS );

#else
@@ -1173,7 +1173,7 @@ void ivas_ism_metadata_sid_dec( 
                }

                else

                {

#ifdef MD5

#ifdef TD5

                    hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth );

                    hIsmMetaData->angle[0].last_elevation_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation );

#else

lib_enc/ivas_ism_metadata_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -1425,7 +1425,7 @@ void ivas_ism_metadata_sid_enc( 
                /* update last indexes to correspond to active frames coding */

                if ( nBits_azimuth > ISM_AZIMUTH_NBITS )

                {

#ifdef MD5

#ifdef TD5

                    hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS );

                    hIsmMetaData->angle[0].last_elevation_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS );

#else
@@ -1435,7 +1435,7 @@ void ivas_ism_metadata_sid_enc( 
                }

                else

                {

#ifdef MD5

#ifdef TD5

                    hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth );

                    hIsmMetaData->angle[0].last_elevation_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation );

#else