Commit 58ca7a92 authored by vaclav's avatar vaclav
Browse files

update to non-BE fix

parent 1388b42c

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 
#define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */

#define FIX_NCHAN_BUFFERS                               /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */

#define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */

#define FIX_1172_OBJ_EDIT_CLEANING                      /* VA: issue 1172: remove obsolete code in object editing */



/* #################### End BE switches ################################## */
@@ -176,6 +175,7 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_FIX_1326_MASA_EXTREND_CUSTOMLS_OUT        /* FhG: Fix crash for external renderer MASA to custom LS rendering, number of output channels not set correctly */

#define NONBE_FIX_1172_OBJ_EDIT_JBM                     /* VA: issue 1172: fix OMASA object editing in JBM */



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

lib_dec/lib_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1615,7 +1615,7 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                }

                else

                {

                    /* detect editing in ISM_MASA_MODE_DISC. optionally, add quantization-resolution -based thresholds */

                    /* detect editing in ISM_MASA_MODE_DISC mode */

                    if ( fabsf( st_ivas->hIsmMetaData[obj]->azimuth - hIvasEditableParameters.ism_metadata[obj].azimuth ) > OMASA_AZI_EDIT_THR ||

                         fabsf( st_ivas->hIsmMetaData[obj]->elevation - hIvasEditableParameters.ism_metadata[obj].elevation ) > OMASA_ELE_EDIT_THR )

                    {
@@ -1650,7 +1650,7 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                st_ivas->hIsmMetaData[obj]->edited_yaw = hIvasEditableParameters.ism_metadata[obj].yaw;

                st_ivas->hIsmMetaData[obj]->edited_pitch = hIvasEditableParameters.ism_metadata[obj].pitch;

                st_ivas->hIsmMetaData[obj]->edited_radius = hIvasEditableParameters.ism_metadata[obj].radius;

#ifndef FIX_1172_OBJ_EDIT_CLEANING

#ifndef NONBE_FIX_1172_OBJ_EDIT_JBM

                st_ivas->hIsmMetaData[obj]->azimuth = hIvasEditableParameters.ism_metadata[obj].azimuth;

                st_ivas->hIsmMetaData[obj]->elevation = hIvasEditableParameters.ism_metadata[obj].elevation;

                st_ivas->hIsmMetaData[obj]->yaw = hIvasEditableParameters.ism_metadata[obj].yaw;