Commit acecaca6 authored by vaclav's avatar vaclav
Browse files

fix

parent 058e89a0

lib_dec/acelp_core_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ ivas_error acelp_core_dec_fx( 
        }



#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING

        set32_fx( output_fx32, 0, output_frame ); /* output and synth are not used in DFT domain CNG generation and the decoder output is unaffected if they are left uninitalized */

        set32_fx( output_fx32, 0, st->L_frame ); /* output and synth are not used in DFT domain CNG generation and the decoder output is unaffected if they are left uninitalized */

#else

        set16_fx( output_fx, 0, output_frame ); /* output and synth are not used in DFT domain CNG generation and the decoder output is unaffected if they are left uninitalized */

#endif

lib_dec/core_switching_dec_fx.c

+8 −3
Original line number Diff line number Diff line
@@ -247,6 +247,10 @@ ivas_error core_switching_post_dec_fx( 
    HQ_DEC_HANDLE hHQ_core;

    ivas_error error;

    Word16 offset;

#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING

    Word16 q_output_fx = Q11;

    move16();

#endif



    L_tmp = 0;

    move32();
@@ -448,7 +452,8 @@ ivas_error core_switching_post_dec_fx( 
                IF( ( ( NE_32( st_fx->last_core_brate, SID_2k40 ) && NE_32( st_fx->last_core_brate, FRAME_NO_DATA ) ) || ( NE_16( st_fx->element_mode, IVAS_CPE_DFT ) && NE_16( st_fx->element_mode, IVAS_CPE_TD ) ) || EQ_16( nchan_out, 1 ) ) && !( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) && EQ_16( st_fx->idchan, 1 ) && ( EQ_16( nchan_out, 1 ) || EQ_16( last_element_mode, IVAS_CPE_DFT ) ) ) )

                {

#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING

                    Scale_sig32( output_fx, output_frame, Q10 - Q11 ); /* Q10 */

                    Scale_sig32( output_fx, st_fx->L_frame, Q10 - Q11 ); /* Q10 */

                    q_output_fx = Q4;

#else

                    Scale_sig32( output_fx, L_FRAME48k, Q10 - Q4 );                                         /* Q10 */

#endif
@@ -510,7 +515,7 @@ ivas_error core_switching_post_dec_fx( 
                    {

                        st_fx->cldfbAna->cldfb_state_fx[offset - delta + i] =

#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING

                            Mpy_32_16_1( L_shl( output_fx[st_fx->L_frame - delta + i], Q10 - Q11 ), alpha ); /* Q10 */

                            Mpy_32_16_1( L_shl( output_fx[st_fx->L_frame - delta + i], sub( Q10, q_output_fx ) ), alpha ); /* Q10 */

#else

                            Mpy_32_16_1( L_shl( output_fx[st_fx->L_frame - delta + i], Q10 - Q4 ), alpha ); /* Q10 */

#endif
@@ -563,7 +568,7 @@ ivas_error core_switching_post_dec_fx( 
                    {

                        st_fx->cldfbAna->cldfb_state_fx[offset - delta + i] =

#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING

                            Mpy_32_16_1( L_shl( output_fx[st_fx->L_frame - delta + i], Q10 - Q11 ), alpha ); /* Q10 */

                            Mpy_32_16_1( L_shl( output_fx[st_fx->L_frame - delta + i], sub( Q10, q_output_fx ) ), alpha ); /* Q10 */

#else

                            Mpy_32_16_1( L_shl( output_fx[st_fx->L_frame - delta + i], Q10 - Q4 ), alpha ); /* Q10 */

#endif

lib_dec/hq_core_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ void ivas_hq_core_dec_fx( 
#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING

    Word16 tmp_out[L_FRAME48k];

#else

    Word16 output[L_FRAME48k];

    Word16 output[L_FRAME16k];

    Word16 Q_output;



    Q_output = 0;