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

Updates from float to limit editing to Discrete ISM and combined formats Disc ISM

parent 155ce856

apps/decoder.c

+0 −1
Original line number Diff line number Diff line
@@ -3883,7 +3883,6 @@ static void do_object_editing( 
                        editableParameters->ism_metadata[obj_idx].elevation = readInfo->obj_ele[obj_idx];

                    }

                }



#ifdef FIX_2192_OBJ_EDITING_EXT_METADATA

                /* object direction editing only for diegetic objects */

                if ( readInfo->obj_yaw_edited[obj_idx] )

lib_dec/lib_dec.c

+9 −0
Original line number Diff line number Diff line
@@ -1713,9 +1713,18 @@ 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_2192_OBJ_EDITING_EXT_METADATA

                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;

                }

#else

                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

#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;