Unverified Commit d3a8efb1 authored by Sumeyra Demir Kanik's avatar Sumeyra Demir Kanik
Browse files

Enable extended metadata editing for Discrete ISM, OMASA Discrete ISM and OSBA Discrete ISM

parent 06494e27

lib_dec/lib_dec.c

+10 −10
Original line number Diff line number Diff line
@@ -1513,12 +1513,9 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                st_ivas->hIsmMetaData[obj]->edited_azimuth = hIvasEditableParameters.ism_metadata[obj].azimuth;

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

#ifdef FIX_1427_OBJ_EDITING_EXT_METADATA

                if ( ism_mode == ISM_MODE_DISC )

                {

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

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

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

                }

#endif

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

                st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
@@ -1688,10 +1685,13 @@ ivas_error IVAS_DEC_SetEditableParameters( 
            {

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

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

#ifndef FIX_1427_OBJ_EDITING_EXT_METADATA // Do we want to completely discard extended metadata or enable only for OMASA Discrete ISM?

#ifdef FIX_1427_OBJ_EDITING_EXT_METADATA // Enable only for OMASA Discrete ISM

                if ( ism_mode == ISM_MASA_MODE_DISC )

                {

                    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;

                }

#endif

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

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