Commit 1c932cde authored by vaclav's avatar vaclav
Browse files

remove unused parameter

parent bc1c3868

lib_com/prot_fx.h

+1 −2
Original line number Diff line number Diff line
@@ -7806,8 +7806,7 @@ void bw_switching_pre_proc_fx( 
    const Word32 last_element_brate, /* i  : last element bitrate                     */

    const Word16 nchan_out,          /* i  : number of output channels                */

    Word16 *old_syn_12k8_16k_fx16,

    Word32 *old_syn_12k8_16k_fx32,

    Word16 Q

    Word32 *old_syn_12k8_16k_fx32

#else

    const Word16 *old_syn_12k8_16k_fx, /* i  : ACELP core synthesis at 12.8kHz or 16kHz        Qx*/

    Decoder_State *st_fx               /* i/o: decoder state structure     */

lib_dec/core_switching_dec_fx.c

+3 −4
Original line number Diff line number Diff line
@@ -190,8 +190,7 @@ void bw_switching_pre_proc_fx( 
    const Word32 last_element_brate, /* i  : last element bitrate                     */

    const Word16 nchan_out,          /* i  : number of output channels                */

    Word16 *old_syn_12k8_16k_fx16,

    Word32 *old_syn_12k8_16k_fx32,

    Word16 Q

    Word32 *old_syn_12k8_16k_fx32

#else

    const Word16 *old_syn_12k8_16k_fx,                                                                                   /* i  : ACELP core synthesis at 12.8kHz or 16kHz        Qx*/

    Decoder_State *st_fx                                                                                                 /* i/o: decoder state structure     */
@@ -219,8 +218,8 @@ void bw_switching_pre_proc_fx( 
        {

            /* Calculate tilt of the ACELP core synthesis - needed in SWB BWE decoding */

            Word16 old_syn_12k8_16k_tmp_16fx[L_FRAME16k];

            Copy_Scale_sig_32_16( old_syn_12k8_16k_fx32, old_syn_12k8_16k_tmp_16fx, st_fx->L_frame, sub( -1, Q ) );

            st_fx->tilt_wb_fx = round_fx_sat( L_shl_sat( calc_tilt_bwe_fx( old_syn_12k8_16k_tmp_16fx, -1, st_fx->L_frame ), sub( Q, 8 ) ) ); // Q24+(Q-8) - 16

            Copy_Scale_sig_32_16( old_syn_12k8_16k_fx32, old_syn_12k8_16k_tmp_16fx, st_fx->L_frame, sub( -1, Q11 ) );

            st_fx->tilt_wb_fx = round_fx_sat( L_shl_sat( calc_tilt_bwe_fx( old_syn_12k8_16k_tmp_16fx, -1, st_fx->L_frame ), sub( Q11, 8 ) ) ); // Q24+(Q11-8) - 16

            move16();

        }

lib_dec/evs_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ ivas_error evs_dec_fx( 
         *---------------------------------------------------------------------*/



#ifdef HARM_CORE_SW

        bw_switching_pre_proc_fx( st_fx, -1, 1, old_syn_12k8_16k_fx, NULL, 0 );

        bw_switching_pre_proc_fx( st_fx, -1, 1, old_syn_12k8_16k_fx, NULL );

#else

        bw_switching_pre_proc_fx( old_syn_12k8_16k_fx, st_fx );

#endif

lib_dec/ivas_core_dec_fx.c

+4 −1
Original line number Diff line number Diff line
@@ -872,11 +872,14 @@ ivas_error ivas_core_dec_fx( 
            move16();

        }



#ifndef HARM_CORE_SW

        Word16 q_audio, old_syn_fx;

        old_syn_fx = Q11;

        move16();

        q_audio = Q12;

        move16();

#endif



        test();

        test();

        test();
@@ -959,7 +962,7 @@ ivas_error ivas_core_dec_fx( 
         *---------------------------------------------------------------------*/



#ifdef HARM_CORE_SW

        bw_switching_pre_proc_fx( st, last_element_brate, nchan_out, old_syn_12k8_16k_fx_16[n], old_syn_12k8_16k_fx[n], old_syn_fx );

        bw_switching_pre_proc_fx( st, last_element_brate, nchan_out, old_syn_12k8_16k_fx_16[n], old_syn_12k8_16k_fx[n] );

#else

        ivas_bw_switching_pre_proc_fx( st, last_element_brate, nchan_out, old_syn_12k8_16k_fx[n], old_syn_fx, q_audio );

#endif