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

Port changes from float

parent 0c92727e

apps/decoder.c

+3 −2
Original line number Diff line number Diff line
@@ -3561,7 +3561,8 @@ static void do_object_editing_fx( 
                    if ( readInfo->obj_radius_relative[obj_idx] )

                    {

                        /* radius: apply relative edit + saturation */                  

                        editableParameters->ism_metadata[obj_idx].radius_fx = L_max( L_min( L_shl_sat( Mpy_32_32( editableParameters->ism_metadata[obj_idx].radius_fx, (Word32) ( readInfo->obj_radius[obj_idx] * 536870912 ) ), 2 ), OBJ_EDIT_RADIUS_MAX_FX ), 0.0 ); /* Q29*Q29 -> Q27 shift back to Q29 */

                        Word32 temp_result = L_shl_sat( Mpy_32_32( editableParameters->ism_metadata[obj_idx].radius_fx, (Word32) ( readInfo->obj_radius[obj_idx] * (Word32) 536870912L ) ), 2 ); 

                        editableParameters->ism_metadata[obj_idx].radius_fx = L_max( L_min( temp_result, OBJ_EDIT_RADIUS_MAX_FX ), 0 ); /* Q29*Q29 -> Q27 shift back to Q29 */

                    }

                    else

                    {

lib_com/common_api_types.h

+7 −3
Original line number Diff line number Diff line
@@ -127,7 +127,11 @@ typedef struct _IVAS_ISM_METADATA 
{

    Word32 azimuth_fx;   /* Q22 */

    Word32 elevation_fx; /* Q22 */

#ifdef FIX_2192_OBJ_EDITING_EXT_METADATA

    Word32 radius_fx; /* Q29 */

#else

    Word16 radius_fx; /* Q9 */

#endif

    Word32 spread_fx;     /* Q22 */

    Word32 gainFactor_fx; /* Q29 */

    Word32 yaw_fx;        /* Q22 */

lib_dec/lib_dec_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -4593,12 +4593,24 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                move32();

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

                move32();

#ifdef FIX_2192_OBJ_EDITING_EXT_METADATA

                IF( EQ_16( ism_mode, ISM_MASA_MODE_DISC ) )

                {

                    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_radius_fx = hIvasEditableParameters.ism_metadata[obj].radius_fx;

                    move32();

                }

#else

                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_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();

lib_util/obj_edit_file_reader.h

+3 −2
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ the United Nations Convention on Contracts on the International Sales of Goods. 


#ifdef FIX_2192_OBJ_EDITING_EXT_METADATA

#define OBJ_EDIT_RADIUS_MAX    15.75f       /* Max radius = (2^ISM_RADIUS_NBITS-1)*0.25 = 15.75 */

#define OBJ_EDIT_RADIUS_MAX_FX 8452702364 /* Q29, 15.75f */

#define OBJ_EDIT_RADIUS_MAX_FX 8455716864LL /* Q29, 15.75f */

#define OBJ_EDIT_RADIUS_MIN_FX 0

#endif



typedef struct ObjectEditFileReader ObjectEditFileReader;