Commit 9947e059 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_836_fix' into 'main' 

Remove dependency of UNUSED_PARAM macro when WMOPS macro is enabled

See merge request !518
parents a76bb9bc 639c974c

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ 
    <ClInclude Include="..\lib_com\stat_com_fx_2.h" />

    <ClInclude Include="..\lib_com\stl.h" />

    <ClInclude Include="..\lib_com\typedef.h" />

    <ClInclude Include="..\lib_com\options_warnings.h" />

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

Workspace_msvc/lib_com.vcxproj.filters

+1 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ 
    <ClInclude Include="..\lib_com\enhUL32.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\options_warnings.h" />

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_evs_c">

lib_com/bits_alloc_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -637,8 +637,6 @@ ivas_error config_acelp1( 
    const Word16 GSC_IVAS_mode         /* i  : GSC IVAS mode                   */

)

{

    UNUSED_PARAM( active_cnt );



    Word16 i, bits, nb_subfr;

    Word16 flag_hardcoded, coder_type_sw, fix_first;

    Word32 core_brate;

lib_com/count.c

+12 −9
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ 
#include "options.h"

#include "wmc_auto.h"



#ifndef WMOPS

#include "options_warnings.h"

#endif



#define WMC_TOOL_SKIP



#ifdef WMOPS
@@ -945,9 +949,9 @@ void printStack( char *text, char *Id ) 
#endif

}



#ifdef WMOPS

void BASOP_push_wmops( const char *label )

{

#ifdef WMOPS

    int new_flag, prev_counter;

    int i, j;
@@ -1016,11 +1020,8 @@ void BASOP_push_wmops( const char *label ) 
#ifdef DEBUG_COUNTER

    printf( "Entering: %s\n", readCounterIdName() );

#endif



#endif /* if WMOPS */

    UNUSED_PARAM( label );

}



#endif



Word32 BASOP_pop_wmops( void )

{
@@ -1242,9 +1243,9 @@ void WMOPS_output_all( Word16 dtx_mode ) 
    }

#endif

    WMOPS_destroy();



#endif /* if WMOPS */

#else

    UNUSED_PARAM( dtx_mode );

#endif /* if WMOPS */

}

void WMOPS_output_all_std( Word16 dtx_mode )

{
@@ -1342,8 +1343,9 @@ void WMOPS_output_all_std( Word16 dtx_mode ) 


    WMOPS_destroy();



#endif /* if WMOPS */

#else

    UNUSED_PARAM( dtx_mode );

#endif /* if WMOPS */

}
@@ -1383,10 +1385,11 @@ void BASOP_get_total_wmops( double *min, double *max, double *avg ) 
            ops_cnt += total_wmops[i];

        *avg = ( nbframe[0] == 0 ) ? 0 : ops_cnt / nbframe[0];

    }

#endif /* if WMOPS */

#else

    UNUSED_PARAM( min );

    UNUSED_PARAM( max );

    UNUSED_PARAM( avg );

#endif /* if WMOPS */

}

/* end of file */

#undef WMC_TOOL_SKIP

lib_com/fd_cng_com.c

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ void initFdCngCom_flt( 


    /* Initialize the comfort noise generation */

    set_f( hFdCngCom->fftBuffer_flt, 0.0f, FFTLEN );

    UNUSED_PARAM( scale );

    set_f( hFdCngCom->cngNoiseLevel_flt, 0.0f, FFTCLDFBLEN );

    set_f( hFdCngCom->olapBufferSynth2_flt, 0.0f, FFTLEN );