Commit e8b27323 authored by malenov's avatar malenov
Browse files

Replaced wmops_sub_start() with push_wmops()

parent f2746625

lib_dec/acelp_core_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ ivas_error acelp_core_dec( 
        return error;

    }



    wmops_sub_start( "acelp_core_dec" );

    push_wmops( "acelp_core_dec" );



    output_frame = (int16_t) ( st->output_Fs / FRAMES_PER_SEC );
@@ -179,7 +179,7 @@ ivas_error acelp_core_dec( 
        set_f( synth, 0, output_frame );  /* They are however read in a few places which causes errors in the valgrind tests. Simplest solution from a code perspective was to set them to zero. */



        /* CN generation done in DFT domain */

        wmops_sub_end();

        pop_wmops();

        return error;

    }
@@ -1432,6 +1432,6 @@ ivas_error acelp_core_dec( 
        st->hTdCngDec->ho_16k_lsp[st->hTdCngDec->ho_circ_ptr] = ( st->L_frame == L_FRAME ? 0 : 1 );

    }



    wmops_sub_end();

    pop_wmops();

    return error;

}

lib_dec/dec_acelp_tcx_main.c

+2 −2
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ void dec_acelp_tcx_frame( 
    float old_bwe_exc[( PIT16k_MAX + ( L_FRAME16k + 1 ) + L_SUBFR16k ) * 2]; /* excitation buffer */

    float *ptr_bwe_exc;                                                      /* pointer to BWE excitation signal in the current frame */



    wmops_sub_start( "dec_acelp_tcx_frame" );

    push_wmops( "dec_acelp_tcx_frame" );



    start_bit_pos = st->next_bit_pos;

    if ( st->rf_flag == 1 )
@@ -479,6 +479,6 @@ void dec_acelp_tcx_frame( 
        st->last_coder_type = INACTIVE;

    }



    wmops_sub_end();

    pop_wmops();

    return;

}

lib_dec/evs_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ ivas_error evs_dec( 


    error = IVAS_ERR_OK;



    wmops_sub_start( "evs_dec" );

    push_wmops( "evs_dec" );

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

     * Initialization

     *-----------------------------------------------------------------*/
@@ -285,7 +285,7 @@ ivas_error evs_dec( 
        /*---------------------------------------------------------------------*

         * Pre-processing for bandwidth switching

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

        wmops_sub_start( "BWE_decoding" );

        push_wmops( "BWE_decoding" );



        bw_switching_pre_proc( st, old_syn_12k8_16k, -1, 1 );
@@ -356,7 +356,7 @@ ivas_error evs_dec( 
            swb_CNG_dec( st, synth, hb_synth, sid_bw );

        }



        wmops_sub_end();

        pop_wmops();



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

         * Delay ACELP core synthesis to be synchronized with the components of bandwidth extension layers
@@ -975,6 +975,6 @@ ivas_error evs_dec( 
    }

#endif



    wmops_sub_end();

    pop_wmops();

    return error;

}

lib_dec/fd_cng_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ void ApplyFdCng( 
    int16_t L_frame, last_L_frame;

    int32_t sr_core;



    wmops_sub_start( "ApplyFdCng" );

    push_wmops( "ApplyFdCng" );



    /* limit L_frame and core Fs values for MDCT-Stereo modes which can have higher core sampling than 16kHz, but use a downsampled buffer */

    L_frame = min( st->L_frame, L_FRAME16k );
@@ -608,7 +608,7 @@ void ApplyFdCng( 
            break;

    }



    wmops_sub_end();

    pop_wmops();



    return;

}
@@ -1771,7 +1771,7 @@ void generate_masking_noise_dirac( 
    int16_t *seed = &( hFdCngCom->seed );

    float scale;



    wmops_sub_start( "fd_cng_dirac" );

    push_wmops( "fd_cng_dirac" );



    /* Init */

    scale = 0.f;
@@ -1930,7 +1930,7 @@ void generate_masking_noise_dirac( 
        }

    }



    wmops_sub_end();

    pop_wmops();



    return;

}

lib_dec/hq_core_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void hq_core_dec( 
    int16_t mdctWindowLength;

    int16_t mdctWindowLengthFB;



    wmops_sub_start( "hq_core_dec" );

    push_wmops( "hq_core_dec" );

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

     * Initializations

     *--------------------------------------------------------------------------*/
@@ -495,7 +495,7 @@ void hq_core_dec( 
        mvr2r( output, st->old_exc + L_EXC_MEM_DEC - st->L_frame, st->L_frame );

    }



    wmops_sub_end();

    pop_wmops();

    return;

}