Commit 489bc35f authored by Manuel Jander's avatar Manuel Jander
Browse files

Restore correct scale of hb_speech, was broken after introducing q_new_inp_resamp16k_fx[].

parent 674ec869

lib_enc/ivas_core_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -717,7 +717,11 @@ ivas_error ivas_core_enc_fx( 
        IF( EQ_16( st->extl, WB_TBE ) )

        {

            /* WB TBE encoder */

#ifdef NONBE_FIX_ISSUE_2206

            wb_tbe_enc_ivas_fx( st, hb_speech_fx, q_new_inp_resamp16k_fx[n], bwe_exc_extended_fx[n], Q_new[n], voice_factors_fx[n], pitch_buf_fx[n] );

#else

            wb_tbe_enc_ivas_fx( st, hb_speech_fx, bwe_exc_extended_fx[n], Q_new[n], voice_factors_fx[n], pitch_buf_fx[n] );

#endif

        }

        ELSE IF( EQ_16( st->extl, WB_BWE ) && n == 0 && NE_16( st->element_mode, IVAS_CPE_MDCT ) )

        {

lib_enc/prot_fx_enc.h

+6 −1
Original line number Diff line number Diff line
@@ -767,7 +767,12 @@ void wb_tbe_enc_fx( 


void wb_tbe_enc_ivas_fx(

    Encoder_State *st_fx,           /* i/o: encoder state structure                       */

#ifdef NONBE_FIX_ISSUE_2206

    const Word16 *hb_speech, /* i  : HB target signal (6-8kHz) at 16kHz       q_hb_speech */

    const Word16 q_hb_speech, /* i  : HB target signal (6-8kHz) at 16kHz               Q0 */

#else

    const Word16 *hb_speech, /* i  : HB target signal (6-8kHz) at 16kHz             Q(-1) */

#endif

    const Word32 *bwe_exc_extended, /* i  : bandwidth extended exciatation     Q(2*Q_new) */

    const Word16 Q_new,             /* i  : input HB speech Q factor                      */

    const Word16 voice_factors[],   /* i  : voicing factors                           Q15 */

lib_enc/swb_tbe_enc_fx.c

+3 −2
Original line number Diff line number Diff line
@@ -1237,7 +1237,8 @@ void wb_tbe_enc_fx( 
void wb_tbe_enc_ivas_fx(

    Encoder_State *st_fx, /* i/o: encoder state structure                       */

#ifdef NONBE_FIX_ISSUE_2206

    const Word16 *hb_speech, /* i  : HB target signal (6-8kHz) at 16kHz    Q_new-1 */

    const Word16 *hb_speech, /* i  : HB target signal (6-8kHz) at 16kHz    q_hb_speech */

    const Word16 q_hb_speech, /* i  : HB target signal (6-8kHz) at 16kHz            Q0 */

#else

    const Word16 *hb_speech, /* i  : HB target signal (6-8kHz) at 16kHz      Q(-1) */

#endif
@@ -1276,7 +1277,7 @@ void wb_tbe_enc_ivas_fx( 
    Word32 L_tmp, Lmax;

    Word16 tmp, exp, Q_out, sc;

#ifdef NONBE_FIX_ISSUE_2206

    Word16 Q_ns = sub( Q_new, 1 );

    Word16 Q_ns = q_hb_speech;

#else

    Word16 Q_ns = -1;

    move16();