# gstreamer-vaapi package version number
-m4_define([gst_vaapi_major_version], [0])
-m4_define([gst_vaapi_minor_version], [7])
+m4_define([gst_vaapi_major_version], [1])
+m4_define([gst_vaapi_minor_version], [11])
m4_define([gst_vaapi_micro_version], [1])
-m4_define([gst_vaapi_nano_version], [1])
+m4_define([gst_vaapi_nano_version], [0])
m4_define([gst_vaapi_version],
[gst_vaapi_major_version.gst_vaapi_minor_version.gst_vaapi_micro_version])
m4_if(gst_vaapi_nano_version, [0], [],
dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0
# gstreamer-vaapi library (libtool) version number
-m4_define([gst_vaapi_lt_current], [7])
+m4_define([gst_vaapi_lt_current], [1101])
m4_define([gst_vaapi_lt_revision], [0])
-m4_define([gst_vaapi_lt_age], [0])
+m4_define([gst_vaapi_lt_age], [1101])
# glib version number
-m4_define([glib_version], [2.32])
+m4_define([glib_version], [2.40])
# gstreamer version number
-m4_define([gst_version], [1.6.3])
-m4_define([gst_plugins_base_version], [1.6.3])
-m4_define([gst_plugins_bad_version], [1.6.3])
+m4_define([gst_version], [1.11.1])
+m4_define([gst_plugins_base_version], [1.11.1])
+m4_define([gst_plugins_bad_version], [1.11.1])
# Wayland minimum version number
m4_define([wayland_api_version], [1.0.2])
dnl *** check for arguments to configure ***
AG_GST_ARG_DISABLE_FATAL_WARNINGS
+AG_GST_ARG_ENABLE_EXTRA_CHECKS
AG_GST_ARG_DEBUG
+AG_GST_ARG_EXAMPLES
+
AG_GST_ARG_WITH_PKG_CONFIG_PATH
+AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
+ ["${srcdir}/gstreamer-vaapi.doap"],
+ [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO])
+
AC_ARG_ENABLE([encoders],
AS_HELP_STRING([--enable-encoders],
[enable video encoders @<:@default=yes@:>@]),
dnl check for libm, for sin() etc.
AC_CHECK_LIB([m], [tan])
-dnl Check to see if dlopen is in default libraries (like Solaris, which
-dnl has it in libc), or if libdl is needed to get it.
+dnl Check to see if dlopen/dlsym is in default libraries (like
+dnl Solaris, which has it in libc), or if libdl is needed to get it.
AC_CHECK_FUNC([dlopen], [], [
AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
AC_SUBST([DLOPEN_LIBS])
AG_GST_CHECK_MODULES([GST_CODEC_PARSERS],
[gstreamer-codecparsers-$GST_API_VERSION], [$GST_PBADREQ], [yes])
-dnl ... VP9 parser, with required extensions
-HAVE_GST_VP9_PARSER=0
-AC_CACHE_CHECK([for VP9 parser],
- [ac_cv_have_gst_vp9_parser],
- [
- saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_CODEC_PARSERS_CFLAGS"
- saved_LIBS="$LIBS"
- LIBS="$LIBS $GST_LIBS $GST_CODEC_PARSERS_LIBS"
- AC_COMPILE_IFELSE(
- [
- AC_LANG_PROGRAM(
- [[
-#include <gst/codecparsers/gstvp9parser.h>
- ]],
- [[
-GstVp9FrameHdr frame_hdr;
- ]])
- ],
- [ac_cv_have_gst_vp9_parser="yes"],
- [ac_cv_have_gst_vp9_parser="no"])
- CPPFLAGS="$saved_CPPFLAGS"
- LIBS="$saved_LIBS"
- ])
-AS_IF([test "x$ac_cv_have_gst_vp9_parser" = "xyes"], [HAVE_GST_VP9_PARSER=1])
-
AS_IF([test "x$enable_glx" = "xyes" -o "x$enable_egl" = "xyes"],
[enable_opengl="yes"], [enable_opengl="no"])
CPPFLAGS="$saved_CPPFLAGS"
LIBS="$saved_LIBS"
])
- ], [])
+ ], [:])
fi
AS_IF([test "x$ac_cv_have_gst_gl_helpers" = "xno"], [HAVE_GSTGL=0])
AM_CONDITIONAL([USE_GST_GL_HELPERS], [test $HAVE_GSTGL -eq 1])
CPPFLAGS="$CPPFLAGS $DRM_CFLAGS"
AC_CHECK_HEADERS([drm_fourcc.h], [], [USE_DRM=0])
CPPFLAGS="$saved_CPPFLAGS"
- ], [])
+ ], [:])
fi
dnl Check for X11
CPPFLAGS="$CPPFLAGS $X11_CFLAGS"
AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h X11/Xatom.h], [], [USE_X11=0])
CPPFLAGS="$saved_CPPFLAGS"
- ], [])
+ ], [:])
fi
HAVE_XKBLIB=0
CPPFLAGS="$CPPFLAGS $XRANDR_CFLAGS"
AC_CHECK_HEADERS([X11/extensions/Xrandr.h], [], [HAVE_XRANDR=0])
CPPFLAGS="$saved_CPPFLAGS"
- ], [])
+ ], [:])
dnl Check for XRender
PKG_CHECK_MODULES([XRENDER], [xrender],
CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
AC_CHECK_HEADERS([X11/extensions/Xrender.h], [], [HAVE_XRENDER=0])
CPPFLAGS="$saved_CPPFLAGS"
- ], [])
+ ], [:])
fi
AC_DEFINE_UNQUOTED([HAVE_XKBLIB], [$HAVE_XKBLIB],
AC_CHECK_LIB([EGL], [eglGetDisplay], [], [USE_EGL=0])
CPPFLAGS="$saved_CPPFLAGS"
LIBS="$saved_LIBS"
-
- dnl Check for GMODULE
- PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= $GLIB_REQ])
- ], [])
+ ], [:])
fi
dnl Check for Wayland
CPPFLAGS="$CPPFLAGS $WAYLAND_CFLAGS"
AC_CHECK_HEADERS([wayland-client.h], [], [USE_WAYLAND=0])
CPPFLAGS="$saved_CPPFLAGS"
- ], [])
+ ], [:])
fi
dnl ---------------------------------------------------------------------------
dnl Core API
PKG_CHECK_MODULES([LIBVA], [libva >= $VAAPI_REQ])
VA_VERSION_STR=`$PKG_CONFIG --modversion libva`
+VA_DRIVERS_PATH=`$PKG_CONFIG --variable=driverdir libva`
+AC_DEFINE_UNQUOTED([VA_DRIVERS_PATH], ["$VA_DRIVERS_PATH"],
+ [VA drivers path])
dnl VA/DRM API
if test $USE_DRM -eq 1; then
CPPFLAGS="$saved_CPPFLAGS"
LIBS="$saved_LIBS"
])
-AS_IF([test "x$ac_cv_have_vp9_decoding_api" = "xyes"],
- [USE_VP9_DECODER=$HAVE_GST_VP9_PARSER])
+AS_IF([test "x$ac_cv_have_vp9_decoding_api" = "xyes"], [USE_VP9_DECODER=1])
dnl Check for va_dec_hevc.h header
saved_CPPFLAGS="$CPPFLAGS"
#include <va/va.h>
])
CPPFLAGS="$saved_CPPFLAGS"
- ], [])
+ ], [:])
fi
USE_JPEG_ENCODER=0
USE_VP8_ENCODER=0
USE_H265_ENCODER=0
+USE_VP9_ENCODER=0
+
if test $USE_ENCODERS -eq 1; then
dnl Check for JPEG Encoding API (0.37.0+)
AC_CHECK_HEADERS([va/va_enc_jpeg.h], [], [],
LIBS="$saved_LIBS"
])
AS_IF([test "x$ac_cv_have_hevc_encoding_api" = "xyes"], [USE_H265_ENCODER=1])
+
+ dnl Check for VP9 Encoding API
+ AC_CHECK_HEADERS([va/va_enc_vp9.h], [], [],
+ [
+#include <va/va.h>
+ ])
+ AC_CACHE_CHECK([for VP9 encoding API],
+ [ac_cv_have_vp9_encoding_api],
+ [
+ saved_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBVA_CFLAGS"
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS $LIBVA_LIBS"
+ AC_COMPILE_IFELSE(
+ [
+ AC_LANG_PROGRAM(
+ [[
+#include <va/va.h>
+#ifdef HAVE_VA_VA_ENC_VP9_H
+# include <va/va_enc_vp9.h>
+#endif
+ ]],
+ [[
+VAEncSequenceParameterBufferVP9 seq_param;
+VAEncPictureParameterBufferVP9 pic_param;
+VAEncSegParamVP9 seg_param;
+VAEncMiscParameterTypeVP9PerSegmantParam misc_param;
+ ]])
+ ],
+ [ac_cv_have_vp9_encoding_api="yes"],
+ [ac_cv_have_vp9_encoding_api="no"])
+ CPPFLAGS="$saved_CPPFLAGS"
+ LIBS="$saved_LIBS"
+ ])
+ AS_IF([test "x$ac_cv_have_vp9_encoding_api" = "xyes"], [USE_VP9_ENCODER=1])
fi
dnl VA/Wayland API
# set by AG_GST_PARSE_SUBSYSTEM_DISABLES above
dnl make sure it doesn't complain about unused variables if debugging is disabled
-NO_WARNINGS=""
-AG_GST_CHECK_GST_DEBUG_DISABLED([NO_WARNINGS="-Wno-unused"], [
- -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls
- -Wwrite-strings -Wformat-security -Wold-style-definition
- -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar
- -Wnested-externs $NO_WARNINGS])
+AG_GST_CHECK_GST_DEBUG_DISABLED([NO_WARNINGS="-Wno-unused"], [NO_WARNINGS=""])
dnl define an ERROR_CFLAGS Makefile variable
-AG_GST_SET_ERROR_CFLAGS([$FATAL_WARNINGS], [$NO_WARNINGS])
+dnl FIXME Add -Wredundant-decls again if considered useful and warnings are fixed
+AG_GST_SET_ERROR_CFLAGS([$FATAL_WARNINGS], [-Wmissing-declarations -Wmissing-prototypes -Wwrite-strings -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wnested-externs $NO_WARNINGS])
dnl define correct level for debugging messages
AG_GST_SET_LEVEL_DEFAULT([$GST_GIT])
[Defined to 1 if H265 encoder is used])
AM_CONDITIONAL([USE_H265_ENCODER], [test $USE_H265_ENCODER -eq 1])
+AC_DEFINE_UNQUOTED([USE_VP9_ENCODER], [$USE_VP9_ENCODER],
+ [Defined to 1 if VP9 encoder is used])
+AM_CONDITIONAL([USE_VP9_ENCODER], [test $USE_VP9_ENCODER -eq 1])
+
AC_DEFINE_UNQUOTED([USE_VA_VPP], [$USE_VA_VPP],
[Defined to 1 if video post-processing is used])
AM_CONDITIONAL([USE_VA_VPP], [test $USE_VA_VPP -eq 1])
Makefile
common/Makefile
common/m4/Makefile
+ m4/Makefile
docs/Makefile
docs/version.entities
docs/plugins/Makefile
gst/Makefile
gst/vaapi/Makefile
tests/Makefile
+ tests/elements/Makefile
])
AC_OUTPUT
projects / platform / upstream / gstreamer.git / blobdiff