Commit 7fc9e2f3 authored by vaclav's avatar vaclav
Browse files

- Merge branch 'revision_tran_det' into revision_corecoder_struct

parents 2c8e4e09 2a129274

lib_com/ivas_prot_fx.h

+2 −2
Original line number Diff line number Diff line
@@ -3152,9 +3152,9 @@ void stereo_tcx_core_enc( 
Word16 transient_analysis_ivas_fx(

    TRAN_DET_HANDLE hTranDet,  /* i  : handle transient detection       */

    const Word16 cor_map_LT[], /* i  : LT correlation map  Q_cor_map = Qx */

    Word16 Q_cor_map,

    const Word16 Q_cor_map,

    const Word16 multi_harm_limit, /* i  : multi harmonic threshold Q_multi_harm_limit = Qx */

    Word16 Q_multi_harm_limit );

    const Word16 Q_multi_harm_limit );



void set_transient_stereo_fx(

    CPE_ENC_HANDLE hCPE,  /* i  : CPE structure                           */

lib_enc/init_enc_fx.c

+1 −5
Original line number Diff line number Diff line
@@ -880,9 +880,7 @@ ivas_error init_encoder_fx( 
        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) );

    }



    InitTransientDetection_fx( extract_l( Mult_32_16( st_fx->input_Fs, 0x0290 ) ),

                               NS2SA_FX2( st_fx->input_Fs, DELAY_FIR_RESAMPL_NS ),

                               st_fx->hTranDet );

    InitTransientDetection_fx( input_frame, NS2SA_FX2( st_fx->input_Fs, DELAY_FIR_RESAMPL_NS ), st_fx->hTranDet );



    st_fx->Q_syn2 = 0;

    move16();
@@ -2101,8 +2099,6 @@ ivas_error init_encoder_ivas_fx( 
        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) );

    }



    Word16 frame_length = extract_l( Mpy_32_32_r( st->input_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) );



    IF( GT_16( st->element_mode, EVS_MONO ) )

    {

        InitTransientDetection_ivas_fx( input_frame, 0, st->hTranDet, 1 );

lib_enc/prot_fx_enc.h

+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ void RunTransientDetection_ivas_fx( 
 * @return average temporal flatness measure with exponent AVG_FLAT_E

 */

Word16 GetTCXAvgTemporalFlatnessMeasure_fx(

    TRAN_DET_HANDLE hTranDet,

    TRAN_DET_HANDLE hTranDetn,

    const Word16 nCurrentSubblocks,

    const Word16 nPrevSubblocks );

lib_enc/tcx_ltp_enc_fx.c

+5 −1
Original line number Diff line number Diff line
@@ -608,6 +608,8 @@ static void tcx_ltp_find_gain_ivas_fx( Word16 *speech /*Qx*/, Word16 *pred_speec 
    /* Dequantize gain */

    *gain = imult1616( add( g, 1 ), 0x1400 ); /*Q15*/

    move16();



    return;

}



void tcx_ltp_encode_fx(
@@ -655,7 +657,6 @@ void tcx_ltp_encode_fx( 
#endif

#endif





    norm_corr = 0;

    move16();
@@ -914,8 +915,11 @@ void tcx_ltp_encode_fx( 
    move16();

    *norm_corr_past = norm_corr;

    move16();



    return;

}





void tcx_ltp_encode_ivas_fx(

    Encoder_State *st,

    const Word16 tcxMode,

lib_enc/transient_detection_fx.c

+183 −56

File changed.

Preview size limit exceeded, changes collapsed.