Commit 0089595d authored by vaclav's avatar vaclav
Browse files

fix

parent f859a9ed

lib_dec/ivas_core_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -372,7 +372,11 @@ ivas_error ivas_core_dec( 
        if ( st->core == ACELP_CORE )

        {

            /* ACELP core decoder */

#ifdef SIMPLIFY_IVAS_CORE

            if ( ( error = acelp_core_dec( st, output[n], synth[n], save_hb_synth, bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], sharpFlag[n], pitch_buf[n], &unbits[n], &sid_bw[n], hStereoTD, tdm_lspQ_PCh, tdm_lsfQ_PCh, use_cldfb_for_dft, last_element_mode, last_element_brate, flag_sec_CNA, nchan_out, hStereoCng, read_sid_info ) ) != IVAS_ERR_OK )

#else

            if ( ( error = acelp_core_dec( st, output[n], synth[n], save_hb_synth, bwe_exc_extended[n], voice_factors[n], old_syn_12k8_16k[n], sharpFlag[n], pitch_buf[n], &unbits[n], &sid_bw[n], hStereoTD, tdm_lspQ_PCh, tdm_lsfQ_PCh, use_cldfb_for_dft, last_element_mode, last_element_brate, flag_sec_CNA, nchan_out, hCPE == NULL ? NULL : hCPE->hStereoCng, read_sid_info ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }

lib_dec/ivas_tcx_core_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ void stereo_tcx_core_dec( 
    STEREO_CNG_DEC_HANDLE hStereoCng,    /* i  : Stereo CNG handle                  */

    const int16_t nchan_out              /* i  : number of output channels          */

#ifndef SIMPLIFY_IVAS_CORE

    ,

    const IVAS_FORMAT ivas_format /* i  : IVAS format                        */

#endif

)

lib_enc/ivas_core_enc.c

+1 −3
Original line number Diff line number Diff line
@@ -172,9 +172,8 @@ ivas_error ivas_core_enc( 
        st->extl = -1;

        unbits[n] = 0;



#ifndef SIMPLIFY_IVAS_CORE

        st->element_brate = element_brate;

#endif



        /*---------------------------------------------------------------------*

         * Pre-processing, incl. Decision matrix

         *---------------------------------------------------------------------*/
@@ -199,7 +198,6 @@ ivas_error ivas_core_enc( 
    {

#ifdef SIMPLIFY_IVAS_CORE

        ivas_combined_format_brate_sanity( element_brate, sts[0]->core, sts[0]->total_brate, &( sts[0]->core_brate ), &( sts[0]->inactive_coder_type_flag ), &diff_nBits );



#else

        ivas_combined_format_brate_sanity( hCPE->element_brate, sts[0]->core, sts[0]->total_brate, &( sts[0]->core_brate ), &( sts[0]->inactive_coder_type_flag ), &diff_nBits );

#endif