Commit 7bdc4996 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Port changes from float MR 2135 to BASOP main.

parent cdcec236

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
#define FIX_1372_OSBA_OBJECT_EDITING                    /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */

#define FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES        /* Nokia: Issue 2140, fixes three different sanitizer issues persisting in object editing code. */

#define NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT               /* Nokia: issue 1305: Fix OMASA ext output in case of object editing */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/lib_dec_fx.c

+5 −3
Original line number Diff line number Diff line
@@ -4391,12 +4391,12 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                move32();

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

                move32();

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

                move32();

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

                move32();

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

                move32();

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

                move32();

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

                move16();

            }
@@ -4547,7 +4547,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 */

                    test();

                    IF( L_abs( L_sub( st_ivas->hIsmMetaData[obj]->azimuth_fx, hIvasEditableParameters.ism_metadata[obj].azimuth_fx ) ) > OMASA_AZI_EDIT_THR_FX ||

                        L_abs( L_sub( st_ivas->hIsmMetaData[obj]->elevation_fx, hIvasEditableParameters.ism_metadata[obj].elevation_fx ) ) > OMASA_ELE_EDIT_THR_FX )
@@ -4595,6 +4595,7 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                st_ivas->hIsmMetaData[obj]->edited_radius_fx = hIvasEditableParameters.ism_metadata[obj].radius_fx;

                move32();

#endif

#ifndef NONBE_FIX_1172_OBJ_EDIT_JBM

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

                move32();

                st_ivas->hIsmMetaData[obj]->elevation_fx = hIvasEditableParameters.ism_metadata[obj].elevation_fx;
@@ -4605,6 +4606,7 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                move32();

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

                move32();

#endif

                st_ivas->hIsmMetaData[obj]->edited_gain_fx = hIvasEditableParameters.ism_metadata[obj].gain_fx; // TODO: check incoming Q value

                move32();

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