Commit f4401edc authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM

parent 86b6cd0a

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx2 /* FhG: Avoid overflow of SWB_fenv_fx in SWB_BWE_encoding_fx because of very small energies. */

#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM            /* Eri: Basop issue 2453: Fix alignment of peak_avrg_ratio_fx */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_1527_CMR_BITRATE_IDX                        /* Fix for incorrect bitrate idx packed in rtp CMR E-byte */

#define HARMONIZE_2494_FdCng_decodeSID_fx               /* FhG: harmonize FdCng_decodeSID_fx with _ivas_ version */

lib_enc/hq_classifier_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -387,11 +387,7 @@ Word16 peak_avrg_ratio_fx( 
    test();

    test();

    test();

#ifdef FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM

    IF( ( GE_16( add( k, k1 ), 5 ) && GT_16( k1, 2 ) && LT_32( total_brate, HQ_BWE_CROSSOVER_BRATE ) && GT_32( total_brate, HQ_16k40 ) ) || ( ( ( GE_16( add( k, k1 ), 10 ) && GT_16( k1, 5 ) ) || GE_16( *mode_count, 5 ) ) && LT_16( *mode_count1, 5 ) ) )

#else

    IF( ( GE_16( add( k, k1 ), 5 ) && GT_16( k1, 2 ) && LT_32( total_brate, HQ_BWE_CROSSOVER_BRATE ) ) || ( ( ( GE_16( add( k, k1 ), 10 ) && GT_16( k1, 5 ) ) || GE_16( *mode_count, 5 ) ) && LT_16( *mode_count1, 5 ) ) )

#endif

    {

        hqswb_clas = HQ_HARMONIC;

        move16();

lib_enc/hq_lr_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -206,11 +206,7 @@ void hq_lr_enc_fx( 
        }

        ELSE

        {

#ifdef FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM

            hqswb_clas_fx = peak_avrg_ratio_fx( st_fx->total_brate, L_t_audio, NUMC_N, &hHQ_core->mode_count, &hHQ_core->mode_count1, SWB_BWE_LR_Qs ); /* Q0 */

#else

            hqswb_clas_fx = peak_avrg_ratio_fx( HQ_BWE_CROSSOVER_BRATE, L_t_audio, NUMC_N, &hHQ_core->mode_count, &hHQ_core->mode_count1, SWB_BWE_LR_Qs ); /* Q0 */

#endif

        }



        /* write the classification information into the bitstream */