Commit b3922a9c authored by vaclav's avatar vaclav
Browse files

rename delay_signal() -> delay_signal_fx()

parent 457d2c9f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\prot_fx.h">
      <Filter>common_all_c</Filter>
      <Filter>common_h</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
+2 −2
Original line number Diff line number Diff line
@@ -10544,14 +10544,14 @@ void floating_point_add(
    const Word16 ey  /* i:  exponent of the adder Q0   */
);
void delay_signal(
void delay_signal_fx(
    Word16 x[],        /* i/o: signal to be delayed              */
    const Word16 len,  /* i  : length of the input signal        */
    Word16 mem[],      /* i/o: synchronization memory            */
    const Word16 delay /* i  : delay in samples                  */
);
void delay_signal32(
void delay_signal32_fx(
    Word32 x[],        /* i/o: signal to be delayed              */
    const Word16 len,  /* i  : length of the input signal        */
    Word32 mem[],      /* i/o: synchronization memory            */
+20 −26
Original line number Diff line number Diff line
@@ -4004,13 +4004,14 @@ void floating_point_add(
    move16();
    return;
}

/*-------------------------------------------------------------------*
 * delay_signal()
 * delay_signal_fx()
 *
 * Delay buffer by defined number of samples
 *-------------------------------------------------------------------*/

void delay_signal(
void delay_signal_fx(
    Word16 x[],        /* i/o: signal to be delayed              */
    const Word16 len,  /* i  : length of the input signal        */
    Word16 mem[],      /* i/o: synchronization memory            */
@@ -4027,6 +4028,23 @@ void delay_signal(
    return;
}

void delay_signal32_fx(
    Word32 x[],        /* i/o: signal to be delayed              */
    const Word16 len,  /* i  : length of the input signal        */
    Word32 mem[],      /* i/o: synchronization memory            */
    const Word16 delay /* i  : delay in samples                  */
)
{
    Word32 tmp_buffer[L_FRAME48k];

    Copy32( mem, tmp_buffer, delay );
    Copy32( x + sub( len, delay ), mem, delay );
    Copy32( x, x + delay, sub( len, delay ) );
    Copy32( tmp_buffer, x, delay );

    return;
}

void delay_signal_q_adj_fx(
    Word32 x[],         /* i/o: signal to be delayed                    */
    const Word16 len,   /* i  : length of the input signal              */
@@ -4119,30 +4137,6 @@ void v_shr_16(
    return;
}

/*-------------------------------------------------------------------*
 * delay_signal32()
 *
 * Delay buffer by defined number of samples
 *-------------------------------------------------------------------*/

void delay_signal32(
    Word32 x[],        /* i/o: signal to be delayed              */
    const Word16 len,  /* i  : length of the input signal        */
    Word32 mem[],      /* i/o: synchronization memory            */
    const Word16 delay /* i  : delay in samples                  */
)
{
    Word32 tmp_buffer[L_FRAME48k];

    Copy32( mem, tmp_buffer, delay );
    Copy32( x + sub( len, delay ), mem, delay );
    Copy32( x, x + delay, sub( len, delay ) );
    Copy32( tmp_buffer, x, delay );

    return;
}


/*---------------------------------------------------------------------*
 * lin_interp_fx()
 *
+1 −1
Original line number Diff line number Diff line
@@ -1062,7 +1062,7 @@ ivas_error amr_wb_dec_fx(
    {
        tmps = NS2SA_FX2( st_fx->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS );
        Scale_sig( st_fx->prev_synth_buffer_fx, tmps, sub( st_fx->Q_syn2, st_fx->Qprev_synth_buffer_fx ) );
        delay_signal( synth_out_fx, output_frame, st_fx->prev_synth_buffer_fx, tmps );
        delay_signal_fx( synth_out_fx, output_frame, st_fx->prev_synth_buffer_fx, tmps );
    }

    IF( waveadj_rec )
+2 −2
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ ivas_error core_switching_post_dec_fx(
        Scale_sig( st_fx->delay_buf_out_fx, delay_comp, sub( Qtmp, hHQ_core->Q_old_postdec ) ); /* Qtmp */
        hHQ_core->Q_old_postdec = Qtmp;
        move16();
        delay_signal( synth, output_frame, st_fx->delay_buf_out_fx, delay_comp ); /* Qsynth, Q0 */
        delay_signal_fx( synth, output_frame, st_fx->delay_buf_out_fx, delay_comp ); /* Qsynth, Q0 */

        test();
        test();
@@ -1407,7 +1407,7 @@ ivas_error core_switching_post_dec_ivas_fx(
            Scale_sig( st_fx->delay_buf_out_fx, delay_comp, sub( Qtmp, hHQ_core->Q_old_postdec ) ); /* Qtmp */
            hHQ_core->Q_old_postdec = Qtmp;
            move16();
            delay_signal( synth, output_frame, st_fx->delay_buf_out_fx, delay_comp ); /* Qsynth, Q0 */
            delay_signal_fx( synth, output_frame, st_fx->delay_buf_out_fx, delay_comp ); /* Qsynth, Q0 */

            test();
            test();
Loading