Commit 89c92ac8 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

convert data types and set preliminary Q values

parent f98e6425

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

    float gain;

    Word16 gain                 /* Q30 */;



    float edited_azimuth;

    float edited_elevation;

    float edited_radius;

    Word32 edited_azimuth;      /* Q22 */

    Word32 edited_elevation;    /* Q22 */

    Word16 edited_radius;       /* Q9 */



    float edited_yaw;

    float edited_pitch;

    float edited_gain;

    Word32 edited_yaw;          /* Q22 */

    Word32 edited_pitch;        /* Q22 */

    Word16 edited_gain;         /* 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( st_ivas->hIsmRendererData->gains[i], st_ivas->hIsmMetaData[i]->edited_gain, st_ivas->hIsmRendererData->gains[i], nchan_out_woLFE );

                        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

#endif

                    }

                }

lib_dec/ivas_ism_param_dec_fx.c

+5 −7
Original line number Diff line number Diff line
@@ -1906,10 +1906,7 @@ void ivas_param_ism_params_to_masa_param_mapping_fx( 
    }

    ELSE

    {

      

#endif

        st_ivas->hISMDTX.dtx_flag = 1;

      

        move16();

    }
@@ -1958,9 +1955,10 @@ void ivas_param_ism_params_to_masa_param_mapping_fx( 
                move16();

                brange[1] = hParamIsmDec->hParamIsm->band_grouping[band_idx + 1];

                move16();



                azimuth[0] = extract_l( L_shr( L_add( hParamIsmDec->azimuth_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]], ( 1 << 21 ) ), 22 ) ); // Q0

                move16();

#endif

                power_ratio_fx[0] = hParamIsmDec->power_ratios_fx[band_idx][0][0];lues_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]], ( 1 << 21 ) ), 22 ) ); // Q0

                elevation[0] = extract_l( L_shr( L_add( hParamIsmDec->elevation_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]], ( 1 << 21 ) ), 22 ) ); // Q0

                move16();

                power_ratio_fx[0] = hParamIsmDec->power_ratios_fx[band_idx][0][0];

                move16();