Commit c3dcc2dc authored by vaclav's avatar vaclav
Browse files

fix build

parent 5fe3418e
Loading
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ static void enc_prm_hm(
    Word8 flag;
    BSTR_ENC_HANDLE hBstr = st->hBstr;


    /* Disable HM for non-GC,VC modes */
    test();
    IF( NE_16( st->hTcxCfg->coder_type, VOICED ) && NE_16( st->hTcxCfg->coder_type, GENERIC ) )
@@ -1111,15 +1110,12 @@ void enc_prm_fx(
        } /* k, window index */
    }


    /*--------------------------------------------------------------------------------*
     * END
     *--------------------------------------------------------------------------------*/


    total_nbbits = sub( hBstr->nb_bits_tot, nbits_start ); /* Q0 */


    /* Check if total encoded bits does not exceed CBR target bits (->this must never happen) */
    if ( st->bits_frame_core && ( total_nbbits > st->bits_frame_core ) )
    {
+11 −11
Original line number Diff line number Diff line
@@ -1478,12 +1478,12 @@ excludes the waveform contributions at pos 21,22,23 to the MSE, important to kee

Word16 lsf_msvq_ma_encprm_fx(
    BSTR_ENC_HANDLE hBstr,
    Word16 *param_lpc, // Q0
    Word16 core,
    Word16 acelp_mode,
    Word16 acelp_midLpc,
    Word16 *bits_param_lpc,
    Word16 no_indices )
    const Word16 *param_lpc, // Q0
    const Word16 core,
    const Word16 acelp_mode,
    const Word16 acelp_midLpc,
    const Word16 *bits_param_lpc,
    const Word16 no_indices )
{
    Word16 i, nbits_lpc;
    Word16 bits_midlpc;
@@ -1959,7 +1959,7 @@ Word16 Q_lsf_tcxlpc_ivas_fx(
 *--------------------------------------------------------------------------*/

Word16 enc_lsf_tcxlpc_fx(
    Word16 **indices,     /* i  : Ptr to VQ indices  */
    const Word16 **indices, /* i  : Ptr to VQ indices           */
    BSTR_ENC_HANDLE hBstr   /* i/o: encoder bitstream handle    */
)
{
@@ -2036,9 +2036,9 @@ Word16 enc_lsf_tcxlpc_ivas_fx(

Word16 lsf_bctcvq_encprm_fx(
    BSTR_ENC_HANDLE hBstr,
    Word16 *param_lpc, // Q0
    Word16 *bits_param_lpc,
    Word16 no_indices )
    const Word16 *param_lpc, // Q0
    const Word16 *bits_param_lpc,
    const Word16 no_indices )
{
    Word16 i, nbits_lpc;

+11 −11
Original line number Diff line number Diff line
@@ -2804,7 +2804,7 @@ void enc_prm_side_Info_fx(

/* Returns: number of bits written */
Word16 enc_lsf_tcxlpc_fx(
    Word16 **indices,     /* i  : Ptr to VQ indices             */
    const Word16 **indices, /* i  : Ptr to VQ indices             */
    BSTR_ENC_HANDLE hBstr   /* i/o: encoder bitstream handle      */
);

@@ -2834,9 +2834,9 @@ Word16 encode_lpc_avq_ivas_fx(
#endif
Word16 lsf_bctcvq_encprm_fx(
    BSTR_ENC_HANDLE hBstr,
    Word16 *param_lpc,
    Word16 *bits_param_lpc,
    Word16 no_indices );
    const Word16 *param_lpc,
    const Word16 *bits_param_lpc,
    const Word16 no_indices );

#ifndef HARM_COREDECODER_FUNCTIONS
Word16 lsf_bctcvq_encprm_ivas_fx(
@@ -2847,12 +2847,12 @@ Word16 lsf_bctcvq_encprm_ivas_fx(
#endif
Word16 lsf_msvq_ma_encprm_fx(
    BSTR_ENC_HANDLE hBstr,
    Word16 *param_lpc,
    Word16 core,
    Word16 acelp_mode,
    Word16 acelp_midLpc,
    Word16 *bits_param_lpc,
    Word16 no_indices );
    const Word16 *param_lpc,
    const Word16 core,
    const Word16 acelp_mode,
    const Word16 acelp_midLpc,
    const Word16 *bits_param_lpc,
    const Word16 no_indices );

#ifndef HARM_COREDECODER_FUNCTIONS
Word16 lsf_msvq_ma_encprm_ivas_fx(