Skip to content
Snippets Groups Projects
Commit 5d0247d2 authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Adrien Béraud
Browse files

contrib: add webrtc-audio-processing @ v0.3.1

Change-Id: Ib7396b12f98947b25bc96605381cbc29594aa1b7
parent b9aa7719
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,8 @@
"speexdsp",
"upnp",
"yaml-cpp",
"libarchive"
"libarchive",
"webrtc-audio-processing"
],
"configuration": "ReleaseLib_win32",
"project_paths": ["ring-daemon.vcxproj"]
......
......@@ -534,7 +534,6 @@ AS_IF([test "x$with_speex" != xno], [PKG_CHECK_MODULES([SPEEX], [speex])])
AC_DEFINE_UNQUOTED([HAVE_SPEEX], `if test "x$with_speex" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have libspeex])
AM_CONDITIONAL(BUILD_SPEEX, test "x$with_speex" = "xyes" )
# SPEEX DSP
# required dependency(ies): libspeexdsp
dnl check in case the libspeexdsp is not installed
......@@ -548,6 +547,27 @@ AS_IF([test "x$with_speexdsp" != xno], [PKG_CHECK_MODULES([SPEEXDSP], [speexdsp]
AC_DEFINE_UNQUOTED([HAVE_SPEEXDSP], `if test "x$with_speexdsp" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have libspeexdsp])
AM_CONDITIONAL(BUILD_SPEEXDSP, test "x$with_speexdsp" = "xyes" )
# WEBRTC AUDIO PROCESSING
if test "${SYS}" = "linux"; then
dnl Check for webrtc-audio-processing development package
dnl - name: libwebrtc-audio-processing-dev
AC_ARG_WITH([webrtcap],
[AS_HELP_STRING([--without-webrtc-ap], [disable support for webrtc-audio-processing])],
[],
[with_webrtc_ap=yes])
AS_IF([test "x$with_webrtc_ap" = "xyes"],
[PKG_CHECK_MODULES(WEBRTC, [webrtc-audio-processing >= 0.3.1],
[
AC_DEFINE([HAVE_WEBRTC_AP], 1, [Define if you have webrtc-audio-processing])
CPPFLAGS="${CPPFLAGS} ${WEBRTC_CFLAGS}"
LDFLAGS="${LDFLAGS} ${WEBRTC_LIBS}"
],
AC_MSG_WARN([Missing webrtc-audio-processing development files]))
])
fi
AM_CONDITIONAL([HAVE_WEBRTC_AP], test "x$with_webrtc_ap" = "xyes")
dnl check for openDHT
PKG_CHECK_MODULES([OPENDHT], [opendht >= 0.6.1],, AC_MSG_WARN([Missing OpenDHT]))
......
From ffd7e4a3d6be593050190f6b83cd389a680dfb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 12 Mar 2021 14:00:52 -0500
Subject: [PATCH] configure: disable NEON and armv5 code on arm64
---
configure.ac | 6 +++---
webrtc/common_audio/Makefile.am | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index a687e4d..768b63a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,16 +86,16 @@ AM_CONDITIONAL(HAVE_WIN, [test "x${HAVE_WIN}" = "x1"])
# Testing __ARM_ARCH_ISA_ARM since the code contains ARM instructions,
# which don't work on Thumb-2 only platforms (ARMv7-M).
AC_CHECK_DECLS([__ARM_ARCH_ISA_ARM],
- [HAVE_ARM=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM"])
+ [HAVE_ARMV5=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM"])
AC_CHECK_DECLS([__ARM_ARCH_7A__],
[HAVE_ARMV7=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM_V7"])
AC_CHECK_DECLS([__aarch64__],
- [HAVE_NEON=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_HAS_NEON -DWEBRTC_ARCH_ARM64"])
+ [ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM64"])
AC_CHECK_DECLS([__i386__], [HAVE_X86=1])
AC_CHECK_DECLS([__x86_64__], [HAVE_X86=1])
AM_CONDITIONAL(HAVE_X86, [test "x${HAVE_X86}" = "x1"])
-AM_CONDITIONAL(HAVE_ARM, [test "x${HAVE_ARM}" = "x1"])
+AM_CONDITIONAL(HAVE_ARMV5, [test "x${HAVE_ARMV5}" = "x1"])
AM_CONDITIONAL(HAVE_ARMV7, [test "x${HAVE_ARMV7}" = "x1"])
# Borrowed from pulseaudio's configure.ac
diff --git a/webrtc/common_audio/Makefile.am b/webrtc/common_audio/Makefile.am
index 3bbd318..dd898be 100644
--- a/webrtc/common_audio/Makefile.am
+++ b/webrtc/common_audio/Makefile.am
@@ -106,7 +106,7 @@ libcommon_audio_sse2_la_LDFLAGS = $(AM_LDFLAGS)
libcommon_audio_la_LIBADD = libcommon_audio_sse2.la
endif
-if HAVE_ARM
+if HAVE_ARMV5
libcommon_audio_la_SOURCES += \
signal_processing/complex_bit_reverse_arm.S \
signal_processing/spl_sqrt_floor_arm.S
@@ -127,7 +127,7 @@ libcommon_audio_la_SOURCES += \
fir_filter_neon.h
endif
-if !HAVE_ARM
+if !HAVE_ARMV5
# FIXME: This condition will also hold for !HAVE_MIPS
libcommon_audio_la_SOURCES += \
signal_processing/complex_bit_reverse.c \
--
2.30.1
This diff is collapsed.
50ee71900f49d32aecf3dd8c541fd4fe8097496fabbe5fe001691931987373c67fafdfce6648f3b2b971a1eb1883e1c9fdf015fe4cc91260bd40d753c7e538b4 webrtc-audio-processing-v0.3.1.tar.gz
{
"name": "webrtc-audio-processing",
"version": "v0.3.1",
"url": "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/__VERSION__/webrtc-audio-processing-__VERSION__.tar.gz",
"use_cmake": true,
"win_patches": [
"0001-provide-cmake-for-windows.patch"
]
}
\ No newline at end of file
# webrtc-audio-processing
WEBRTCAP_VER := v0.3.1
WEBRTCAP_URL := https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/$(WEBRTCAP_VER)/webrtc-audio-processing-$(WEBRTCAP_VER).tar.gz
ifndef HAVE_DARWIN_OS
PKGS += webrtc-audio-processing
endif
$(TARBALLS)/webrtc-audio-processing-$(WEBRTCAP_VER).tar.gz:
$(call download,$(WEBRTCAP_URL))
.sum-webrtc-audio-processing: webrtc-audio-processing-$(WEBRTCAP_VER).tar.gz
webrtc-audio-processing: webrtc-audio-processing-$(WEBRTCAP_VER).tar.gz .sum-webrtc-audio-processing
$(UNPACK)
$(APPLY) $(SRC)/webrtc-audio-processing/0001-configure-disable-NEON-and-armv5-code-on-arm64.patch
$(MOVE)
.webrtc-audio-processing: webrtc-audio-processing
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-neon=no
cd $< && $(MAKE) install
touch $@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment