Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 13:09:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'webapp' into dev/webrtc-revisions

Browse source
This commit is contained in:
David Rowe 2021-11-14 14:13:19 +13:00
commit 861b8398f4
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/ports/webrtc/portfile.cmake
View file

@ -24,9 +24,9 @@ else ()
# else Linux desktop # else Linux desktop
vcpkg_download_distfile( vcpkg_download_distfile(
WEBRTC_SOURCE_ARCHIVE WEBRTC_SOURCE_ARCHIVE
URLS "${EXTERNAL_BUILD_ASSETS}/seth/webrtc-20190626-linux.tar.gz" URLS "${EXTERNAL_BUILD_ASSETS}/dependencies/vcpkg/webrtc-m84-gcc-linux.tar.xz"
SHA512 07d7776551aa78cb09a3ef088a8dee7762735c168c243053b262083d90a1d258cec66dc386f6903da5c4461921a3c2db157a1ee106a2b47e7756cb424b66cc43 SHA512 f7c5f93566e2e79241cbb9628ab47302dd48739bb6a022c351be75553060fac4221892d094306a572cb3ec94c5031d7e812f07e7b3c0102be8c01b8c231f8ea0
FILENAME webrtc-20190626-linux.tar.gz FILENAME webrtc-m84-gcc-linux.tar.xz
) )
endif () endif ()

2
libraries/audio-client/src/AudioClient.cpp
View file

@ -2507,4 +2507,4 @@ void AudioClient::setInputVolume(float volume, bool emitSignal) {
emit inputVolumeChanged(_audioInput->volume()); emit inputVolumeChanged(_audioInput->volume());
} }
} }
} }

4
libraries/networking/CMakeLists.txt
View file

@ -4,8 +4,8 @@ link_hifi_libraries(shared platform)
target_openssl() target_openssl()
target_tbb() target_tbb()
if (WIN32)
# WEBRTC TODO: Add UNIX. if (WIN32 OR (UNIX AND NOT APPLE))
target_webrtc() target_webrtc()
endif () endif ()

2
libraries/shared/src/shared/WebRTC.h
View file

@ -37,7 +37,7 @@
#elif defined(Q_OS_LINUX) && defined(Q_PROCESSOR_X86_64) #elif defined(Q_OS_LINUX) && defined(Q_PROCESSOR_X86_64)
# define WEBRTC_AUDIO 1 # define WEBRTC_AUDIO 1
# define WEBRTC_POSIX 1 # define WEBRTC_POSIX 1
# define WEBRTC_LEGACY 1 # define WEBRTC_DATA_CHANNELS 1
#elif defined(Q_OS_LINUX) && defined(Q_PROCESSOR_ARM) #elif defined(Q_OS_LINUX) && defined(Q_PROCESSOR_ARM)
// WebRTC is basically impossible to build on aarch64 Linux. // WebRTC is basically impossible to build on aarch64 Linux.
// I am looking at https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing for an alternative. // I am looking at https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing for an alternative.