diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2012-01-12 15:36:50 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2012-01-12 15:36:50 +0800 |
| commit | f0e7788c32013ec71c45ed82b8bfba0b6c602fe3 (patch) | |
| tree | 7aacaee2f482ea33c9b6b2b5697cc0964809fea5 | |
| parent | 088d87d1f1a336088a73b2a3b8f216ae4f94214f (diff) | |
| parent | cff1adedd3c9ee5348c7b992d50f87569625f142 (diff) | |
| download | libva-f0e7788c32013ec71c45ed82b8bfba0b6c602fe3.tar.gz | |
Merge branch 'master' into vaapi-ext
Conflicts:
configure.ac
test/Makefile.am
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
35 files changed, 3583 insertions, 1377 deletions
diff --git a/Makefile.am b/Makefile.am index 331394b..1425b0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream +SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream doc # Extra clean files so that maintainer-clean removes *everything* MAINTAINERCLEANFILES = \ @@ -0,0 +1,32 @@ +libva NEWS -- summary of user visible changes. 2011-10-28 +Copyright (C) 2009-2011 Intel Corporation + +Version 1.0.15 - 28.Oct.2011 +* API: make {Top,Bottom}FieldOrderCnt signed (Yi Wang) +* Add auto-generated Debian packaging +* Refine VA trace & VA fool utilities +* Move i965 driver to a specific repository (vaapi/intel-driver) +* Fix DSO link issue in tests +* Fix fglrx driver name detection +* Fix API vs. DSO vs. package versioning + +Version 1.0.14 - 28.Jul.2011 +* API: rename VA_DECODE_ERROR_TYPE to VADecodeErrorType +* Fix memory leaks (Edgar Hucek) +* Fix VA trace logs (Alexander Osin) +* Fix vaTerminate() with some applications, e.g. GStreamer + +Version 1.0.13 - 30.May.2011 +* API: fix VA_ROTATION_270 definition +* Add a simple H.264 encoder "avcenc" (Chang Zhou) +* Fix VA tracer (Alexander Osin) +* Fix vaBufferInfo() interface (Alexander Osin) + +Version 1.0.12 - 01.Apr.2011 +* API: add VARenderMode interface to select overlay or GPU rendering mode +* API: add VARenderDevice interface to allow rendering to an external device +* API: add VADisplayAttribOverlay{ColorKey,AutoPaintColorKey} interface +* Fix build issues on Android 2.3 + +Changes for older versions can be found in git log or previously +released packages. diff --git a/configure.ac b/configure.ac index 1972cf7..7d5a6ee 100644 --- a/configure.ac +++ b/configure.ac @@ -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], [15]) +m4_define([libva_micro_version], [16]) m4_define([libva_pre_version], [1]) m4_define([libva_version], @@ -111,25 +111,36 @@ LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION" AC_SUBST(LIBVA_LT_VERSION) AC_SUBST(LIBVA_LT_LDFLAGS) +AC_ARG_ENABLE(docs, + [AC_HELP_STRING([--enable-docs], + [build Doxygen documentation @<:@default=no@:>@])], + [], [enable_docs="no"]) + AC_ARG_ENABLE(glx, - [AC_HELP_STRING([--enable-glx], - [build with OpenGL for X11 support])], - [], [enable_glx=yes]) + [AC_HELP_STRING([--enable-glx], + [build with GLX support @<:@default=yes@:>@])], + [], [enable_glx="yes"]) + +AC_ARG_ENABLE(egl, + [AC_HELP_STRING([--enable-egl], + [build with EGL support @<:@default=yes@:>@])], + [], [enable_egl="yes"]) AC_ARG_ENABLE(dummy-driver, - [AC_HELP_STRING([--enable-dummy-driver], - [build dummy video driver])], - [], [enable_dummy_driver=yes]) + [AC_HELP_STRING([--enable-dummy-driver], + [build dummy video driver @<:@default=yes@:>@])], + [], [enable_dummy_driver="yes"]) AM_CONDITIONAL(BUILD_DUMMY_DRIVER, test x$enable_dummy_driver = xyes) AC_ARG_ENABLE(dummy-backend, - [AC_HELP_STRING([--enable-dummy-backend], - [build dummy libva backend])], - [], [enable_dummy_backend=no]) + [AC_HELP_STRING([--enable-dummy-backend], + [build dummy libva backend])], + [], [enable_dummy_backend="no"]) AC_ARG_WITH(drivers-path, - [AC_HELP_STRING([--with-drivers-path=[[path]]], [drivers path])],, - [with_drivers_path="$libdir/dri"]) + [AC_HELP_STRING([--with-drivers-path=[[path]]], + [drivers path])], + [], [with_drivers_path="$libdir/dri"]) LIBVA_DRIVERS_PATH="$with_drivers_path" AC_SUBST(LIBVA_DRIVERS_PATH) @@ -146,6 +157,12 @@ PKG_CHECK_MODULES([X11], [x11]) PKG_CHECK_MODULES([XEXT],[xext]) PKG_CHECK_MODULES([XFIXES], [xfixes]) +# Check for Doxygen +if test "$enable_docs" = "yes"; then + AC_CHECK_TOOL([DOXYGEN], [doxygen], [enable_docs="no"]) +fi +AM_CONDITIONAL(ENABLE_DOCS, test "$enable_docs" = "yes") + # Check for recent enough DRM LIBDRM_VERSION=libdrm_version PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION]) @@ -159,7 +176,7 @@ if test x$libudev = xno; then fi AM_CONDITIONAL(BUILD_DUMMY_BACKEND, test x$enable_dummy_backend = xyes) -# Check for OpenGL (X11) +# Check for GLX USE_GLX="no" GL_DEPS_CFLAGS="" GL_DEPS_LIBS="" @@ -175,9 +192,23 @@ AC_SUBST(GL_DEPS_CFLAGS) AC_SUBST(GL_DEPS_LIBS) AM_CONDITIONAL(USE_GLX, test "$USE_GLX" = "yes") -# TBD: Check for EGL -USE_EGL="yes" +# Check for EGL +USE_EGL="no" +EGL_DEPS_CFLAGS="" +EGL_DEPS_LIBS="" +if test "$enable_egl" = "yes"; then + AC_CHECK_HEADERS([EGL/egl.h]) + AC_CHECK_LIB(EGL, eglGetDisplay, [ + USE_EGL="yes" + EGL_DEPS_LIBS="-lEGL" + ]) + + PKG_CHECK_MODULES([GLESv1_CM], [glesv1_cm], [libglesv1_cm=yes], [libglesv1_cm=no]) +fi +AC_SUBST(EGL_DEPS_CFLAGS) +AC_SUBST(EGL_DEPS_LIBS) AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes") +AM_CONDITIONAL(BUILD_EGL_TEST, test x$libglesv1_cm = xyes) # We only need the headers, we don't link against the DRM libraries LIBVA_CFLAGS="$DRM_CFLAGS" @@ -206,6 +237,7 @@ AC_OUTPUT([ test/Makefile test/basic/Makefile test/decode/Makefile + test/egl/Makefile test/putsurface/Makefile test/encode/Makefile test/vainfo/Makefile @@ -219,25 +251,15 @@ AC_OUTPUT([ ]) # Print a small summary - -echo "" -echo "libva - ${LIBVA_VERSION} (VA-API ${VA_API_VERSION})" -echo "" - -echo " • Global :" -echo " Prefix: ${prefix}" -echo "" - -AS_IF([test x$enable_dummy_driver = xyes], [DRIVERS="dummy $DRIVERS"]) - -echo " • Drivers: ${DRIVERS}" - AS_IF([test x$USE_GLX = xyes], [BACKENDS="glx $BACKENDS"]) AS_IF([test x$USE_EGL = xyes], [BACKENDS="egl $BACKENDS"]) -BACKENDS="x11 $BACKENDS" -AS_IF([test x$enable_dummy_backend = xyes], [BACKENDS="dummy -$BACKENDS"]) - -echo " • Winsys : ${BACKENDS}" - +echo +echo "libva - ${LIBVA_VERSION} (VA-API ${VA_API_VERSION})" +echo +echo Installation prefix .............. : $prefix +echo Default driver path .............. : $LIBVA_DRIVERS_PATH +echo Extra window systems ............. : $BACKENDS +echo Build dummy driver ............... : $enable_dummy_driver +echo Build documentation .............. : $enable_docs +echo diff --git a/debian.upstream/Makefile.am b/debian.upstream/Makefile.am index 56dc98a..87a571a 100644 --- a/debian.upstream/Makefile.am +++ b/debian.upstream/Makefile.am @@ -9,6 +9,7 @@ DEBIANFILES = \ libva1.dirs \ libva1.install \ rules \ + vainfo.install \ $(NULL) DEBIANGENFILES = \ diff --git a/debian.upstream/control.in b/debian.upstream/control.in index f8291c5..78de060 100644 --- a/debian.upstream/control.in +++ b/debian.upstream/control.in @@ -50,3 +50,12 @@ Description: Video Acceleration (VA) API for Linux -- runtime The library loads a hardware dependendent driver. . This package contains the debug files. + +Package: vainfo +Architecture: any +Depends: libva1 (= ${Source-Version}) +Description: Video Acceleration (VA) API for Linux -- info program + The libva library implements the Video Acceleration (VA) API for Linux. + The library loads a hardware dependendent driver. + . + This package contains the `vainfo' program. diff --git a/debian.upstream/rules b/debian.upstream/rules index 27b2639..40b76be 100755 --- a/debian.upstream/rules +++ b/debian.upstream/rules @@ -2,7 +2,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk # Allow SMP build diff --git a/debian.upstream/vainfo.install b/debian.upstream/vainfo.install new file mode 100644 index 0000000..8ef46a0 --- /dev/null +++ b/debian.upstream/vainfo.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/vainfo
\ No newline at end of file diff --git a/doc/Doxyfile b/doc/Doxyfile new file mode 100644 index 0000000..4fb3a8c --- /dev/null +++ b/doc/Doxyfile @@ -0,0 +1,1679 @@ +# Doxyfile 1.7.3 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" "). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = VA-API + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = + +# Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = $(VA_HEADER_DIR) + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful if your file system +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also makes the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penalty. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will roughly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespaces are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = YES + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = YES + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even if there is only one candidate or it is obvious which candidate to choose by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# will still accept a match between prototype and implementation in such cases. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or macro consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and macros in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command <command> <input-file>, where <command> is the value of +# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. The create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# The WARN_NO_PARAMDOC option can be enabled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = $(VA_HEADER_FILES) + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.f90 *.f *.for *.vhd *.vhdl + +FILE_PATTERNS = *.h + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = */test/* + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command <filter> <input-file>, where <filter> +# is the value of the INPUT_FILTER tag, and <input-file> is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty or if +# non of the patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when +# FILTER_SOURCE_FILES is enabled. + +FILTER_SOURCE_PATTERNS = + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html-out + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the stylesheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters"> +# Qt Help Project / Custom Filters</a>. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes"> +# Qt Help Project / Filter Attributes</a>. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [0,1..20]) +# that doxygen will group on one line in the generated HTML documentation. +# Note that a value of 0 will completely suppress the enum values from appearing in the overview section. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you also need to install MathJax separately and +# configure the path to it using the MATHJAX_RELPATH option. + +USE_MATHJAX = NO + +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the mathjax.org site, so you can quickly see the result without installing +# MathJax, but it is strongly recommended to install a local copy of MathJax +# before deployment. + +MATHJAX_RELPATH = http://www.mathjax.org/mathjax + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvantages are that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4 + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition that overrules the definition found in the source code. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all references to function-like macros +# that are alone on a line, have an all uppercase name, and do not end with a +# semicolon, because these will confuse the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option also works with HAVE_DOT disabled, but it is recommended to +# install and use dot, since it yields more powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance +# between CPU load and processing speed. + +DOT_NUM_THREADS = 0 + +# By default doxygen will write a font called Helvetica to the output +# directory and reference it in all dot files that doxygen generates. +# When you want a differently looking font you can specify the font name +# using DOT_FONTNAME. You need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = Helvetica + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will generate a graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, svg, gif or svg. +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the +# \mscfile command). + +MSCFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = YES + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..36c3905 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,52 @@ +# Copyright (c) 2007-2011 Intel Corporation. All Rights Reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sub license, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice (including the +# next paragraph) shall be included in all copies or substantial portions +# of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR +# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +all: html +install-data-local: install-html + +EXTRA_DIST = \ + Doxyfile \ + $(NULL) + +VA_HEADER_DIR = $(top_srcdir)/va +VA_HEADER_FILES = \ + $(NULL) + +export VA_HEADER_DIR +export VA_HEADER_FILES +html-out/index.html: Doxyfile $(VA_HEADER_FILES) + $(DOXYGEN) $< + +if ENABLE_DOCS +html: html-out/index.html +install-html-local: + install -d $(DESTDIR)$(docdir)/html + install -m 0644 html-out/* $(DESTDIR)$(docdir)/html +uninstall-local: + rm -rf $(DESTDIR)$(docdir)/html +endif + +clean-local: + rm -rf html-out + +# Extra clean files so that maintainer-clean removes *everything* +MAINTAINERCLEANFILES = Makefile.in diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c index 310fb20..a6e76b9 100644 --- a/dummy_drv_video/dummy_drv_video.c +++ b/dummy_drv_video/dummy_drv_video.c @@ -1056,7 +1056,7 @@ VAStatus dummy_PutSurface( ) { /* TODO */ - Drawable drawable = (Drawable)draw; + void *drawable = (void *)draw; (void)drawable; diff --git a/test/Makefile.am b/test/Makefile.am index ad95136..6254881 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -25,4 +25,8 @@ AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x1 SUBDIRS = basic decode encode putsurface vainfo transcode +if BUILD_EGL_TEST +SUBDIRS += egl +endif + EXTRA_DIST = loadsurface.h loadsurface_yuv.h diff --git a/test/egl/Makefile.am b/test/egl/Makefile.am new file mode 100644 index 0000000..caf7126 --- /dev/null +++ b/test/egl/Makefile.am @@ -0,0 +1,15 @@ +bin_PROGRAMS = va_egl + +INCLUDES = -I$(top_srcdir) + +TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/libva-egl.la -lpthread -lX11 -lEGL -lGLESv1_CM + +va_egl_LDADD = $(TEST_LIBS) +va_egl_SOURCES = va_egl_x11.c + +EXTRA_DIST = + +valgrind: $(bin_PROGRAMS) + for a in $(bin_PROGRAMS); do \ + valgrind --leak-check=full --show-reachable=yes .libs/$$a; \ + done diff --git a/test/egl/va_egl_x11.c b/test/egl/va_egl_x11.c new file mode 100644 index 0000000..7d7521d --- /dev/null +++ b/test/egl/va_egl_x11.c @@ -0,0 +1,598 @@ +#include <assert.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/keysym.h> +#include <GLES/gl.h> +#include <GLES/glext.h> +#include <EGL/egl.h> +#include <EGL/eglext.h> +#include <va/va_x11.h> +#include <va/va_egl.h> + +struct va_egl_context +{ + Display *x11_dpy; + Window win; + + EGLDisplay egl_dpy; + EGLContext egl_ctx; + EGLSurface egl_surf; + unsigned int egl_target; + EGLClientBuffer egl_buffer; + EGLImageKHR egl_image; + PFNEGLCREATEIMAGEKHRPROC egl_create_image_khr; + PFNEGLDESTROYIMAGEKHRPROC egl_destroy_image_hkr; + PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glegl_image_target_texture2d_oes; + + VADisplay va_dpy; + VASurfaceID va_surface; + VASurfaceEGL va_egl_surface; + + int x, y; + unsigned int width, height; + GLuint texture; + GLfloat ar; + unsigned int box_width; + unsigned char ydata; +}; + +static void +va_egl_fini_egl(struct va_egl_context *ctx) +{ + eglMakeCurrent(ctx->egl_dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + eglTerminate(ctx->egl_dpy); +} + +static int +va_egl_init_egl(struct va_egl_context *ctx) +{ + EGLint egl_major, egl_minor; + const char *s; + + ctx->egl_dpy = eglGetDisplay(ctx->x11_dpy); + + if (!ctx->egl_dpy) { + printf("Error: eglGetDisplay() failed\n"); + return -1; + } + + if (!eglInitialize(ctx->egl_dpy, &egl_major, &egl_minor)) { + printf("Error: eglInitialize() failed\n"); + return -1; + } + + s = eglQueryString(ctx->egl_dpy, EGL_VERSION); + printf("EGL_VERSION = %s\n", s); + + return 0; +} + +static int +yuvgen_planar(int width, int height, + unsigned char *Y_start, int Y_pitch, + unsigned char *U_start, int U_pitch, + unsigned char *V_start, int V_pitch, + int UV_interleave, int box_width, unsigned char ydata) +{ + int row; + + /* copy Y plane */ + for (row = 0; row < height; row++) { + unsigned char *Y_row = Y_start + row * Y_pitch; + int jj, xpos, ypos; + + ypos = (row / box_width) & 0x1; + + for (jj = 0; jj < width; jj++) { + xpos = ((jj) / box_width) & 0x1; + + if ((xpos == 0) && (ypos == 0)) + Y_row[jj] = ydata; + if ((xpos == 1) && (ypos == 1)) + Y_row[jj] = ydata; + + if ((xpos == 1) && (ypos == 0)) + Y_row[jj] = 0xff - ydata; + if ((xpos == 0) && (ypos == 1)) + Y_row[jj] = 0xff - ydata; + } + } + + /* copy UV data */ + for( row = 0; row < height/2; row++) { + unsigned short value = 0x80; + + if (UV_interleave) { + unsigned short *UV_row = (unsigned short *)(U_start + row * U_pitch); + + memset(UV_row, value, width); + } else { + unsigned char *U_row = U_start + row * U_pitch; + unsigned char *V_row = V_start + row * V_pitch; + + memset(U_row, value, width / 2); + memset(V_row, value, width / 2); + } + } + + return 0; +} + +static int +va_egl_upload_surface(struct va_egl_context *ctx) +{ + VAImage surface_image; + void *surface_p = NULL, *U_start, *V_start; + + vaDeriveImage(ctx->va_dpy, ctx->va_surface, &surface_image); + + vaMapBuffer(ctx->va_dpy, surface_image.buf, &surface_p); + + U_start = (char *)surface_p + surface_image.offsets[1]; + V_start = (char *)surface_p + surface_image.offsets[2]; + + /* assume surface is planar format */ + yuvgen_planar(surface_image.width, surface_image.height, + (unsigned char *)surface_p, surface_image.pitches[0], + (unsigned char *)U_start, surface_image.pitches[1], + (unsigned char *)V_start, surface_image.pitches[2], + (surface_image.format.fourcc==VA_FOURCC_NV12), + ctx->box_width, ctx->ydata); + + vaUnmapBuffer(ctx->va_dpy,surface_image.buf); + + vaDestroyImage(ctx->va_dpy,surface_image.image_id); + + return 0; +} + +static void +va_egl_fini_va(struct va_egl_context *ctx) +{ + vaDestroySurfaces(ctx->va_dpy, &ctx->va_surface, 1); + vaTerminate(ctx->va_dpy); +} + +static int +va_egl_init_va(struct va_egl_context *ctx) +{ + VAStatus va_status; + int major_ver, minor_ver; + + ctx->va_dpy = vaGetDisplayEGL(ctx->x11_dpy, ctx->egl_dpy); + + if (!ctx->va_dpy) { + printf("Error: vaGetDisplayEGL() failed\n"); + return -1; + } + + va_status = vaInitialize(ctx->va_dpy, &major_ver, &minor_ver); + + if (va_status != VA_STATUS_SUCCESS) { + printf("Error: vaInitialize() failed\n"); + return -1; + } + + va_status = vaCreateSurfaces(ctx->va_dpy, + ctx->width, ctx->height, + VA_RT_FORMAT_YUV420, + 1, &ctx->va_surface); + + if (va_status != VA_STATUS_SUCCESS) { + printf("Error: vaCreateSurfaces() failed\n"); + return -1; + } + + va_egl_upload_surface(ctx); + + return 0; +} + +static void +va_egl_make_window(struct va_egl_context *ctx, const char *title) +{ + int scrnum; + XSetWindowAttributes attr; + unsigned long mask; + Window root; + XVisualInfo *visInfo, visTemplate; + int num_visuals; + EGLConfig config; + EGLint num_configs, vid; + const EGLint attribs[] = { + EGL_RED_SIZE, 8, + EGL_GREEN_SIZE, 8, + EGL_BLUE_SIZE, 8, + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT, + EGL_NONE + }; + + scrnum = DefaultScreen(ctx->x11_dpy); + root = RootWindow(ctx->x11_dpy, scrnum); + + if (!eglChooseConfig(ctx->egl_dpy, attribs, &config, 1, &num_configs) || + !num_configs) { + printf("Error: couldn't get an EGL visual config\n"); + + return; + } + + if (!eglGetConfigAttrib(ctx->egl_dpy, config, EGL_NATIVE_VISUAL_ID, &vid)) { + printf("Error: eglGetConfigAttrib() failed\n"); + + return; + } + + /* The X window visual must match the EGL config */ + visTemplate.visualid = vid; + visInfo = XGetVisualInfo(ctx->x11_dpy, VisualIDMask, &visTemplate, &num_visuals); + + if (!visInfo) { + printf("Error: couldn't get X visual\n"); + + return; + } + + /* window attributes */ + attr.background_pixel = 0; + attr.border_pixel = 0; + attr.colormap = XCreateColormap(ctx->x11_dpy, root, visInfo->visual, AllocNone); + attr.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask; + attr.override_redirect = 0; + mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask | CWOverrideRedirect; + + ctx->win = XCreateWindow(ctx->x11_dpy, + root, + ctx->x, ctx->y, + ctx->width, ctx->height, + 0, visInfo->depth, InputOutput, + visInfo->visual, mask, &attr); + + /* set hints and properties */ + { + XSizeHints sizehints; + sizehints.x = ctx->x; + sizehints.y = ctx->y; + sizehints.width = ctx->width; + sizehints.height = ctx->height; + sizehints.flags = USSize | USPosition; + XSetNormalHints(ctx->x11_dpy, ctx->win, &sizehints); + XSetStandardProperties(ctx->x11_dpy, ctx->win, title, title, + None, (char **)NULL, 0, &sizehints); + } + + eglBindAPI(EGL_OPENGL_ES_API); + + ctx->egl_ctx = eglCreateContext(ctx->egl_dpy, config, EGL_NO_CONTEXT, NULL); + + if (!ctx->egl_ctx) { + printf("Error: eglCreateContext() failed\n"); + + return; + } + + ctx->egl_surf = eglCreateWindowSurface(ctx->egl_dpy, config, ctx->win, NULL); + eglMakeCurrent(ctx->egl_dpy, ctx->egl_surf, ctx->egl_surf, ctx->egl_ctx); + XFree(visInfo); +} + +static int +va_egl_init_extension(struct va_egl_context *ctx) +{ + const char *exts; + + exts = eglQueryString(ctx->egl_dpy, EGL_EXTENSIONS); + ctx->egl_create_image_khr = + (PFNEGLCREATEIMAGEKHRPROC)eglGetProcAddress("eglCreateImageKHR"); + ctx->egl_destroy_image_hkr = + (PFNEGLDESTROYIMAGEKHRPROC)eglGetProcAddress("eglDestroyImageKHR"); + + if (!exts || + !strstr(exts, "EGL_KHR_image_base") || + !ctx->egl_create_image_khr || + !ctx->egl_destroy_image_hkr) { + printf("EGL does not support EGL_KHR_image_base\n"); + return -1; + } + + exts = (const char *)glGetString(GL_EXTENSIONS); + ctx->glegl_image_target_texture2d_oes = + (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)eglGetProcAddress("glEGLImageTargetTexture2DOES"); + + if (!exts || + !strstr(exts, "GL_OES_EGL_image") || + !ctx->glegl_image_target_texture2d_oes) { + printf("OpenGL ES does not support GL_OES_EGL_image\n"); + return -1; + } + + return 0; +} + +static void +va_egl_fini_gles(struct va_egl_context *ctx) +{ + glDeleteTextures(1, &ctx->texture); +} + +static int +va_egl_init_gles(struct va_egl_context *ctx) +{ + glClearColor(0.0, 0.0, 0.0, 0.0); + glColor4f(1.0, 1.0, 1.0, 1.0); + + glDisable(GL_BLEND); + glDisable(GL_DEPTH_TEST); + + glGenTextures(1, &ctx->texture); + glBindTexture(GL_TEXTURE_2D, ctx->texture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glEnable(GL_TEXTURE_2D); + + return 0; +} + +static void +va_egl_fini_va_egl(struct va_egl_context *ctx) +{ + if (ctx->egl_image) + ctx->egl_destroy_image_hkr(ctx->egl_dpy, ctx->egl_image); + + vaDeassociateSurfaceEGL(ctx->va_dpy, ctx->va_egl_surface); + vaDestroySurfaceEGL(ctx->va_dpy, ctx->va_egl_surface); +} + +static int +va_egl_init_va_egl(struct va_egl_context *ctx) +{ + VAStatus va_status; + int num_max_targets = 0, num_targets = 0; + int num_max_attributes = 0, num_attribs = 0; + unsigned int *target_list = NULL; + EGLint *img_attribs = NULL; + + num_targets = num_max_targets = vaMaxNumSurfaceTargetsEGL(ctx->va_dpy); + + if (num_max_targets < 1) { + printf("Error: vaMaxNumSurfaceTargetsEGL() returns %d\n", num_max_targets); + return -1; + } + + num_attribs = num_max_attributes = vaMaxNumSurfaceAttributesEGL(ctx->va_dpy); + + if (num_max_attributes < 1) { + printf("Error: vaMaxNumSurfaceAttributesEGL() returns %d\n", num_max_attributes); + return -1; + } + + target_list = malloc(num_max_targets * sizeof(unsigned int)); + va_status = vaQuerySurfaceTargetsEGL(ctx->va_dpy, + target_list, + &num_targets); + + if (va_status != VA_STATUS_SUCCESS || num_targets < 1) { + printf("Error: vaQuerySurfaceTargetsEGL() failed\n"); + return -1; + } + + va_status = vaCreateSurfaceEGL(ctx->va_dpy, + target_list[0], + ctx->width, ctx->height, + &ctx->va_egl_surface); + + if (va_status != VA_STATUS_SUCCESS) { + printf("Error: vaCreateSurfaceEGL() failed\n"); + return -1; + } + + va_status = vaAssociateSurfaceEGL(ctx->va_dpy, + ctx->va_egl_surface, + ctx->va_surface, + 0); + + if (va_status != VA_STATUS_SUCCESS) { + printf("Error: vaAssociateSurfaceEGL() failed\n"); + return -1; + } + + img_attribs = malloc(2 * num_max_attributes * sizeof(EGLint)); + va_status = vaGetSurfaceInfoEGL(ctx->va_dpy, + ctx->va_egl_surface, + &ctx->egl_target, + &ctx->egl_buffer, + img_attribs, + &num_attribs); + + if (va_status != VA_STATUS_SUCCESS) { + printf("Error: vaGetSurfaceInfoEGL() failed\n"); + return -1; + } + + ctx->egl_image = ctx->egl_create_image_khr(ctx->egl_dpy, + EGL_NO_CONTEXT, + ctx->egl_target, + ctx->egl_buffer, + img_attribs); + + vaSyncSurfaceEGL(ctx->va_dpy, ctx->va_egl_surface); + ctx->glegl_image_target_texture2d_oes(GL_TEXTURE_2D, + (GLeglImageOES)ctx->egl_image); + + return 0; +} + +static void +va_egl_fini(struct va_egl_context *ctx) +{ + va_egl_fini_gles(ctx); + va_egl_fini_va(ctx); + va_egl_fini_egl(ctx); + va_egl_fini_gles(ctx); + va_egl_fini_va_egl(ctx); + + // XDestroyWindow(ctx->x11_dpy, ctx->win); + XCloseDisplay(ctx->x11_dpy); +} + +static int +va_egl_init(struct va_egl_context *ctx, int argc, char **argv) +{ + memset(ctx, 0, sizeof(*ctx)); + ctx->x11_dpy = XOpenDisplay(NULL); + ctx->width = 320; + ctx->height = 320; + ctx->ar = 1.0; + ctx->box_width = 16; + ctx->ydata = 0xff; + + if (!ctx->x11_dpy) { + printf("Error: couldn't open display %s\n", getenv("DISPLAY")); + return -1; + } + + if (va_egl_init_egl(ctx) != 0) + return -1; + + if (va_egl_init_va(ctx) != 0) + return -1; + + va_egl_make_window(ctx, "VA/EGL"); + va_egl_init_extension(ctx); + va_egl_init_gles(ctx); + va_egl_init_va_egl(ctx); + + return 0; +} + +static void +va_egl_reshape(struct va_egl_context *ctx, int width, int height) +{ + GLfloat ar = (GLfloat) width / (GLfloat) height; + + ctx->width = width; + ctx->height = height; + ctx->ar = ar; + + glViewport(0, 0, (GLint) width, (GLint) height); + + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrthof(-ar, ar, -ar, ar, -1.0, 1.0); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); +} + +static void +va_egl_draw(struct va_egl_context *ctx) +{ + const GLfloat verts[][3] = { + { -ctx->ar, -ctx->ar, 0 }, + { ctx->ar, -ctx->ar, 0 }, + { ctx->ar, ctx->ar, 0 }, + { -ctx->ar, ctx->ar, 0 } + }; + const GLfloat texs[][2] = { + { 0, 0 }, + { 1, 0 }, + { 1, 1 }, + { 0, 1 } + }; + + glClear(GL_COLOR_BUFFER_BIT); + + glVertexPointer(3, GL_FLOAT, 0, verts); + glTexCoordPointer(2, GL_FLOAT, 0, texs); + + glEnableClientState(GL_VERTEX_ARRAY); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + + glDisableClientState(GL_VERTEX_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); +} + +static void +va_egl_event_loop(struct va_egl_context *ctx) +{ + while (1) { + int redraw = 0; + + if (XPending(ctx->x11_dpy) > 0) { + XEvent event; + XNextEvent(ctx->x11_dpy, &event); + + switch (event.type) { + case Expose: + redraw = 1; + break; + + case ConfigureNotify: + va_egl_reshape(ctx, event.xconfigure.width, event.xconfigure.height); + redraw = 1; + break; + + case KeyPress: + { + char buffer[10]; + int code; + code = XLookupKeysym(&event.xkey, 0); + + if (code == XK_y) { + ctx->ydata += 0x10; + va_egl_upload_surface(ctx); + vaSyncSurfaceEGL(ctx->va_dpy, ctx->va_egl_surface); + ctx->glegl_image_target_texture2d_oes(GL_TEXTURE_2D, + (GLeglImageOES)ctx->egl_image); + redraw = 1; + } else { + XLookupString(&event.xkey, buffer, sizeof(buffer), + NULL, NULL); + + if (buffer[0] == 27) { + /* escape */ + return; + } + } + } + + break; + + default: + ; /*no-op*/ + } + } + + if (redraw) { + va_egl_draw(ctx); + eglSwapBuffers(ctx->egl_dpy, ctx->egl_surf); + } + } +} + +static void +va_egl_run(struct va_egl_context *ctx) +{ + XMapWindow(ctx->x11_dpy, ctx->win); + va_egl_reshape(ctx, ctx->width, ctx->height); + va_egl_event_loop(ctx); +} + +int +main(int argc, char *argv[]) +{ + struct va_egl_context ctx; + + printf("Usage: press 'y' to change Y plane \n\n"); + + if (va_egl_init(&ctx, argc, argv) == 0) { + va_egl_run(&ctx); + va_egl_fini(&ctx); + } + + return 0; +} diff --git a/va/Makefile.am b/va/Makefile.am index 16a1e8f..bc70435 100644 --- a/va/Makefile.am +++ b/va/Makefile.am @@ -92,7 +92,7 @@ libva_egl_la_SOURCES = libva_egl_la_LDFLAGS = $(LDADD) libva_egl_la_DEPENDENCIES = $(libvacorelib) egl/libva_egl.la libva-x11.la libva_egl_la_LIBADD = $(libvacorelib) egl/libva_egl.la libva-x11.la \ - $(GL_DEPS_LIBS) -ldl + $(EGL_DEPS_LIBS) -ldl endif if BUILD_DUMMY_BACKEND diff --git a/va/egl/Makefile.am b/va/egl/Makefile.am index c02daa7..2cfdf9c 100644 --- a/va/egl/Makefile.am +++ b/va/egl/Makefile.am @@ -20,16 +20,22 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 +INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va source_c = \ - va_egl.c + va_egl.c \ + va_egl_impl.c \ + $(NULL) source_h = \ - va_egl.h \ - va_backend_egl.h + ../va_egl.h \ + va_backend_egl.h \ + $(NULL) -source_h_priv = +source_h_priv = \ + va_egl_impl.h \ + va_egl_private.h \ + $(NULL) noinst_LTLIBRARIES = libva_egl.la libva_eglincludedir = ${includedir}/va diff --git a/va/egl/va_backend_egl.h b/va/egl/va_backend_egl.h index 925d933..7307b2e 100644 --- a/va/egl/va_backend_egl.h +++ b/va/egl/va_backend_egl.h @@ -35,7 +35,56 @@ struct VADriverVTableEGL { VASurfaceID surface, void **buffer ); + /* TBD: more APIs for EGL */ + int max_egl_surface_targets; + int max_egl_surface_attributes; + + VAStatus (*vaQuerySurfaceTargetsEGL)( + VADriverContextP ctx, + EGLenum *target_list, /* out */ + int *num_targets /* out */ + ); + + VAStatus (*vaCreateSurfaceEGL)( + VADriverContextP ctx, + EGLenum target, + unsigned int width, + unsigned int height, + VASurfaceEGL *gl_surface + ); + + /* Optional: destroy a VA/EGL surface */ + VAStatus (*vaDestroySurfaceEGL)( + VADriverContextP ctx, + VASurfaceEGL egl_surface + ); + + VAStatus (*vaAssociateSurfaceEGL)( + VADriverContextP ctx, + VASurfaceEGL egl_surface, + VASurfaceID surface, + unsigned int flags + ); + + VAStatus (*vaSyncSurfaceEGL)( + VADriverContextP ctx, + VASurfaceEGL egl_surface + ); + + VAStatus (*vaGetSurfaceInfoEGL)( + VADisplay dpy, + VASurfaceEGL egl_surface, + EGLenum *target, + EGLClientBuffer *buffer, + EGLint *attrib_list, + int *num_attribs + ); + + VAStatus (*vaDeassociateSurfaceEGL)( + VADriverContextP ctx, + VASurfaceEGL egl_surface + ); }; #endif /* VA_BACKEND_EGL_H */ diff --git a/va/egl/va_egl.c b/va/egl/va_egl.c index 36e5504..48ff7a1 100644 --- a/va/egl/va_egl.c +++ b/va/egl/va_egl.c @@ -53,14 +53,34 @@ * * Bellow API vaGetEGLClientBufferFromSurface is for this purpose */ - -#include "va.h" -#include "va_backend_egl.h" -#include "va_egl.h" +#include "va_egl_private.h" +#include "va_egl_impl.h" #define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext) #define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; } +#define INIT_CONTEXT(ctx, dpy) do { \ + if (!vaDisplayIsValid(dpy)) \ + return VA_STATUS_ERROR_INVALID_DISPLAY; \ + \ + ctx = ((VADisplayContextP)(dpy))->pDriverContext; \ + if (!(ctx)) \ + return VA_STATUS_ERROR_INVALID_DISPLAY; \ + \ + status = va_egl_init_context(dpy); \ + if (status != VA_STATUS_SUCCESS) \ + return status; \ + } while (0) + +#define INVOKE(ctx, func, args) do { \ + VADriverVTablePrivEGLP vtable; \ + vtable = &VA_DRIVER_CONTEXT_EGL(ctx)->vtable; \ + if (!vtable->va##func##EGL) \ + return VA_STATUS_ERROR_UNIMPLEMENTED; \ + status = vtable->va##func##EGL args; \ + } while (0) + + VAStatus vaGetEGLClientBufferFromSurface ( VADisplay dpy, VASurfaceID surface, @@ -79,4 +99,216 @@ VAStatus vaGetEGLClientBufferFromSurface ( return VA_STATUS_ERROR_UNIMPLEMENTED; } +// Destroy VA/EGL display context +static void va_DisplayContextDestroy(VADisplayContextP pDisplayContext) +{ + VADisplayContextEGLP pDisplayContextEGL; + VADriverContextP pDriverContext; + VADriverContextEGLP pDriverContextEGL; + + if (!pDisplayContext) + return; + + pDriverContext = pDisplayContext->pDriverContext; + pDriverContextEGL = pDriverContext->egl; + if (pDriverContextEGL) { + free(pDriverContextEGL); + pDriverContext->egl = NULL; + } + + pDisplayContextEGL = pDisplayContext->opaque; + if (pDisplayContextEGL) { + vaDestroyFunc vaDestroy = pDisplayContextEGL->vaDestroy; + free(pDisplayContextEGL); + pDisplayContext->opaque = NULL; + if (vaDestroy) + vaDestroy(pDisplayContext); + } +} + +// Return a suitable VADisplay for VA API +VADisplay vaGetDisplayEGL(VANativeDisplay native_dpy, + EGLDisplay egl_dpy) +{ + VADisplay dpy = NULL; + VADisplayContextP pDisplayContext = NULL; + VADisplayContextEGLP pDisplayContextEGL = NULL; + VADriverContextP pDriverContext; + VADriverContextEGLP pDriverContextEGL = NULL; + + dpy = vaGetDisplay(native_dpy); + + if (!dpy) + return NULL; + + if (egl_dpy == EGL_NO_DISPLAY) + goto error; + + pDisplayContext = (VADisplayContextP)dpy; + pDriverContext = pDisplayContext->pDriverContext; + + pDisplayContextEGL = calloc(1, sizeof(*pDisplayContextEGL)); + if (!pDisplayContextEGL) + goto error; + + pDriverContextEGL = calloc(1, sizeof(*pDriverContextEGL)); + if (!pDriverContextEGL) + goto error; + + pDisplayContextEGL->vaDestroy = pDisplayContext->vaDestroy; + pDisplayContext->vaDestroy = va_DisplayContextDestroy; + pDisplayContext->opaque = pDisplayContextEGL; + pDriverContextEGL->egl_display = egl_dpy; + pDriverContext->egl = pDriverContextEGL; + return dpy; + +error: + free(pDriverContextEGL); + free(pDisplayContextEGL); + pDisplayContext->vaDestroy(pDisplayContext); + return NULL; +} + +int vaMaxNumSurfaceTargetsEGL( + VADisplay dpy +) +{ + VADriverContextP ctx; + struct VADriverVTableEGL *va_egl; + CHECK_DISPLAY(dpy); + ctx = CTX(dpy); + + va_egl = (struct VADriverVTableEGL *)ctx->vtable_egl; + + if (va_egl) + return va_egl->max_egl_surface_targets; + else + return IMPL_MAX_EGL_SURFACE_TARGETS; +} + +int vaMaxNumSurfaceAttributesEGL( + VADisplay dpy +) +{ + VADriverContextP ctx; + struct VADriverVTableEGL *va_egl; + CHECK_DISPLAY(dpy); + ctx = CTX(dpy); + + va_egl = (struct VADriverVTableEGL *)ctx->vtable_egl; + + if (va_egl) + return va_egl->max_egl_surface_attributes; + else + return IMPL_MAX_EGL_SURFACE_ATTRIBUTES; +} + +VAStatus vaQuerySurfaceTargetsEGL( + VADisplay dpy, + EGLenum *target_list, /* out */ + int *num_targets /* out */ +) +{ + VADriverContextP ctx; + VAStatus status; + + INIT_CONTEXT(ctx, dpy); + + INVOKE(ctx, QuerySurfaceTargets, (dpy, target_list, num_targets)); + return status; +} + +VAStatus vaCreateSurfaceEGL( + VADisplay dpy, + EGLenum target, + unsigned int width, + unsigned int height, + VASurfaceEGL *gl_surface +) +{ + VADriverContextP ctx; + VAStatus status; + + INIT_CONTEXT(ctx, dpy); + + INVOKE(ctx, CreateSurface, (dpy, target, width, height, gl_surface)); + return status; +} + +// Destroy a VA/EGL surface +VAStatus vaDestroySurfaceEGL( + VADisplay dpy, + VASurfaceEGL egl_surface +) +{ + VADriverContextP ctx; + VAStatus status; + + INIT_CONTEXT(ctx, dpy); + + INVOKE(ctx, DestroySurface, (dpy, egl_surface)); + return status; +} + +VAStatus vaAssociateSurfaceEGL( + VADisplay dpy, + VASurfaceEGL egl_surface, + VASurfaceID surface, + unsigned int flags +) +{ + VADriverContextP ctx; + VAStatus status; + + INIT_CONTEXT(ctx, dpy); + + INVOKE(ctx, AssociateSurface, (dpy, egl_surface, surface, flags)); + return status; +} + +VAStatus vaSyncSurfaceEGL( + VADisplay dpy, + VASurfaceEGL egl_surface +) +{ + VADriverContextP ctx; + VAStatus status; + + INIT_CONTEXT(ctx, dpy); + + INVOKE(ctx, SyncSurface, (dpy, egl_surface)); + return status; +} + +VAStatus vaGetSurfaceInfoEGL( + VADisplay dpy, + VASurfaceEGL egl_surface, + EGLenum *target, /* out, the type of <buffer> */ + EGLClientBuffer *buffer, /* out */ + EGLint *attrib_list, /* out, the last attribute must be EGL_NONE */ + int *num_attribs /* in/out */ +) +{ + VADriverContextP ctx; + VAStatus status; + + INIT_CONTEXT(ctx, dpy); + + INVOKE(ctx, GetSurfaceInfo, (dpy, egl_surface, target, buffer, attrib_list, num_attribs)); + return status; +} + +VAStatus vaDeassociateSurfaceEGL( + VADisplay dpy, + VASurfaceEGL egl_surface +) +{ + VADriverContextP ctx; + VAStatus status; + + INIT_CONTEXT(ctx, dpy); + + INVOKE(ctx, DeassociateSurface, (dpy, egl_surface)); + return status; +} diff --git a/va/egl/va_egl.h b/va/egl/va_egl.h deleted file mode 100644 index 4243d0b..0000000 --- a/va/egl/va_egl.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _VA_EGL_H_ -#define _VA_EGL_H_ - -#include <va/va.h> - -#ifdef __cplusplus -extern "C" { -#endif - -typedef void* EGLClientBuffer; - -/*This function is used to get EGLClientBuffer - * (lower 16bits is buffer index, upper 16bits - * is BC device id.) from surface id. Application - * should maintain EGLClientBuffer itself.*/ - -VAStatus vaGetEGLClientBufferFromSurface ( - VADisplay dpy, - VASurfaceID surface, - EGLClientBuffer *buffer /* out*/ -); - -#ifdef __cplusplus -} -#endif - -#endif /* _VA_EGL_H_ */ diff --git a/va/egl/va_egl_impl.c b/va/egl/va_egl_impl.c new file mode 100644 index 0000000..367f43f --- /dev/null +++ b/va/egl/va_egl_impl.c @@ -0,0 +1,499 @@ +#define _GNU_SOURCE 1 +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <string.h> +#include <assert.h> +#include <dlfcn.h> + +#include "va_egl_private.h" +#include "va_egl_impl.h" + +static int +check_extension(const char *name, const char *exts) +{ + const char *end; + int name_len, n; + + if (!name || !exts) + return 0; + + end = exts + strlen(exts); + name_len = strlen(name); + + while (exts < end) { + n = strcspn(exts, " "); + + if (n == name_len && strncmp(name, exts, n) == 0) + return 1; + + exts += (n + 1); + } + + return 0; +} + +static int +check_pixmap_extensions(VADriverContextP ctx, EGLDisplay egl_display) +{ + const char *exts; + + exts = (const char *)eglQueryString(egl_display, EGL_EXTENSIONS); + + if (!check_extension("EGL_KHR_image_pixmap", exts)) + return 0; + + return 1; +} + +/* ========================================================================= */ +/* === VA/EGL implementation from the driver (fordward calls) === */ +/* ========================================================================= */ +#ifdef INVOKE +#undef INVOKE +#endif + +#define INVOKE(ctx, func, args) do { \ + VADriverVTableEGLP vtable = (ctx)->vtable_egl; \ + if (!vtable->va##func##EGL) \ + return VA_STATUS_ERROR_UNIMPLEMENTED; \ + \ + VAStatus status = vtable->va##func##EGL args; \ + if (status != VA_STATUS_SUCCESS) \ + return status; \ + } while (0) + + +static VAStatus +vaQuerySurfaceTargetsEGL_impl_driver(VADisplay dpy, + EGLenum *target_list, + int *num_targets) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + + INVOKE(ctx, QuerySurfaceTargets, (ctx, target_list, num_targets)); + + return VA_STATUS_SUCCESS; +} + +static VAStatus +vaCreateSurfaceEGL_impl_driver(VADisplay dpy, + EGLenum target, + unsigned int width, + unsigned int height, + VASurfaceEGL *gl_surface) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + + INVOKE(ctx, CreateSurface, (ctx, target, width, height, gl_surface)); + + return VA_STATUS_SUCCESS; +} + +static VAStatus +vaDestroySurfaceEGL_impl_driver(VADisplay dpy, VASurfaceEGL egl_surface) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + + INVOKE(ctx, DestroySurface, (ctx, egl_surface)); + + return VA_STATUS_SUCCESS; +} + +static VAStatus +vaAssociateSurfaceEGL_impl_driver(VADisplay dpy, + VASurfaceEGL egl_surface, + VASurfaceID surface, + unsigned int flags) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + + INVOKE(ctx, AssociateSurface, (ctx, egl_surface, surface, flags)); + + return VA_STATUS_SUCCESS; +} + +static VAStatus +vaSyncSurfaceEGL_impl_driver(VADisplay dpy, + VASurfaceEGL egl_surface) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + + INVOKE(ctx, SyncSurface, (ctx, egl_surface)); + + return VA_STATUS_SUCCESS; +} + +static VAStatus +vaGetSurfaceInfoEGL_impl_driver(VADisplay dpy, + VASurfaceEGL egl_surface, + EGLenum *target, + EGLClientBuffer *buffer, + EGLint *attrib_list, + int *num_attribs) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + + INVOKE(ctx, GetSurfaceInfo, (ctx, egl_surface, target, buffer, attrib_list, num_attribs)); + + return VA_STATUS_SUCCESS; +} + +static VAStatus +vaDeassociateSurfaceEGL_impl_driver(VADisplay dpy, + VASurfaceEGL egl_surface) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + + INVOKE(ctx, DeassociateSurface, (ctx, egl_surface)); + + return VA_STATUS_SUCCESS; +} + +#undef INVOKE + +/* ========================================================================= */ +/* === VA/EGL helpers === */ +/* ========================================================================= */ +/** Unique VASurfaceImplEGL identifier */ +#define VA_SURFACE_IMPL_EGL_MAGIC VA_FOURCC('V','E','G','L') + +struct VASurfaceImplEGL { + uint32_t magic; ///< Magic number identifying a VASurfaceImplEGL + VASurfaceID surface; ///< Associated VA surface + EGLenum target; ///< EGL target + EGLClientBuffer buffer; + unsigned int width; + unsigned int height; + unsigned int flags; +}; + +static void * +create_native_pixmap(VADisplay dpy, unsigned int width, unsigned int height) +{ + VADisplayContextP pDisplayContext = (VADisplayContextP)dpy; + VAStatus status; + void *native_pixmap = NULL; + + status = pDisplayContext->vaCreateNativePixmap(pDisplayContext, width, height, &native_pixmap); + + if (status != VA_STATUS_SUCCESS) + native_pixmap = NULL; + + return native_pixmap; +} + +static void +destroy_native_pixmap(VADisplay dpy, void *native_pixmap) +{ + VADisplayContextP pDisplayContext = (VADisplayContextP)dpy; + + pDisplayContext->vaFreeNativePixmap(pDisplayContext, native_pixmap); +} + +// Check VASurfaceImplEGL is valid +static inline int check_surface(VASurfaceImplEGLP pSurfaceImplEGL) +{ + return pSurfaceImplEGL && pSurfaceImplEGL->magic == VA_SURFACE_IMPL_EGL_MAGIC; +} + +static inline VAStatus +deassociate_surface(VADriverContextP ctx, VASurfaceImplEGLP pSurfaceImplEGL) +{ + pSurfaceImplEGL->surface = VA_INVALID_SURFACE; + + return VA_STATUS_SUCCESS; +} + +static VAStatus +associate_surface(VADriverContextP ctx, + VASurfaceImplEGLP pSurfaceImplEGL, + VASurfaceID surface, + unsigned int flags) +{ + VAStatus status; + status = deassociate_surface(ctx, pSurfaceImplEGL); + + if (status != VA_STATUS_SUCCESS) + return status; + + pSurfaceImplEGL->surface = surface; + pSurfaceImplEGL->flags = flags; + + return VA_STATUS_SUCCESS; +} + +static inline VAStatus +sync_surface(VADriverContextP ctx, VASurfaceImplEGLP pSurfaceImplEGL) +{ + if (pSurfaceImplEGL->surface == VA_INVALID_SURFACE) + return VA_STATUS_ERROR_INVALID_SURFACE; + + return ctx->vtable->vaSyncSurface(ctx, pSurfaceImplEGL->surface); +} + +static VAStatus +sync_associated_surface(VADriverContextP ctx, VASurfaceImplEGLP pSurfaceImplEGL) +{ + VAStatus status; + + status = sync_surface(ctx, pSurfaceImplEGL); + + if (status != VA_STATUS_SUCCESS) + return status; + + if (pSurfaceImplEGL->target != EGL_NATIVE_PIXMAP_KHR) + return VA_STATUS_ERROR_UNIMPLEMENTED; + + status = ctx->vtable->vaPutSurface( + ctx, + pSurfaceImplEGL->surface, + (void *)pSurfaceImplEGL->buffer, + 0, 0, pSurfaceImplEGL->width, pSurfaceImplEGL->height, + 0, 0, pSurfaceImplEGL->width, pSurfaceImplEGL->height, + NULL, 0, + pSurfaceImplEGL->flags + ); + + if (status == VA_STATUS_SUCCESS) { + eglWaitNative(EGL_CORE_NATIVE_ENGINE); + } + + return status; +} + +/* ========================================================================= */ +/* === VA/EGL implementation from libVA (generic and suboptimal path) === */ +/* ========================================================================= */ +#ifdef INIT_SURFACE +#undef INIT_SURFACE +#endif + +#define INIT_SURFACE(surface, egl_surface) do { \ + surface = (VASurfaceImplEGLP)(egl_surface); \ + if (!check_surface(surface)) \ + return VA_STATUS_ERROR_INVALID_SURFACE; \ + } while (0) + +static VAStatus +vaQuerySurfaceTargetsEGL_impl_libva(VADisplay dpy, + EGLenum *target_list, + int *num_targets) +{ + int i = 0; + + /* FIXME: support other targets ??? */ + target_list[i++] = EGL_NATIVE_PIXMAP_KHR; + *num_targets = i; + assert(i <= IMPL_MAX_EGL_SURFACE_TARGETS); + + return VA_STATUS_SUCCESS; +} + +static VAStatus +vaCreateSurfaceEGL_impl_libva(VADisplay dpy, + EGLenum target, + unsigned int width, + unsigned int height, + VASurfaceEGL *egl_surface) +{ + VASurfaceImplEGLP pSurfaceImplEGL = NULL; + + /* So far only support for EGL_NATIVE_PIXMAP_KHR */ + if (target != 0 && target != EGL_NATIVE_PIXMAP_KHR) + return VA_STATUS_ERROR_INVALID_PARAMETER; + + pSurfaceImplEGL = calloc(1, sizeof(*pSurfaceImplEGL)); + + if (!pSurfaceImplEGL) { + *egl_surface = 0; + return VA_STATUS_ERROR_ALLOCATION_FAILED; + } + + pSurfaceImplEGL->magic = VA_SURFACE_IMPL_EGL_MAGIC; + pSurfaceImplEGL->surface = VA_INVALID_SURFACE; + pSurfaceImplEGL->target = target == 0 ? EGL_NATIVE_PIXMAP_KHR : target; + pSurfaceImplEGL->buffer = 0; + pSurfaceImplEGL->width = width; + pSurfaceImplEGL->height = height; + *egl_surface = (VASurfaceEGL)pSurfaceImplEGL; + + return VA_STATUS_SUCCESS; +} + +static VAStatus +vaDestroySurfaceEGL_impl_libva(VADisplay dpy, VASurfaceEGL egl_surface) +{ + VASurfaceImplEGLP pSurfaceImplEGL; + + INIT_SURFACE(pSurfaceImplEGL, egl_surface); + + if (pSurfaceImplEGL->target == EGL_NATIVE_PIXMAP_KHR) { + if (pSurfaceImplEGL->buffer) { + destroy_native_pixmap(dpy, pSurfaceImplEGL->buffer); + pSurfaceImplEGL->buffer = 0; + } + } + + free(pSurfaceImplEGL); + + return VA_STATUS_SUCCESS; +} + +static VAStatus +vaAssociateSurfaceEGL_impl_libva( + VADisplay dpy, + VASurfaceEGL egl_surface, + VASurfaceID surface, + unsigned int flags + ) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + VASurfaceImplEGLP pSurfaceImplEGL; + VAStatus status; + + INIT_SURFACE(pSurfaceImplEGL, egl_surface); + + if (surface == VA_INVALID_SURFACE) + return VA_STATUS_ERROR_INVALID_SURFACE; + + if (pSurfaceImplEGL->target == EGL_NATIVE_PIXMAP_KHR) { + if (pSurfaceImplEGL->buffer) + destroy_native_pixmap(dpy, pSurfaceImplEGL->buffer); + + pSurfaceImplEGL->buffer = create_native_pixmap(dpy, pSurfaceImplEGL->width, pSurfaceImplEGL->height); + } + + pSurfaceImplEGL->surface = surface; + pSurfaceImplEGL->flags = flags; + + if (pSurfaceImplEGL->buffer) + return VA_STATUS_SUCCESS; + + return VA_STATUS_ERROR_UNKNOWN; +} + +static VAStatus +vaSyncSurfaceEGL_impl_libva(VADisplay dpy, + VASurfaceEGL egl_surface) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + VASurfaceImplEGLP pSurfaceImplEGL; + VAStatus status; + + INIT_SURFACE(pSurfaceImplEGL, egl_surface); + + status = sync_associated_surface(ctx, pSurfaceImplEGL); + + return status; +} + +static VAStatus +vaGetSurfaceInfoEGL_impl_libva(VADisplay dpy, + VASurfaceEGL egl_surface, + EGLenum *target, + EGLClientBuffer *buffer, + EGLint *attrib_list, + int *num_attribs) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + VASurfaceImplEGLP pSurfaceImplEGL; + VAStatus status; + int i = 0; + + INIT_SURFACE(pSurfaceImplEGL, egl_surface); + + if (pSurfaceImplEGL->surface == VA_INVALID_SURFACE) + return VA_STATUS_ERROR_INVALID_SURFACE; + + if (*num_attribs < IMPL_MAX_EGL_SURFACE_ATTRIBUTES) + return VA_STATUS_ERROR_INVALID_PARAMETER; + + *target = pSurfaceImplEGL->target; + *buffer = pSurfaceImplEGL->buffer; + + if (pSurfaceImplEGL->target == EGL_NATIVE_PIXMAP_KHR) { + attrib_list[i++] = EGL_IMAGE_PRESERVED_KHR; + attrib_list[i + 1] = EGL_TRUE; + attrib_list[i++] = EGL_NONE; + } else { + /* FIXME later */ + attrib_list[i++] = EGL_NONE; + } + + *num_attribs = i; + + return VA_STATUS_SUCCESS; +} + +static VAStatus +vaDeassociateSurfaceEGL_impl_libva( + VADisplay dpy, + VASurfaceEGL egl_surface + ) +{ + VADriverContextP ctx = ((VADisplayContextP)(dpy))->pDriverContext; + VASurfaceImplEGLP pSurfaceImplEGL; + VAStatus status; + + INIT_SURFACE(pSurfaceImplEGL, egl_surface); + + if (pSurfaceImplEGL->target == EGL_NATIVE_PIXMAP_KHR) { + if (pSurfaceImplEGL->buffer) + destroy_native_pixmap(dpy, pSurfaceImplEGL->buffer); + + pSurfaceImplEGL->buffer = 0; + } + + pSurfaceImplEGL->surface = VA_INVALID_SURFACE; + + return VA_STATUS_SUCCESS; +} + +#undef INIT_SURFACE + +/* ========================================================================= */ +/* === Private VA/EGL vtable initialization === */ +/* ========================================================================= */ + +// Initialize EGL driver context +VAStatus va_egl_init_context(VADisplay dpy) +{ + VADisplayContextP pDisplayContext = (VADisplayContextP)dpy; + VADriverContextP ctx = pDisplayContext->pDriverContext; + VADriverContextEGLP egl_ctx = VA_DRIVER_CONTEXT_EGL(ctx); + VADriverVTablePrivEGLP vtable = &egl_ctx->vtable; + + if (egl_ctx->is_initialized) + return VA_STATUS_SUCCESS; + + if (ctx->vtable_egl && ctx->vtable_egl->vaCreateSurfaceEGL) { + vtable->vaQuerySurfaceTargetsEGL = vaQuerySurfaceTargetsEGL_impl_driver; + vtable->vaCreateSurfaceEGL = vaCreateSurfaceEGL_impl_driver; + vtable->vaDestroySurfaceEGL = vaDestroySurfaceEGL_impl_driver; + vtable->vaAssociateSurfaceEGL = vaAssociateSurfaceEGL_impl_driver; + vtable->vaSyncSurfaceEGL = vaSyncSurfaceEGL_impl_driver; + vtable->vaGetSurfaceInfoEGL = vaGetSurfaceInfoEGL_impl_driver; + vtable->vaDeassociateSurfaceEGL = vaDeassociateSurfaceEGL_impl_driver; + } + else { + if (pDisplayContext->vaCreateNativePixmap == NULL || + pDisplayContext->vaFreeNativePixmap == NULL) + return VA_STATUS_ERROR_UNIMPLEMENTED; + + if (!check_pixmap_extensions(ctx, egl_ctx->egl_display)) + return VA_STATUS_ERROR_UNIMPLEMENTED; + + vtable->vaQuerySurfaceTargetsEGL = vaQuerySurfaceTargetsEGL_impl_libva; + vtable->vaCreateSurfaceEGL = vaCreateSurfaceEGL_impl_libva; + vtable->vaDestroySurfaceEGL = vaDestroySurfaceEGL_impl_libva; + vtable->vaAssociateSurfaceEGL = vaAssociateSurfaceEGL_impl_libva; + vtable->vaSyncSurfaceEGL = vaSyncSurfaceEGL_impl_libva; + vtable->vaGetSurfaceInfoEGL = vaGetSurfaceInfoEGL_impl_libva; + vtable->vaDeassociateSurfaceEGL = vaDeassociateSurfaceEGL_impl_libva; + } + + egl_ctx->is_initialized = 1; + + return VA_STATUS_SUCCESS; +} diff --git a/va/egl/va_egl_impl.h b/va/egl/va_egl_impl.h new file mode 100644 index 0000000..7d4b6f5 --- /dev/null +++ b/va/egl/va_egl_impl.h @@ -0,0 +1,16 @@ +#ifndef _VA_EGL_IMPL_H_ +#define _VA_EGL_IMPL_H_ + +#define IMPL_MAX_EGL_SURFACE_TARGETS 4 +#define IMPL_MAX_EGL_SURFACE_ATTRIBUTES 8 + + +/** + * Initialize EGL driver context + * + * @param[in] dpy the VA Display + * @return VA_STATUS_SUCCESS if successful + */ +VAStatus va_egl_init_context(VADisplay dpy); + +#endif /* _VA_GLX_IMPL_H_ */ diff --git a/va/egl/va_egl_private.h b/va/egl/va_egl_private.h new file mode 100644 index 0000000..5934e36 --- /dev/null +++ b/va/egl/va_egl_private.h @@ -0,0 +1,75 @@ +#ifndef _VA_EGL_PRIVATE_H_ +#define _VA_EGL_PRIVATE_H_ + +#include "va.h" +#include "va_backend.h" +#include "va_egl.h" +#include "va_backend_egl.h" + +typedef struct VADisplayContextEGL *VADisplayContextEGLP; +typedef struct VADriverContextEGL *VADriverContextEGLP; +typedef struct VASurfaceImplEGL *VASurfaceImplEGLP; +typedef struct VADriverVTableEGL *VADriverVTableEGLP; +typedef struct VADriverVTablePrivEGL *VADriverVTablePrivEGLP; +typedef void (*vaDestroyFunc)(VADisplayContextP); + +struct VADisplayContextEGL { + vaDestroyFunc vaDestroy; +}; + +#define VA_DRIVER_CONTEXT_EGL(ctx) ((VADriverContextEGLP)((ctx)->egl)) + +struct VADriverVTablePrivEGL { + VAStatus (*vaQuerySurfaceTargetsEGL)( + VADisplay dpy, + EGLenum *target_list, /* out */ + int *num_targets /* out */ + ); + + VAStatus (*vaCreateSurfaceEGL)( + VADisplay dpy, + EGLenum target, + unsigned int width, + unsigned int height, + VASurfaceEGL *gl_surface + ); + + VAStatus (*vaDestroySurfaceEGL)( + VADisplay dpy, + VASurfaceEGL egl_surface + ); + + VAStatus (*vaAssociateSurfaceEGL)( + VADisplay dpy, + VASurfaceEGL egl_surface, + VASurfaceID surface, + unsigned int flags + ); + + VAStatus (*vaSyncSurfaceEGL)( + VADisplay dpy, + VASurfaceEGL egl_surface + ); + + VAStatus (*vaGetSurfaceInfoEGL)( + VADisplay dpy, + VASurfaceEGL egl_surface, + EGLenum *target, + EGLClientBuffer *buffer, + EGLint *attrib_list, + int *num_attribs + ); + + VAStatus (*vaDeassociateSurfaceEGL)( + VADisplay dpy, + VASurfaceEGL egl_surface + ); +}; + +struct VADriverContextEGL { + struct VADriverVTablePrivEGL vtable; + unsigned int is_initialized : 1; + EGLDisplay egl_display; +}; + +#endif /* _VA_EGL_PRIVATE_H_ */ @@ -47,6 +47,9 @@ #define CHECK_MAXIMUM(s, ctx, var) if (!va_checkMaximum(ctx->max_##var, #var)) s = VA_STATUS_ERROR_UNKNOWN; #define CHECK_STRING(s, ctx, var) if (!va_checkString(ctx->str_##var, #var)) s = VA_STATUS_ERROR_UNKNOWN; +#define Bool int +#define True 1 +#define False 0 /* * read a config "env" for libva.conf or from environment setting @@ -186,7 +186,14 @@ const char *vaErrorStr(VAStatus error_status); * native window system. * For X Windows, native_dpy would be from XOpenDisplay() */ -typedef void* NativeDisplay; /* window system dependent */ +typedef void* VANativeDisplay; /* window system dependent */ + +/* + * Returns a suitable VADisplay for VA API + */ +VADisplay vaGetDisplay ( + VANativeDisplay dpy +); int vaDisplayIsValid(VADisplay dpy); diff --git a/va/va_android.h b/va/va_android.h index 7b98949..dbb3c83 100644 --- a/va/va_android.h +++ b/va/va_android.h @@ -4,21 +4,6 @@ #include <va/va.h> #ifdef __cplusplus -extern "C" { -#endif - -/* - * Returns a suitable VADisplay for VA API - */ -VADisplay vaGetDisplay ( - void *android_dpy -); - -#ifdef __cplusplus -} -#endif - -#ifdef __cplusplus #ifdef ANDROID #include <surfaceflinger/ISurface.h> using namespace android; diff --git a/va/va_backend.h b/va/va_backend.h index 28a5a8e..c6257a6 100644 --- a/va/va_backend.h +++ b/va/va_backend.h @@ -30,9 +30,6 @@ #define _VA_BACKEND_H_ #include <va/va.h> -#ifndef ANDROID -#include <X11/Xlib.h> -#endif #include <linux/videodev2.h> typedef struct VADriverContext *VADriverContextP; @@ -453,8 +450,8 @@ struct VADriverContext void *dri_state; void *glx; /* opaque for GLX code */ - - unsigned long reserved[45]; /* reserve for future add-ins, decrease the subscript accordingly */ + void *egl; + unsigned long reserved[44]; /* reserve for future add-ins, decrease the subscript accordingly */ }; #define VA_DISPLAY_MAGIC 0x56414430 /* VAD0 */ @@ -479,6 +476,16 @@ struct VADisplayContext ); void *opaque; /* opaque for display extensions (e.g. GLX) */ + + VAStatus (*vaCreateNativePixmap) ( + VADisplayContextP pDisplayContext, + unsigned int width, + unsigned int height, + void **native_pixmap); + + VAStatus (*vaFreeNativePixmap) ( + VADisplayContextP pDisplayContext, + void *native_pixmap); }; typedef VAStatus (*VADriverInit) ( diff --git a/va/va_egl.h b/va/va_egl.h new file mode 100644 index 0000000..c9bd16f --- /dev/null +++ b/va/va_egl.h @@ -0,0 +1,179 @@ +#ifndef _VA_EGL_H_ +#define _VA_EGL_H_ + +#include <va/va.h> +#include <EGL/egl.h> +#include <EGL/eglext.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *VASurfaceEGL; + +/*This function is used to get EGLClientBuffer + * (lower 16bits is buffer index, upper 16bits + * is BC device id.) from surface id. Application + * should maintain EGLClientBuffer itself.*/ + +VAStatus vaGetEGLClientBufferFromSurface ( + VADisplay dpy, + VASurfaceID surface, + EGLClientBuffer *buffer /* out*/ +); + +/** + * Return a suitable VADisplay for VA API + * + * @param[in] native_dpy the native display + * @param[in] egl_dpy the EGL display + * @return a VADisplay + */ +VADisplay vaGetDisplayEGL( + VANativeDisplay native_dpy, + EGLDisplay egl_dpy +); + +/** + * Return maximum number of EGL targets supported by the implementation + * + * @param[in] dpy the VADisplay + * @return the maximum number of EGL Target + */ +int vaMaxNumSurfaceTargetsEGL( + VADisplay dpy +); + +/** + * Return maximum number of EGL surface attributes supported by the implementation + * + * @param[in] dpy the VADisplay + * @return the maximum number of EGL surface attributes + */ +int vaMaxNumSurfaceAttributesEGL( + VADisplay dpy +); + +/** + * Query supported EGL targets for eglCreateImageKHR(). + * + * The caller must provide a "target_list" array that can hold at + * least vaMaxNumSurfaceTargetsEGL() entries. The actual number of + * targets returned in "target_list" is returned in "num_targets". + * + * @param[in]] dpy the VADisplay + * @param[out] target_list the array to hold target entries + * @param[out] num_targets the actual number of targets + * @return VA_STATUS_SUCCESS if successful + */ +VAStatus vaQuerySurfaceTargetsEGL( + VADisplay dpy, + EGLenum *target_list, /* out */ + int *num_targets /* out */ +); + +/** + * Creates a VA/EGL surface with the specified target + * + * If target is 0, this means the best efficient target by default. + * + * @param[in] dpy the VADisplay + * @param[in] target the specified EGL target + * @param[in] width the surface width + * @param[in] height the surface height + * @param[out] gl_surface the VA/EGL surface + * @return VA_STATUS_SUCCESS if successful + */ +VAStatus vaCreateSurfaceEGL( + VADisplay dpy, + EGLenum target, + unsigned int width, + unsigned int height, + VASurfaceEGL *gl_surface +); + +/** + * Destroy a VA/EGL surface + * + * The application shall maintain the live EGL context itself. + * + * @param[in] dpy the VA display + * @param[in] gl_surface the VA surface + * @return VA_STATUS_SUCCESS if successful + */ +VAStatus vaDestroySurfaceEGL( + VADisplay dpy, + VASurfaceEGL gl_surface +); + +/** + * Associate a EGL surface with a VA surface + * + * @param[in] dpy the VA display + * @param[in] egl_surface the VA/EGL destination surface + * @param[in] surface the VA surface + * @param[in] flags the flags to PutSurface + * @return VA_STATUS_SUCCESS if successful + */ +VAStatus vaAssociateSurfaceEGL( + VADisplay dpy, + VASurfaceEGL egl_surface, + VASurfaceID surface, + unsigned int flags +); + +/** + * Update the content of a VA/EGL surface + * + * Changes to VA surface are committed to VA/EGL surface at this point. + * + * @param[in] dpy the VA display + * @param[in] egl_surface the VA/EGL surface that has been associated with a VA surface + * @return VA_STATUS_SUCCESS if successful + */ +VAStatus vaSyncSurfaceEGL( + VADisplay dpy, + VASurfaceEGL egl_surface +); + +/** + * Get the necessary information for eglCreateImageKHR() + * + * The caller must provide a "attrib_list" array that can hold at + * least (2 * vaMaxNumSurfaceAttributesEGL()) entries. The last attribute + * specified in attrib_list must be EGL_NONE + * + * @param[in] dpy the VA display + * @param[in] egl_surface the VA/EGL surface that has been associated with a VA surface + * @param[out] target the type of <buffer> for eglCreateImageKHR() + * @param[out] buffer the EGLClientBuffer for eglCreateImageKHR() + * @param[out] attrib_list the list of attribute-value pairs for eglCreateImageKHR() + * @param[in/out] num_attribs input: the number of allocated attribute-value pairs in attrib_list; output: the actual number of attribute-value pairs + * @return VA_STATUS_SUCCESS if successful + */ +VAStatus vaGetSurfaceInfoEGL( + VADisplay dpy, + VASurfaceEGL egl_surface, + EGLenum *target, /* out, the type of <buffer> */ + EGLClientBuffer *buffer, /* out */ + EGLint *attrib_list, /* out, the last attribute must be EGL_NONE */ + int *num_attribs /* in/out, the number of attribute-value pairs */ +); + +/** + * Deassociate a EGL surface + * + * @param[in] dpy the VA display + * @param[in] egl_surface the VA/EGL destination surface + * @return VA_STATUS_SUCCESS if successful + */ +VAStatus vaDeassociateSurfaceEGL( + VADisplay dpy, + VASurfaceEGL egl_surface +); + +#ifdef __cplusplus +} +#endif + +#endif /* _VA_EGL_H_ */ diff --git a/va/va_tpi.h b/va/va_tpi.h index 320a358..921c8fe 100644 --- a/va/va_tpi.h +++ b/va/va_tpi.h @@ -96,7 +96,7 @@ VAStatus vaCreateSurfacesForUserPtr( /* * Create surface from the Kernel buffer */ -VAStatus vaCreateSurfaceFromKbuf( +VAStatus vaCreateSurfaceFromKBuf( VADisplay dpy, int width, int height, diff --git a/va/va_x11.h b/va/va_x11.h index c6f9670..7ff9fdd 100644 --- a/va/va_x11.h +++ b/va/va_x11.h @@ -9,13 +9,6 @@ extern "C" { #endif /* - * Returns a suitable VADisplay for VA API - */ -VADisplay vaGetDisplay ( - Display *dpy -); - -/* * Output rendering * Following is the rendering interface for X windows, * to get the decode output surface to a X drawable diff --git a/va/x11/Makefile.am b/va/x11/Makefile.am index c1cbc7e..fc20f02 100644 --- a/va/x11/Makefile.am +++ b/va/x11/Makefile.am @@ -23,9 +23,7 @@ INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va $(DRM_CFLAGS) source_c = \ - dri1_util.c \ dri2_util.c \ - va_dri.c \ va_dri2.c \ va_dricommon.c \ va_fglrx.c \ @@ -34,7 +32,6 @@ source_c = \ $(NULL) source_h = \ - va_dri.h \ va_dri2.h \ va_dricommon.h \ $(NULL) @@ -42,7 +39,6 @@ source_h = \ source_h_priv = \ va_dri2str.h \ va_dri2tokens.h \ - va_dristr.h \ va_fglrx.h \ va_nvctrl.h \ $(NULL) diff --git a/va/x11/dri1_util.c b/va/x11/dri1_util.c deleted file mode 100644 index 7e5abf8..0000000 --- a/va/x11/dri1_util.c +++ /dev/null @@ -1,157 +0,0 @@ -#include <stdlib.h> -#include <fcntl.h> -#include <unistd.h> -#include <sys/mman.h> -#include <assert.h> - -#include <xf86drm.h> - -#include "X11/Xlib.h" -#include "va.h" -#include "va_backend.h" - -#include "va_dri.h" -#include "va_dricommon.h" - -struct dri1_drawable -{ - struct dri_drawable base; - union dri_buffer buffer; - int width; - int height; -}; - -static struct dri_drawable * -dri1CreateDrawable(VADriverContextP ctx, XID x_drawable) -{ - struct dri1_drawable *dri1_drawable; - - dri1_drawable = calloc(1, sizeof(*dri1_drawable)); - - if (!dri1_drawable) - return NULL; - - dri1_drawable->base.x_drawable = x_drawable; - - return &dri1_drawable->base; -} - -static void -dri1DestroyDrawable(VADriverContextP ctx, struct dri_drawable *dri_drawable) -{ - free(dri_drawable); -} - -static void -dri1SwapBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable) -{ - -} - -static union dri_buffer * -dri1GetRenderingBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable) -{ - struct dri1_drawable *dri1_drawable = (struct dri1_drawable *)dri_drawable; - - return &dri1_drawable->buffer; -} - -static void -dri1Close(VADriverContextP ctx) -{ - struct dri_state *dri_state = (struct dri_state *)ctx->dri_state; - - free_drawable_hashtable(ctx); - VA_DRIDestroyContext(ctx->native_dpy, ctx->x11_screen, dri_state->hwContextID); - assert(dri_state->pSAREA != MAP_FAILED); - drmUnmap(dri_state->pSAREA, SAREA_MAX); - assert(dri_state->fd >= 0); - drmCloseOnce(dri_state->fd); - VA_DRICloseConnection(ctx->native_dpy, ctx->x11_screen); -} - -Bool -isDRI1Connected(VADriverContextP ctx, char **driver_name) -{ - struct dri_state *dri_state = (struct dri_state *)ctx->dri_state; - int direct_capable; - int driver_major; - int driver_minor; - int driver_patch; - int newlyopened; - char *BusID; - drm_magic_t magic; - - *driver_name = NULL; - dri_state->fd = -1; - dri_state->pSAREA = MAP_FAILED; - dri_state->driConnectedFlag = VA_NONE; - - if (!VA_DRIQueryDirectRenderingCapable(ctx->native_dpy, - ctx->x11_screen, - &direct_capable)) - goto err_out0; - - if (!direct_capable) - goto err_out0; - - if (!VA_DRIGetClientDriverName(ctx->native_dpy, ctx->x11_screen, - &driver_major, &driver_minor, - &driver_patch, driver_name)) - goto err_out0; - - if (!VA_DRIOpenConnection(ctx->native_dpy, ctx->x11_screen, - &dri_state->hSAREA, &BusID)) - goto err_out0; - - - dri_state->fd = drmOpenOnce(NULL, BusID, &newlyopened); - XFree(BusID); - - if (dri_state->fd < 0) - goto err_out1; - - - if (drmGetMagic(dri_state->fd, &magic)) - goto err_out1; - - if (newlyopened && !VA_DRIAuthConnection(ctx->native_dpy, ctx->x11_screen, magic)) - goto err_out1; - - if (drmMap(dri_state->fd, dri_state->hSAREA, SAREA_MAX, &dri_state->pSAREA)) - goto err_out1; - - if (!VA_DRICreateContext(ctx->native_dpy, ctx->x11_screen, - DefaultVisual(ctx->native_dpy, ctx->x11_screen), - &dri_state->hwContextID, &dri_state->hwContext)) - goto err_out1; - - dri_state->driConnectedFlag = VA_DRI1; - dri_state->createDrawable = dri1CreateDrawable; - dri_state->destroyDrawable = dri1DestroyDrawable; - dri_state->swapBuffer = dri1SwapBuffer; - dri_state->getRenderingBuffer = dri1GetRenderingBuffer; - dri_state->close = dri1Close; - - return True; - -err_out1: - if (dri_state->pSAREA != MAP_FAILED) - drmUnmap(dri_state->pSAREA, SAREA_MAX); - - if (dri_state->fd >= 0) - drmCloseOnce(dri_state->fd); - - VA_DRICloseConnection(ctx->native_dpy, ctx->x11_screen); - -err_out0: - if (*driver_name) - XFree(*driver_name); - - dri_state->pSAREA = MAP_FAILED; - dri_state->fd = -1; - *driver_name = NULL; - - return False; -} - diff --git a/va/x11/va_dri.c b/va/x11/va_dri.c deleted file mode 100644 index ce3b7cd..0000000 --- a/va/x11/va_dri.c +++ /dev/null @@ -1,624 +0,0 @@ -/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.13 2002/10/30 12:51:25 alanh Exp $ */ -/************************************************************************** - -Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. -Copyright 2000 VA Linux Systems, Inc. -Copyright 2007 Intel Corporation -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sub license, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/* - * Authors: - * Kevin E. Martin <martin@valinux.com> - * Jens Owen <jens@tungstengraphics.com> - * Rickard E. (Rik) Faith <faith@valinux.com> - * - */ - -/* THIS IS NOT AN X CONSORTIUM STANDARD */ - -#define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include "va_dristr.h" - -#define PUBLIC - -static XExtensionInfo _va_dri_info_data; -static XExtensionInfo *va_dri_info = &_va_dri_info_data; -static char va_dri_extension_name[] = VA_DRINAME; - -#define VA_DRICheckExtension(dpy,i,val) \ - XextCheckExtension (dpy, i, va_dri_extension_name, val) - -/***************************************************************************** - * * - * private utility routines * - * * - *****************************************************************************/ - -static int close_display(Display *dpy, XExtCodes *extCodes); -static /* const */ XExtensionHooks va_dri_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ - NULL, /* flush_gc */ - NULL, /* free_gc */ - NULL, /* create_font */ - NULL, /* free_font */ - close_display, /* close_display */ - NULL, /* wire_to_event */ - NULL, /* event_to_wire */ - NULL, /* error */ - NULL, /* error_string */ -}; - -static XEXT_GENERATE_FIND_DISPLAY (find_display, va_dri_info, - va_dri_extension_name, - &va_dri_extension_hooks, - 0, NULL) - -static XEXT_GENERATE_CLOSE_DISPLAY (close_display, va_dri_info) - - -/***************************************************************************** - * * - * public XFree86-DRI Extension routines * - * * - *****************************************************************************/ - -#if 0 -#include <stdio.h> -#define TRACE(msg) fprintf(stderr,"XF86DRI%s\n", msg); -#else -#define TRACE(msg) -#endif - - -PUBLIC Bool VA_DRIQueryExtension (dpy, event_basep, error_basep) - Display *dpy; - int *event_basep, *error_basep; -{ - XExtDisplayInfo *info = find_display (dpy); - - TRACE("QueryExtension..."); - if (XextHasExtension(info)) { - *event_basep = info->codes->first_event; - *error_basep = info->codes->first_error; - TRACE("QueryExtension... return True"); - return True; - } else { - TRACE("QueryExtension... return False"); - return False; - } -} - -PUBLIC Bool VA_DRIQueryVersion(dpy, majorVersion, minorVersion, patchVersion) - Display* dpy; - int* majorVersion; - int* minorVersion; - int* patchVersion; -{ - XExtDisplayInfo *info = find_display (dpy); - xVA_DRIQueryVersionReply rep; - xVA_DRIQueryVersionReq *req; - - TRACE("QueryVersion..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRIQueryVersion, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRIQueryVersion; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - TRACE("QueryVersion... return False"); - return False; - } - *majorVersion = rep.majorVersion; - *minorVersion = rep.minorVersion; - *patchVersion = rep.patchVersion; - UnlockDisplay(dpy); - SyncHandle(); - TRACE("QueryVersion... return True"); - return True; -} - -PUBLIC Bool VA_DRIQueryDirectRenderingCapable(dpy, screen, isCapable) - Display* dpy; - int screen; - Bool* isCapable; -{ - XExtDisplayInfo *info = find_display (dpy); - xVA_DRIQueryDirectRenderingCapableReply rep; - xVA_DRIQueryDirectRenderingCapableReq *req; - - TRACE("QueryDirectRenderingCapable..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRIQueryDirectRenderingCapable, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRIQueryDirectRenderingCapable; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - TRACE("QueryDirectRenderingCapable... return False"); - return False; - } - *isCapable = rep.isCapable; - UnlockDisplay(dpy); - SyncHandle(); - TRACE("QueryDirectRenderingCapable... return True"); - return True; -} - -PUBLIC Bool VA_DRIOpenConnection(dpy, screen, hSAREA, busIdString) - Display* dpy; - int screen; - drm_handle_t * hSAREA; - char **busIdString; -{ - XExtDisplayInfo *info = find_display (dpy); - xVA_DRIOpenConnectionReply rep; - xVA_DRIOpenConnectionReq *req; - - TRACE("OpenConnection..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRIOpenConnection, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRIOpenConnection; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - TRACE("OpenConnection... return False"); - return False; - } - - *hSAREA = rep.hSAREALow; - if (sizeof(drm_handle_t) == 8) { - int shift = 32; /* var to prevent warning on next line */ - *hSAREA |= ((drm_handle_t) rep.hSAREAHigh) << shift; - } - - if (rep.length) { - if (!(*busIdString = (char *)Xcalloc(rep.busIdStringLength + 1, 1))) { - _XEatData(dpy, ((rep.busIdStringLength+3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); - TRACE("OpenConnection... return False"); - return False; - } - _XReadPad(dpy, *busIdString, rep.busIdStringLength); - } else { - *busIdString = NULL; - } - UnlockDisplay(dpy); - SyncHandle(); - TRACE("OpenConnection... return True"); - return True; -} - -PUBLIC Bool VA_DRIAuthConnection(dpy, screen, magic) - Display* dpy; - int screen; - drm_magic_t magic; -{ - XExtDisplayInfo *info = find_display (dpy); - xVA_DRIAuthConnectionReq *req; - xVA_DRIAuthConnectionReply rep; - - TRACE("AuthConnection..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRIAuthConnection, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRIAuthConnection; - req->screen = screen; - req->magic = magic; - rep.authenticated = 0; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse) || !rep.authenticated) { - UnlockDisplay(dpy); - SyncHandle(); - TRACE("AuthConnection... return False"); - return False; - } - UnlockDisplay(dpy); - SyncHandle(); - TRACE("AuthConnection... return True"); - return True; -} - -PUBLIC Bool VA_DRICloseConnection(dpy, screen) - Display* dpy; - int screen; -{ - XExtDisplayInfo *info = find_display (dpy); - xVA_DRICloseConnectionReq *req; - - TRACE("CloseConnection..."); - - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRICloseConnection, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRICloseConnection; - req->screen = screen; - UnlockDisplay(dpy); - SyncHandle(); - TRACE("CloseConnection... return True"); - return True; -} - -PUBLIC Bool VA_DRIGetClientDriverName(dpy, screen, ddxDriverMajorVersion, - ddxDriverMinorVersion, ddxDriverPatchVersion, clientDriverName) - Display* dpy; - int screen; - int* ddxDriverMajorVersion; - int* ddxDriverMinorVersion; - int* ddxDriverPatchVersion; - char** clientDriverName; -{ - XExtDisplayInfo *info = find_display (dpy); - xVA_DRIGetClientDriverNameReply rep; - xVA_DRIGetClientDriverNameReq *req; - - TRACE("GetClientDriverName..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRIGetClientDriverName, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRIGetClientDriverName; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - TRACE("GetClientDriverName... return False"); - return False; - } - - *ddxDriverMajorVersion = rep.ddxDriverMajorVersion; - *ddxDriverMinorVersion = rep.ddxDriverMinorVersion; - *ddxDriverPatchVersion = rep.ddxDriverPatchVersion; - - if (rep.length) { - if (!(*clientDriverName = (char *)Xcalloc(rep.clientDriverNameLength + 1, 1))) { - _XEatData(dpy, ((rep.clientDriverNameLength+3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); - TRACE("GetClientDriverName... return False"); - return False; - } - _XReadPad(dpy, *clientDriverName, rep.clientDriverNameLength); - } else { - *clientDriverName = NULL; - } - UnlockDisplay(dpy); - SyncHandle(); - TRACE("GetClientDriverName... return True"); - return True; -} - -PUBLIC Bool VA_DRICreateContextWithConfig(dpy, screen, configID, context, - hHWContext) - Display* dpy; - int screen; - int configID; - XID* context; - drm_context_t * hHWContext; -{ - XExtDisplayInfo *info = find_display (dpy); - xVA_DRICreateContextReply rep; - xVA_DRICreateContextReq *req; - - TRACE("CreateContext..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRICreateContext, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRICreateContext; - req->visual = configID; - req->screen = screen; - *context = XAllocID(dpy); - req->context = *context; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - TRACE("CreateContext... return False"); - return False; - } - *hHWContext = rep.hHWContext; - UnlockDisplay(dpy); - SyncHandle(); - TRACE("CreateContext... return True"); - return True; -} - -PUBLIC Bool VA_DRICreateContext(dpy, screen, visual, context, hHWContext) - Display* dpy; - int screen; - Visual* visual; - XID* context; - drm_context_t * hHWContext; -{ - return VA_DRICreateContextWithConfig( dpy, screen, visual->visualid, - context, hHWContext ); -} - -PUBLIC Bool VA_DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, - __DRIid context ) -{ - Display * const dpy = (Display *) ndpy; - XExtDisplayInfo *info = find_display (dpy); - xVA_DRIDestroyContextReq *req; - - TRACE("DestroyContext..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRIDestroyContext, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRIDestroyContext; - req->screen = screen; - req->context = context; - UnlockDisplay(dpy); - SyncHandle(); - TRACE("DestroyContext... return True"); - return True; -} - -PUBLIC Bool VA_DRICreateDrawable( __DRInativeDisplay * ndpy, int screen, - __DRIid drawable, drm_drawable_t * hHWDrawable ) -{ - Display * const dpy = (Display *) ndpy; - XExtDisplayInfo *info = find_display (dpy); - xVA_DRICreateDrawableReply rep; - xVA_DRICreateDrawableReq *req; - - TRACE("CreateDrawable..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRICreateDrawable, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRICreateDrawable; - req->screen = screen; - req->drawable = drawable; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - TRACE("CreateDrawable... return False"); - return False; - } - *hHWDrawable = rep.hHWDrawable; - UnlockDisplay(dpy); - SyncHandle(); - TRACE("CreateDrawable... return True"); - return True; -} - -PUBLIC Bool VA_DRIDestroyDrawable( __DRInativeDisplay * ndpy, int screen, - __DRIid drawable ) -{ - Display * const dpy = (Display *) ndpy; - XExtDisplayInfo *info = find_display (dpy); - xVA_DRIDestroyDrawableReq *req; - - TRACE("DestroyDrawable..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRIDestroyDrawable, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRIDestroyDrawable; - req->screen = screen; - req->drawable = drawable; - UnlockDisplay(dpy); - SyncHandle(); - TRACE("DestroyDrawable... return True"); - return True; -} - -PUBLIC Bool VA_DRIGetDrawableInfo(Display* dpy, int screen, Drawable drawable, - unsigned int* index, unsigned int* stamp, - int* X, int* Y, int* W, int* H, - int* numClipRects, drm_clip_rect_t ** pClipRects, - int* backX, int* backY, - int* numBackClipRects, drm_clip_rect_t ** pBackClipRects ) -{ - XExtDisplayInfo *info = find_display (dpy); - xVA_DRIGetDrawableInfoReply rep; - xVA_DRIGetDrawableInfoReq *req; - int total_rects; - - TRACE("GetDrawableInfo..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRIGetDrawableInfo, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRIGetDrawableInfo; - req->screen = screen; - req->drawable = drawable; - - if (!_XReply(dpy, (xReply *)&rep, 1, xFalse)) - { - UnlockDisplay(dpy); - SyncHandle(); - TRACE("GetDrawableInfo... return False"); - return False; - } - *index = rep.drawableTableIndex; - *stamp = rep.drawableTableStamp; - *X = (int)rep.drawableX; - *Y = (int)rep.drawableY; - *W = (int)rep.drawableWidth; - *H = (int)rep.drawableHeight; - *numClipRects = rep.numClipRects; - total_rects = *numClipRects; - - *backX = rep.backX; - *backY = rep.backY; - *numBackClipRects = rep.numBackClipRects; - total_rects += *numBackClipRects; - -#if 0 - /* Because of the fix in Xserver/GL/dri/xf86dri.c, this check breaks - * backwards compatibility (Because of the >> 2 shift) but the fix - * enables multi-threaded apps to work. - */ - if (rep.length != ((((SIZEOF(xVA_DRIGetDrawableInfoReply) - - SIZEOF(xGenericReply) + - total_rects * sizeof(drm_clip_rect_t)) + 3) & ~3) >> 2)) { - _XEatData(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - TRACE("GetDrawableInfo... return False"); - return False; - } -#endif - - if (*numClipRects) { - int len = sizeof(drm_clip_rect_t) * (*numClipRects); - - *pClipRects = (drm_clip_rect_t *)Xcalloc(len, 1); - if (*pClipRects) - _XRead(dpy, (char*)*pClipRects, len); - } else { - *pClipRects = NULL; - } - - if (*numBackClipRects) { - int len = sizeof(drm_clip_rect_t) * (*numBackClipRects); - - *pBackClipRects = (drm_clip_rect_t *)Xcalloc(len, 1); - if (*pBackClipRects) - _XRead(dpy, (char*)*pBackClipRects, len); - } else { - *pBackClipRects = NULL; - } - - UnlockDisplay(dpy); - SyncHandle(); - TRACE("GetDrawableInfo... return True"); - return True; -} - -PUBLIC Bool VA_DRIGetDeviceInfo(dpy, screen, hFrameBuffer, - fbOrigin, fbSize, fbStride, devPrivateSize, pDevPrivate) - Display* dpy; - int screen; - drm_handle_t * hFrameBuffer; - int* fbOrigin; - int* fbSize; - int* fbStride; - int* devPrivateSize; - void** pDevPrivate; -{ - XExtDisplayInfo *info = find_display (dpy); - xVA_DRIGetDeviceInfoReply rep; - xVA_DRIGetDeviceInfoReq *req; - - TRACE("GetDeviceInfo..."); - VA_DRICheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(VA_DRIGetDeviceInfo, req); - req->reqType = info->codes->major_opcode; - req->driReqType = X_VA_DRIGetDeviceInfo; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - TRACE("GetDeviceInfo... return False"); - return False; - } - - *hFrameBuffer = rep.hFrameBufferLow; - if (sizeof(drm_handle_t) == 8) { - int shift = 32; /* var to prevent warning on next line */ - *hFrameBuffer |= ((drm_handle_t) rep.hFrameBufferHigh) << shift; - } - - *fbOrigin = rep.framebufferOrigin; - *fbSize = rep.framebufferSize; - *fbStride = rep.framebufferStride; - *devPrivateSize = rep.devPrivateSize; - - if (rep.length) { - if (!(*pDevPrivate = (void *)Xcalloc(rep.devPrivateSize, 1))) { - _XEatData(dpy, ((rep.devPrivateSize+3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); - TRACE("GetDeviceInfo... return False"); - return False; - } - _XRead(dpy, (char*)*pDevPrivate, rep.devPrivateSize); - } else { - *pDevPrivate = NULL; - } - - UnlockDisplay(dpy); - SyncHandle(); - TRACE("GetDeviceInfo... return True"); - return True; -} - -PUBLIC Bool VA_DRIOpenFullScreen(dpy, screen, drawable) - Display* dpy; - int screen; - Drawable drawable; -{ - /* This function and the underlying X protocol are deprecated. - */ - (void) dpy; - (void) screen; - (void) drawable; - return False; -} - -PUBLIC Bool VA_DRICloseFullScreen(dpy, screen, drawable) - Display* dpy; - int screen; - Drawable drawable; -{ - /* This function and the underlying X protocol are deprecated. - */ - (void) dpy; - (void) screen; - (void) drawable; - return True; -} - -#undef TRACE - diff --git a/va/x11/va_dri.h b/va/x11/va_dri.h deleted file mode 100644 index 91f87a2..0000000 --- a/va/x11/va_dri.h +++ /dev/null @@ -1,120 +0,0 @@ -/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.8 2002/10/30 12:51:25 alanh Exp $ */ -/************************************************************************** - -Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. -Copyright 2000 VA Linux Systems, Inc. -Copyright 2007 Intel Corporation -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sub license, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/** - * \file xf86dri.h - * Protocol numbers and function prototypes for DRI X protocol. - * - * \author Kevin E. Martin <martin@valinux.com> - * \author Jens Owen <jens@tungstengraphics.com> - * \author Rickard E. (Rik) Faith <faith@valinux.com> - */ - -#ifndef _VA_DRI_H_ -#define _VA_DRI_H_ - -#include <X11/Xfuncproto.h> -#include <xf86drm.h> - -#define X_VA_DRIQueryVersion 0 -#define X_VA_DRIQueryDirectRenderingCapable 1 -#define X_VA_DRIOpenConnection 2 -#define X_VA_DRICloseConnection 3 -#define X_VA_DRIGetClientDriverName 4 -#define X_VA_DRICreateContext 5 -#define X_VA_DRIDestroyContext 6 -#define X_VA_DRICreateDrawable 7 -#define X_VA_DRIDestroyDrawable 8 -#define X_VA_DRIGetDrawableInfo 9 -#define X_VA_DRIGetDeviceInfo 10 -#define X_VA_DRIAuthConnection 11 -#define X_VA_DRIOpenFullScreen 12 /* Deprecated */ -#define X_VA_DRICloseFullScreen 13 /* Deprecated */ - -#define VA_DRINumberEvents 0 - -#define VA_DRIClientNotLocal 0 -#define VA_DRIOperationNotSupported 1 -#define VA_DRINumberErrors (VA_DRIOperationNotSupported + 1) - -typedef unsigned long __DRIid; -typedef void __DRInativeDisplay; - -_XFUNCPROTOBEGIN - -Bool VA_DRIQueryExtension( Display *dpy, int *event_base, int *error_base ); - -Bool VA_DRIQueryVersion( Display *dpy, int *majorVersion, int *minorVersion, - int *patchVersion ); - -Bool VA_DRIQueryDirectRenderingCapable( Display *dpy, int screen, - Bool *isCapable ); - -Bool VA_DRIOpenConnection( Display *dpy, int screen, drm_handle_t *hSAREA, - char **busIDString ); - -Bool VA_DRIAuthConnection( Display *dpy, int screen, drm_magic_t magic ); - -Bool VA_DRICloseConnection( Display *dpy, int screen ); - -Bool VA_DRIGetClientDriverName( Display *dpy, int screen, - int *ddxDriverMajorVersion, int *ddxDriverMinorVersion, - int *ddxDriverPatchVersion, char **clientDriverName ); - -Bool VA_DRICreateContext( Display *dpy, int screen, Visual *visual, - XID *ptr_to_returned_context_id, drm_context_t *hHWContext ); - -Bool VA_DRICreateContextWithConfig( Display *dpy, int screen, int configID, - XID *ptr_to_returned_context_id, drm_context_t *hHWContext ); - -Bool VA_DRIDestroyContext( __DRInativeDisplay *dpy, int screen, - __DRIid context_id ); - -Bool VA_DRICreateDrawable( __DRInativeDisplay *dpy, int screen, - __DRIid drawable, drm_drawable_t *hHWDrawable ); - -Bool VA_DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen, - __DRIid drawable); - -Bool VA_DRIGetDrawableInfo( Display *dpy, int screen, Drawable drawable, - unsigned int *index, unsigned int *stamp, - int *X, int *Y, int *W, int *H, - int *numClipRects, drm_clip_rect_t ** pClipRects, - int *backX, int *backY, - int *numBackClipRects, drm_clip_rect_t **pBackClipRects ); - -Bool VA_DRIGetDeviceInfo( Display *dpy, int screen, - drm_handle_t *hFrameBuffer, int *fbOrigin, int *fbSize, - int *fbStride, int *devPrivateSize, void **pDevPrivate ); - -_XFUNCPROTOEND - -#endif /* _VA_DRI_H_ */ - diff --git a/va/x11/va_dricommon.h b/va/x11/va_dricommon.h index 357cc8e..f863004 100644 --- a/va/x11/va_dricommon.h +++ b/va/x11/va_dricommon.h @@ -32,9 +32,6 @@ union dri_buffer unsigned int cpp; unsigned int flags; } dri2; - - struct { - } dri1; }; struct dri_drawable @@ -54,10 +51,6 @@ struct dri_state int fd; int driConnectedFlag; /* 0: disconnected, 1: DRI, 2: DRI2 */ #ifndef ANDROID - drm_handle_t hSAREA; - drm_context_t hwContext; - drmAddress pSAREA; - XID hwContextID; struct dri_drawable *drawable_hash[DRAWABLE_HASH_SZ]; struct dri_drawable *(*createDrawable)(VADriverContextP ctx, XID x_drawable); @@ -69,7 +62,6 @@ struct dri_state }; Bool isDRI2Connected(VADriverContextP ctx, char **driver_name); -Bool isDRI1Connected(VADriverContextP ctx, char **driver_name); void free_drawable(VADriverContextP ctx, struct dri_drawable* dri_drawable); void free_drawable_hashtable(VADriverContextP ctx); struct dri_drawable *dri_get_drawable(VADriverContextP ctx, XID drawable); diff --git a/va/x11/va_dristr.h b/va/x11/va_dristr.h deleted file mode 100644 index 3e391de..0000000 --- a/va/x11/va_dristr.h +++ /dev/null @@ -1,344 +0,0 @@ -/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.10 2002/10/30 12:51:25 alanh Exp $ */ -/************************************************************************** - -Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. -Copyright 2000 VA Linux Systems, Inc. -Copyright 2007 Intel Corporation -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sub license, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/* - * Authors: - * Kevin E. Martin <martin@valinux.com> - * Jens Owen <jens@tungstengraphics.com> - * Rickard E. (Rik) Fiath <faith@valinux.com> - * - */ - -#ifndef _VA_DRISTR_H_ -#define _VA_DRISTR_H_ - -#include "va_dri.h" - -#define VA_DRINAME "XFree86-DRI" - -/* The DRI version number. This was originally set to be the same of the - * XFree86 version number. However, this version is really indepedent of - * the XFree86 version. - * - * Version History: - * 4.0.0: Original - * 4.0.1: Patch to bump clipstamp when windows are destroyed, 28 May 02 - * 4.1.0: Add transition from single to multi in DRMInfo rec, 24 Jun 02 - */ -#define VA_DRI_MAJOR_VERSION 4 -#define VA_DRI_MINOR_VERSION 1 -#define VA_DRI_PATCH_VERSION 0 - -typedef struct _VA_DRIQueryVersion { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRIQueryVersion */ - CARD16 length B16; -} xVA_DRIQueryVersionReq; -#define sz_xVA_DRIQueryVersionReq 4 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of DRI protocol */ - CARD16 minorVersion B16; /* minor version of DRI protocol */ - CARD32 patchVersion B32; /* patch version of DRI protocol */ - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xVA_DRIQueryVersionReply; -#define sz_xVA_DRIQueryVersionReply 32 - -typedef struct _VA_DRIQueryDirectRenderingCapable { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* X_DRIQueryDirectRenderingCapable */ - CARD16 length B16; - CARD32 screen B32; -} xVA_DRIQueryDirectRenderingCapableReq; -#define sz_xVA_DRIQueryDirectRenderingCapableReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - BOOL isCapable; - BOOL pad2; - BOOL pad3; - BOOL pad4; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; - CARD32 pad8 B32; - CARD32 pad9 B32; -} xVA_DRIQueryDirectRenderingCapableReply; -#define sz_xVA_DRIQueryDirectRenderingCapableReply 32 - -typedef struct _VA_DRIOpenConnection { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRIOpenConnection */ - CARD16 length B16; - CARD32 screen B32; -} xVA_DRIOpenConnectionReq; -#define sz_xVA_DRIOpenConnectionReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 hSAREALow B32; - CARD32 hSAREAHigh B32; - CARD32 busIdStringLength B32; - CARD32 pad6 B32; - CARD32 pad7 B32; - CARD32 pad8 B32; -} xVA_DRIOpenConnectionReply; -#define sz_xVA_DRIOpenConnectionReply 32 - -typedef struct _VA_DRIAuthConnection { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRICloseConnection */ - CARD16 length B16; - CARD32 screen B32; - CARD32 magic B32; -} xVA_DRIAuthConnectionReq; -#define sz_xVA_DRIAuthConnectionReq 12 - -typedef struct { - BYTE type; - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 authenticated B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xVA_DRIAuthConnectionReply; -#define zx_xVA_DRIAuthConnectionReply 32 - -typedef struct _VA_DRICloseConnection { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRICloseConnection */ - CARD16 length B16; - CARD32 screen B32; -} xVA_DRICloseConnectionReq; -#define sz_xVA_DRICloseConnectionReq 8 - -typedef struct _VA_DRIGetClientDriverName { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRIGetClientDriverName */ - CARD16 length B16; - CARD32 screen B32; -} xVA_DRIGetClientDriverNameReq; -#define sz_xVA_DRIGetClientDriverNameReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 ddxDriverMajorVersion B32; - CARD32 ddxDriverMinorVersion B32; - CARD32 ddxDriverPatchVersion B32; - CARD32 clientDriverNameLength B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xVA_DRIGetClientDriverNameReply; -#define sz_xVA_DRIGetClientDriverNameReply 32 - -typedef struct _VA_DRICreateContext { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRICreateContext */ - CARD16 length B16; - CARD32 screen B32; - CARD32 visual B32; - CARD32 context B32; -} xVA_DRICreateContextReq; -#define sz_xVA_DRICreateContextReq 16 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 hHWContext B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xVA_DRICreateContextReply; -#define sz_xVA_DRICreateContextReply 32 - -typedef struct _VA_DRIDestroyContext { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRIDestroyContext */ - CARD16 length B16; - CARD32 screen B32; - CARD32 context B32; -} xVA_DRIDestroyContextReq; -#define sz_xVA_DRIDestroyContextReq 12 - -typedef struct _VA_DRICreateDrawable { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRICreateDrawable */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; -} xVA_DRICreateDrawableReq; -#define sz_xVA_DRICreateDrawableReq 12 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 hHWDrawable B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xVA_DRICreateDrawableReply; -#define sz_xVA_DRICreateDrawableReply 32 - -typedef struct _VA_DRIDestroyDrawable { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRIDestroyDrawable */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; -} xVA_DRIDestroyDrawableReq; -#define sz_xVA_DRIDestroyDrawableReq 12 - -typedef struct _VA_DRIGetDrawableInfo { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRIGetDrawableInfo */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; -} xVA_DRIGetDrawableInfoReq; -#define sz_xVA_DRIGetDrawableInfoReq 12 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 drawableTableIndex B32; - CARD32 drawableTableStamp B32; - INT16 drawableX B16; - INT16 drawableY B16; - INT16 drawableWidth B16; - INT16 drawableHeight B16; - CARD32 numClipRects B32; - INT16 backX B16; - INT16 backY B16; - CARD32 numBackClipRects B32; -} xVA_DRIGetDrawableInfoReply; - -#define sz_xVA_DRIGetDrawableInfoReply 36 - - -typedef struct _VA_DRIGetDeviceInfo { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRIGetDeviceInfo */ - CARD16 length B16; - CARD32 screen B32; -} xVA_DRIGetDeviceInfoReq; -#define sz_xVA_DRIGetDeviceInfoReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 hFrameBufferLow B32; - CARD32 hFrameBufferHigh B32; - CARD32 framebufferOrigin B32; - CARD32 framebufferSize B32; - CARD32 framebufferStride B32; - CARD32 devPrivateSize B32; -} xVA_DRIGetDeviceInfoReply; -#define sz_xVA_DRIGetDeviceInfoReply 32 - -typedef struct _VA_DRIOpenFullScreen { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRIOpenFullScreen */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; -} xVA_DRIOpenFullScreenReq; -#define sz_xVA_DRIOpenFullScreenReq 12 - -typedef struct { - BYTE type; - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 isFullScreen B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xVA_DRIOpenFullScreenReply; -#define sz_xVA_DRIOpenFullScreenReply 32 - -typedef struct _VA_DRICloseFullScreen { - CARD8 reqType; /* always DRIReqCode */ - CARD8 driReqType; /* always X_DRICloseFullScreen */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; -} xVA_DRICloseFullScreenReq; -#define sz_xVA_DRICloseFullScreenReq 12 - -typedef struct { - BYTE type; - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; -} xVA_DRICloseFullScreenReply; -#define sz_xVA_DRICloseFullScreenReply 32 - - -#endif /* _VA_DRISTR_H_ */ diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c index 86b040a..08e3086 100644 --- a/va/x11/va_x11.c +++ b/va/x11/va_x11.c @@ -29,7 +29,6 @@ #include "va_trace.h" #include "va_fool.h" #include "va_x11.h" -#include "va_dri.h" #include "va_dri2.h" #include "va_dricommon.h" #include "va_nvctrl.h" @@ -87,19 +86,6 @@ static VAStatus va_DRI2GetDriverName ( return VA_STATUS_SUCCESS; } -static VAStatus va_DRIGetDriverName ( - VADisplayContextP pDisplayContext, - char **driver_name -) -{ - VADriverContextP ctx = pDisplayContext->pDriverContext; - - if (!isDRI1Connected(ctx, driver_name)) - return VA_STATUS_ERROR_UNKNOWN; - - return VA_STATUS_SUCCESS; -} - static VAStatus va_NVCTRL_GetDriverName ( VADisplayContextP pDisplayContext, char **driver_name @@ -153,17 +139,56 @@ static VAStatus va_DisplayContextGetDriverName ( vaStatus = va_DRI2GetDriverName(pDisplayContext, driver_name); if (vaStatus != VA_STATUS_SUCCESS) - vaStatus = va_DRIGetDriverName(pDisplayContext, driver_name); - if (vaStatus != VA_STATUS_SUCCESS) vaStatus = va_NVCTRL_GetDriverName(pDisplayContext, driver_name); if (vaStatus != VA_STATUS_SUCCESS) vaStatus = va_FGLRX_GetDriverName(pDisplayContext, driver_name); return vaStatus; } +static VAStatus va_CreateNativePixmap( + VADisplayContextP pDisplayContext, + unsigned int width, + unsigned int height, + void **native_pixmap) +{ + VADriverContextP ctx = pDisplayContext->pDriverContext; + Window root_window; + XWindowAttributes wattr; + Pixmap pixmap = None; + + root_window = RootWindow(ctx->native_dpy, ctx->x11_screen); + XGetWindowAttributes(ctx->native_dpy, root_window, &wattr); + + if (wattr.depth != 24 && wattr.depth != 32) + return VA_STATUS_ERROR_INVALID_DISPLAY; + + pixmap = XCreatePixmap( + ctx->native_dpy, + root_window, + width, + height, + wattr.depth + ); + + *native_pixmap = (void *)pixmap; + + return !pixmap ? VA_STATUS_ERROR_UNKNOWN : VA_STATUS_SUCCESS; +} + +static VAStatus va_FreeNativePixmap( + VADisplayContextP pDisplayContext, + void *native_pixmap) +{ + VADriverContextP ctx = pDisplayContext->pDriverContext; + Pixmap pixmap = (Pixmap)native_pixmap; + + XFreePixmap(ctx->native_dpy, pixmap); + + return VA_STATUS_SUCCESS; +} VADisplay vaGetDisplay ( - Display *native_dpy /* implementation specific */ + VANativeDisplay native_dpy /* implementation specific */ ) { VADisplay dpy = NULL; @@ -190,6 +215,8 @@ VADisplay vaGetDisplay ( pDisplayContext->vaDestroy = va_DisplayContextDestroy; pDisplayContext->vaGetDriverName = va_DisplayContextGetDriverName; pDisplayContext->opaque = NULL; + pDisplayContext->vaCreateNativePixmap = va_CreateNativePixmap; + pDisplayContext->vaFreeNativePixmap = va_FreeNativePixmap; pDriverContext->dri_state = dri_state; dpy = (VADisplay)pDisplayContext; } |