Skip to content

Commit ecab16e

Browse files
seven1240mjerris
authored andcommitted
FS-7516: add mod_imagick
use the magick-core API We have pdfs and gifs auto play gif and png yeah, you can play video files with imgk video only requires ffmpeg binary need autoplay=(1000/FPS)
1 parent f364a41 commit ecab16e

File tree

5 files changed

+454
-0
lines changed

5 files changed

+454
-0
lines changed

build/modules.conf.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ event_handlers/mod_event_socket
111111
#event_handlers/mod_odbc_cdr
112112
#event_handlers/mod_rayo
113113
#event_handlers/mod_snmp
114+
#formats/mod_imagick
114115
formats/mod_local_stream
115116
formats/mod_native_file
116117
#formats/mod_portaudio_stream

configure.ac

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,10 @@ PKG_CHECK_MODULES([OPENCV], [opencv >= 2.4.9.1],[
12561256
AM_CONDITIONAL([HAVE_OPENCV],[true])],[
12571257
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPENCV],[false])])
12581258

1259+
PKG_CHECK_MODULES([MAGICK], [ImageMagick >= 6.0.0],[
1260+
AM_CONDITIONAL([HAVE_MAGICK],[true])],[
1261+
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MAGICK],[false])])
1262+
12591263
PKG_CHECK_MODULES([MEMCACHED], [libmemcached >= 0.31],[
12601264
AM_CONDITIONAL([HAVE_MEMCACHED],[true])
12611265
MEMCACHED_LIBS="${MEMCACHED_LIBS} -lpthread"
@@ -1643,6 +1647,7 @@ AC_CONFIG_FILES([Makefile
16431647
src/mod/event_handlers/mod_snmp/Makefile
16441648
src/mod/event_handlers/mod_event_zmq/Makefile
16451649
src/mod/formats/mod_avformat/Makefile
1650+
src/mod/formats/mod_imagick/Makefile
16461651
src/mod/formats/mod_local_stream/Makefile
16471652
src/mod/formats/mod_native_file/Makefile
16481653
src/mod/formats/mod_shell_stream/Makefile
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
include $(top_srcdir)/build/modmake.rulesam
2+
MODNAME=mod_imagick
3+
4+
if HAVE_MAGICK
5+
6+
mod_LTLIBRARIES = mod_imagick.la
7+
mod_imagick_la_SOURCES = mod_imagick.c
8+
mod_imagick_la_CFLAGS = $(AM_CFLAGS) $(MAGICK_CFLAGS)
9+
mod_imagick_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(MAGICK_LIBS)
10+
mod_imagick_la_LDFLAGS = -avoid-version -module -no-undefined -shared
11+
12+
else
13+
install: error
14+
all: error
15+
error:
16+
$(error You must install libmagickcore-dev to build mod_imagick)
17+
endif
18+
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#Mac
2+
#LOCAL_CFLAGS=-I/usr/local/Cellar/imagemagick/6.8.9-8/include/ImageMagick-6
3+
#LOCAL_LDFLAGS=-L/usr/local/Cellar/imagemagick/6.8.9-8/lib -lMagickCore-6.Q16
4+
5+
LOCAL_CFLAGS=-I/usr/include/ImageMagick
6+
LOCAL_LDFLAGS=-L/usr/lib/x86_64-linux-gnu -lMagickCore
7+
8+
BASE=../../../..
9+
include $(BASE)/build/modmake.rules

0 commit comments

Comments
 (0)