Commit fee16fab authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2457 Removing legacy function and renaming the Ivas function to fx(), Renaming instances.

parent 6a03103d

lib_com/prot_fx.h

+2 −0
Original line number Diff line number Diff line
@@ -6911,11 +6911,13 @@ void generate_comfort_noise_dec_ivas_fx( 
    const Word16 nchan_out /* i  : number of output channels     */

);



#ifndef FIX_BASOP_2457_HARM_GEN

void generate_comfort_noise_dec_hf_fx(

    Word32 **bufferReal, /* o   : matrix to real part of i   bands */

    Word32 **bufferImag, /* o   : matrix to imaginary part of i   bands */

    Word16 *bufferScale, /* o   : pointer to scalefactor for real and imaginary part of i   bands */

    Decoder_State *stdec );

#endif



void generate_comfort_noise_dec_hf_ivas_fx(

    Word32 **bufferReal, /* o   : matrix to real part of input bands */

lib_dec/acelp_core_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1842,7 +1842,7 @@ ivas_error acelp_core_dec_fx( 
            generate_comfort_noise_dec_hf_fx( realBuffer_fx, imagBuffer_fx, &scaleFactor.hb_scale, st );



#else

            generate_comfort_noise_dec_hf_ivas_fx( realBuffer_fx, imagBuffer_fx, &scaleFactor.hb_scale, st, 0 );

            generate_comfort_noise_dec_hf_fx( realBuffer_fx, imagBuffer_fx, &scaleFactor.hb_scale, st, 0 );



#endif // !FIX_BASOP_2457_HARM_GEN
@@ -2013,7 +2013,7 @@ ivas_error acelp_core_dec_fx( 
#ifndef FIX_BASOP_2457_HARM_GEN

                    generate_comfort_noise_dec_hf_ivas_fx( realBuffer_fx, imagBuffer_fx, /*realBuffer, imagBuffer,*/ &tmpBufferScale, st->hFdCngDec->hFdCngCom, st->cng_ism_flag );

#else

                    generate_comfort_noise_dec_hf_ivas_fx( realBuffer_fx, imagBuffer_fx, /*realBuffer, imagBuffer,*/ &tmpBufferScale, st, st->cng_ism_flag );

                    generate_comfort_noise_dec_hf_fx( realBuffer_fx, imagBuffer_fx, /*realBuffer, imagBuffer,*/ &tmpBufferScale, st, st->cng_ism_flag );

#endif // !FIX_BASOP_2457_HARM_GEN

lib_dec/fd_cng_dec_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -3434,6 +3434,7 @@ void generate_comfort_noise_dec_ivas_fx( 
    return;

}



#ifndef FIX_BASOP_2457_HARM_GEN

void generate_comfort_noise_dec_hf_fx(

    Word32 **bufferReal, /* o   : matrix to real part of input bands  bufferScale*/

    Word32 **bufferImag, /* o   : matrix to imaginary part of input bands  bufferScale*/
@@ -3503,7 +3504,13 @@ void generate_comfort_noise_dec_hf_fx( 
    }

}



#endif // !FIX_BASOP_2457_HARM_GEN



#ifndef FIX_BASOP_2457_HARM_GEN

void generate_comfort_noise_dec_hf_ivas_fx(

#else

void generate_comfort_noise_dec_hf_fx(

#endif // !FIX_BASOP_2457_HARM_GEN

    Word32 **bufferReal, /* o   : matrix to real part of input bands   bufferScale*/

    Word32 **bufferImag, /* o   : matrix to imaginary part of input bands  bufferScale*/

    Word16 *bufferScale, /* o   : pointer to scalefactor for real and imaginary part of input bands */