Loading .gitlab-ci.yml +1 −1 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ variables: TESTV_DIR: "/usr/local/testv" LTV_DIR: "/usr/local/ltv" EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop" REFERENCE_BRANCH: "ivas-float-update" REFERENCE_BRANCH: "static-sclaing-for-dmx-signals-to-ref" BUILD_OUTPUT: "build_output.txt" SCRIPTS_DIR: "/usr/local/scripts" EXIT_CODE_NON_BE: 123 Loading Workspace_msvc/lib_com.vcxproj +1 −0 Original line number Diff line number Diff line Loading @@ -214,6 +214,7 @@ <ClCompile Include="..\lib_com\ivas_filters.c" /> <ClCompile Include="..\lib_com\ivas_ism_com.c" /> <ClCompile Include="..\lib_com\ivas_lfe_com.c" /> <ClCompile Include="..\lib_com\ivas_limiter.c" /> <ClCompile Include="..\lib_com\ivas_mcmasa_com.c" /> <ClCompile Include="..\lib_com\ivas_dirac_com.c" /> <ClCompile Include="..\lib_com\ivas_masa_com.c" /> Loading Workspace_msvc/lib_com.vcxproj.filters +6 −0 Original line number Diff line number Diff line Loading @@ -426,11 +426,17 @@ <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" /> <<<<<<< HEAD <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\ivas_limiter.c"> <Filter>common_ivas_c</Filter> </ClCompile> >>>>>>> fix </ItemGroup> <ItemGroup> <ClInclude Include="..\lib_com\basop_proto_func.h"> Loading Workspace_msvc/lib_rend.vcxproj +0 −1 Original line number Diff line number Diff line Loading @@ -148,7 +148,6 @@ <ClCompile Include="..\lib_rend\ivas_crend.c" /> <ClCompile Include="..\lib_rend\ivas_dirac_ana.c" /> <ClCompile Include="..\lib_rend\ivas_efap.c" /> <ClCompile Include="..\lib_rend\ivas_limiter.c" /> <ClCompile Include="..\lib_rend\ivas_masa_merge.c" /> <ClCompile Include="..\lib_rend\ivas_mcmasa_ana.c" /> <ClCompile Include="..\lib_rend\ivas_objectRenderer.c" /> Loading Workspace_msvc/lib_rend.vcxproj.filters +0 −6 Original line number Diff line number Diff line Loading @@ -32,9 +32,6 @@ <ClCompile Include="..\lib_rend\ivas_hrtf.c"> <Filter>rend_c</Filter> </ClCompile> <ClCompile Include="..\lib_rend\ivas_limiter.c"> <Filter>rend_c</Filter> </ClCompile> <ClCompile Include="..\lib_rend\ivas_masa_merge.c"> <Filter>rend_c</Filter> </ClCompile> Loading Loading @@ -143,9 +140,6 @@ <ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h"> <Filter>rend_h</Filter> </ClInclude> <ClInclude Include="..\lib_rend\ivas_lcld_prot.h"> <Filter>rend_h</Filter> </ClInclude> </ItemGroup> <ItemGroup> <Filter Include="rend_h"> Loading Loading
.gitlab-ci.yml +1 −1 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ variables: TESTV_DIR: "/usr/local/testv" LTV_DIR: "/usr/local/ltv" EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop" REFERENCE_BRANCH: "ivas-float-update" REFERENCE_BRANCH: "static-sclaing-for-dmx-signals-to-ref" BUILD_OUTPUT: "build_output.txt" SCRIPTS_DIR: "/usr/local/scripts" EXIT_CODE_NON_BE: 123 Loading
Workspace_msvc/lib_com.vcxproj +1 −0 Original line number Diff line number Diff line Loading @@ -214,6 +214,7 @@ <ClCompile Include="..\lib_com\ivas_filters.c" /> <ClCompile Include="..\lib_com\ivas_ism_com.c" /> <ClCompile Include="..\lib_com\ivas_lfe_com.c" /> <ClCompile Include="..\lib_com\ivas_limiter.c" /> <ClCompile Include="..\lib_com\ivas_mcmasa_com.c" /> <ClCompile Include="..\lib_com\ivas_dirac_com.c" /> <ClCompile Include="..\lib_com\ivas_masa_com.c" /> Loading
Workspace_msvc/lib_com.vcxproj.filters +6 −0 Original line number Diff line number Diff line Loading @@ -426,11 +426,17 @@ <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" /> <<<<<<< HEAD <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\ivas_limiter.c"> <Filter>common_ivas_c</Filter> </ClCompile> >>>>>>> fix </ItemGroup> <ItemGroup> <ClInclude Include="..\lib_com\basop_proto_func.h"> Loading
Workspace_msvc/lib_rend.vcxproj +0 −1 Original line number Diff line number Diff line Loading @@ -148,7 +148,6 @@ <ClCompile Include="..\lib_rend\ivas_crend.c" /> <ClCompile Include="..\lib_rend\ivas_dirac_ana.c" /> <ClCompile Include="..\lib_rend\ivas_efap.c" /> <ClCompile Include="..\lib_rend\ivas_limiter.c" /> <ClCompile Include="..\lib_rend\ivas_masa_merge.c" /> <ClCompile Include="..\lib_rend\ivas_mcmasa_ana.c" /> <ClCompile Include="..\lib_rend\ivas_objectRenderer.c" /> Loading
Workspace_msvc/lib_rend.vcxproj.filters +0 −6 Original line number Diff line number Diff line Loading @@ -32,9 +32,6 @@ <ClCompile Include="..\lib_rend\ivas_hrtf.c"> <Filter>rend_c</Filter> </ClCompile> <ClCompile Include="..\lib_rend\ivas_limiter.c"> <Filter>rend_c</Filter> </ClCompile> <ClCompile Include="..\lib_rend\ivas_masa_merge.c"> <Filter>rend_c</Filter> </ClCompile> Loading Loading @@ -143,9 +140,6 @@ <ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h"> <Filter>rend_h</Filter> </ClInclude> <ClInclude Include="..\lib_rend\ivas_lcld_prot.h"> <Filter>rend_h</Filter> </ClInclude> </ItemGroup> <ItemGroup> <Filter Include="rend_h"> Loading