Commit 1fccd069 authored by vaclav's avatar vaclav
Browse files

simplification

parent cba1fbbb

lib_dec/ivas_core_dec_fx.c

+10 −39
Original line number Diff line number Diff line
@@ -1468,48 +1468,14 @@ ivas_error ivas_core_dec_fx( 
         * - updates for potential TD->DFT stereo switching

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



        IF( hCPE != NULL )

        {

            FOR( Word32 ch_ind = 0; ch_ind < n_channels; ch_ind++ )

            {

                IF( hCPE->hCoreCoder[ch_ind] != NULL )

                {

                    IF( hCPE->hCoreCoder[ch_ind]->hHQ_core != NULL )

                    {

#ifdef FIX_ISSUE_1237

                        Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[ch_ind]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[ch_ind]->hHQ_core->old_outLB_fx, L_FRAME32k, sub( Q11, hCPE->hCoreCoder[ch_ind]->hHQ_core->Q_old_wtda_LB ) ); // Q11

                        Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[ch_ind]->hHQ_core->old_out_fx, hCPE->hCoreCoder[ch_ind]->hHQ_core->oldOut_fx, L_FRAME48k, sub( Q11, hCPE->hCoreCoder[ch_ind]->hHQ_core->Q_old_wtda ) );          // Q11



#else

                        Copy_Scale_sig_16_32_DEPREC( hCPE->hCoreCoder[ch_ind]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[ch_ind]->hHQ_core->old_outLB_fx, L_FRAME32k, sub( Q11, hCPE->hCoreCoder[ch_ind]->hHQ_core->Q_old_wtda_LB ) ); // Q11

                        Copy_Scale_sig_16_32_DEPREC( hCPE->hCoreCoder[ch_ind]->hHQ_core->old_out_fx, hCPE->hCoreCoder[ch_ind]->hHQ_core->oldOut_fx, L_FRAME48k, sub( Q11, hCPE->hCoreCoder[ch_ind]->hHQ_core->Q_old_wtda ) );          // Q11

#endif

                    }

                }

            }

        }

        IF( hSCE != NULL )

        {

            IF( hSCE->hCoreCoder[0] != NULL )

            {

                IF( hSCE->hCoreCoder[0]->hHQ_core != NULL )

                {

#ifdef FIX_ISSUE_1237

                    Copy_Scale_sig_16_32_no_sat( hSCE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hSCE->hCoreCoder[0]->hHQ_core->old_outLB_fx, L_FRAME32k, sub( Q11, hSCE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ) ); // Q11

                    Copy_Scale_sig_16_32_no_sat( hSCE->hCoreCoder[0]->hHQ_core->old_out_fx, hSCE->hCoreCoder[0]->hHQ_core->oldOut_fx, L_FRAME48k, sub( Q11, hSCE->hCoreCoder[0]->hHQ_core->Q_old_wtda ) );          // Q11

        Copy_Scale_sig_16_32_no_sat( st->hHQ_core->old_out_LB_fx, st->hHQ_core->old_outLB_fx, L_FRAME32k, sub( Q11, st->hHQ_core->Q_old_wtda_LB ) ); // Q11

        Copy_Scale_sig_16_32_no_sat( st->hHQ_core->old_out_fx, st->hHQ_core->oldOut_fx, L_FRAME48k, sub( Q11, st->hHQ_core->Q_old_wtda ) );          // Q11

#else

                    Copy_Scale_sig_16_32_DEPREC( hSCE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hSCE->hCoreCoder[0]->hHQ_core->old_outLB_fx, L_FRAME32k, sub( Q11, hSCE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ) );                    // Q11

                    Copy_Scale_sig_16_32_DEPREC( hSCE->hCoreCoder[0]->hHQ_core->old_out_fx, hSCE->hCoreCoder[0]->hHQ_core->oldOut_fx, L_FRAME48k, sub( Q11, hSCE->hCoreCoder[0]->hHQ_core->Q_old_wtda ) );                             // Q11

        Copy_Scale_sig_16_32_DEPREC( st->hHQ_core->old_out_LB_fx, st->hHQ_core->old_outLB_fx, L_FRAME32k, sub( Q11, st->hHQ_core->Q_old_wtda_LB ) ); // Q11

        Copy_Scale_sig_16_32_DEPREC( st->hHQ_core->old_out_fx, st->hHQ_core->oldOut_fx, L_FRAME48k, sub( Q11, st->hHQ_core->Q_old_wtda ) );          // Q11

#endif

                }

            }

        }



        Word16 exp_max;

        Word32 output_fx_loc[L_FRAME48k];



        exp_max = 0;

        move16();

        IF( NE_16( st->element_mode, IVAS_CPE_DFT ) )

        {

            test();
@@ -1565,8 +1531,13 @@ ivas_error ivas_core_dec_fx( 
         * Common updates

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



        /*Scale Memories*/

        Word16 exp_max;

        Word32 output_fx_loc[L_FRAME48k];



        exp_max = 0;

        move16();



        /*Scale Memories*/

        test();

        test();

        test();