Commit 29b454bb authored by malenovsky's avatar malenovsky
Browse files

Merge branch... 

Merge branch '897-no-complexity-numbers-for-ivas-internal-evs-implementation-shown-in-automated-complexity' into 'main'

[CI] Resolve "No complexity numbers for IVAS-internal EVS implementation shown in automated complexity measurements"

Closes #897

See merge request !606
parents 722287dd cd30416c

lib_com/count.c

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ void WMOPS_destroy( void ) 
    {

        if ( NULL != objectName[i] )

        {

            free_( objectName[i] );

            free( objectName[i] );

            objectName[i] = NULL;

        }

    }

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -54,11 +54,9 @@ 


#define SUPPORT_JBM_TRACEFILE                   /* Support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */



//#define WMOPS                                   /* Activate complexity and memory counters */

/*#define WMOPS*/                                   /* Activate complexity and memory counters */

#ifdef WMOPS

/*#define WMOPS_PER_FRAME*/                     /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */

/*#define WMOPS_DETAIL*/                        /* Output detailed complexity printout for every function. Increases runtime overhead */

/*#define WMOPS_WC_FRAME_ANALYSIS*/             /* Output detailed complexity analysis for the worst-case frame */

/*#define MEM_COUNT_DETAILS*/                   /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */

#endif

lib_dec/amr_wb_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ ivas_error amr_wb_dec( 
    TCX_LTP_DEC_HANDLE hTcxLtpDec = st->hTcxLtpDec;

    ivas_error error;



    push_wmops( "amr_wb_dec" );



    error = IVAS_ERR_OK;



    /*------------------------------------------------------------------*
@@ -810,6 +812,7 @@ ivas_error amr_wb_dec( 
    /* final output of synthesis signal */

    mvr2r( synth_out, output, output_frame );



    pop_wmops();



    return error;

}

lib_dec/amr_wb_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -88,10 +88,13 @@ ivas_error amr_wb_dec_fx( 
    hTcxLtpDec = st_fx->hTcxLtpDec;

    hTcxDec = st_fx->hTcxDec;



    push_wmops( "amr_wb_dec_fx" );



    error = IVAS_ERR_OK;

    st_fx->idchan = 0;

    move16();

    move16();



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

     * Initialization

     *------------------------------------------------------------------*/
@@ -1111,6 +1114,7 @@ ivas_error amr_wb_dec_fx( 
    /* final output of synthesis signal */

    syn_output_fx( st_fx->codec_mode, synth_out_fx, output_frame, output_sp, st_fx->Q_syn2 );



    pop_wmops();



    return error;

}

lib_dec/evs_dec_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ ivas_error evs_dec_fx( 
    TCX_LTP_DEC_HANDLE hTcxLtpDec;

    TCX_DEC_HANDLE hTcxDec;

    ivas_error error;



    push_wmops( "evs_dec_fx" );



#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move16();
@@ -1502,6 +1505,9 @@ ivas_error evs_dec_fx( 
        }

        updt_dec_common_fx( st_fx, hq_core_type, concealWholeFrameTmp, output_sp, Qpostd );

    }



    pop_wmops();



    return IVAS_ERR_OK;

}

#endif