mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

vp8: allow compilation without the built-in libvpx.

Browse source 
The built-in libvpx serves multiple purposes, among which the most
important ones could be: track the most up-to-date, and optimized,
range decoder; allow for future hybrid implementations (non-VLD);
and have a completely independent range decoder implementation.
This commit is contained in:
Gwenole Beauchesne 2014-04-21 17:49:38 +02:00
parent 746ac17f59
commit de6a980065
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure.ac
View file

@ -97,7 +97,7 @@ AM_CONDITIONAL([HAVE_GIT], [test -n "$GIT"])
AC_ARG_VAR([YASM], [Path to yasm program, if any]) AC_ARG_VAR([YASM], [Path to yasm program, if any])
AC_PATH_PROG([YASM], [yasm]) AC_PATH_PROG([YASM], [yasm])
if test -z "$YASM"; then if test -z "$YASM" -a "$enable_builtin_libvpx" = "yes"; then
AC_MSG_ERROR([yasm is needed to build libvpx sources]) AC_MSG_ERROR([yasm is needed to build libvpx sources])
fi fi
@ -110,6 +110,11 @@ AC_ARG_ENABLE(builtin_codecparsers,
[enable built-in codecparsers @<:@default=yes@:>@]), [enable built-in codecparsers @<:@default=yes@:>@]),
[], [enable_builtin_codecparsers="yes"]) [], [enable_builtin_codecparsers="yes"])
AC_ARG_ENABLE(builtin_libvpx,
AS_HELP_STRING([--enable-builtin-libvpx],
[enable built-in libvpx @<:@default=yes@:>@]),
[], [enable_builtin_libvpx="yes"])
AC_ARG_ENABLE([encoders], AC_ARG_ENABLE([encoders],
AS_HELP_STRING([--enable-encoders], AS_HELP_STRING([--enable-encoders],
[enable video encoders @<:@default=yes@:>@]), [enable video encoders @<:@default=yes@:>@]),
@ -421,6 +426,9 @@ AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_JPEG],
[test "$ac_cv_have_gst_jpeg_parser" != "yes"]) [test "$ac_cv_have_gst_jpeg_parser" != "yes"])
dnl ... VP8 parser, not upstream yet dnl ... VP8 parser, not upstream yet
if test "$enable_builtin_libvpx" = "yes"; then
ac_cv_have_gst_vp8_parser="no"
fi
AC_CACHE_CHECK([for VP8 parser], AC_CACHE_CHECK([for VP8 parser],
ac_cv_have_gst_vp8_parser, [ ac_cv_have_gst_vp8_parser, [
saved_CPPFLAGS="$CPPFLAGS" saved_CPPFLAGS="$CPPFLAGS"
@ -439,6 +447,7 @@ AC_CACHE_CHECK([for VP8 parser],
]) ])
AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_VP8], AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_VP8],
[test "$ac_cv_have_gst_vp8_parser" != "yes"]) [test "$ac_cv_have_gst_vp8_parser" != "yes"])
AM_CONDITIONAL([USE_BUILTIN_LIBVPX], [test "$enable_builtin_libvpx" = "yes"])
case $GST_API_VERSION in case $GST_API_VERSION in
0.10) lt_bias=gst0_vaapi_lt_current_bias;; 0.10) lt_bias=gst0_vaapi_lt_current_bias;;

2
ext/libvpx/Makefile.am
View file

@ -19,7 +19,7 @@
# Boston, MA 02110-1301, USA. # Boston, MA 02110-1301, USA.
lib_LTLIBRARIES = lib_LTLIBRARIES =
if USE_LOCAL_CODEC_PARSERS_VP8 if USE_BUILTIN_LIBVPX
lib_LTLIBRARIES += libgstcodecparsers_vpx.la lib_LTLIBRARIES += libgstcodecparsers_vpx.la
endif endif

8
gst-libs/gst/codecparsers/Makefile.am
View file

@ -45,8 +45,8 @@ endif
if USE_LOCAL_CODEC_PARSERS_VP8 if USE_LOCAL_CODEC_PARSERS_VP8
gen_source_c += gstvp8parser.c gen_source_c += gstvp8parser.c
gen_source_h += gstvp8parser.h gstvp8rangedecoder.h vp8utils.h gen_source_h += gstvp8parser.h gstvp8rangedecoder.h vp8utils.h
#gen_source_c += dboolhuff.c gstvp8rangedecoder.c vp8utils.c
#gen_source_h += dboolhuff.h if USE_BUILTIN_LIBVPX
add_source_c += gstvaapilibvpx.c add_source_c += gstvaapilibvpx.c
libgstvaapi_codecparsers_cflags += \ libgstvaapi_codecparsers_cflags += \
@ -56,6 +56,10 @@ libgstvaapi_codecparsers_cflags += \
libgstvaapi_codecparsers_libs += \ libgstvaapi_codecparsers_libs += \
$(top_builddir)/ext/libvpx/libgstcodecparsers_vpx.la $(top_builddir)/ext/libvpx/libgstcodecparsers_vpx.la
else
gen_source_c += dboolhuff.c gstvp8rangedecoder.c vp8utils.c
gen_source_h += dboolhuff.h
endif
endif endif
GENFILES = \ GENFILES = \