Commit 81072ab6 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1624_ref_port_fl1439' into 'float-pc' 

Port MR 1439 into float-pc

See merge request !1645
parents 28954456 e47d8e07

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ 


//#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 actiate 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() */



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

lib_dec/ivas_mc_param_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -88,8 +88,10 @@ static void ivas_param_mc_dequantize_cov( PARAM_MC_DEC_HANDLE hDirAC, float *ild 


static void ivas_param_mc_get_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, IVAS_OUTPUT_SETUP *hSynthesisOutputSetup, float Cx_in[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], const int16_t param_band_idx, float *mixing_matrix[], float *mixing_matrix_res[], const int16_t nY_int, const PARAM_MC_SYNTHESIS_CONF synth_conf, const int16_t nX, const int16_t nY );



#ifndef FIX_1024_REMOVE_PARAMMC_MIXING_MAT

static void ivas_param_mc_get_mono_stereo_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, float Cx_in[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], const int16_t param_band_idx, float *mixing_matrix[], float *mixing_matrix_res[], const int16_t nY_intern, const int16_t nX, const int16_t nY_cov );



#endif

static void param_mc_update_mixing_matrices( PARAM_MC_DEC_HANDLE hParamMC, float *mixing_matrix[], float *mixing_matrix_res[], const uint16_t nX, const uint16_t nY );



static void ivas_param_mc_dec_compute_interpolator( const uint16_t bAttackPresent, const uint16_t attackPos, const uint16_t interp_length, float *interpolator );
@@ -1494,6 +1496,7 @@ void ivas_param_mc_dec_digest_tc( 
                continue;

            }



#ifndef FIX_1024_REMOVE_PARAMMC_MIXING_MAT

            if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO )

            {

                ivas_param_mc_get_mono_stereo_mixing_matrices( hParamMC,
@@ -1507,6 +1510,7 @@ void ivas_param_mc_dec_digest_tc( 
            }

            else

            {

#endif

                /* generate mixing matrices */

                ivas_param_mc_get_mixing_matrices( hParamMC,

                                                   hSynthesisOutputSetup,
@@ -1518,7 +1522,9 @@ void ivas_param_mc_dec_digest_tc( 
                                                   hParamMC->synthesis_conf,

                                                   nchan_transport,

                                                   nchan_out_cov );

#ifndef FIX_1024_REMOVE_PARAMMC_MIXING_MAT

            }

#endif

        }

    }
@@ -2488,6 +2494,7 @@ static void ivas_param_mc_get_mixing_matrices( 
}





#ifndef FIX_1024_REMOVE_PARAMMC_MIXING_MAT

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

 * ivas_param_mc_get_mono_stereo_mixing_matrices()

 *
@@ -2607,6 +2614,7 @@ static void ivas_param_mc_get_mono_stereo_mixing_matrices( 
    return;

}



#endif



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

 * param_mc_update_mixing_matrices()

lib_dec/ivas_out_setup_conversion.c

+8 −0
Original line number Diff line number Diff line
@@ -973,7 +973,11 @@ void ivas_ls_setup_conversion_process_mdct_param_mc( 
        set_zero( Nrqq, MAX_OUTPUT_CHANNELS );

        set_zero( target_ch_ener, 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 = hParamMC->icld_q + bandIdx * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe;



        for ( chInIdx = 0; chInIdx < nchan_transport_format; chInIdx++ )
@@ -991,7 +995,11 @@ void ivas_ls_setup_conversion_process_mdct_param_mc( 
            Nrqq[hParamMC->hMetadataPMC->ild_mapping_conf->ild_index[chInIdx]] = powf( 10.0f, ild_q[chInIdx] / 10.0f ) * hParamMC->hMetadataPMC->ild_factors[chInIdx] * ref_ener;

        }



#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++ )