Commit 398de840 authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'basop-2537-harmonization-transient-detection-gettcxmaxenergychange-gettcxavgtemporalflatnessmeasure' into 'main'

Resolve "Harmonization transient detection - GetTCXMaxenergyChange, GETTCXAvgTemporalFlatnessMeasure - SetTCXModeInfo"

Closes #2537

See merge request !2948
parents d4f7e9ae 1f5eb4e8

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ 
#define HARMONIZE_2543_SQ_gain                          /* FhG: Harmonize SQ_gain */

#define FIX_ISSUE_2533_EXTRA_CONDITION                  /* FhG: Fix issue basop 2533 removing the extra condition*/



/*Harmonize SetTCXModeInfo, GetTCXMaxenergyChange*/                                                        

#define HARMONIZE_2537_SetTCXModeInfo                 /* FhG: Harmonize SetTCXModeInfo  - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */

#define HARMONIZE_2537_GetTCXMaxenergyChange            /* FhG: Harmonize GetTCXMaxenergyChange */



/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

lib_enc/cod_tcx_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -4963,7 +4963,11 @@ 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 ) ) )

                                    {
@@ -5257,7 +5261,11 @@ 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/ivas_core_pre_proc_fx.c

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

        IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )

        {

#ifdef HARMONIZE_2537_SetTCXModeInfo

            SetTCXModeInfo_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );

#else

            SetTCXModeInfo_ivas_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );

#endif

        }

    }

    ELSE IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )

lib_enc/ivas_mdct_core_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1290,7 +1290,11 @@ void ivas_mdct_core_whitening_enc_fx( 
        FOR( ch = 0; ch < CPE_CHANNELS; ch++ )

        {

            st = sts[ch];

#ifdef HARMONIZE_2537_SetTCXModeInfo

            SetTCXModeInfo_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );

#else

            SetTCXModeInfo_ivas_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );

#endif

        }

    }

lib_enc/ivas_stereo_mdct_core_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -211,7 +211,11 @@ void stereo_mdct_core_enc_fx( 
    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )

    {

        st = sts[ch];

#ifdef HARMONIZE_2537_SetTCXModeInfo

        SetTCXModeInfo_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );

#else

        SetTCXModeInfo_ivas_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );

#endif

    }

    /* adaptively sync tcx modes*/

    test();