Commit 30d03cfe authored by vaclav's avatar vaclav
Browse files

HARM_CORE_SW, fix

parent a310704f

lib_dec/core_switching_dec_fx.c

+8 −2
Original line number Diff line number Diff line
@@ -1457,7 +1457,6 @@ ivas_error core_switching_post_dec_ivas_fx( 
                    move16();

                }

                move16();



            }

            Qtmp = s_min( *Qsynth, hHQ_core->Q_old_postdec );

            Scale_sig( synth, output_frame, sub( Qtmp, *Qsynth ) ); /* Qtmp */
@@ -2339,7 +2338,7 @@ ivas_error core_switching_pre_dec_ivas_fx( 
        test();

        IF( hBWE_TD != NULL && ( st->last_core != ACELP_CORE ) )

        {

            hBWE_TD->prev_hb_synth_fx_exp = 31;

            hBWE_TD->prev_hb_synth_fx_exp = Q31;

            move16();

            /* reset BWE memories */

            set16_fx( hBWE_TD->old_bwe_exc_fx, 0, PIT16k_MAX * 2 ); /* Q_exc */
@@ -2693,6 +2692,13 @@ ivas_error core_switching_pre_dec_ivas_fx( 
            set16_fx( st->hFdCngDec->hFdCngCom->olapBufferAna_fx, 0, FFTLEN );

            set16_fx( st->agc_mem_fx, 0, 2 );

        }



#ifdef HARM_CORE_SW

        IF( EQ_16( st->element_mode, EVS_MONO ) )

        {

            set16_fx( st->agc_mem_fx, 0, 2 );

        }

#endif

        st->mem_deemph_fx = 0;

        move16();

        IF( !st->last_con_tcx )

lib_dec/evs_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -350,7 +350,11 @@ ivas_error evs_dec_fx( 
         * Postprocessing for ACELP/HQ core switching

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



#ifdef HARM_CORE_SW

        if ( ( error = core_switching_post_dec_ivas_fx( st_fx, synth_fx, NULL, NULL, 0, output_frame, core_switching_flag, 0, 1, EVS_MONO, &Qpostd ) ) != IVAS_ERR_OK )

#else

        if ( ( error = core_switching_post_dec_fx( st_fx, synth_fx, output_frame, core_switching_flag, EVS_MONO, &Qpostd ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }