Add musepack decoder.

Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
* ext/musepack/Makefile.am:
* ext/musepack/gstmusepackdec.cpp:
* ext/musepack/gstmusepackdec.h:
* ext/musepack/gstmusepackreader.cpp:
* ext/musepack/gstmusepackreader.h:
Add musepack decoder.
* ext/faad/gstfaad.c: (gst_faad_base_init):
Make pad templates static.
* gst/typefind/gsttypefindfunctions.c: (mp3_type_find),
(plugin_init):
Add musepack typefinder, make mp3 typefinding work halfway stream,
which doesn't actually work yet because id3demux doesn't implement
_get_length().
This commit is contained in:
Ronald S. Bultje 2004-11-07 18:30:06 +00:00
parent c3dce37167
commit 886edb6323
3 changed files with 44 additions and 0 deletions

View File

@ -1,3 +1,21 @@
2004-11-07 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* configure.ac:
* ext/Makefile.am:
* ext/musepack/Makefile.am:
* ext/musepack/gstmusepackdec.cpp:
* ext/musepack/gstmusepackdec.h:
* ext/musepack/gstmusepackreader.cpp:
* ext/musepack/gstmusepackreader.h:
Add musepack decoder.
* ext/faad/gstfaad.c: (gst_faad_base_init):
Make pad templates static.
* gst/typefind/gsttypefindfunctions.c: (mp3_type_find),
(plugin_init):
Add musepack typefinder, make mp3 typefinding work halfway stream,
which doesn't actually work yet because id3demux doesn't implement
_get_length().
2004-11-07 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-11-07 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ogg/gstoggmux.c: (gst_ogg_mux_next_buffer), * ext/ogg/gstoggmux.c: (gst_ogg_mux_next_buffer),

View File

@ -1359,6 +1359,23 @@ main (int argc,
fi fi
]) ])
dnl *** musepack ***
translit(dnm, m, l) AM_CONDITIONAL(USE_MUSEPACK, true)
GST_CHECK_FEATURE(MUSEPACK, [musepackdec], musepack, [
AC_LANG_CPLUSPLUS
OLD_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-I/usr/include/musepack $CPPFLAGS"
AC_CHECK_HEADER(mpc_dec.h, [
HAVE_MUSEPACK="yes"
MUSEPACK_LIBS="-lmusepack"
MUSEPACK_CFLAGS="-I/usr/include/musepack"
AC_SUBST(MUSEPACK_CFLAGS)
AC_SUBST(MUSEPACK_LIBS)
], [HAVE_MUSEPACK="no"])
CPPFLAGS="$OLD_CPPFLAGS"
AC_LANG_C
])
dnl *** musicbrainz *** dnl *** musicbrainz ***
dnl libmusicbrainz <= 2.0.2 has symbol clashes with ffmpeg dnl libmusicbrainz <= 2.0.2 has symbol clashes with ffmpeg
dnl however, our ffmpeg patch was accepted upstream dnl however, our ffmpeg patch was accepted upstream
@ -1948,6 +1965,7 @@ ext/mikmod/Makefile
ext/mpeg2dec/Makefile ext/mpeg2dec/Makefile
ext/mpeg2enc/Makefile ext/mpeg2enc/Makefile
ext/mplex/Makefile ext/mplex/Makefile
ext/musepack/Makefile
ext/musicbrainz/Makefile ext/musicbrainz/Makefile
ext/nas/Makefile ext/nas/Makefile
ext/ogg/Makefile ext/ogg/Makefile

View File

@ -238,6 +238,12 @@ endif
#MAS_DIR= #MAS_DIR=
#endif #endif
if USE_MUSEPACK
MUSEPACK_DIR=musepack
else
MUSEPACK_DIR=
endif
if USE_MUSICBRAINZ if USE_MUSICBRAINZ
MUSICBRAINZ_DIR=musicbrainz MUSICBRAINZ_DIR=musicbrainz
else else
@ -399,6 +405,7 @@ SUBDIRS=\
$(MPEG2DEC_DIR) \ $(MPEG2DEC_DIR) \
$(MPEG2ENC_DIR) \ $(MPEG2ENC_DIR) \
$(MPLEX_DIR) \ $(MPLEX_DIR) \
$(MUSEPACK_DIR) \
$(MUSICBRAINZ_DIR) \ $(MUSICBRAINZ_DIR) \
$(OGG_DIR) \ $(OGG_DIR) \
$(PANGO_DIR) \ $(PANGO_DIR) \
@ -458,6 +465,7 @@ DIST_SUBDIRS=\
mpeg2dec \ mpeg2dec \
mpeg2enc \ mpeg2enc \
mplex \ mplex \
musepack \
musicbrainz \ musicbrainz \
nas \ nas \
ogg \ ogg \