Commit 802fb9cd authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_1024_REMOVE_PARAMMC_MIXING_MAT

parent 78e44917

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ 
#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */



#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT              /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */

#define FIX_1741_REVERB_TIMES_Q_FORMAT                  /* Philips: reverberation times in Q26 format instead of Q31 */

#define NONBE_FIX_1034_DRY_MASA_RATIOS                  /* Nokia: Fix issue 1034, use of wrong numDir state. */

#define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH                /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/

lib_dec/ivas_mc_param_dec_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -3063,16 +3063,6 @@ static void ivas_param_mc_get_mixing_matrices_fx( 
    return;

}



#ifndef FIX_1024_REMOVE_PARAMMC_MIXING_MAT



/*-------------------------------------------------------------------------

 * ivas_param_mc_get_mono_stereo_mixing_matrices()

 *

 * calculate the direct and residual mixing matrices

 * for mono and stereo output

 *------------------------------------------------------------------------*/



#endif



/*-------------------------------------------------------------------------

 * param_mc_update_mixing_matrices()

lib_dec/ivas_out_setup_conversion_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -1190,11 +1190,7 @@ void ivas_ls_setup_conversion_process_mdct_param_mc_fx( 
        set_zero_fx( cy_fx, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );

        set_zero_fx( Nrqq_fx, MAX_OUTPUT_CHANNELS );

        set_zero_fx( target_ch_ener_fx, MAX_OUTPUT_CHANNELS );

#ifdef FIX_1024_REMOVE_PARAMMC_MIXING_MAT

        /* Step 1.2, get target channel energies for the transported format, Nrqq calculation */

#else

        /* Step 1.2, get target channel energies for the transported format as in ivas_param_mc_get_mono_stereo_mixing_matrices(), Nrqq calculation */

#endif

        ild_q_fx = hParamMC->icld_q_fx + imult1616( bandIdx, hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe );

        move16();

        FOR( chInIdx = 0; chInIdx < nchan_transport_format; chInIdx++ )
@@ -1216,11 +1212,7 @@ void ivas_ls_setup_conversion_process_mdct_param_mc_fx( 
            move32();

        }



#ifdef FIX_1024_REMOVE_PARAMMC_MIXING_MAT

        /* Step 1.3 get target Cy () (with dmx matrix from CICPX to MONO/STEREO saved in hParamMC) */

#else

        /* Step 1.3 get target Cy like in ivas_param_mc_get_mono_stereo_mixing_matrices() (with dmx matrix from CICPX to MONO/STEREO saved in hParamMC) */

#endif

        FOR( chOutIdx = 0; chOutIdx < nchan_out; chOutIdx++ )

        {

            FOR( i = 0; i < nchan_transport_format; i++ )