Commit fea01257 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'fix_MSVC_build' into 'main' 

Fix msvc build

See merge request !1176
parents 1e8b9f11 83f55d06

Workspace_msvc/lib_com.vcxproj.filters

+189 −63
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ 
    <ClCompile Include="..\lib_com\tools_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -161,7 +160,6 @@ 
    <ClCompile Include="..\lib_com\log2.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

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

      <Filter>common_evs_c</Filter>

    </ClCompile>
@@ -216,7 +214,6 @@ 
    <ClCompile Include="..\lib_com\cng_exc_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -361,65 +358,192 @@ 
    <ClCompile Include="..\lib_com\gain_inov_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <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\ivas_stereo_ica_com_fx.c" />

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

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

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

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

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

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">
@@ -493,7 +617,6 @@ 
    <ClInclude Include="..\lib_com\rom_com_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

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

    <ClInclude Include="..\lib_com\count.h">

      <Filter>common_h</Filter>

    </ClInclude>
@@ -504,6 +627,9 @@ 
    <ClInclude Include="..\lib_com\ivas_prot_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\prot_fx.h">

      <Filter>common_all_c</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_evs_c">

Workspace_msvc/lib_dec.vcxproj.filters

+902 −295

File changed.

Preview size limit exceeded, changes collapsed.

Workspace_msvc/lib_enc.vcxproj.filters

+530 −542

File changed.

Preview size limit exceeded, changes collapsed.

Workspace_msvc/renderer.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

apps/renderer.c

+50 −6
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#include "vector3_pair_file_reader.h"

#include "wmc_auto.h"



#include "prot_fx.h"



#define WMC_TOOL_SKIP
@@ -56,11 +55,15 @@ 
 * Local constants

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



#define Q15        15

#define Q22        22

#define Q31        31

#define ONE_IN_Q31 0x7fffffff



#define RENDERER_MAX_CLI_ARG_LENGTH       ( FILENAME_MAX )

#define RENDERER_MAX_METADATA_LENGTH      8192

#define RENDERER_MAX_METADATA_LINE_LENGTH 1024





#define IVAS_MAX16B_FLT 32767.0f

#define IVAS_MIN16B_FLT ( -32768.0f )

#define IVAS_MAX16B_FX  32767
@@ -428,6 +431,47 @@ static Word16 find_guard_bits( Word32 n ) 
                    : n <= 1024 ? 10

                                : 11;

}



static Word32 floatToFixed( float f, Word16 Q )

{

    Word64 result_32;



    if ( f == 1.0f && Q == Q15 )

        return IVAS_MAX16B_FX;

    if ( f == 1.0f && Q == Q31 )

        return MAXVAL_WORD32;

    if ( Q < 0 )

        result_32 = (Word64) ( (float) ( f ) / (double) ( (unsigned Word64) 1 << ( -Q ) ) + ( f >= 0 ? 0.5 : -0.5 ) );

    else

        result_32 = (Word64) ( f * (double) ( (unsigned Word64) 1 << Q ) + ( f >= 0 ? 0.5 : -0.5 ) );

    if ( result_32 > MAX_32 )

        return MAX_32;

    if ( result_32 < MIN_32 )

        return MIN_32;



    return (Word32) result_32;

}



/* note: This function is defined inside the library too with different name but same functionality */

static void floatToFixed_arrL_app( float *f, Word32 *i, Word16 Q, Word16 l )

{

    for ( int j = 0; j < l; j++ )

    {

        Word64 i64_val = floatToFixed( f[j], Q );

        IF( i64_val > MAX_32 )

        {

            i64_val = MAX_32;

        }

        ELSE IF( i64_val < MIN_32 )

        {

            i64_val = MIN_32;

        }

        i[j] = (Word32) i64_val;

    }



    return;

}



static IVAS_REND_ReadOnlyAudioBuffer getReadOnlySubBuffer(

    IVAS_REND_AudioBuffer buffer,

    const Word16 chBeginIdx,
@@ -930,8 +974,8 @@ int main( 
    /* Set up output custom layout configuration */

    if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

    {

        floatToFixed_arrL( args.outConfig.outSetupCustom.azimuth, args.outConfig.outSetupCustom.azimuth_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );

        floatToFixed_arrL( args.outConfig.outSetupCustom.elevation, args.outConfig.outSetupCustom.elevation_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );

        floatToFixed_arrL_app( args.outConfig.outSetupCustom.azimuth, args.outConfig.outSetupCustom.azimuth_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );

        floatToFixed_arrL_app( args.outConfig.outSetupCustom.elevation, args.outConfig.outSetupCustom.elevation_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );

        if ( ( error = IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( hIvasRend, args.outConfig.outSetupCustom ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Error in IVAS_REND_ConfigureCustomOutputLoudspeakerLayout(): %s\n", ivas_error_to_string( error ) );
@@ -1018,8 +1062,8 @@ int main( 


        if ( args.inConfig.multiChannelBuses[i].audioConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

        {

            floatToFixed_arrL( args.inConfig.inSetupCustom.azimuth, args.inConfig.inSetupCustom.azimuth_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );

            floatToFixed_arrL( args.inConfig.inSetupCustom.elevation, args.inConfig.inSetupCustom.elevation_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );

            floatToFixed_arrL_app( args.inConfig.inSetupCustom.azimuth, args.inConfig.inSetupCustom.azimuth_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );

            floatToFixed_arrL_app( args.inConfig.inSetupCustom.elevation, args.inConfig.inSetupCustom.elevation_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );

            if ( ( error = IVAS_REND_ConfigureCustomInputLoudspeakerLayout( hIvasRend, mcIds[i], args.inConfig.inSetupCustom ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Error in IVAS_REND_ConfigureCustomInputLoudspeakerLayout(): %s\n", ivas_error_to_string( error ) );