From 1d2b56c68bbc3287e17f6140bdf8c8c3efe08fdc Mon Sep 17 00:00:00 2001 From: Julian Scheel Date: Fri, 29 Aug 2014 09:09:33 +0200 Subject: [PATCH] mmal: Move video_output plugin into hw/mmal module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the mmal modules will require some shared code in the future move them out of the split directory structure into a hw/mmal subdirectory, like it is handled with vdpau plugins already. Signed-off-by: Julian Scheel Signed-off-by: Rémi Denis-Courmont --- configure.ac | 25 +++++++++++-------- modules/Makefile.am | 6 ++++- modules/hw/mmal/Makefile.am | 8 ++++++ .../{video_output/mmal.c => hw/mmal/vout.c} | 0 modules/video_output/Modules.am | 8 ------ 5 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 modules/hw/mmal/Makefile.am rename modules/{video_output/mmal.c => hw/mmal/vout.c} (100%) diff --git a/configure.ac b/configure.ac index b780242d59..60c18e21b9 100644 --- a/configure.ac +++ b/configure.ac @@ -3515,31 +3515,33 @@ AC_SUBST(KVA_LIBS) AM_CONDITIONAL([HAVE_KVA], [test "${have_kva}" = "yes"]) dnl -dnl MMAL vout plugin +dnl MMAL plugin dnl -AC_ARG_ENABLE(mmal-vout, - AS_HELP_STRING([--enable-mmal-vout], - [Multi-Media Abstraction Layer (MMAL) based vout plugin for Raspberry Pi (default enable)])) -if test "${enable_mmal_vout}" != "no"; then +AC_ARG_ENABLE(mmal, + AS_HELP_STRING([--enable-mmal], + [Multi-Media Abstraction Layer (MMAL) hardware plugin (default enable)])) +if test "${enable_mmal}" != "no"; then VLC_SAVE_FLAGS LDFLAGS="${LDFLAGS} -L/opt/vc/lib" CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux" AC_CHECK_HEADERS(interface/mmal/mmal.h, [ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [ - VLC_ADD_PLUGIN([mmal_vout]) - VLC_ADD_LDFLAGS([mmal_vout],[ -L/opt/vc/lib ]) - VLC_ADD_CFLAGS([mmal_vout],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ]) - VLC_ADD_LIBS([mmal_vout],[ -lbcm_host -lmmal ]) ], [ - AS_IF([test "${enable_mmal_vout}" = "yes"], + have_mmal="yes" + VLC_ADD_PLUGIN([mmal]) + VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ]) + VLC_ADD_CFLAGS([mmal],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ]) + VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal ]) ], [ + AS_IF([test "${enable_mmal}" = "yes"], [ AC_MSG_ERROR([Cannot find bcm library...]) ], [ AC_MSG_WARN([Cannot find bcm library...]) ]) ], []) - ] , [ AS_IF([test "${enable_mmal_vout}" = "yes"], + ] , [ AS_IF([test "${enable_mmal}" = "yes"], [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ], [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ]) VLC_RESTORE_FLAGS fi +AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"]) dnl dnl Audio plugins @@ -4263,6 +4265,7 @@ AC_CONFIG_FILES([ modules/video_output/Makefile modules/visualization/Makefile modules/hw/vdpau/Makefile + modules/hw/mmal/Makefile ]) AM_COND_IF([HAVE_WIN32], [ diff --git a/modules/Makefile.am b/modules/Makefile.am index dc0fb39e63..005c15017d 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -16,7 +16,8 @@ EXTRA_SUBDIRS = \ access_output \ mux \ stream_out \ - hw/vdpau + hw/vdpau \ + hw/mmal SUBDIRS = . $(BASE_SUBDIRS) DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) @@ -26,6 +27,9 @@ endif if HAVE_VDPAU SUBDIRS += hw/vdpau endif +if HAVE_MMAL +SUBDIRS += hw/mmal +endif TESTS = diff --git a/modules/hw/mmal/Makefile.am b/modules/hw/mmal/Makefile.am new file mode 100644 index 0000000000..0ddbe29b01 --- /dev/null +++ b/modules/hw/mmal/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/modules/common.am +mmaldir = $(pluginsdir)/mmal + +libmmal_vout_plugin_la_SOURCES = vout.c +libmmal_vout_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_mmal) +libmmal_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(mmaldir)' $(LDFLAGS_mmal) -lm +libmmal_vout_plugin_la_LIBADD = $(LIBS_mmal) +mmal_LTLIBRARIES = libmmal_vout_plugin.la diff --git a/modules/video_output/mmal.c b/modules/hw/mmal/vout.c similarity index 100% rename from modules/video_output/mmal.c rename to modules/hw/mmal/vout.c diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am index b610edccd5..ad5737fc30 100644 --- a/modules/video_output/Modules.am +++ b/modules/video_output/Modules.am @@ -251,14 +251,6 @@ libcaca_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' EXTRA_LTLIBRARIES += libcaca_plugin.la vout_LTLIBRARIES += $(LTLIBcaca) -### MMAL ### -libmmal_vout_plugin_la_SOURCES = mmal.c -libmmal_vout_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_mmal_vout) -libmmal_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' $(LDFLAGS_mmal_vout) -lm -libmmal_vout_plugin_la_LIBADD = $(LIBS_mmal_vout) -EXTRA_LTLIBRARIES += libmmal_vout_plugin.la -vout_LTLIBRARIES += $(LTLIBmmal_vout) - ### Common ### libvdummy_plugin_la_SOURCES = vdummy.c