Add configuration for preprocessor

preprocessor functionality makes a build error in the VD repo.
because it doesn't have some packages such as rnnoise, libaudio-effect,
webrtc-audio-processing.

This configuration would be removed after the packages are completely included.

[Version] 15.0.45
[Issue Type] Build Break(VD)

Change-Id: I5685f0f2852746f3c1ac7257ee98474d9a721bcb
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 01e5190..686996a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,7 @@ MODULE_LIBADD = $(AM_LIBADD) $(PACORE_LIBS) $(PA_LIBS)
 
 pulsemodlibexec_LTLIBRARIES = \
           libhal-interface.la \
-          libprocessor.la \
           libcommunicator.la \
-          libtizenaudio-util.la \
           module-tizenaudio-sink.la \
           module-tizenaudio-source.la \
           module-tizenaudio-sink2.la \
@@ -42,7 +40,6 @@ pulsemodlibexec_LTLIBRARIES = \
           module-tizenaudio-policy.la \
           module-tizenaudio-discover.la \
           module-tizenaudio-publish.la \
-          module-tizenaudio-preprocessor.la \
           module-sound-player.la \
           module-tone-player.la \
           module-poweroff.la
@@ -52,6 +49,10 @@ endif
 if ENABLE_ACM
 pulsemodlibexec_LTLIBRARIES += module-acm-sink.la
 endif
+if ENABLE_PREPROCESSOR
+pulsemodlibexec_LTLIBRARIES += libprocessor.la module-tizenaudio-preprocessor.la
+endif
+pulsemodlibexec_LTLIBRARIES += libtizenaudio-util.la
 
 libhal_interface_la_SOURCES = \
           src/hal-interface.c   src/hal-interface.h
@@ -84,8 +85,12 @@ libtizenaudio_util_la_SOURCES = \
           src/tizenaudio-util.h \
           src/preprocessor/processor-def.h
 libtizenaudio_util_la_LDFLAGS = $(AM_LDFLAGS) $(PA_LDFLAGS) -avoid-version
-libtizenaudio_util_la_LIBADD = $(AM_LIBADD) $(PA_LIBS) libhal-interface.la libprocessor.la
+libtizenaudio_util_la_LIBADD = $(AM_LIBADD) $(PA_LIBS) libhal-interface.la
 libtizenaudio_util_la_CFLAGS = $(MODULE_CFLAGS)
+if ENABLE_PREPROCESSOR
+libtizenaudio_util_la_LIBADD += libprocessor.la
+libtizenaudio_util_la_CFLAGS += -DENABLE_PREPROCESSOR
+endif
 
 module_tizenaudio_sink2_la_SOURCES = src/module-tizenaudio-sink2.c
 module_tizenaudio_sink2_la_LDFLAGS = $(MODULE_LDFLAGS)
@@ -97,6 +102,7 @@ module_tizenaudio_source2_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_tizenaudio_source2_la_LIBADD = $(MODULE_LIBADD) libtizenaudio-util.la
 module_tizenaudio_source2_la_CFLAGS = $(MODULE_CFLAGS) -DPA_MODULE_NAME=module_tizenaudio_source2
 
+if ENABLE_PREPROCESSOR
 libprocessor_la_SOURCES = \
           src/preprocessor/reference_method_filesrc.c \
           src/preprocessor/processor.c \
@@ -117,6 +123,7 @@ module_tizenaudio_preprocessor_la_SOURCES = src/preprocessor/module-tizenaudio-p
 module_tizenaudio_preprocessor_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_tizenaudio_preprocessor_la_LIBADD = $(MODULE_LIBADD) libprocessor.la
 module_tizenaudio_preprocessor_la_CFLAGS = $(MODULE_CFLAGS) -DPA_MODULE_NAME=module_tizenaudio_preprocessor
+endif
 
 module_sound_player_la_SOURCES = src/module-sound-player.c
 module_sound_player_la_LDFLAGS = $(MODULE_LDFLAGS)

diff --git a/configure.ac b/configure.ac
index 6f2ebe6..61f86d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -369,11 +369,6 @@ PKG_CHECK_MODULES(HALAPIAUDIO, hal-api-audio)
 AC_SUBST(HALAPIAUDIO_CFLAGS)
 AC_SUBST(HALAPIAUDIO_LIBS)
 
-PKG_CHECK_MODULES(AUDIOEFFECT, libaudio-effect)
-AC_SUBST(AUDIOEFFECT_CFLAGS)
-AC_SUBST(AUDIOEFFECT_LIBS)
-
-
 dnl use hal tc ------------------------------------------------------------
 AC_ARG_ENABLE(haltc, AC_HELP_STRING([--enable-haltc], [using haltc]),
 [
@@ -398,6 +393,24 @@ AC_ARG_ENABLE(acm, AC_HELP_STRING([--enable-acm], [using acm]),
 AM_CONDITIONAL(ENABLE_ACM, test "x$ENABLE_ACM" = "xyes")
 dnl end --------------------------------------------------------------------
 
+dnl use preprocessor ----------------------------------------------------------------
+AC_ARG_ENABLE(preprocessor, AC_HELP_STRING([--enable-preprocessor], [using preprocessor]),
+[
+ case "${enableval}" in
+        yes) ENABLE_PREPROCESSOR=yes ;;
+        no)  ENABLE_PREPROCESSOR=no ;;
+        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-preprocessor) ;;
+ esac
+ ],[USE_PREPROCESSOR=no])
+AM_CONDITIONAL(ENABLE_PREPROCESSOR, test "x$ENABLE_PREPROCESSOR" = "xyes")
+AS_IF([test "x$ENABLE_PREPROCESSOR" = "xyes"],
+    [
+        PKG_CHECK_MODULES(AUDIOEFFECT, libaudio-effect)
+        AC_SUBST(AUDIOEFFECT_CFLAGS)
+        AC_SUBST(AUDIOEFFECT_LIBS)
+    ])
+dnl end --------------------------------------------------------------------
+
 AM_CONDITIONAL(ENABLE_WEBRTC, test "x$ENABLE_WEBRTC" = "xyes")
 dnl end --------------------------------------------------------------------
 

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 58285ec..1d7a4df 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -2,7 +2,7 @@
 
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          15.0.44
+Version:          15.0.45
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
@@ -24,8 +24,9 @@ BuildRequires:    pkgconfig(libsystemd)
 BuildRequires:    pkgconfig(dns_sd)
 BuildRequires:    pkgconfig(hal-api-audio)
 BuildRequires:    pkgconfig(speexdsp)
-BuildRequires:    pkgconfig(webrtc-audio-processing)
+%if "%{tizen_profile_name}" != "tv"
 BuildRequires:    pkgconfig(libaudio-effect)
+%endif
 BuildRequires:    pulseaudio
 BuildRequires:    m4
 Requires(post):   /sbin/ldconfig
@@ -54,6 +55,9 @@ export LD_AS_NEEDED=0
 %reconfigure --prefix=%{_prefix} \
         --disable-static \
         --enable-acm \
+%if "%{tizen_profile_name}" != "tv"
+        --enable-preprocessor \
+%endif
 %if "%{tizen_profile_name}" == "tv"
         --enable-vconf-helper
 %endif
@@ -87,8 +91,10 @@ install -m 0644 %SOURCE1 %{buildroot}%{_tmpfilesdir}/pulseaudio.conf
 %{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-source2.so
 %{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-discover.so
 %{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-publish.so
+%if "%{tizen_profile_name}" != "tv"
 %{_libdir}/pulse-%{module_ver}/modules/module-tizenaudio-preprocessor.so
 %{_libdir}/pulse-%{module_ver}/modules/libprocessor.so
+%endif
 %{_libdir}/pulse-%{module_ver}/modules/libtizenaudio-util.so
 %{_libdir}/pulse-%{module_ver}/modules/libhal-interface.so
 %{_libdir}/pulse-%{module_ver}/modules/libcommunicator.so

diff --git a/src/tizenaudio-sink2.c b/src/tizenaudio-sink2.c
index 1178799..913a0d7 100644 (file)
--- a/src/tizenaudio-sink2.c
+++ b/src/tizenaudio-sink2.c
@@ -47,9 +47,12 @@
 
 #include "hal-interface.h"
 #include "tizenaudio-util.h"
+
 #include "preprocessor/processor-def.h"
+#ifdef ENABLE_PREPROCESSOR
 #include "preprocessor/processor_holder.h"
 #include "preprocessor/processor_reference.h"
+#endif
 
 #define DEFAULT_SINK_NAME "tizenaudio-sink2"
 
@@ -243,6 +246,7 @@ static int sink_process_msg(
 
     struct userdata *u = PA_SINK(o)->userdata;
 
+#ifdef ENABLE_PREPROCESSOR
     switch (code) {
         case PA_SINK_MESSAGE_GET_LATENCY: {
             int64_t r = 0;
@@ -317,6 +321,7 @@ static int sink_process_msg(
             break;
         }
     }
+#endif
 
     return pa_sink_process_msg(o, code, data, offset, chunk);
 }

diff --git a/src/tizenaudio-source2.c b/src/tizenaudio-source2.c
index f808cf2..e2b12b9 100644 (file)
--- a/src/tizenaudio-source2.c
+++ b/src/tizenaudio-source2.c
@@ -47,8 +47,11 @@
 
 #include "hal-interface.h"
 #include "tizenaudio-util.h"
+
 #include "preprocessor/processor-def.h"
+#ifdef ENABLE_PREPROCESSOR
 #include "preprocessor/processor_holder.h"
+#endif
 
 #define DEFAULT_SOURCE_NAME "tizenaudio-source2"
 
@@ -244,6 +247,7 @@ static int source_process_msg(
 
     struct userdata *u = PA_SOURCE(o)->userdata;
 
+#ifdef ENABLE_PREPROCESSOR
     switch (code) {
         case PA_SOURCE_MESSAGE_GET_LATENCY: {
             uint64_t r = 0;
@@ -296,6 +300,7 @@ static int source_process_msg(
         default:
             break;
     }
+#endif
 
     return pa_source_process_msg(o, code, data, offset, chunk);
 }