Commit 46c6fcf3 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

delete most of the recently added push/pop wmops

parent bba34f62

lib_dec/swb_tbe_dec_fx.c

+0 −25
Original line number Diff line number Diff line
@@ -5519,7 +5519,6 @@ void ivas_swb_tbe_dec_fx( 


    hBWE_TD = st->hBWE_TD;



    push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART A" );



    /* initializations */

    GainFrame_fx = 0;
@@ -5561,9 +5560,7 @@ void ivas_swb_tbe_dec_fx( 
        tilt_swb_fec_fx = hBWE_TD->tilt_swb_fec_fx;

        move16();

    }

    pop_wmops(); /*push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART A" );*/



    push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART B" );

    /* WB/SWB bandwidth switching */

    test();

    test();
@@ -5887,9 +5884,6 @@ void ivas_swb_tbe_dec_fx( 
        }

    }



    pop_wmops(); /*push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART B" );*/



    push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART C" );

    /* get the gainshape delay */

    Copy( &hBWE_TD->GainShape_Delay_fx[4], &hBWE_TD->GainShape_Delay_fx[0], NUM_SHB_SUBFR / 4 );

    FOR( i = 0; i < NUM_SHB_SUBFR / 4; i++ )
@@ -5928,9 +5922,7 @@ void ivas_swb_tbe_dec_fx( 
    {

        set16_fx( vf_modified_fx, 0, NB_SUBFR16k );

    }

    pop_wmops(); /*push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART C" );*/



    push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART D" );

    /* SHB LSF from current frame; and convert to LSP for interpolation */

    E_LPC_lsf_lsp_conversion( lsf_shb_fx, lsp_shb_2_fx, LPC_SHB_ORDER );
@@ -6084,9 +6076,6 @@ void ivas_swb_tbe_dec_fx( 
        }

    }



    pop_wmops(); /*push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART D" );*/



    push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART E" );

    /* Save the SWB LSP values from current frame for interpolation */

    Copy( lsp_shb_2_fx, hBWE_TD->swb_lsp_prev_interp_fx, LPC_SHB_ORDER );
@@ -6140,9 +6129,7 @@ void ivas_swb_tbe_dec_fx( 
            Copy( lpc_shb_fx, &lpc_shb_sf_fx[i_mult( j, ( LPC_SHB_ORDER + 1 ) )], LPC_SHB_ORDER + 1 );

        }

    }

    pop_wmops(); /*push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART E" );*/



    push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART F" );

    /* From low band excitation, generate highband excitation */



    /* -------- start of  memory rescaling  -------- */
@@ -6344,9 +6331,6 @@ void ivas_swb_tbe_dec_fx( 
    }

    ener_fx = s_max( 1, round_fx_sat( L_shl_sat( L_ener, sub( 18, shl( Q_bwe_exc, 1 ) ) ) ) ); /* Q2: 2*Q_bwe_exc+18-2*Q_bwe_exc-16 */



    pop_wmops(); /*push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART F" );*/



    push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART G" );

    /* WB/SWB bandwidth switching */

    IF( st->bws_cnt > 0 )

    {
@@ -6664,10 +6648,6 @@ void ivas_swb_tbe_dec_fx( 
    hBWE_TD->prev_Q_bwe_syn = Q_bwe_exc;

    move16();



    pop_wmops(); /*push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART G" );*/





    push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART H" );

    /* Gain shape smoothing after quantization */

    test();

    IF( EQ_32( st->extl_brate, SWB_TBE_1k10 ) || EQ_32( st->extl_brate, SWB_TBE_1k75 ) )
@@ -6860,9 +6840,6 @@ void ivas_swb_tbe_dec_fx( 
        }

    }



    pop_wmops(); /*push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART H" );*/



    push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART J" );

    /* adjust the FEC frame energy */

    IF( st->bfi )

    {
@@ -7020,8 +6997,6 @@ void ivas_swb_tbe_dec_fx( 
        move32();

    }



    pop_wmops(); /*push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART J" );*/



    push_wmops( "ICD PP TBE/BWE swb_tbe_dec PART K" );



    /* generate 32kHz SHB synthesis from 12.8(16)kHz signal */