Commit 26c61062 authored by vaclav's avatar vaclav
Browse files

updt

parent 24d5f7ff
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -1601,6 +1601,7 @@ void ivas_hq_core_dec_fx(
    Word16 *Q_output 
);

#ifndef HARMONIZE_TBE
void ivas_HQ_FEC_Mem_update_fx(
    Decoder_State *st_fx,                                       /* i/o: decoder state structure                 */
    Word32 *t_audio_q_fx,                                       /*Q12*/
@@ -1616,6 +1617,7 @@ void ivas_HQ_FEC_Mem_update_fx(
    Word16 hq_core_type,                                        /* i : normal or low-rate MDCT(HQ) core         */
    Word16 output_frame 
);
#endif
/* o  : Consumed bits  Q0 */
Word16 ivas_hq_classifier_dec_fx(                          
    Decoder_State *st_fx,                                       /* i/o: decoder state structure                 */
+14 −0
Original line number Diff line number Diff line
@@ -259,13 +259,21 @@ static void rescale_genSHB_mem_dec(
    {
        FOR( i = 0; i < LPC_SHB_ORDER; i++ )
        {
#ifdef HARMONIZE_TBE
            hBWE_TD->state_lpc_syn_fx[i] = shl_sat( hBWE_TD->state_lpc_syn_fx[i], sf );
#else
            hBWE_TD->state_lpc_syn_fx[i] = shl( hBWE_TD->state_lpc_syn_fx[i], sf );
#endif
            move16();
        }

        FOR( i = 0; i < L_SHB_LAHEAD; i++ )
        {
#ifdef HARMONIZE_TBE
            hBWE_TD->state_syn_shbexc_fx[i] = shl_sat( hBWE_TD->state_syn_shbexc_fx[i], sf );
#else
            hBWE_TD->state_syn_shbexc_fx[i] = shl( hBWE_TD->state_syn_shbexc_fx[i], sf );
#endif
            move16();
        }
    }
@@ -5542,6 +5550,7 @@ static void calc_tilt_bwe_fx_loc(
    return;
}

#ifndef HARMONIZE_TBE
/*-------------------------------------------------------------------*
 * swb_tbe_dec()
 *
@@ -5588,6 +5597,7 @@ static void rescale_genSHB_mem_dec_ivas(

    return;
}
#endif

static void find_max_mem_dec_m3(
    Decoder_State *st,
@@ -6358,7 +6368,11 @@ void ivas_swb_tbe_dec_fx(
    sc = sub( Q_bwe_exc, st->prev_Q_bwe_exc );
    IF( sc != 0 )
    {
#ifdef HARMONIZE_TBE
        rescale_genSHB_mem_dec( st, sc );
#else
        rescale_genSHB_mem_dec_ivas( st, sc );
#endif
    }

    /* rescale the bwe_exc_extended and bring it to 16-bit single precision with dynamic norm  */