Commit 61f7f3dc authored by Ludovic Fauvet's avatar Ludovic Fauvet

Add MPEG audio layer I, II, III decoder based on mpg123

parent 575a20f3
...@@ -20,6 +20,7 @@ Decoder: ...@@ -20,6 +20,7 @@ Decoder:
* Important improvements for the MMAL decoder and output for rPI * Important improvements for the MMAL decoder and output for rPI
* Support HEVC hardware decoding using OMX and MediaCodec * Support HEVC hardware decoding using OMX and MediaCodec
* Support VP9 and WMV3 decoding using OMX and performance improvements * Support VP9 and WMV3 decoding using OMX and performance improvements
* New MPEG-1 & 2 audio layer I, II, III + MPEG 2.5 decoder based on libmpg123
Demuxers: Demuxers:
* Support HD-DVD .evo (H.264, VC-1, MPEG-2, PCM, AC-3, E-AC3, MLP, DTS) * Support HD-DVD .evo (H.264, VC-1, MPEG-2, PCM, AC-3, E-AC3, MLP, DTS)
......
...@@ -2234,6 +2234,11 @@ AC_SUBST(MAD_CFLAGS) ...@@ -2234,6 +2234,11 @@ AC_SUBST(MAD_CFLAGS)
AC_SUBST(MAD_LIBS) AC_SUBST(MAD_LIBS)
AM_CONDITIONAL([HAVE_MAD], [test "${have_mad}" = "yes"]) AM_CONDITIONAL([HAVE_MAD], [test "${have_mad}" = "yes"])
dnl mpg123 plugin
dnl
dnl
PKG_ENABLE_MODULES_VLC([MPG123], [mpg123], [libmpg123], [libmpg123 decoder support], [auto])
AC_ARG_ENABLE(merge-ffmpeg, AC_ARG_ENABLE(merge-ffmpeg,
[ --enable-merge-ffmpeg merge FFmpeg-based plugins (default disabled)],, [ [ --enable-merge-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
......
...@@ -226,6 +226,7 @@ $Id$ ...@@ -226,6 +226,7 @@ $Id$
* mp4: MP4 file input module * mp4: MP4 file input module
* mpc: Musepack decoder * mpc: Musepack decoder
* mpeg_audio: MPEG audio parser/packetizer * mpeg_audio: MPEG audio parser/packetizer
* mpg123: MPEG-1 & 2 audio layer I, II, III + MPEG 2.5 decoder using mpg123
* mpgv: MPEG-I/II Video demuxer * mpgv: MPEG-I/II Video demuxer
* mtp: MTP interface module * mtp: MTP interface module
* mux_asf: ASF muxer * mux_asf: ASF muxer
......
...@@ -60,6 +60,13 @@ if HAVE_MAD ...@@ -60,6 +60,13 @@ if HAVE_MAD
libmpeg_audio_plugin_la_CPPFLAGS += -DHAVE_MPGA_FILTER libmpeg_audio_plugin_la_CPPFLAGS += -DHAVE_MPGA_FILTER
endif endif
libmpg123_plugin_la_SOURCES = codec/mpg123.c
libmpg123_plugin_la_CFLAGS = $(AM_CFLAGS) $(MPG123_CFLAGS)
libmpg123_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
libmpg123_plugin_la_LIBADD = $(MPG123_LIBS)
EXTRA_LTLIBRARIES += libmpg123_plugin.la
codec_LTLIBRARIES += $(LTLIBmpg123)
libuleaddvaudio_plugin_la_SOURCES = codec/uleaddvaudio.c libuleaddvaudio_plugin_la_SOURCES = codec/uleaddvaudio.c
codec_LTLIBRARIES += libuleaddvaudio_plugin.la codec_LTLIBRARIES += libuleaddvaudio_plugin.la
......
This diff is collapsed.
...@@ -383,6 +383,7 @@ modules/codec/libmpeg2.c ...@@ -383,6 +383,7 @@ modules/codec/libmpeg2.c
modules/codec/lpcm.c modules/codec/lpcm.c
modules/codec/mft.c modules/codec/mft.c
modules/codec/mpeg_audio.c modules/codec/mpeg_audio.c
modules/codec/mpg123.c
modules/codec/omxil/android_mediacodec.c modules/codec/omxil/android_mediacodec.c
modules/codec/omxil/omxil.c modules/codec/omxil/omxil.c
modules/codec/omxil/omxil.h modules/codec/omxil/omxil.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment