Commit 4a9d3bb3 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_468_16KHZ_PUPMIX

parent 6d19d90a

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
#define FIX_393_459_460_SBA_MD                          /* FhG: fix issues 393, 459, 460, 494 all related to MD buffers and the read index for accessing them */





#define FIX_468_16KHZ_PUPMIX                            /* Dlb: Fix issue 468 for Param Upmix at 16kHz sampling rate */

#define FIX_499_DFT_STEREO_PLC                          /* Eri: Fix for issue 499: Wrong past memory addressed for computing energy of DFT stereo residual ECU frame  */

#define FIX_489_COV_SMOOTHING                           /* Dlb: Fix covariance smoothing for ParamUpmix */

#define FIX_501_TABLE_IDX_INIT                          /* Dlb: Fix for the issue 501 */

lib_enc/ivas_mc_paramupmix_enc.c

+0 −11
Original line number Diff line number Diff line
@@ -742,9 +742,7 @@ static void ivas_mc_paramupmix_param_est_enc( 


    int16_t l_ts;

    int16_t b, i, j, ts, bnd;

#ifdef FIX_468_16KHZ_PUPMIX

    int16_t maxbands;

#endif



    int16_t transient_det[MC_PARAMUPMIX_COMBINATIONS][2];

    int16_t transient_det_l[2], transient_det_r[2];
@@ -820,18 +818,11 @@ static void ivas_mc_paramupmix_param_est_enc( 
        }

        ivas_enc_cov_handler_process( hMCParamUpmix->hCovEnc[b], pp_in_fr_real, pp_in_fr_imag, cov_real, cov_dtx_real, hMCParamUpmix->hFbMixer->pFb, 0, hMCParamUpmix->hFbMixer->pFb->filterbank_num_bands, MC_PARAMUPMIX_NCH, 0 /*dtx_vad*/, transient_det[b], HOA_md_ind );

    }

#ifdef FIX_468_16KHZ_PUPMIX

    maxbands = hMCParamUpmix->hFbMixer->pFb->filterbank_num_bands;

    for ( b = 0; b < MC_PARAMUPMIX_COMBINATIONS; b++ )

    {

        for ( bnd = 0; bnd < maxbands; bnd++ )

        {

#else

    for ( b = 0; b < MC_PARAMUPMIX_COMBINATIONS; b++ )

    {

        for ( bnd = 0; bnd < IVAS_MAX_NUM_BANDS; bnd++ )

        {

#endif

            rxy = hMCParamUpmix->cov_real[b][1][0][bnd];

            ryy = hMCParamUpmix->cov_real[b][1][1][bnd];

            cmat = rxy / ( ryy + EPSILON );
@@ -845,7 +836,6 @@ static void ivas_mc_paramupmix_param_est_enc( 
            betas[b][bnd] = (float) 2.0 * wetaux;

        }

    }

#ifdef FIX_468_16KHZ_PUPMIX

    if ( maxbands < IVAS_MAX_NUM_BANDS )

    {

        for ( b = 0; b < MC_PARAMUPMIX_COMBINATIONS; b++ )
@@ -857,6 +847,5 @@ static void ivas_mc_paramupmix_param_est_enc( 
            }

        }

    }

#endif

    return;

}