Commit ccfb90b4 authored by malenovsky's avatar malenovsky
Browse files

Merge branch 'replace_complexity_counting_mechanism_from_count_to_wmc_tool' into 'main' 

Replace complexity counting mechanism from count to wmc tool

Closes #1047

See merge request !819
parents 45f78445 5f78aabd

Workspace_msvc/lib_com.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -142,9 +142,7 @@ 
    <ClCompile Include="..\lib_com\cng_exc_fx.c" />

    <ClCompile Include="..\lib_com\codec_tcx_common.c" />

    <ClCompile Include="..\lib_com\complex_basop.c" />

    <ClCompile Include="..\lib_com\control.c" />

    <ClCompile Include="..\lib_com\core_com_config.c" />

    <ClCompile Include="..\lib_com\count.c" />

    <ClCompile Include="..\lib_com\deemph.c" />

    <ClCompile Include="..\lib_com\delay_comp.c" />

    <ClCompile Include="..\lib_com\disclaimer.c" />

Workspace_msvc/lib_com.vcxproj.filters

+0 −4
Original line number Diff line number Diff line
@@ -76,9 +76,6 @@ 
    <ClCompile Include="..\lib_com\ivas_lfe_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\control.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\enh64.c">

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -417,7 +414,6 @@ 
    <ClCompile Include="..\lib_com\tools.c" />

    <ClCompile Include="..\lib_com\wtda.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c" />

    <ClCompile Include="..\lib_com\count.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c" />

    <ClCompile Include="..\lib_com\frame_ener_fx.c" />

    <ClCompile Include="..\lib_com\get_gain_fx.c" />

lib_com/basop32.c

+2 −4
Original line number Diff line number Diff line
@@ -159,7 +159,9 @@ HISTORY: 


#include <stdio.h>

#include <stdlib.h>

#include "options.h"

#include "stl.h"



#ifdef BASOP_NOGLOB

#include <assert.h>

#endif /* BASOP_NOGLOB */
@@ -170,10 +172,6 @@ HISTORY: 
#pragma warning( disable : 4310 )

#endif



#ifdef WMOPS

extern BASIC_OP multiCounter[MAXCOUNTERS];

extern int currCounter;

#endif



/*___________________________________________________________________________

 |                                                                           |

lib_com/basop_util.c

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include "rom_com.h"

#include "rom_basic_math.h"

#include "basop_settings.h"

#include "control.h"

#include "cnst.h"

lib_com/complex_basop.c

+1 −14
Original line number Diff line number Diff line
@@ -9,22 +9,9 @@ 
*****************************************************************************/





#include "typedef.h"

#include "basop32.h"



#include "complex_basop.h"



#include "stl.h"





#ifdef WMOPS



extern BASIC_OP multiCounter[MAXCOUNTERS];



extern int currCounter;



#endif /* if WMOPS */



#define WMC_TOOL_SKIP



#ifdef COMPLEX_OPERATOR