Commit 1046d8c4 authored by multrus's avatar multrus
Browse files

[cleanup] accept HARMONIZE_2537_GetTCXMaxenergyChange

parent 92223ed0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ 
#define FIX_2402_SIMPLIFY_ARI_CODEC                     /* FhG: basop issue 2402: simplified arithmetic in TCX arithmetic coder */

#define FIX_2402_REPL_EVS_ARI_CODEC_ENC                 /* FhG: basop issue 2402: replace EVS arith encoder with IVAS arith encoder */

#define FIX_BASOP_2551_HARM_SCALAR_QUAN                 /* FhG: issue 2551: Harmonize function pair tcx_scalar_quantization_fx*/

#define HARMONIZE_2537_GetTCXMaxenergyChange            /* FhG: Harmonize GetTCXMaxenergyChange */

#define HARMONIZE_2508_InitTransientDetection           /* FhG: harmonize GetAttackForTCXDecision derivates for evs/ivas  */

#define HARMONIZE_2564_GetEnergyCldfb                   /* FhG: harmonize GetEnergyCldfb derivates for evs/ivas  */

#define FIX_BASOP_2555_FRAMELEN_CALC                    /* FhG: BASOP issue 2555: Simplify (sub-)framelength calculation in ivas_mdct_core_tns_ns_fx() */

lib_enc/cod_tcx_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -4963,11 +4963,7 @@ void TNSAnalysisStereo_fx( 
                                ELSE

                                {

                                    Word16 maxEnergyChange_fx;

#ifdef HARMONIZE_2537_GetTCXMaxenergyChange

                                    maxEnergyChange_fx = mac_r( L_mult( GetTCXMaxenergyChange_fx( sts[0]->hTranDet, isTCX10, NSUBBLOCKS, 3, 1 /*non-EVS*/ ), 16384 ), GetTCXMaxenergyChange_fx( sts[1]->hTranDet, isTCX10, NSUBBLOCKS, 3, 1 /*non-EVS*/ ), 16384 );

#else

                                    maxEnergyChange_fx = mac_r( L_mult( GetTCXMaxenergyChange_ivas_fx( sts[0]->hTranDet, isTCX10, NSUBBLOCKS, 3 ), 16384 ), GetTCXMaxenergyChange_ivas_fx( sts[1]->hTranDet, isTCX10, NSUBBLOCKS, 3 ), 16384 );

#endif



                                    IF( GE_16( maxEnergyChange_fx, shl( pTnsParameters[0]->minEnergyChange, Q3 - Q7 ) ) )

                                    {
@@ -5261,11 +5257,7 @@ void TNSAnalysisStereo_fx( 
                        }

                        ELSE

                        {

#ifdef HARMONIZE_2537_GetTCXMaxenergyChange

                            Word16 maxEnergyChange_fx = GetTCXMaxenergyChange_fx( sts[ch]->hTranDet, isTCX10, NSUBBLOCKS, 3, 1 /*non-EVS*/ );

#else

                            Word16 maxEnergyChange_fx = GetTCXMaxenergyChange_ivas_fx( sts[ch]->hTranDet, isTCX10, NSUBBLOCKS, 3 );

#endif



                            IF( GE_16( maxEnergyChange_fx, shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) )

                            {

lib_enc/prot_fx_enc.h

+0 −14
Original line number Diff line number Diff line
@@ -946,26 +946,12 @@ Word32 GetTCXAvgTemporalFlatnessMeasure_ivas_fx( 
 * @param nPrevSubblocks Number of subblocks from the previous frames to use for the calculation.

 * @param maximum energy change with exponent NRG_CHANGE_E

 */

#ifdef HARMONIZE_2537_GetTCXMaxenergyChange

Word16 GetTCXMaxenergyChange_fx(

    TRAN_DET_HANDLE hTranDet,

    const Word8 isTCX10,

    const Word16 nCurrentSubblocks,

    const Word16 nPrevSubblocks,

    Word16 element_mode );

#else

Word16 GetTCXMaxenergyChange_fx(

    TRAN_DET_HANDLE hTranDet,

    const Word8 isTCX10,

    const Word16 nCurrentSubblocks,

    const Word16 nPrevSubblocks );



Word16 GetTCXMaxenergyChange_ivas_fx(

    TRAN_DET_HANDLE hTranDet,

    const Word8 isTCX10,

    const Word16 nCurrentSubblocks,

    const Word16 nPrevSubblocks );

#endif





/** Set TCX window length and overlap configuration

lib_enc/tcx_ltp_enc_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -418,11 +418,7 @@ void tcx_ltp_encode_fx( 


        tempFlatness = GetTCXAvgTemporalFlatnessMeasure_fx( hTranDet, NSUBBLOCKS, nPrevSubblocks );



#ifdef HARMONIZE_2537_GetTCXMaxenergyChange

        maxEnergyChange = GetTCXMaxenergyChange_fx( hTranDet, (const Word8) isTCX10, NSUBBLOCKS, nPrevSubblocks, EVS_MONO );

#else

        maxEnergyChange = GetTCXMaxenergyChange_fx( hTranDet, (const Word8) isTCX10, NSUBBLOCKS, nPrevSubblocks );

#endif



        /* Switch LTP on */

        test();
@@ -772,20 +768,12 @@ void tcx_ltp_encode_ivas_fx( 
        IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) )

        {

            tempFlatness_fx = extract_h( L_shl_sat( GetTCXAvgTemporalFlatnessMeasure_ivas_fx( st->hTranDet, NSUBBLOCKS - NSUBBLOCKS_SHIFT, add( nPrevSubblocks, NSUBBLOCKS_SHIFT ) ), 2 ) );

#ifdef HARMONIZE_2537_GetTCXMaxenergyChange

            maxEnergyChange_fx = GetTCXMaxenergyChange_fx( st->hTranDet, (const Word8) isTCX10, NSUBBLOCKS - NSUBBLOCKS_SHIFT, add( nPrevSubblocks, NSUBBLOCKS_SHIFT ), st->element_mode ); // Q3

#else

            maxEnergyChange_fx = GetTCXMaxenergyChange_ivas_fx( st->hTranDet, (const Word8) isTCX10, NSUBBLOCKS - NSUBBLOCKS_SHIFT, add( nPrevSubblocks, NSUBBLOCKS_SHIFT ) ); // Q3

#endif

        }

        ELSE

        {

            tempFlatness_fx = extract_h( L_shl_sat( ( GetTCXAvgTemporalFlatnessMeasure_ivas_fx( st->hTranDet, NSUBBLOCKS, nPrevSubblocks ) ), 2 ) ); // Q7

#ifdef HARMONIZE_2537_GetTCXMaxenergyChange

            maxEnergyChange_fx = GetTCXMaxenergyChange_fx( st->hTranDet, (const Word8) isTCX10, NSUBBLOCKS, nPrevSubblocks, st->element_mode ); // Q3

#else

            maxEnergyChange_fx = GetTCXMaxenergyChange_ivas_fx( st->hTranDet, (const Word8) isTCX10, NSUBBLOCKS, nPrevSubblocks ); // Q3

#endif

        }



        /* Switch LTP on */

lib_enc/tns_base_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -405,11 +405,7 @@ Word16 DetectTnsFilt_fx( 
            }

            ELSE

            {

#ifdef HARMONIZE_2537_GetTCXMaxenergyChange

                maxEnergyChange = GetTCXMaxenergyChange_fx( hTranDet, isTCX10, NSUBBLOCKS, 3, 1 /*non-EVS*/ );

#else

                maxEnergyChange = GetTCXMaxenergyChange_ivas_fx( hTranDet, isTCX10, NSUBBLOCKS, 3 );

#endif

                IF( sub( maxEnergyChange, shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) >= 0 )

                {