From: Julian Scheel <julian@jusst.de>
Date: Fri, 29 Aug 2014 07:09:34 +0000 (+0200)
Subject: mmal: Move codec plugin into hw/mmal module
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bdb1d86acfb0d0068e57281b6fbfc52345960d29;p=vlc

mmal: Move codec plugin into hw/mmal module

The mmal codec plugin is built as a part of the mmal module now. This drops
the ability to en-/disable codec support independently from the vout, but in
fact currently there is no mmal implementation which wouldn't support both
modules, so it seems sane to build them together as this unclutters the
configure scripts a little.

Signed-off-by: Julian Scheel <julian@jusst.de>
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
---

diff --git a/configure.ac b/configure.ac
index 60c18e21b9..27873911a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2151,33 +2151,6 @@ then
   VLC_ADD_CFLAGS([omxil omxil_vout],[-DRPI_OMX])
 fi
 
-dnl
-dnl MMAL codec plugin
-dnl
-AC_ARG_ENABLE(mmal-codec,
-  AS_HELP_STRING([--enable-mmal-codec],
-    [Multi-Media Abstraction Layer (MMAL) based codec plugin for Raspberry Pi (default enable)]))
-if test "${enable_mmal_codec}" != "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, bcm_host_init, [
-        VLC_ADD_PLUGIN([mmal_codec])
-        VLC_ADD_LDFLAGS([mmal_codec],[ -L/opt/vc/lib ])
-        VLC_ADD_CFLAGS([mmal_codec],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ])
-        VLC_ADD_LIBS([mmal_codec],[ -lbcm_host -lmmal ]) ], [
-          AS_IF([test "${enable_mmal_codec}" = "yes"],
-            [ AC_MSG_ERROR([Cannot find bcm library...]) ],
-            [ AC_MSG_WARN([Cannot find bcm library...]) ])
-          ],
-        [])
-    ] , [ AS_IF([test "${enable_mmal_codec}" = "yes"],
-      [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ],
-      [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ])
-  VLC_RESTORE_FLAGS
-fi
-
 dnl
 dnl CrystalHD codec plugin
 dnl
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index c35192986b..cc99a36c95 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -389,16 +389,6 @@ codec_LTLIBRARIES += libiomx_plugin.la libmediacodec_plugin.la
 endif
 
 
-### MMAL ###
-
-libmmal_codec_plugin_la_SOURCES = codec/mmal.c
-libmmal_codec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_mmal_codec)
-libmmal_codec_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' $(LDFLAGS_mmal_codec)
-libmmal_codec_plugin_la_LIBADD = $(LIBS_mmal_codec)
-EXTRA_LTLIBRARIES += libmmal_codec_plugin.la
-codec_LTLIBRARIES += $(LTLIBmmal_codec)
-
-
 ### X26x encoders ###
 
 libx265_plugin_la_SOURCES = codec/x265.c
diff --git a/modules/hw/mmal/Makefile.am b/modules/hw/mmal/Makefile.am
index 0ddbe29b01..4f7f275d73 100644
--- a/modules/hw/mmal/Makefile.am
+++ b/modules/hw/mmal/Makefile.am
@@ -1,8 +1,17 @@
 include $(top_srcdir)/modules/common.am
 mmaldir = $(pluginsdir)/mmal
 
+AM_CFLAGS += $(CFLAGS_mmal)
+AM_LDFLAGS += -rpath '$(mmaldir)' $(LDFLAGS_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_CFLAGS = $(AM_CFLAGS)
+libmmal_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -lm
 libmmal_vout_plugin_la_LIBADD = $(LIBS_mmal)
 mmal_LTLIBRARIES = libmmal_vout_plugin.la
+
+libmmal_codec_plugin_la_SOURCES = codec.c
+libmmal_codec_plugin_la_CFLAGS = $(AM_CFLAGS)
+libmmal_codec_plugin_la_LDFLAGS = $(AM_LDFLAGS)
+libmmal_codec_plugin_la_LIBADD = $(LIBS_mmal)
+mmal_LTLIBRARIES += libmmal_codec_plugin.la
diff --git a/modules/codec/mmal.c b/modules/hw/mmal/codec.c
similarity index 100%
rename from modules/codec/mmal.c
rename to modules/hw/mmal/codec.c