mediacodec: don't try OMX.google.*

[vlc] / modules / codec / Makefile.am

diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index d6027fb51dc4a85a0ffa87a53e43ea71000dc56d..0dc451da7fb3a913806bb12223adde8f92aa04d1 100644 (file)
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -24,6 +24,7 @@ libaes3_plugin_la_SOURCES = codec/aes3.c
 codec_LTLIBRARIES += libaes3_plugin.la
 
 libaraw_plugin_la_SOURCES = codec/araw.c
+libaraw_plugin_la_LIBADD = $(LIBM)
 codec_LTLIBRARIES += libaraw_plugin.la
 
 libdts_plugin_la_SOURCES = codec/dts.c codec/dts_header.c codec/dts_header.h
@@ -109,6 +110,13 @@ libjpeg_plugin_la_LIBADD = -ljpeg
 EXTRA_LTLIBRARIES += libjpeg_plugin.la
 codec_LTLIBRARIES += $(LTLIBjpeg)
 
+libsvgdec_plugin_la_SOURCES = codec/svg.c
+libsvgdec_plugin_la_CFLAGS = $(AM_CLAGS) $(CFLAGS_svgdec)
+libsvgdec_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'  $(LDFLAGS_svg)
+libsvgdec_plugin_la_LIBADD = $(LIBS_svgdec)
+EXTRA_LTLIBRARIES += libsvgdec_plugin.la
+codec_LTLIBRARIES += $(LTLIBsvgdec)
+
 libsdl_image_plugin_la_SOURCES = codec/sdl_image.c
 libsdl_image_plugin_la_CFLAGS = $(AM_CFLAGS) $(SDL_IMAGE_CFLAGS)
 libsdl_image_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
@@ -144,6 +152,13 @@ codec_LTLIBRARIES += libcvdsub_plugin.la
 libdvbsub_plugin_la_SOURCES = codec/dvbsub.c
 codec_LTLIBRARIES += libdvbsub_plugin.la
 
+libaribsub_plugin_la_SOURCES = codec/arib/aribsub.c codec/arib/substext.h
+libaribsub_plugin_la_CFLAGS = $(AM_CFLAGS) $(ARIBB24_CFLAGS)
+libaribsub_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libaribsub_plugin_la_LIBADD = $(ARIBB24_LIBS)
+EXTRA_LTLIBRARIES += libaribsub_plugin.la
+codec_LTLIBRARIES += $(LTLIBaribsub)
+
 libscte27_plugin_la_SOURCES = codec/scte27.c
 codec_LTLIBRARIES += libscte27_plugin.la
 
@@ -223,6 +238,13 @@ libtheora_plugin_la_LIBADD = $(THEORA_LIBS)
 EXTRA_LTLIBRARIES += libtheora_plugin.la
 codec_LTLIBRARIES += $(LTLIBtheora)
 
+libdaala_plugin_la_SOURCES = codec/daala.c
+libdaala_plugin_la_CFLAGS = $(AM_CFLAGS) $(DAALA_CFLAGS)
+libdaala_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+libdaala_plugin_la_LIBADD = $(DAALA_LIBS)
+EXTRA_LTLIBRARIES += libdaala_plugin.la
+codec_LTLIBRARIES += $(LTLIBdaala)
+
 libtremor_plugin_la_SOURCES = codec/vorbis.c
 libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
 libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
@@ -313,14 +335,6 @@ if HAVE_AVCODEC_VDA
 codec_LTLIBRARIES += libvda_plugin.la
 endif
 
-libhwdummy_plugin_la_SOURCES = codec/avcodec/hwdummy.c
-libhwdummy_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS) $(AVCODEC_CFLAGS)
-libhwdummy_plugin_la_LIBADD = $(AVCODEC_LIBS)
-# FIXME: hwdummy only needs libavutil, and only if avcodec < 55.13.0
-if HAVE_AVCODEC_VDPAU
-codec_LTLIBRARIES += libhwdummy_plugin.la
-endif
-
 
 ### OpenMAX ###
 
@@ -338,7 +352,8 @@ noinst_HEADERS += \
 
 libomxil_plugin_la_SOURCES = \
        codec/omxil/utils.c codec/omxil/omxil_utils.h \
-       codec/h264_nal.h \
+       codec/h264_nal.c codec/h264_nal.h \
+       codec/hevc_nal.c codec/hevc_nal.h \
        codec/omxil/qcom.c codec/omxil/qcom.h \
        codec/omxil/omxil.c codec/omxil/omxil.h codec/omxil/omxil_core.c codec/omxil/omxil_core.h \
        video_chroma/copy.c
@@ -357,7 +372,8 @@ libiomx_plugin_la_LIBADD = $(libomxil_plugin_la_LIBADD)
 
 libmediacodec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil
 libmediacodec_plugin_la_SOURCES = codec/omxil/android_mediacodec.c codec/omxil/utils.c \
-       video_chroma/copy.c codec/omxil/android_opaque.c codec/omxil/android_opaque.h
+       video_chroma/copy.c codec/omxil/android_opaque.c codec/omxil/android_opaque.h \
+       codec/h264_nal.c codec/h264_nal.h codec/hevc_nal.c codec/hevc_nal.h
 
 codec_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout)
 EXTRA_LTLIBRARIES += libomxil_plugin.la libomxil_vout_plugin.la
@@ -435,7 +451,7 @@ codec_LTLIBRARIES += $(LTLIBtwolame)
 
 ### Hardware encoders ###
 
-libcrystalhd_plugin_la_SOURCES = codec/crystalhd.c codec/h264_nal.h
+libcrystalhd_plugin_la_SOURCES = codec/crystalhd.c codec/h264_nal.c codec/h264_nal.h
 libcrystalhd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
 libcrystalhd_plugin_la_LIBADD = $(LIBS_crystalhd)
 EXTRA_LTLIBRARIES += libcrystalhd_plugin.la
@@ -459,9 +475,9 @@ libdmo_plugin_la_LIBADD += -lole32 -luuid
 codec_LTLIBRARIES += libdmo_plugin.la
 endif
 
-libmft_plugin_la_SOURCES = codec/mft.c
+libmft_plugin_la_SOURCES = codec/mft.c codec/h264_nal.c codec/h264_nal.h
 if HAVE_WIN32
-libmft_plugin_la_LIBADD = -lole32 -luuid
+libmft_plugin_la_LIBADD = -lole32 -luuid -lmfuuid
 codec_LTLIBRARIES += libmft_plugin.la
 endif