Commit 00b80aeb authored by Jan Kiene's avatar Jan Kiene
Browse files

accept FIX_563_PARAMMC_LIMITER

parent 92b9bbcd

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1432,9 +1432,7 @@ typedef enum 
#define PARAM_MC_MAX_BAND_ABS_COV_DEC           10

#define PARAM_MC_ENER_LIMIT_INTRAFRAME          (1.5f)

#define PARAM_MC_ENER_LIMIT_INTERFRAME          (2.0f)

#ifdef FIX_563_PARAMMC_LIMITER

#define PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC       (15.0f)

#endif

#ifdef FIX_580_PARAMMC_ENER_BURSTS

#define PARAM_MC_NUM_ATTACK_ILD_THRESH          (3)

#endif

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 
#define VLBR_20MS_MD                                    /* Dlb: SBA VLBR 20ms Optimization*/

#define SBA_MODE_CLEANUP_2                              /* Dlb : changes part of fix issue #523 for unused signaling bit in SBA SID*/

#define FIX_137_SID_MD_BITS                             /* Dlb: Fix issue #137 , SID bitrate mismatch correction */

#define FIX_563_PARAMMC_LIMITER                         /* FhG: issue 563: fix ILD limiter when coming from silence w/o transient set             */

#define FIX_560_VAD_FLAG                                /* Eri: Issue 560 - VAD flag issue for unified stereo */

#define FIX_549_DMX_GAIN                                /* FhG: issue 549: ParamISM output too quiet */

#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

lib_enc/ivas_mc_param_enc.c

+0 −10
Original line number Diff line number Diff line
@@ -932,11 +932,7 @@ static void ivas_param_mc_param_est_enc( 


        for ( ; cur_param_band < num_parameter_bands; cur_param_band += 2 )

        {

#ifdef FIX_563_PARAMMC_LIMITER

            if ( cur_param_band < num_parameter_bands )

#else

            if ( cur_param_band + 1 < num_parameter_bands )

#endif

            {

                for ( ch_idx1 = 0; ch_idx1 < nchan_transport; ++ch_idx1 )

                {
@@ -1332,11 +1328,7 @@ static void ivas_param_mc_quantize_ilds( 
    ener_fac = 10.0f * log10f( ( tot_ener + EPSILON ) / ( dmx_ener + EPSILON ) );

    delta_fac = ener_fac - hParamMC->ener_fac[freq_idx];



#ifdef FIX_563_PARAMMC_LIMITER

    if ( !hParamMC->hMetadataPMC.bAttackPresent && ( delta_fac > PARAM_MC_ENER_LIMIT_INTERFRAME ) && ( delta_fac < PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC ) )

#else

    if ( !hParamMC->hMetadataPMC.bAttackPresent && ( delta_fac > PARAM_MC_ENER_LIMIT_INTERFRAME ) )

#endif

    {

        float limit_fac;

        limit_fac = powf( 10.0f, ( ( 0.3f * logf( delta_fac - PARAM_MC_ENER_LIMIT_INTERFRAME + 1.0f ) - ( delta_fac - PARAM_MC_ENER_LIMIT_INTERFRAME ) ) / 10.0f ) );
@@ -1346,13 +1338,11 @@ static void ivas_param_mc_quantize_ilds( 


    hParamMC->ener_fac[freq_idx] = ener_fac;



#ifdef FIX_563_PARAMMC_LIMITER

    /* update also combined bands ener_fac when in transient frame */

    if ( hParamMC->hMetadataPMC.bAttackPresent && ( ( freq_idx + 1 ) < hParamMC->hMetadataPMC.nbands_coded ) )

    {

        hParamMC->ener_fac[freq_idx + 1] = ener_fac;

    }

#endif



    for ( k = 0; k < num_ilds_to_code; ++k )

    {