Skip to content

Support webrtc-aec3 on windows #2775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trengginas merged 2 commits into from
Jul 28, 2021
Merged

Support webrtc-aec3 on windows #2775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
330dadc
Support webrtc-aec3 on windows
trengginas Jul 27, 2021
ba0c7a9
Add modification to PJSIP_NOTES
trengginas Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 39 additions & 36 deletions pjmedia/build/pjmedia.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions pjmedia/build/pjmedia.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@
<ClCompile Include="..\src\pjmedia\vid_conf.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pjmedia\echo_webrtc_aec3.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\pjmedia\alaw_ulaw.h">
Expand Down
5 changes: 5 additions & 0 deletions pjmedia/src/pjmedia/echo_webrtc_aec3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@

#if defined(PJMEDIA_HAS_WEBRTC_AEC3) && PJMEDIA_HAS_WEBRTC_AEC3 != 0

#ifdef _MSC_VER
# pragma warning(disable: 4100) // Unreferenced parameter
# pragma warning(disable: 4244) // Possible loss of data
#endif

#include "modules/audio_processing/aec3/echo_canceller3.h"
#include "modules/audio_processing/ns/noise_suppressor.h"
#include "modules/audio_processing/gain_controller2.h"
Expand Down
41 changes: 41 additions & 0 deletions pjproject-vs14.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebrtc", "third_party\bu
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swig_java_pjsua2", "pjsip-apps\build\swig_java_pjsua2.vcxproj", "{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebrtc_aec3", "third_party\build\webrtc_aec3\libwebrtc_aec3.vcxproj", "{D738A812-CE37-40A4-B2FA-D81488C12C87}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{207e7bd4-7b11-4a40-ba3a-cc627762a7b6}*SharedItemsImports = 4
Expand Down Expand Up @@ -1957,6 +1959,45 @@ Global
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|ARM.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|Win32.ActiveCfg = Release|Win32
{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|x64.ActiveCfg = Release|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|Any CPU.ActiveCfg = Debug|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|ARM.ActiveCfg = Debug|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|Win32.ActiveCfg = Debug|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|x64.ActiveCfg = Debug|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|x64.Build.0 = Debug-Static|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|Any CPU.ActiveCfg = Release|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|ARM.ActiveCfg = Release|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|ARM.Build.0 = Release|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|Win32.ActiveCfg = Release|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|Win32.Build.0 = Release|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|x64.ActiveCfg = Release|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|x64.Build.0 = Release|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|ARM.Build.0 = Release-Static|ARM
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|Win32.Build.0 = Release-Static|Win32
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|x64.ActiveCfg = Release-Static|x64
{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|x64.Build.0 = Release-Static|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
3 changes: 3 additions & 0 deletions pjsip-apps/build/libpjproject.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,9 @@
<ProjectReference Include="..\..\third_party\build\webrtc\libwebrtc.vcxproj">
<Project>{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}</Project>
</ProjectReference>
<ProjectReference Include="..\..\third_party\build\webrtc_aec3\libwebrtc_aec3.vcxproj">
<Project>{d738a812-ce37-40a4-b2fa-d81488c12c87}</Project>
</ProjectReference>
<ProjectReference Include="..\..\third_party\build\yuv\libyuv.vcxproj">
<Project>{6ac9b65f-0862-4a5c-8a9d-141516993130}</Project>
</ProjectReference>
Expand Down
4 changes: 2 additions & 2 deletions third_party/build/webrtc_aec3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export WEBRTC_AEC3_OBJS = \
common_audio/resampler/push_resampler.o \
common_audio/resampler/push_sinc_resampler.o \
common_audio/resampler/sinc_resampler.o \
common_audio/signal_processing/splitting_filter.o \
common_audio/signal_processing/splitting_filter2.o \
api/audio/channel_layout.o \
api/audio/echo_canceller3_config.o \
api/audio/echo_canceller3_factory.o \
Expand Down Expand Up @@ -161,7 +161,7 @@ export WEBRTC_AEC3_OBJS = \
rtc_base/synchronization/mutex.o \
rtc_base/synchronization/yield.o \
rtc_base/system/file_wrapper.o \
system_wrappers/source/cpu_features.o \
system_wrappers/source/cpu_features2.o \
system_wrappers/source/field_trial.o \
system_wrappers/source/metrics.o \
third_party/rnnoise/src/rnn_vad_weights.o \
Expand Down
Loading