Commit 558ffd67 authored by vaclav's avatar vaclav
Browse files

fix

parent 76c4eb6a

lib_dec/hq_hr_dec_fx.c

+8 −2
Original line number Diff line number Diff line
@@ -478,7 +478,13 @@ void hq_hr_dec_fx( 
     *------------------------------------------------------------------*/



#ifdef HARM_HQ_CORE

    hq_configure_fx( length, *hqswb_clas, st_fx->core_brate, &num_sfm, &nb_sfm, &start_norm,

    Word16 tmp_length = length;

    if( length == 960 )

    {

        tmp_length = L_SPEC48k;

    }



    hq_configure_fx( tmp_length, *hqswb_clas, st_fx->core_brate, &num_sfm, &nb_sfm, &start_norm,

                     &num_env_bands, &numnrmibits, &hq_generic_offset, sfmsize, sfm_start, sfm_end );

#else

    hq_configure_evs_fx( length, *hqswb_clas, st_fx->core_brate, &num_sfm, &nb_sfm, &start_norm,

lib_enc/hq_hr_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ void hq_hr_enc_ivas_fx( 
    /*------------------------------------------------------------------*

     * Transient frame handling

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



    /* Interleave MLT coefficients of 4 sub-vectors in case of transient frame */

    IF( is_transient )

    {
@@ -366,6 +367,7 @@ void hq_hr_enc_ivas_fx( 


    /* calculate and quantize norms */

    calc_norm_ivas_fx( t_audio_fx, ynrm, normqlg2, start_norm, num_env_bands, sfmsize, sfm_start );

    

    /* create differential code of quantized norm indices */

    diff_envelope_coding_fx( is_transient, num_env_bands, start_norm, ynrm, normqlg2, difidx );
@@ -374,6 +376,7 @@ void hq_hr_enc_ivas_fx( 


    *num_bits = sub( *num_bits, add( hcode_l, NORM0_BITS + FLAGS_BITS ) );

    move16();

    

    /* Encode norm indices */

    encode_envelope_indices_ivas_fx( hBstr, num_env_bands, numnrmibits, difidx, &LCmode, 1, NORMAL_HQ_CORE, is_transient );
@@ -493,6 +496,7 @@ void hq_hr_enc_ivas_fx( 
    /* updates */

    hHQ_core->prev_hqswb_clas = hqswb_clas; /* Q0 */

    move16();



    /* Prepare synthesis for LB generation in case of switch to ACELP */

    IF( NE_16( hqswb_clas, HQ_HVQ ) )

    {