Merge pull request #1351 in FS/freeswitch from…

Merge pull request #1351 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:feature/FS-10530_mod_opusfile to master

* commit 'ed2b3b7b':
  FS-10530: [mod_opusfile]: multichannel
  FS-10530: [mod_opusfile] new module, read and write ogg/opus files (".opus" extension)

build/modules.conf.in

@@ -125,6 +125,7 @@ formats/mod_sndfile
 #formats/mod_ssml
 formats/mod_tone_stream
 #formats/mod_vlc
+#formats/mod_opusfile
 #languages/mod_basic
 #languages/mod_java
 languages/mod_lua

conf/testing/autoload_configs/modules.conf.xml

@@ -26,6 +26,7 @@
     <load module="mod_opus"/>
     <load module="mod_sndfile"/>
     <load module="mod_native_file"/>
+    <load module="mod_opusfile"/>
     <load module="mod_local_stream"/>
     <load module="mod_tone_stream"/>
     <load module="mod_lua"/>

conf/vanilla/autoload_configs/modules.conf.xml

@@ -105,6 +105,7 @@
     <!--<load module="mod_av"/>-->
     <load module="mod_sndfile"/>
     <load module="mod_native_file"/>
+    <!--<load module="mod_opusfile"/>-->
     <load module="mod_png"/>
     <!-- <load module="mod_shell_stream"/> -->
     <!--For icecast/mp3 streams/files-->

configure.ac

@@ -1389,6 +1389,14 @@ PKG_CHECK_MODULES([OPENCV], [opencv >= 2.4.5],[
   AM_CONDITIONAL([HAVE_OPENCV],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPENCV],[false])])
 
+PKG_CHECK_MODULES([OPUSFILE_DECODE], [opusfile >= 0.5],[
+   AM_CONDITIONAL([HAVE_OPUSFILE_DECODE],[true])],[
+   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPUSFILE_DECODE],[false])])
+PKG_CHECK_MODULES([OPUSFILE_ENCODE], [libopusenc >= 0.1],[
+   AM_CONDITIONAL([HAVE_OPUSFILE_ENCODE],[true])],[
+   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPUSFILE_ENCODE],[false])])
+
+
 PKG_CHECK_MODULES([MAGICK], [ImageMagick >= 6.0.0],[
   AM_CONDITIONAL([HAVE_MAGICK],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MAGICK],[false])])
@@ -1946,6 +1954,7 @@ AC_CONFIG_FILES([Makefile
 		src/mod/formats/mod_imagick/Makefile
 		src/mod/formats/mod_local_stream/Makefile
 		src/mod/formats/mod_native_file/Makefile
+		src/mod/formats/mod_opusfile/Makefile
 		src/mod/formats/mod_shell_stream/Makefile
 		src/mod/formats/mod_shout/Makefile
 		src/mod/formats/mod_sndfile/Makefile

debian/control-modules

@@ -621,6 +621,11 @@ Module: formats/mod_webm
 Description: Adds mod_webm
  Adds mod_webm.
 
+Module: formats/mod_opusfile
+Description: mod_opusfile
+ Adds mod_opusfile.
+Build-Depends: libopusfile-dev
+
 ## mod/languages
 
 Module: languages/mod_basic

freeswitch.spec

@@ -38,6 +38,7 @@
 %define build_mod_rayo 1
 %define build_mod_ssml 1
 %define build_mod_shout 0
+%define build_mod_opusfile 0
 
 %{?with_sang_tc:%define build_sng_tc 1 }
 %{?with_sang_isdn:%define build_sng_isdn 1 }
@@ -46,6 +47,7 @@
 %{?with_timerfd:%define build_timerfd 1 }
 %{?with_mod_esl:%define build_mod_esl 1 }
 %{?with_mod_shout:%define build_mod_shout 1 }
+%{?with_mod_opusfile:%define build_mod_opusfile 1 }
 
 %define version 1.7.0
 %define release 1
@@ -1157,6 +1159,18 @@ Mod Shout is a FreeSWITCH module to allow you to stream audio from MP3s or a i
 shoutcast stream.
 %endif
 
+%if %{build_mod_opusfile}
+%package format-mod-opusfile
+Summary:	Plays Opus encoded files
+Group:		System/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	opusfile >= 0.5
+BuildRequires:	opusfile-devel >= 0.5
+
+%description format-mod-opusfile
+Mod Opusfile is a FreeSWITCH module to allow you to play Opus encoded files
+%endif
+
 %if %{build_mod_ssml}
 %package format-ssml
 Summary:        Adds Speech Synthesis Markup Language (SSML) parser format for the FreeSWITCH open source telephony platform
@@ -1546,6 +1560,9 @@ FORMATS_MODULES+=" formats/mod_shout "
 %if %{build_mod_ssml}
 FORMATS_MODULES+=" formats/mod_ssml"
 %endif
+%if %{build_mod_opusfile}
+FORMATS_MODULES+=" formats/mod_opusfile"
+%endif
 
 ######################################################################################################################
 #

src/mod/formats/mod_opusfile/Makefile.am

+include $(top_srcdir)/build/modmake.rulesam
+MODNAME=mod_opusfile
+
+mod_LTLIBRARIES = mod_opusfile.la
+mod_opusfile_la_SOURCES  = mod_opusfile.c
+mod_opusfile_la_CFLAGS   = $(AM_CFLAGS)
+mod_opusfile_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
+mod_opusfile_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+
+if HAVE_OPUSFILE_DECODE
+mod_opusfile_la_CFLAGS += -I$(OPUSFILE_DECODE_CFLAGS)
+mod_opusfile_la_LIBADD += $(OPUSFILE_DECODE_LIBS)
+endif
+
+if HAVE_OPUSFILE_ENCODE
+mod_opusfile_la_CFLAGS += -I$(OPUSFILE_ENCODE_CFLAGS) -DHAVE_OPUSFILE_ENCODE
+mod_opusfile_la_LIBADD += $(OPUSFILE_ENCODE_LIBS)
+endif
+