Commit 1fbc5486 authored by multrus's avatar multrus
Browse files

[debugging] temporarily disable part of FIX_1320_STACK_CPE_DECODER, to see... 

[debugging] temporarily disable part of FIX_1320_STACK_CPE_DECODER, to see whether this restores BE for all test cases; wrapped in FIX_1320_STACK_CPE_DECODER_CHECK_BE, which is locally defined in ivas_core_dec_fx()
parent 49ca5538

lib_dec/ivas_core_dec_fx.c

+13 −2
Original line number Diff line number Diff line
@@ -76,9 +76,14 @@ ivas_error ivas_core_dec_fx( 
    set16_fx( tmp_buffer_fx, 0, L_FRAME48k );



    Word16 tmps, incr;

#define FIX_1320_STACK_CPE_DECODER_CHECK_BE

#ifdef FIX_1320_STACK_CPE_DECODER

    Word32 *bwe_exc_extended_fx[CPE_CHANNELS] = { NULL, NULL };

    Word16 flag_bwe_bws;

#ifdef FIX_1320_STACK_CPE_DECODER_CHECK_BE

    Word32 bwe_exc_extended_fx[CPE_CHANNELS][L_FRAME32k + NL_BUFF_OFFSET];

#else

    Word32 *bwe_exc_extended_fx[CPE_CHANNELS] = { NULL, NULL };

#endif

#else

    Word32 bwe_exc_extended_fx[CPE_CHANNELS][L_FRAME32k + NL_BUFF_OFFSET];

#endif
@@ -297,7 +302,9 @@ ivas_error ivas_core_dec_fx( 
        set32_fx( hb_synth_32_fx[n], 0, L_FRAME48k );

        set16_fx( hb_synth_16_fx[n], 0, L_FRAME48k );

#ifdef FIX_1320_STACK_CPE_DECODER

#ifndef FIX_1320_STACK_CPE_DECODER_CHECK_BE

        bwe_exc_extended_fx[n] = hb_synth_32_fx[n]; /* note: reuse the buffer */

#endif

#endif



        /*------------------------------------------------------------------*
@@ -1019,15 +1026,19 @@ ivas_error ivas_core_dec_fx( 
        }



        /* Memories  Re-Scaling */

#ifndef FIX_1320_STACK_CPE_DECODER_CHECK_BE

#ifdef FIX_1320_STACK_CPE_DECODER

        test();

        test();

        IF( EQ_16( st->extl, WB_TBE ) || ( EQ_16( st->extl, WB_BWE ) && st->bws_cnt == 0 ) )

        IF( EQ_16( st->extl, WB_TBE ) || ( ( EQ_16( st->extl, WB_BWE ) && st->bws_cnt == 0 ) ) )

        {

#endif

#endif

            Copy_Scale_sig_16_32_no_sat( hb_synth_16_fx[n], hb_synth_32_fx[n], L_FRAME48k, sub( Q11, Q_hb_synth_fx ) ); // Q11

#ifndef FIX_1320_STACK_CPE_DECODER_CHECK_BE

#ifdef FIX_1320_STACK_CPE_DECODER

        }

#endif

#endif

        Copy_Scale_sig_16_32_no_sat( output_16_fx[n], output_32_fx[n], L_FRAME48k, sub( Q11, Q_input ) );    // Q11    // Q_input can get value <= -5

        Copy_Scale_sig_16_32_no_sat( synth_16_fx[n], synth_32_fx[n], output_frame, sub( Q11, Q_synth_fx ) ); // Q11