Commit 683d1fa7 authored by Sebastian Ramacher's avatar Sebastian Ramacher

New upstream version 1.7.3

parent 5e2de0cb
libva NEWS -- summary of user visible changes. 2016-09-05
libva NEWS -- summary of user visible changes. 2016-11-10
Copyright (C) 2009-2016 Intel Corporation
Version 1.7.3 - 10.Nov.2016
* Bump VA API version to 0.39.4
* API: add support for bitrate control per temporal layer
* API: update the usage for framerate in VAEncMiscParameterFrameRate to support non-integer frame-rate
* Add has_prime_sharing flag in VADriverVTableWayland to indicate if buffer sharing with prime fd can
be used in the backend driver
Version 1.7.2 - 05.Sep.2016
* Bump VA API version to 0.39.3
* API: add support for ROI
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libva 1.7.2.
# Generated by GNU Autoconf 2.69 for libva 1.7.3.
#
# Report bugs to <waldo.bastian@intel.com>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libva'
PACKAGE_TARNAME='libva'
PACKAGE_VERSION='1.7.2'
PACKAGE_STRING='libva 1.7.2'
PACKAGE_VERSION='1.7.3'
PACKAGE_STRING='libva 1.7.3'
PACKAGE_BUGREPORT='waldo.bastian@intel.com'
PACKAGE_URL=''
......@@ -1395,7 +1395,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libva 1.7.2 to adapt to many kinds of systems.
\`configure' configures libva 1.7.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1465,7 +1465,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libva 1.7.2:";;
short | recursive ) echo "Configuration of libva 1.7.3:";;
esac
cat <<\_ACEOF
......@@ -1605,7 +1605,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libva configure 1.7.2
libva configure 1.7.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2095,7 +2095,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libva $as_me 1.7.2, which was
It was created by libva $as_me 1.7.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2960,7 +2960,7 @@ fi
# Define the identity of the package.
PACKAGE='libva'
VERSION='1.7.2'
VERSION='1.7.3'
cat >>confdefs.h <<_ACEOF
......@@ -3100,8 +3100,8 @@ TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
VA_API_MAJOR_VERSION=0
VA_API_MINOR_VERSION=39
VA_API_MICRO_VERSION=3
VA_API_VERSION=0.39.3
VA_API_MICRO_VERSION=4
VA_API_VERSION=0.39.4
......@@ -3109,16 +3109,16 @@ VA_API_VERSION=0.39.3
LIBVA_MAJOR_VERSION=1
LIBVA_MINOR_VERSION=7
LIBVA_MICRO_VERSION=2
LIBVA_VERSION=1.7.2
LIBVA_MICRO_VERSION=3
LIBVA_VERSION=1.7.3
LIBVA_LT_CURRENT=3904
LIBVA_LT_CURRENT=3905
LIBVA_LT_REV=0
LIBVA_LT_AGE=3903
LIBVA_LT_AGE=3904
LIBVA_LT_VERSION="$LIBVA_LT_CURRENT:$LIBVA_LT_REV:$LIBVA_LT_AGE"
LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION"
......@@ -18083,7 +18083,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libva $as_me 1.7.2, which was
This file was extended by libva $as_me 1.7.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -18149,7 +18149,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libva config.status 1.7.2
libva config.status 1.7.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -28,7 +28,7 @@
# - reset minor version to zero when major version is incremented
m4_define([va_api_major_version], [0])
m4_define([va_api_minor_version], [39])
m4_define([va_api_micro_version], [3])
m4_define([va_api_micro_version], [4])
m4_define([va_api_version],
[va_api_major_version.va_api_minor_version.va_api_micro_version])
......@@ -42,7 +42,7 @@ m4_define([va_api_version],
# - reset micro version to zero when VA-API major or minor version is changed
m4_define([libva_major_version], [m4_eval(va_api_major_version + 1)])
m4_define([libva_minor_version], [m4_eval(va_api_minor_version - 32)])
m4_define([libva_micro_version], [2])
m4_define([libva_micro_version], [3])
m4_define([libva_pre_version], [0])
m4_define([libva_version],
......
......@@ -317,9 +317,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian.upstream/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign debian.upstream/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu debian.upstream/Makefile
$(AUTOMAKE) --foreign debian.upstream/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
libva (1.7.2-1) unstable; urgency=low
libva (1.7.3-1) unstable; urgency=low
* Autogenerated package, see NEWS file for ChangeLog.
-- Gwenole Beauchesne <gwenole.beauchesne@intel.com> Mon, 05 Sep 2016 10:30:33 +0800
-- Gwenole Beauchesne <gwenole.beauchesne@intel.com> Thu, 10 Nov 2016 09:10:06 +0800
......@@ -314,9 +314,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu doc/Makefile
$(AUTOMAKE) --foreign doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......@@ -413,8 +413,8 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
@ENABLE_DOCS_FALSE@uninstall-local:
@ENABLE_DOCS_FALSE@install-html-local:
@ENABLE_DOCS_FALSE@uninstall-local:
clean: clean-am
clean-am: clean-generic clean-libtool mostlyclean-am
......
......@@ -396,9 +396,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dummy_drv_video/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dummy_drv_video/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu dummy_drv_video/Makefile
$(AUTOMAKE) --foreign dummy_drv_video/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -349,9 +349,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pkgconfig/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pkgconfig/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu pkgconfig/Makefile
$(AUTOMAKE) --foreign pkgconfig/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -361,9 +361,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu test/Makefile
$(AUTOMAKE) --foreign test/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -427,9 +427,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/basic/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/basic/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu test/basic/Makefile
$(AUTOMAKE) --foreign test/basic/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -398,9 +398,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/common/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/common/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu test/common/Makefile
$(AUTOMAKE) --foreign test/common/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -393,9 +393,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/decode/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/decode/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu test/decode/Makefile
$(AUTOMAKE) --foreign test/decode/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -21,6 +21,7 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
bin_PROGRAMS = avcenc mpeg2vaenc h264encode jpegenc
noinst_PROGRAMS = svctenc
AM_CPPFLAGS = \
-Wall \
......@@ -54,10 +55,17 @@ jpegenc_CFLAGS = -I$(top_srcdir)/test/common -g
jpegenc_LDADD = \
$(top_builddir)/va/libva.la \
$(top_builddir)/test/common/libva-display.la \
-lpthread
valgrind: $(bin_PROGRAMS)
for a in $(bin_PROGRAMS); do \
-lpthread
svctenc_SOURCES = svctenc.c
svctenc_CFLAGS = -I$(top_srcdir)/test/common -g
svctenc_LDADD = \
$(top_builddir)/va/libva.la \
$(top_builddir)/test/common/libva-display.la \
-lpthread -lm
valgrind: $(bin_PROGRAMS) $(noinst_PROGRAMS)
for a in $(bin_PROGRAMS) $(noinst_PROGRAMS); do \
valgrind --leak-check=full --show-reachable=yes .libs/$$a; \
done
......
......@@ -102,6 +102,7 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = avcenc$(EXEEXT) mpeg2vaenc$(EXEEXT) h264encode$(EXEEXT) \
jpegenc$(EXEEXT)
noinst_PROGRAMS = svctenc$(EXEEXT)
subdir = test/encode
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
......@@ -117,7 +118,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_avcenc_OBJECTS = avcenc-avcenc.$(OBJEXT)
avcenc_OBJECTS = $(am_avcenc_OBJECTS)
avcenc_DEPENDENCIES = $(top_builddir)/va/libva.la \
......@@ -150,6 +151,13 @@ mpeg2vaenc_DEPENDENCIES = $(top_builddir)/va/libva.la \
mpeg2vaenc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mpeg2vaenc_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
am_svctenc_OBJECTS = svctenc-svctenc.$(OBJEXT)
svctenc_OBJECTS = $(am_svctenc_OBJECTS)
svctenc_DEPENDENCIES = $(top_builddir)/va/libva.la \
$(top_builddir)/test/common/libva-display.la
svctenc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(svctenc_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
......@@ -185,9 +193,9 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(avcenc_SOURCES) $(h264encode_SOURCES) $(jpegenc_SOURCES) \
$(mpeg2vaenc_SOURCES)
$(mpeg2vaenc_SOURCES) $(svctenc_SOURCES)
DIST_SOURCES = $(avcenc_SOURCES) $(h264encode_SOURCES) \
$(jpegenc_SOURCES) $(mpeg2vaenc_SOURCES)
$(jpegenc_SOURCES) $(mpeg2vaenc_SOURCES) $(svctenc_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
......@@ -398,7 +406,14 @@ jpegenc_CFLAGS = -I$(top_srcdir)/test/common -g
jpegenc_LDADD = \
$(top_builddir)/va/libva.la \
$(top_builddir)/test/common/libva-display.la \
-lpthread
-lpthread
svctenc_SOURCES = svctenc.c
svctenc_CFLAGS = -I$(top_srcdir)/test/common -g
svctenc_LDADD = \
$(top_builddir)/va/libva.la \
$(top_builddir)/test/common/libva-display.la \
-lpthread -lm
EXTRA_DIST = \
jpegenc_utils.h \
......@@ -417,9 +432,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/encode/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/encode/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu test/encode/Makefile
$(AUTOMAKE) --foreign test/encode/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......@@ -488,6 +503,15 @@ clean-binPROGRAMS:
echo " rm -f" $$list; \
rm -f $$list
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
avcenc$(EXEEXT): $(avcenc_OBJECTS) $(avcenc_DEPENDENCIES) $(EXTRA_avcenc_DEPENDENCIES)
@rm -f avcenc$(EXEEXT)
$(AM_V_CCLD)$(avcenc_LINK) $(avcenc_OBJECTS) $(avcenc_LDADD) $(LIBS)
......@@ -504,6 +528,10 @@ mpeg2vaenc$(EXEEXT): $(mpeg2vaenc_OBJECTS) $(mpeg2vaenc_DEPENDENCIES) $(EXTRA_mp
@rm -f mpeg2vaenc$(EXEEXT)
$(AM_V_CCLD)$(mpeg2vaenc_LINK) $(mpeg2vaenc_OBJECTS) $(mpeg2vaenc_LDADD) $(LIBS)
svctenc$(EXEEXT): $(svctenc_OBJECTS) $(svctenc_DEPENDENCIES) $(EXTRA_svctenc_DEPENDENCIES)
@rm -f svctenc$(EXEEXT)
$(AM_V_CCLD)$(svctenc_LINK) $(svctenc_OBJECTS) $(svctenc_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
......@@ -514,6 +542,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h264encode-h264encode.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegenc-jpegenc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpeg2vaenc-mpeg2vaenc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svctenc-svctenc.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
......@@ -592,6 +621,20 @@ mpeg2vaenc-mpeg2vaenc.obj: mpeg2vaenc.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpeg2vaenc_CFLAGS) $(CFLAGS) -c -o mpeg2vaenc-mpeg2vaenc.obj `if test -f 'mpeg2vaenc.c'; then $(CYGPATH_W) 'mpeg2vaenc.c'; else $(CYGPATH_W) '$(srcdir)/mpeg2vaenc.c'; fi`
svctenc-svctenc.o: svctenc.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svctenc_CFLAGS) $(CFLAGS) -MT svctenc-svctenc.o -MD -MP -MF $(DEPDIR)/svctenc-svctenc.Tpo -c -o svctenc-svctenc.o `test -f 'svctenc.c' || echo '$(srcdir)/'`svctenc.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/svctenc-svctenc.Tpo $(DEPDIR)/svctenc-svctenc.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='svctenc.c' object='svctenc-svctenc.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svctenc_CFLAGS) $(CFLAGS) -c -o svctenc-svctenc.o `test -f 'svctenc.c' || echo '$(srcdir)/'`svctenc.c
svctenc-svctenc.obj: svctenc.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svctenc_CFLAGS) $(CFLAGS) -MT svctenc-svctenc.obj -MD -MP -MF $(DEPDIR)/svctenc-svctenc.Tpo -c -o svctenc-svctenc.obj `if test -f 'svctenc.c'; then $(CYGPATH_W) 'svctenc.c'; else $(CYGPATH_W) '$(srcdir)/svctenc.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/svctenc-svctenc.Tpo $(DEPDIR)/svctenc-svctenc.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='svctenc.c' object='svctenc-svctenc.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svctenc_CFLAGS) $(CFLAGS) -c -o svctenc-svctenc.obj `if test -f 'svctenc.c'; then $(CYGPATH_W) 'svctenc.c'; else $(CYGPATH_W) '$(srcdir)/svctenc.c'; fi`
mostlyclean-libtool:
-rm -f *.lo
......@@ -719,7 +762,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool \
clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
......@@ -790,22 +834,23 @@ uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
clean-binPROGRAMS clean-generic clean-libtool \
clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
valgrind: $(bin_PROGRAMS)
for a in $(bin_PROGRAMS); do \
valgrind: $(bin_PROGRAMS) $(noinst_PROGRAMS)
for a in $(bin_PROGRAMS) $(noinst_PROGRAMS); do \
valgrind --leak-check=full --show-reachable=yes .libs/$$a; \
done
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -397,9 +397,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/putsurface/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/putsurface/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu test/putsurface/Makefile
$(AUTOMAKE) --foreign test/putsurface/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -375,9 +375,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/vainfo/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/vainfo/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu test/vainfo/Makefile
$(AUTOMAKE) --foreign test/vainfo/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -569,9 +569,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu va/Makefile
$(AUTOMAKE) --foreign va/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -409,9 +409,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/drm/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/drm/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu va/drm/Makefile
$(AUTOMAKE) --foreign va/drm/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -401,9 +401,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/egl/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/egl/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu va/egl/Makefile
$(AUTOMAKE) --foreign va/egl/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -410,9 +410,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/glx/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/glx/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu va/glx/Makefile
$(AUTOMAKE) --foreign va/glx/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -471,6 +471,15 @@ typedef enum
* VAEncMiscParameterTypeROI.
*/
VAConfigAttribEncROI = 25,
/**
* \brief Encoding extended rate control attribute. Read-only.
*
* This attribute conveys whether the driver supports any extended rate control features
* The attribute value is partitioned into fields as defined in the
* VAConfigAttribValEncRateControlExt union.
*/
VAConfigAttribEncRateControlExt = 26,
/**@}*/
VAConfigAttribTypeMax
} VAConfigAttribType;
......@@ -622,6 +631,47 @@ typedef union _VAConfigAttribValEncROI {
unsigned int value;
} VAConfigAttribValEncROI;
/** \brief Attribute value for VAConfigAttribEncRateControlExt */
typedef union _VAConfigAttribValEncRateControlExt {
struct {
/**
* \brief The maximum number of temporal layers minus 1
*
* \ref max_num_temporal_layers_minus1 plus 1 specifies the maximum number of temporal
* layers that supported by the underlying driver. \ref max_num_temporal_layers_minus1
* equal to 0 implies the underlying driver doesn't support encoding with temporal layer.
*/
unsigned int max_num_temporal_layers_minus1 : 8;
/**
* /brief support temporal layer bit-rate control flag
*
* \ref temporal_layer_bitrate_control_flag equal to 1 specifies the underlying driver
* can support bit-rate control per temporal layer when (#VAConfigAttribRateControl == #VA_RC_CBR ||
* #VAConfigAttribRateControl == #VA_RC_VBR).
*
* The underlying driver must set \ref temporal_layer_bitrate_control_flag to 0 when
* \c max_num_temporal_layers_minus1 is equal to 0
*
* To use bit-rate control per temporal layer, an application must send the right layer
* structure via #VAEncMiscParameterTemporalLayerStructure at the beginning of a coded sequence
* and then followed by #VAEncMiscParameterRateControl and #VAEncMiscParameterFrameRate structures
* for each layer, using the \c temporal_id field as the layer identifier. Otherwise
* the driver doesn't use bitrate control per temporal layer if an application doesn't send the
* layer structure via #VAEncMiscParameterTemporalLayerStructure to the driver. The driver returns
* VA_STATUS_ERROR_INVALID_PARAMETER if an application sends a wrong layer structure or doesn't send
* #VAEncMiscParameterRateControl and #VAEncMiscParameterFrameRate for each layer.
*
* The driver will ignore #VAEncMiscParameterTemporalLayerStructure and the \c temporal_id field
* in #VAEncMiscParameterRateControl and #VAEncMiscParameterFrameRate if
* \ref temporal_layer_bitrate_control_flag is equal to 0 or #VAConfigAttribRateControl == #VA_RC_CQP
*/
unsigned int temporal_layer_bitrate_control_flag : 1;
unsigned int reserved : 23;
} bits;
unsigned int value;
} VAConfigAttribValEncRateControlExt;
/**
* if an attribute is not applicable for a given
* profile/entrypoint pair, then set the value to the following
......@@ -1097,7 +1147,9 @@ typedef enum
* rate control, when the user has externally skipped frames. */
VAEncMiscParameterTypeSkipFrame = 9,
/** \brief Buffer type used for region-of-interest (ROI) parameters. */
VAEncMiscParameterTypeROI = 10
VAEncMiscParameterTypeROI = 10,
/** \brief Buffer type used for temporal layer structure */
VAEncMiscParameterTypeTemporalLayerStructure = 12,
} VAEncMiscParameterType;
/** \brief Packed header type. */
......@@ -1154,6 +1206,22 @@ typedef struct _VAEncMiscParameterBuffer
unsigned int data[0];
} VAEncMiscParameterBuffer;
/** \brief Temporal layer Structure*/
typedef struct _VAEncMiscParameterTemporalLayerStructure
{
/** \brief The number of temporal layers */
unsigned int number_of_layers;
/** \brief The length of the array defining frame layer membership. Should be 1-32 */
unsigned int periodicity;
/**
* \brief The array indicating the layer id for each frame
*
* The layer id for the first frame in a coded sequence is always 0, so layer_id[] specifies the layer
* ids for frames starting from the 2nd frame.
*/
unsigned int layer_id[32];
} VAEncMiscParameterTemporalLayerStructure;
/** \brief Rate control parameters */
typedef struct _VAEncMiscParameterRateControl
......@@ -1181,6 +1249,11 @@ typedef struct _VAEncMiscParameterRateControl
unsigned int disable_frame_skip : 1; /* Disable frame skip in rate control mode */
unsigned int disable_bit_stuffing : 1; /* Disable bit stuffing in rate control mode */
unsigned int mb_rate_control : 4; /* Control VA_RC_MB 0: default, 1: enable, 2: disable, other: reserved*/
/*
* The temporal layer that the rate control parameters are specified for.
*/
unsigned int temporal_id : 8;
unsigned int reserved : 17;
} bits;
unsigned int value;
} rc_flags;
......@@ -1188,7 +1261,27 @@ typedef struct _VAEncMiscParameterRateControl
typedef struct _VAEncMiscParameterFrameRate
{
/*
* fps = numerator / denominator
* The high 2 bytes (bits 16 to 31) of framerate specifies the numerator, and
* the low 2 bytes (bits 0 to 15) of framerate specifies the denominator. For
* example, ((100 < 16 ) | 750) is 7.5 fps
*
* If the high 2 btyes is 0, the frame rate is specified by the low 2 bytes.
*/
unsigned int framerate;
union
{
struct
{
/*
* The temporal id the framerate parameters are specified for.
*/
unsigned int temporal_id : 8;
unsigned int reserved : 24;
} bits;
unsigned int value;
} framerate_flags;
} VAEncMiscParameterFrameRate;
/**
......
......@@ -44,14 +44,14 @@
*
* The micro version of VA-API (3, if %VA_VERSION is 1.2.3)
*/
#define VA_MICRO_VERSION 3
#define VA_MICRO_VERSION 4
/**
* VA_VERSION:
*
* The full version of VA-API, like 1.2.3
*/
#define VA_VERSION 0.39.3
#define VA_VERSION 0.39.4
/**
* VA_VERSION_S:
......@@ -59,7 +59,7 @@
* The full version of VA-API, in string form (suited for string
* concatenation)
*/
#define VA_VERSION_S "0.39.3"
#define VA_VERSION_S "0.39.4"
/**
* VA_VERSION_HEX:
......
......@@ -425,9 +425,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/wayland/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign va/wayland/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu va/wayland/Makefile
$(AUTOMAKE) --foreign va/wayland/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -60,6 +60,9 @@ struct VADriverVTableWayland {
unsigned int flags,
struct wl_buffer **out_buffer
);
/** \brief Indicate whether buffer sharing with prime fd is supported. */
unsigned int has_prime_sharing;
};
#endif /* VA_BACKEND_WAYLAND_H */
......@@ -98,10 +98,21 @@ drm_handle_authenticated(void *data, struct wl_drm *drm)
drm_state->auth_type = VA_DRM_AUTH_CUSTOM;
}
static void
drm_handle_capabilities(void *data, struct wl_drm *wl_drm, uint32_t value)
{
VADisplayContextP const pDisplayContext = data;
VADriverContextP const ctx = pDisplayContext->pDriverContext;
struct VADriverVTableWayland *vtable = ctx->vtable_wayland;
vtable->has_prime_sharing = !!(value & WL_DRM_CAPABILITY_PRIME);
}
static const struct wl_drm_listener drm_listener = {
drm_handle_device,
drm_handle_format,
drm_handle_authenticated
drm_handle_authenticated,
drm_handle_capabilities,
};
static VAStatus
......@@ -121,6 +132,9 @@ va_wayland_drm_destroy(VADisplayContextP pDisplayContext)
VADriverContextP const ctx = pDisplayContext->pDriverContext;
struct va_wayland_drm_context * const wl_drm_ctx = pDisplayContext->opaque;
struct drm_state * const drm_state = ctx->drm_state;
struct VADriverVTableWayland *vtable = ctx->vtable_wayland;