Commit 8f0c1943 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_268

parent 9598fd5f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
#endif

#define FIX_I59_DELAY_ROUNDING                          /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */

#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */

#define LOW_RATE_TRANS_FIX                              /* Eri: Fix for critical item during transitions */



#define FIX_197_CREND_INTERFACE 

/* ################## End DEVELOPMENT switches ######################### */

lib_enc/ivas_cpe_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -656,7 +656,6 @@ ivas_error ivas_cpe_enc( 
        hCPE->hFrontVad[0]->ini_frame = min( hCPE->hFrontVad[0]->ini_frame, MAX_FRAME_COUNTER );

    }



#ifdef LOW_RATE_TRANS_FIX

    /* Store previous attack detection flag */

    for ( n = 0; n < CPE_CHANNELS; n++ )

    {
@@ -665,7 +664,6 @@ ivas_error ivas_cpe_enc( 
            sts[n]->hTranDet->transientDetector.prev_bIsAttackPresent = sts[n]->hTranDet->transientDetector.bIsAttackPresent;

        }

    }

#endif



#ifdef DEBUG_MODE_INFO

    if ( hCPE->element_mode == IVAS_CPE_DFT )

lib_enc/ivas_ism_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -274,10 +274,8 @@ ivas_error ivas_ism_enc( 
        /* update input samples buffer */

        mvr2r( st->input, st->old_input_signal, input_frame );



#ifdef LOW_RATE_TRANS_FIX

        /* Store previous attack detection flag */

        st->hTranDet->transientDetector.prev_bIsAttackPresent = st->hTranDet->transientDetector.bIsAttackPresent;

#endif

    }



    pop_wmops();

lib_enc/stat_enc.h

+0 −2
Original line number Diff line number Diff line
@@ -140,9 +140,7 @@ typedef struct TransientDetector 
    TCheckSubblocksForAttack CheckSubblocksForAttack; /* Function for checking a presence of an attack. */

    float attackRatioThreshold;                       /* Attack ratio threshold. */

    int16_t bIsAttackPresent;                         /* True when an attack was detected. */

#ifdef LOW_RATE_TRANS_FIX

    int16_t prev_bIsAttackPresent; /* True if an attack was detected in the previous frame. */

#endif

    int16_t attackIndex; /* The index of an attack. */

} TransientDetector;

lib_enc/transient_detection.c

+0 −6
Original line number Diff line number Diff line
@@ -577,9 +577,7 @@ static void InitTransientDetector( 
    pTransientDetector->CheckSubblocksForAttack = pCheckSubblocksForAttack;

    pTransientDetector->attackRatioThreshold = attackRatioThreshold;

    pTransientDetector->bIsAttackPresent = FALSE;

#ifdef LOW_RATE_TRANS_FIX

    pTransientDetector->prev_bIsAttackPresent = FALSE;

#endif

    pTransientDetector->attackIndex = -1;

    pTransientDetector->pSubblockEnergies->ramp_up_flag = 0x0;
@@ -900,11 +898,7 @@ int16_t transient_analysis( 
            prel_force_td |= 0x0001;

        }

    }

#ifdef LOW_RATE_TRANS_FIX

    if ( prel_force_td == 0 && hTranDet->transientDetector.prev_bIsAttackPresent == 1 )

#else

    if ( prel_force_td == 0 )

#endif

    {

        /* release analysis */

        pSubblockNrg = hTranDet->transientDetector.pSubblockEnergies->subblockNrg;