Commit ee3d37d7 authored by Nishant S Kulgod's avatar Nishant S Kulgod
Browse files

commit 1

parent 55f431d5

lib_com/core_com_config.c

+2 −2
Original line number Diff line number Diff line
@@ -1235,8 +1235,8 @@ void init_tcx_window_cfg_fx( 
    }

    /*Mid-OLA*/

    /*compute minimum length for "half" window: lookahead - 5ms. It must be also multiple of 2*/

    hTcxCfg->tcx_mdct_window_half_length = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA_FX2( 12800, 5000000L ), sr2fscale( sr_core ) ), LD_FSCALE_DENOM ) );    /*Q0*/

    hTcxCfg->tcx_mdct_window_half_lengthFB = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA_FX2( 12800, 5000000L ), sr2fscale( input_Fs ) ), LD_FSCALE_DENOM ) ); /*Q0*/

    hTcxCfg->tcx_mdct_window_half_length = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA( 12800, 5000000L ), sr2fscale( sr_core ) ), LD_FSCALE_DENOM ) );    /*Q0*/

    hTcxCfg->tcx_mdct_window_half_lengthFB = extract_l( L_shr( L_mult0( L_LOOK_12k8 - NS2SA( 12800, 5000000L ), sr2fscale( input_Fs ) ), LD_FSCALE_DENOM ) ); /*Q0*/

    move16();

    move16();

    assert( GT_16( hTcxCfg->tcx_mdct_window_half_length, 16 ) && "Half window can not be large enough!" );

lib_com/ivas_fb_mixer.c

+3 −3
Original line number Diff line number Diff line
@@ -1289,7 +1289,7 @@ static ivas_error ivas_filterbank_setup_fx( 


        ivas_get_active_bins_fx( &pAll_bins_per_band, &pAll_bins_per_band_abs, &pAll_bins_start_offset, &pAll_bins_start_offset_abs, sampling_rate );



        IF( EQ_16( pCfg->fb_latency, NS2SA( sampling_rate, DELAY_FB_1_NS ) ) )

        IF( EQ_16( pCfg->fb_latency, NS2SA_FX2( sampling_rate, DELAY_FB_1_NS ) ) )

        {

            pAll_fb_fr_fx[0] = ivas_fb_fr_12band_1ms_re_fx; // Q30

            move32();
@@ -1478,7 +1478,7 @@ static ivas_error ivas_fb_mixer_get_window_fx( 
    error = IVAS_ERR_OK;

    move32();



    IF( EQ_16( fade_len, NS2SA( sampling_rate, DELAY_FB_4_NS ) ) )

    IF( EQ_16( fade_len, NS2SA_FX2( sampling_rate, DELAY_FB_4_NS ) ) )

    {

        SWITCH( sampling_rate )

        {
@@ -1495,7 +1495,7 @@ static ivas_error ivas_fb_mixer_get_window_fx( 
                return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Unsupported Sampling frequency!" );

        }

    }

    ELSE IF( EQ_16( fade_len, NS2SA( sampling_rate, DELAY_FB_1_NS ) ) )

    ELSE IF( EQ_16( fade_len, NS2SA_FX2( sampling_rate, DELAY_FB_1_NS ) ) )

    {

        SWITCH( sampling_rate )

        {

lib_com/ivas_prot_fx.h

+1 −2
Original line number Diff line number Diff line
@@ -5857,8 +5857,7 @@ ivas_error ivas_compute_core_buffers_fx( 
    Word16 lsp_mid_fx[M],                  /* i/o: LSPs in the middle of the frame          */

    Word16 Q_old_inp_16k,

    Word16 Q_r[2],

    Word16 *Q_new,

    Word16 downscale_buf_speech_enc_pe );

    Word16 *Q_new);



ivas_error ivas_enc_fx(

    Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure      */

lib_com/tcx_ltp_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1282,7 +1282,7 @@ void tcx_ltp_post( 


    filtIdx = 0; /* just to avoid comilation warnings */

    move16();

    tcx_buf_len = NS2SA( st->output_Fs, TCXLTP_DELAY_NS ); /* Q0 */

    tcx_buf_len = NS2SA_FX2( st->output_Fs, TCXLTP_DELAY_NS ); /* Q0 */

    SideInfoOnly = 0;

    move16();

    if ( GE_32( total_brate, HQ_96k ) )

lib_com/window_ola_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -833,13 +833,13 @@ void core_switching_OLA_fx( 


        IF( ( output_frame - L_FRAME16k ) == 0 ) /* no resampling */

        {

            Copy( mem_over_hp + 2, tmp_buf_switch + i_mult2( SWITCH_GAP_LENGTH_8k, delta ), NS2SA( output_Fs, DELAY_CLDFB_NS ) );

            Copy( mem_over_hp + 2, tmp_buf_switch + i_mult2( SWITCH_GAP_LENGTH_8k, delta ), NS2SA_FX2( output_Fs, DELAY_CLDFB_NS ) );

        }

        ELSE

        {

            IF( ( output_frame - L_FRAME8k ) == 0 ) /* not done yet */

            {

                Copy( synth_subfr_out + SWITCH_GAP_LENGTH_8k, tmp_buf_switch + SWITCH_GAP_LENGTH_8k, NS2SA( output_Fs, DELAY_CLDFB_NS ) ); /* copy subframe to tmp buffer */

                Copy( synth_subfr_out + SWITCH_GAP_LENGTH_8k, tmp_buf_switch + SWITCH_GAP_LENGTH_8k, NS2SA_FX2( output_Fs, DELAY_CLDFB_NS ) ); /* copy subframe to tmp buffer */

            }

            ELSE

            {
@@ -950,7 +950,7 @@ void core_switching_OLA_fx( 


    pt = synth;

    pt2 = tmp_buf_switch;

    tmp = NS2SA( output_Fs, DELAY_CLDFB_NS );

    tmp = NS2SA_FX2( output_Fs, DELAY_CLDFB_NS );

    move16();

    pt3 = synth_subfr_bwe;