Commit 5e278c12 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

convert OE code to BASOP

parent 89c92ac8

lib_com/ivas_ism_com_fx.c

+7 −7
Original line number Diff line number Diff line
@@ -471,13 +471,13 @@ void ivas_ism_reset_metadata( 
    move16();



#ifdef OBJ_EDITING_API

    hIsmMeta->edited_gain = 1.0f;

    hIsmMeta->edited_azimuth = 0.0f;

    hIsmMeta->edited_elevation = 0.0f;

    hIsmMeta->edited_pitch = 0.0f;

    hIsmMeta->edited_yaw = 0.0f;

    hIsmMeta->edited_radius = 1.0f;

    hIsmMeta->gain = 1.0f;

    hIsmMeta->edited_gain_fx = ONE_IN_Q30;

    hIsmMeta->edited_azimuth_fx = 0;

    hIsmMeta->edited_elevation_fx = 0;

    hIsmMeta->edited_pitch_fx = 0;

    hIsmMeta->edited_yaw_fx = 0;

    hIsmMeta->edited_radius_fx = ONE_IN_Q30;

    hIsmMeta->gain_fx = ONE_IN_Q30;

    hIsmMeta->non_diegetic_flag = 0;

#endif

lib_com/ivas_prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -4334,7 +4334,7 @@ void ivas_param_ism_dec_digest_tc_fx( 




#ifdef OBJ_EDITING_API

void ivas_param_ism_dec_dequant_md(

void ivas_param_ism_dec_dequant_md_fx(

    Decoder_Struct *st_ivas 

);

lib_com/ivas_stat_com.h

+7 −7
Original line number Diff line number Diff line
@@ -66,15 +66,15 @@ typedef struct 
    Word32 pitch_fx; /* pitch value read from the input metadata file */         /* Q22 */



#ifdef OBJ_EDITING_API

    Word16 gain                 /* Q30 */;

    Word32 gain_fx;                /* Q30 */



    Word32 edited_azimuth;      /* Q22 */

    Word32 edited_elevation;    /* Q22 */

    Word16 edited_radius;       /* Q9 */

    Word32 edited_azimuth_fx;      /* Q22 */

    Word32 edited_elevation_fx;    /* Q22 */

    Word32 edited_radius_fx;       /* Q9 */



    Word32 edited_yaw;          /* Q22 */

    Word32 edited_pitch;        /* Q22 */

    Word16 edited_gain;         /* Q30 */

    Word32 edited_yaw_fx;          /* Q22 */

    Word32 edited_pitch_fx;        /* Q22 */

    Word32 edited_gain_fx;         /* Q30 */

#endif



    Word16 non_diegetic_flag; /* Non-diegetic (non-headtracked) object flag */

lib_dec/ivas_dirac_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -3838,7 +3838,7 @@ void ivas_dirac_dec_render_sf_fx( 
                        const Word32 ele_fx = L_shl( el1_32, Q22 - Q16 ); // Q16 -> Q22

                        efap_determine_gains_fx( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains_fx[i], azi_fx, ele_fx, EFAP_MODE_EFAP );

#ifdef OBJ_EDITING_API

                        v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain, st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE ); // Q30, Q30 --> Q30

                        v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE ); // Q30, Q30 --> Q30

#endif

                    }

                }

lib_dec/ivas_ism_param_dec_fx.c

+134 −62

File changed.

Preview size limit exceeded, changes collapsed.