Commit ae4d78ba authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

apply missing renames fixed -> fx

parent 098fac65

lib_dec/ivas_ism_param_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,7 @@ void ivas_ism_dec_digest_tc_fx( 
                        efap_determine_gains_fx( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains_fx[i], azimuth_fx, elevation_fx, EFAP_MODE_EFAP );

#ifdef OBJ_EDITING_API

                        // TODO: align Q values properly

                        v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hEFAPdata->numSpk );

                        v_multc_fx( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hEFAPdata->numSpk );

#endif

                    }

                }

lib_dec/ivas_omasa_dec_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -1181,7 +1181,7 @@ void ivas_omasa_dirac_rend_jbm_fx( 
                    test();

                    IF( st_ivas->hMasaIsmData->ism_gain_is_edited_fx[n] && EQ_16( st_ivas->hMasaIsmData->idx_separated_ism, n ) )

                    {

                        v_multc_fixed_16( data_separated_objects[0], st_ivas->hMasaIsmData->gain_ism_edited_fx[n], data_separated_objects[0], *nSamplesRendered ); // Q = 8

                        v_multc_fx_16( data_separated_objects[0], st_ivas->hMasaIsmData->gain_ism_edited_fx[n], data_separated_objects[0], *nSamplesRendered ); // Q = 8

                        Scale_sig32( data_separated_objects[0], *nSamplesRendered, Q3 );                                                                           // Q = 11

                    }

                }
@@ -1197,7 +1197,7 @@ void ivas_omasa_dirac_rend_jbm_fx( 
                /* Gain discrete objects, if edited */

                IF( st_ivas->hMasaIsmData->ism_gain_is_edited_fx[n] )

                {

                    v_multc_fixed_16( data_separated_objects[n], st_ivas->hMasaIsmData->gain_ism_edited_fx[n], data_separated_objects[n], *nSamplesRendered ); // Q = 8

                    v_multc_fx_16( data_separated_objects[n], st_ivas->hMasaIsmData->gain_ism_edited_fx[n], data_separated_objects[n], *nSamplesRendered ); // Q = 8

                    Scale_sig32( data_separated_objects[n], *nSamplesRendered, Q3 );                                                                           // Q = 11

                }

#endif
@@ -1208,7 +1208,7 @@ void ivas_omasa_dirac_rend_jbm_fx( 
            {

                FOR( n = 0; n < 2; n++ )

                {

                    v_multc_fixed_16( output_f[n], st_ivas->hMasaIsmData->gain_masa_edited_fx, output_f[n], *nSamplesRendered ); // Q = 8

                    v_multc_fx_16( output_f[n], st_ivas->hMasaIsmData->gain_masa_edited_fx, output_f[n], *nSamplesRendered ); // Q = 8

                    Scale_sig32( output_f[n], *nSamplesRendered, Q3 );                                                           // Q = 11

                }

            }

lib_dec/lib_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -3975,7 +3975,7 @@ ivas_error IVAS_DEC_GetEditableParameters( 
    IVAS_DEC_HANDLE hIvasDec,

    IVAS_EDITABLE_PARAMETERS *hIvasEditableParameters )

{

    Word16 obj;

    Word16 obj, dirac_read_idx;

    Decoder_Struct *st_ivas;

    ISM_MODE ism_mode;

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+6 −6
Original line number Diff line number Diff line
@@ -5071,8 +5071,8 @@ static void getDirectPartGains_fx( 
            }



            /* Scaling to have the same expected gain as for the HRTF rendering */

            *lRealp = Mpy_32_32( *lRealp, SQRT2_FIXED ); // Q30

            *rRealp = Mpy_32_32( *rRealp, SQRT2_FIXED ); // Q30

            *lRealp = Mpy_32_32( *lRealp, SQRT2_FX ); // Q30

            *rRealp = Mpy_32_32( *rRealp, SQRT2_FX ); // Q30



            *lRealp = L_shr( *lRealp, 2 ); // Q28

            *rRealp = L_shr( *rRealp, 2 ); // Q28
@@ -5518,10 +5518,10 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
                    gain = st_ivas->hMasaIsmData->gain_ism_edited_fx[ch];

                    move32();



                    v_multc_fixed_16( inRe_fx[ch + 2][slot], gain, inRe_fx[ch + 2][slot], nBins ); // Q = *cldfb_buf_q - 3

                    v_multc_fx_16( inRe_fx[ch + 2][slot], gain, inRe_fx[ch + 2][slot], nBins ); // Q = *cldfb_buf_q - 3

                    Scale_sig32( inRe_fx[ch + 2][slot], nBins, Q3 );                               // Q = *cldfb_buf_q



                    v_multc_fixed_16( inIm_fx[ch + 2][slot], gain, inIm_fx[ch + 2][slot], nBins ); // Q = *cldfb_buf_q - 3

                    v_multc_fx_16( inIm_fx[ch + 2][slot], gain, inIm_fx[ch + 2][slot], nBins ); // Q = *cldfb_buf_q - 3

                    Scale_sig32( inIm_fx[ch + 2][slot], nBins, Q3 );                               // Q = *cldfb_buf_q

                }

            }
@@ -5538,10 +5538,10 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
                    gain_masa = st_ivas->hMasaIsmData->gain_masa_edited_fx;

                    move32();



                    v_multc_fixed_16( inRe_fx[ch][slot], gain_masa, inRe_fx[ch][slot], nBins ); // Q = *cldfb_buf_q - 3

                    v_multc_fx_16( inRe_fx[ch][slot], gain_masa, inRe_fx[ch][slot], nBins ); // Q = *cldfb_buf_q - 3

                    Scale_sig32( inRe_fx[ch][slot], nBins, Q3 );                                // Q = *cldfb_buf_q



                    v_multc_fixed_16( inIm_fx[ch][slot], gain_masa, inIm_fx[ch][slot], nBins ); // Q = *cldfb_buf_q - 3

                    v_multc_fx_16( inIm_fx[ch][slot], gain_masa, inIm_fx[ch][slot], nBins ); // Q = *cldfb_buf_q - 3

                    Scale_sig32( inIm_fx[ch][slot], nBins, Q3 );                                // Q = *cldfb_buf_q

                }

            }