Commit 02579bc7 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'basop-2265-fix-opt_2239_ivas_filter_process-macro-definition' into 'main' 

Fix `OPT_2239_IVAS_FILTER_PROCESS` macro definition.

Closes #2265

See merge request !2638
parents 2da128c7 280e157c

lib_com/ivas_filters_fx.c

+5 −5
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ void ivas_filters_init_fx( 
            filter_state->den_fx[IVAS_FILTER_STAGE_0][i] = filt_coeff_fx[i + IVAS_BIQUAD_FILT_LEN];

            move32();

            move32();

#ifdef OPT_2239_IVAS_FILTER_PROCESS

#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS

            filter_state->num_shr[IVAS_FILTER_STAGE_0][i] = Q30 - Q31;

            filter_state->den_shr[IVAS_FILTER_STAGE_0][i] = Q30 - Q31;

            move16();
@@ -80,7 +80,7 @@ void ivas_filters_init_fx( 
#endif

        }



#ifdef OPT_2239_IVAS_FILTER_PROCESS

#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS

        filter_state->state_fx[IVAS_FILTER_STAGE_0][0] = 0;

        filter_state->state_fx[IVAS_FILTER_STAGE_0][1] = 0;

        filter_state->state_fx[IVAS_FILTER_STAGE_0][2] = 0;
@@ -117,7 +117,7 @@ void ivas_filters_init_fx( 
            move32();

            move32();

            move32();

#ifdef OPT_2239_IVAS_FILTER_PROCESS

#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS

            filter_state->num_shr[IVAS_FILTER_STAGE_0][i] = sub( sub( 31, filt_coeff_e[i + 0 * IVAS_BIQUAD_FILT_LEN] ), Q31 );

            filter_state->den_shr[IVAS_FILTER_STAGE_0][i] = sub( sub( 31, filt_coeff_e[i + 1 * IVAS_BIQUAD_FILT_LEN] ), Q31 );

            filter_state->num_shr[IVAS_FILTER_STAGE_1][i] = sub( sub( 31, filt_coeff_e[i + 2 * IVAS_BIQUAD_FILT_LEN] ), Q31 );
@@ -138,7 +138,7 @@ void ivas_filters_init_fx( 
#endif

        }



#ifdef OPT_2239_IVAS_FILTER_PROCESS

#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS

        filter_state->state_fx[IVAS_FILTER_STAGE_0][0] = 0;

        filter_state->state_fx[IVAS_FILTER_STAGE_0][1] = 0;

        filter_state->state_fx[IVAS_FILTER_STAGE_0][2] = 0;
@@ -182,7 +182,7 @@ void ivas_filters_init_fx( 
    return;

}



#ifdef OPT_2239_IVAS_FILTER_PROCESS

#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS

static Word64 ivas_iir_2_filter_fx( ivas_filters_process_state_t *filter_state, const Word16 stage, const Word64 in );



/*-----------------------------------------------------------------------------------------*

lib_com/ivas_prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -3803,7 +3803,7 @@ void ivas_lfe_enc_fx( 
    BSTR_ENC_HANDLE hBstr                                       /* i/o: bitstream handle                                */

);



#ifdef OPT_2239_IVAS_FILTER_PROCESS

#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS

void ivas_filter_process_fx32(

    ivas_filters_process_state_t *filter_state,                 /* i/o: filter state handle                             */

    Word32 *pIn_Out_fx,                                         /* i  : signal subject to filtering                     */

lib_com/ivas_stat_com.h

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ typedef struct ivas_filters_process_state_t 
    Word16 filt_len;

    Word32 num_fx[IVAS_FILTER_MAX_STAGES][IVAS_BIQUAD_FILT_LEN];

    Word32 den_fx[IVAS_FILTER_MAX_STAGES][IVAS_BIQUAD_FILT_LEN];

#ifdef OPT_2239_IVAS_FILTER_PROCESS

#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS

    Word64 state_fx[IVAS_FILTER_MAX_STAGES][IVAS_BIQUAD_FILT_LEN];

    Word16 num_shr[IVAS_FILTER_MAX_STAGES][IVAS_BIQUAD_FILT_LEN];

    Word16 den_shr[IVAS_FILTER_MAX_STAGES][IVAS_BIQUAD_FILT_LEN];

lib_com/ivas_transient_det_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
 *------------------------------------------------------------------------------------------*/



#define IVAS_TDET_PARM_ENV_EPS ( 1e-5f )

#ifdef OPT_2239_IVAS_FILTER_PROCESS

#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS

#define IVAS_TDET_PARM_ENV_EPS_fx ( ( (Word64) 21474 ) << 12 ) // Q11+32

#else

#define IVAS_TDET_PARM_ENV_EPS_fx 21474 // Q31
@@ -396,7 +396,7 @@ void ivas_td_decorr_get_ducking_gains_fx( 
    Word32 duck_mult_fac = hTranDet->duck_mult_fac; /*Q29*/

    move32();



#ifdef OPT_2239_IVAS_FILTER_PROCESS

#ifdef NONBE_OPT_2239_IVAS_FILTER_PROCESS

    Word64 e_fast_fx[L_FRAME48k], e_slow_fx[L_FRAME48k];

    Word32 fast_fx, slow_fx;

    Word16 fast_e, slow_e;

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 
#define OPT_2181_MATRIX_TRANSP_1_MUL        /* Dolby: Issue 2181, optimize matrixTransp1Mul_fx. */

#define OPT_2182_MATRIX_SCALE_OPS           /* Dolby: Issue 2181, move matrix scale operations outside mul operations. */

#define OPT_2185_MATRIX_OUT_SCALING         /* Dolby: Issue 2185, optimize matrix-mul output-format. */

#define OPT_2239_IVAS_FILTER_PROCESS        /* Dolby: Issue 2239, optimize ivas_filter_process_fx. */

#define NONBE_OPT_2239_IVAS_FILTER_PROCESS  /* Dolby: Issue 2239, optimize ivas_filter_process_fx. */

#define NONBE_OPT_2193_EIG2X2               /* Dolby: Issue 2193, optimize eig2x2_fx. */

#define BE_FIX_2240_COMPUTE_COV_MTC_FX_FAST /* FhG: Speeds up covariance calculation e.g. 60 WMOPS for encoding -mc 7_1_4 24400 48 */