Commit c0d66be5 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

compilation fixes, compiles on windows

parent 69394535

Workspace_msvc/Workspace_msvc.sln

+12 −0
Original line number Diff line number Diff line
@@ -99,6 +99,18 @@ Global 
		{95030B82-70CD-4C6B-84D4-61096035BEA2}.Release|Win32.ActiveCfg = Release|Win32

		{95030B82-70CD-4C6B-84D4-61096035BEA2}.Release|Win32.Build.0 = Release|Win32

		{95030B82-70CD-4C6B-84D4-61096035BEA2}.Release|x64.ActiveCfg = Release|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Debug|Win32.ActiveCfg = Debug|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Debug|Win32.Build.0 = Debug|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Debug|x64.ActiveCfg = Debug|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Release|Win32.ActiveCfg = Release|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Release|Win32.Build.0 = Release|Win32

		{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}.Release|x64.ActiveCfg = Release|Win32

		{12374ADC-0E5C-4FDD-B903-71D572413831}.Debug|Win32.ActiveCfg = Debug|Win32

		{12374ADC-0E5C-4FDD-B903-71D572413831}.Debug|Win32.Build.0 = Debug|Win32

		{12374ADC-0E5C-4FDD-B903-71D572413831}.Debug|x64.ActiveCfg = Debug|Win32

		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release|Win32.ActiveCfg = Release|Win32

		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release|Win32.Build.0 = Release|Win32

		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release|x64.ActiveCfg = Release|Win32

	EndGlobalSection

	GlobalSection(SolutionProperties) = preSolution

		HideSolutionNode = FALSE

apps/renderer.c

+0 −1
Original line number Diff line number Diff line
@@ -1907,7 +1907,6 @@ int main( 
    free( outInt16Buffer );

    free( outFloatBuffer );



cleanup:



#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( bitsBufferData != NULL )

lib_dec/ivas_dirac_dec.c

+23 −67
Original line number Diff line number Diff line
@@ -1849,24 +1849,6 @@ void ivas_dirac_dec_render_sf( 
                set_zero( surCohRatio, hSpatParamRendCom->num_freq_bands );

            }

        }



        if ( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[st_ivas->hCombinedOrientationData->subframe_idx] && st_ivas->hCombinedOrientationData->shd_rot_max_order == 1 )

        {

            ivas_dirac_dec_compute_directional_responses( hSpatParamRendCom,

                                                          hDirACRend,

                                                          st_ivas->hVBAPdata,

                                                          st_ivas->hMasa == NULL ? NULL : st_ivas->hMasa->data.band_mapping,

                                                          st_ivas->hMasaIsmData,

                                                          azimuth,

                                                          elevation,

                                                          md_idx,

                                                          surCohRatio,

                                                          st_ivas->hCombinedOrientationData->shd_rot_max_order,

                                                          p_Rmat,

                                                          hodirac_flag );

        }

        else

        {

        ivas_dirac_dec_compute_directional_responses( hSpatParamRendCom,

                                                      hDirACRend,

                                                      st_ivas->hVBAPdata,
@@ -1876,11 +1858,8 @@ void ivas_dirac_dec_render_sf( 
                                                      elevation,

                                                      md_idx,

                                                      surCohRatio,

                                                          0,

                                                          NULL,

                                                      hodirac_flag );

    }

    }



    if ( st_ivas->ivas_format == MASA_ISM_FORMAT && nchan_transport == 2 )

    {
@@ -2209,8 +2188,6 @@ void ivas_dirac_dec_render_sf( 
        }



        /*Compute PSDs*/

        if ( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[st_ivas->hCombinedOrientationData->subframe_idx] && st_ivas->hCombinedOrientationData->shd_rot_max_order > 0 )

        {

        ivas_dirac_dec_output_synthesis_process_slot( reference_power,

                                                      p_onset_filter,

                                                      azimuth,
@@ -2218,33 +2195,12 @@ void ivas_dirac_dec_render_sf( 
                                                      hSpatParamRendCom->diffuseness_vector[md_idx],

                                                      hSpatParamRendCom,

                                                      hDirACRend,

                                                          st_ivas->hCombinedOrientationData->shd_rot_max_order,

                                                          p_Rmat,

                                                      st_ivas->hVBAPdata,

                                                      hDirACRend->hOutSetup,

                                                      nchan_transport,

                                                      md_idx,

                                                      hodirac_flag,

                                                      hDirAC->hConfig->dec_param_estim );

        }

        else

        {

            ivas_dirac_dec_output_synthesis_process_slot( reference_power,

                                                          p_onset_filter,

                                                          azimuth,

                                                          elevation,

                                                          hSpatParamRendCom->diffuseness_vector[md_idx],

                                                          hSpatParamRendCom,

                                                          hDirACRend,

                                                          0,

                                                          0,

                                                          st_ivas->hVBAPdata,

                                                          hDirACRend->hOutSetup,

                                                          nchan_transport,

                                                          md_idx,

                                                          hodirac_flag,

                                                          hDirAC->hConfig->dec_param_estim );

        }



        if ( hDirAC->hConfig->dec_param_estim )

        {

lib_enc/ivas_osba_enc.c

+2 −0
Original line number Diff line number Diff line
@@ -447,7 +447,9 @@ static void ivas_osba_render_ism_to_sba( 
    int16_t azimuth, elevation;

    float gains[MAX_INPUT_CHANNELS];

    float g1, g2;

#ifndef NONE_BE_FIX_BASOP_1044_OSBA_PRERENDER_MIX_GAINS

    float output_gain;

#endif



    int16_t nchan_sba;

lib_rend/ivas_shoebox.c

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

#include <stdint.h>

#include <math.h>

#include "ivas_prot.h"

#include "ivas_prot_rend.h"

#include "ivas_stat_rend.h"

#include "ivas_cnst.h"