Commit 00fc2426 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

port FIX_1024_REMOVE_PARAMMC_MIXING_MAT

parent 86c87c45

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */

#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: (no changes needed in BASOP) fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_mc_param_dec_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -3085,6 +3085,7 @@ 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()
@@ -3093,6 +3094,7 @@ static void ivas_param_mc_get_mixing_matrices_fx( 
 * for mono and stereo output

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



#endif



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

 * param_mc_update_mixing_matrices()

lib_dec/ivas_out_setup_conversion_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1190,7 +1190,11 @@ 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++ )
@@ -1212,7 +1216,11 @@ 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++ )