Added the missing files

7d6bbcfc · Austin Yuan · 881b49c5 · 7d6bbcfc · 7d6bbcfc · 7d6bbcfc
Commit 7d6bbcfc authored Oct 28, 2010 by Austin Yuan
7 changed files
--- a/config.h
+++ b/config.h
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <GL/glx.h> header file. */
+#define HAVE_GL_GLX_H 1
+
+/* Define to 1 if you have the <GL/gl.h> header file. */
+#define HAVE_GL_GL_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libva"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "waldo.bastian@intel.com"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libva"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libva 0.31.1"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libva"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.31.1"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "0.31.1"
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#define _FILE_OFFSET_BITS 64
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
--- a/libva.spec
+++ b/libva.spec
+#%define moduledir %(pkg-config xorg-server --variable=moduledir)
+%define driverdir %{_libdir}/
+
+%define reldate 04282009
+
+Name:           libva
+Version:        1.0.6
+Release:        0.0
+License:        MIT
+Source:         %{name}-%{version}.tar.bz2
+Group:          Development/Libraries
+Summary:        Video Acceleration (VA) API for Linux
+URL:            http://freedesktop.org/wiki/Software/vaapi
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+Requires: xorg-x11-server-Xorg
+
+BuildRequires: libtool xorg-x11-server-devel pkgconfig(xv) pkgconfig(xrandr)
+BuildRequires: libdrm-devel libX11-devel libXext-devel libXdamage-devel libXfixes-devel xorg-x11-proto-dri2proto
+BuildRequires: xorg-x11-proto-damageproto xorg-x11-proto-kbproto xorg-x11-proto-xproto xorg-x11-proto-xextproto xorg-x11-proto-fixesproto
+
+%description
+The libva library implements the Video Acceleration (VA) API for Linux.
+The library loads a hardware dependendent driver.
+
+%package devel
+Summary: Video Acceleration (VA) API for Linux -- development files
+Group:          Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+The libva library implements the Video Acceleration (VA) API for Linux.
+The library loads a hardware dependendent driver.
+
+This package provides the development environment for libva.
+
+%prep
+%setup -q
+
+%build
+unset LD_AS_NEEDED
+%autogen
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%make_install
+mkdir -p $RPM_BUILD_ROOT%{driverdir}
+install -m 755 ./dummy_drv_video/.libs/dummy_drv_video.so $RPM_BUILD_ROOT%{driverdir}/dummy_drv_video.so
+install -m 755 ./va/.libs/libva.so.1 $RPM_BUILD_ROOT%{driverdir}/libva.so.1
+install -m 755 ./va/.libs/libva.so.1.0.6 $RPM_BUILD_ROOT%{driverdir}/libva.so.1.0.6
+install -m 755 ./va/.libs/libva-tpi.so.1 $RPM_BUILD_ROOT%{driverdir}/libva-tpi.so.1
+install -m 755 ./va/.libs/libva-tpi.so.1.0.6 $RPM_BUILD_ROOT%{driverdir}/libva-tpi.so.1.0.6
+install -m 755 ./va/.libs/libva-x11.so.1 $RPM_BUILD_ROOT%{driverdir}/libva-x11.so.1
+install -m 755 ./va/.libs/libva-x11.so.1.0.6 $RPM_BUILD_ROOT%{driverdir}/libva-x11.so.1.0.6
+install -m 755 ./va/.libs/libva-glx.so.1 $RPM_BUILD_ROOT%{driverdir}/libva-glx.so.1
+install -m 755 ./va/.libs/libva-glx.so.1.0.6 $RPM_BUILD_ROOT%{driverdir}/libva-glx.so.1.0.6
+
+install -m 555 ./test/vainfo $RPM_BUILD_ROOT%{_bindir}/vainfo
+install -m 555 ./test/basic/test_* $RPM_BUILD_ROOT%{_bindir}/
+install -m 555 ./test/decode/mpeg2vldemo $RPM_BUILD_ROOT%{_bindir}/mpeg4vldemo
+install -m 555 ./test/encode/h264encode $RPM_BUILD_ROOT%{_bindir}/h264encode
+install -m 555 ./test/putsurface/putsurface $RPM_BUILD_ROOT%{_bindir}/putsurface
+
+install -m 666 ./va/va_tpi.h $RPM_BUILD_ROOT%{_includedir}/va/va_tpi.h
+install -m 666 ./va/va_x11.h $RPM_BUILD_ROOT%{_includedir}/va/va_x11.h
+install -m 666 ./va/va_version.h $RPM_BUILD_ROOT%{_includedir}/va/va_version.h
+install -m 666 ./va/va_backend.h $RPM_BUILD_ROOT%{_includedir}/va/va_backend.h
+install -m 666 ./va/x11/va_dri2.h $RPM_BUILD_ROOT%{_includedir}/va/x11/va_dri2.h
+install -m 666 ./va/va_dummy.h $RPM_BUILD_ROOT%{_includedir}/va/va_dummy.h
+install -m 666 ./va/va_backend_tpi.h $RPM_BUILD_ROOT%{_includedir}/va/va_backend_tpi.h
+install -m 666 ./va/va.h $RPM_BUILD_ROOT%{_includedir}/va/va.h
+install -m 666 ./va/x11/va_dricommon.h $RPM_BUILD_ROOT%{_includedir}/va/va_dricommon.h
+install -m 666 ./va/x11/va_dri.h $RPM_BUILD_ROOT%{_includedir}/va/va_dri.h
+install -m 666 ./va/glx/va_glx.h $RPM_BUILD_ROOT%{_includedir}/va/va_glx.h
+install -m 666 ./va/glx/va_backend_glx.h $RPM_BUILD_ROOT%{_includedir}/va/va_backend_glx.h
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/libva.so.1
+%{_libdir}/libva.so.1.0.6
+%{_libdir}/libva-tpi.so.1
+%{_libdir}/libva-tpi.so.1.0.6
+%{_libdir}/libva-x11.so.1
+%{_libdir}/libva-x11.so.1.0.6
+%{_libdir}/libva-glx.so.1
+%{_libdir}/libva-glx.so.1.0.6
+%{_bindir}/vainfo
+%{_bindir}/test_*
+%{_bindir}/h264encode
+%{_bindir}/mpeg2vldemo
+%{_bindir}/putsurface
+
+%{driverdir}/dummy_drv_video.so
+
+%{_includedir}/va/va_tpi.h
+%{_includedir}/va/va_x11.h
+%{_includedir}/va/va_version.h
+%{_includedir}/va/va_backend.h
+%{_includedir}/va/x11/va_dri2.h
+%{_includedir}/va/va_dummy.h
+%{_includedir}/va/va_backend_tpi.h
+%{_includedir}/va/va.h
+%{_includedir}/va/va_dricommon.h
+%{_includedir}/va/va_dri.h
+%{_includedir}/va/va_glx.h
+%{_includedir}/va/va_backend_glx.h
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/va
+%{_includedir}/va/*
+%{_libdir}/libva.so
+%{_libdir}/libva-tpi.so
+%{_libdir}/libva-x11.so
+%{_libdir}/libva-glx.so
+%{_libdir}/pkgconfig/libva.pc
+%{_libdir}/pkgconfig/libva-x11.pc
+
+%changelog
+* Wed Dec 23 2009 Prajwal Mohan <prajwal.karur.mohan@intel.com> 1.0.1
+- Updated libva source to IMG Alpha7
+* Fri Dec 18 2009 Prajwal Mohan <prajwal.karur.mohan@intel.com> 0.31.0
+- Updated libva source to IMG Alpha6
+* Tue Nov 24 2009 Prajwal Mohan <prajwal.karur.mohan@intel.com> 0.31.0
+- Updated libva source
+* Mon Nov  9 2009 Prajwal Mohan <prajwal.karur.mohan@intel.com> 0.31.0
+- Update to version 0.31.0
+* Tue Jul  7 2009 Prajwal Mohan <prajwal.karur.mohan@intel.com> 0.30.4
+- Update to version 0.30.4
+* Wed Jun 24 2009 Prajwal Mohan <prajwal.karur.mohan@intel.com> 0.30.20090618
+- Update to version 0.30.20090618_Alpha2.3
+* Thu Jun 11 2009 Priya Vijayan <priya.vijayan@intel.com> 0.30.20090608
+- Update to version 0.30.20090608
+* Tue Jun  2 2009 Anas Nashif <anas.nashif@intel.com> - 0.30~20090514
+- unset LD_AS_NEEDED
+* Fri May 15 2009 Anas Nashif <anas.nashif@intel.com> 0.30~20090514
+- Update to latest snapshot 20090514
+* Wed Apr 29 2009 Anas Nashif <anas.nashif@intel.com> 0.30~20090428
+- Update to 20090428 snpashot
+* Sun Apr 26 2009 Anas Nashif <anas.nashif@intel.com> 0.30~20090423
+- Update libva.pc with new includedir
+* Sun Apr 26 2009 Anas Nashif <anas.nashif@intel.com> 0.30~20090423
+- Update to latest snapshot 20090423
+* Sun Apr 26 2009 Anas Nashif <anas.nashif@intel.com> 0.30~20090423
+- Update to latest snapshot: 20090423
+* Mon Mar 23 2009 Anas Nashif <anas.nashif@intel.com> 0.30~20090323
+- Update to 0.30~20090323
+* Fri Jan 16 2009 Priya Vijayan <priya.vijayan@intel.com> 0.31
+- Fixing vainfo.c
+* Fri Jan 16 2009 Priya Vijayan <priya.vijayan@intel.com> 0.31
+- fixing va_backend.h
+* Fri Jan 16 2009 Priya Vijayan <priya.vijayan@intel.com> 0.31
+- Updating source
+* Tue Jan  6 2009 Priya Vijayan <priya.vijayan@intel.com> 0.30
+- Update to 0.28-working combination with X Server
+* Fri Dec 19 2008 Priya Vijayan <priya.vijayan@intel.com> 0.30.0
+- Added definition of FOURCC IYUV
+  * Dec 16 2008 Priya Vijayan <priya.vijayan@intel.com>
+- Initial Import to MRST
+* Mon Oct 13 2008 shengquan.yuan@intel.com
+- packaged mrst-video-decode-src version 0.0.1 using the buildservice spec file wizard
--- a/test/Android.mk
+++ b/test/Android.mk
+# For vainfo
+# =====================================================
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+  vainfo.c
+
+LOCAL_CFLAGS += \
+  -DANDROID
+
+LOCAL_C_INCLUDES += \
+  $(TARGET_OUT_HEADERS)/libva
+
+LOCAL_MODULE := vainfo
+
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils
+
+include $(BUILD_EXECUTABLE)
+
--- a/va/va_fool.c
+++ b/va/va_fool.c
--- a/va/va_fool.h
+++ b/va/va_fool.h
+/*
+ * Copyright (c) 2009 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.
+ */
+
+
+#ifndef VA_FOOL_H
+#define VA_FOOL_H
+
+void va_FoolInit(VADisplay dpy);
+
+int va_FoolEnd(VADisplay dpy);
+
+
+int va_FoolCodedBuf(VADisplay dpy);
+int va_FoolCreateConfig(
+    VADisplay dpy,
+    VAProfile profile, 
+    VAEntrypoint entrypoint, 
+    VAConfigAttrib *attrib_list,
+    int num_attribs,
+    VAConfigID *config_id /* out */
+);
+
+int va_FoolCreateSurfaces(
+    VADisplay dpy,
+    int width,
+    int height,
+    int format,
+    int num_surfaces,
+    VASurfaceID *surfaces	/* out */
+);
+
+VAStatus va_FoolCreateBuffer (
+    VADisplay dpy,
+    VAContextID context,	/* in */
+    VABufferType type,		/* in */
+    unsigned int size,		/* in */
+    unsigned int num_elements,	/* in */
+    void *data,			/* in */
+    VABufferID *buf_id		/* out */
+);
+
+VAStatus va_FoolMapBuffer (
+    VADisplay dpy,
+    VABufferID buf_id,	/* in */
+    void **pbuf 	/* out */
+);
+
+int va_FoolBeginPicture(
+    VADisplay dpy,
+    VAContextID context,
+    VASurfaceID render_target
+);
+
+int va_FoolRenderPicture(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID *buffers,
+    int num_buffers
+);
+
+int va_FoolEndPicture(
+    VADisplay dpy,
+    VAContextID context
+);
+
+VAStatus va_FoolUnmapBuffer (
+    VADisplay dpy,
+    VABufferID buf_id  /* in */
+);
+
+
+VAStatus va_FoolQuerySubpictureFormats (
+    VADisplay dpy,
+    VAImageFormat *format_list,
+    unsigned int *flags,
+    unsigned int *num_formats
+);
+int va_FoolSyncSurface(
+    VADisplay dpy, 
+    VASurfaceID render_target
+);
+
+
+
+#endif
--- a/va/va_fool_264.h
+++ b/va/va_fool_264.h
--- a/va/va_version.h
+++ b/va/va_version.h
+/*
+ * Copyright (C) 2009 Splitted-Desktop Systems. 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.
+ */
+
+#ifndef VA_VERSION_H
+#define VA_VERSION_H
+
+/**
+ * VA_MAJOR_VERSION:
+ *
+ * The major version of the VA library (1, if %VA_VERSION is 1.2.3)
+ */
+#define VA_MAJOR_VERSION   (0)
+
+/**
+ * VA_MINOR_VERSION:
+ *
+ * The minor version of the VA library (2, if %VA_VERSION is 1.2.3)
+ */
+#define VA_MINOR_VERSION   (31)
+
+/**
+ * VA_MICRO_VERSION:
+ *
+ * The micro version of the VA library (3, if %VA_VERSION is 1.2.3)
+ */
+#define VA_MICRO_VERSION   (1)
+
+/**
+ * VA_VERSION:
+ *
+ * The full version of the VA library, like 1.2.3
+ */
+#define VA_VERSION         0.31.1
+
+/**
+ * VA_VERSION_S:
+ *
+ * The full version of the VA library, in string form (suited for
+ * string concatenation)
+ */
+#define VA_VERSION_S       "0.31.1"
+
+/**
+ * VA_VERSION_HEX:
+ *
+ * Numerically encoded version of the VA library, like 0x010203
+ */
+#define VA_VERSION_HEX     ((VA_MAJOR_VERSION << 24) | \
+                            (VA_MINOR_VERSION << 16) | \
+                            (VA_MICRO_VERSION << 8))
+
+/**
+ * VA_CHECK_VERSION:
+ * @major: major version, like 1 in 1.2.3
+ * @minor: minor version, like 2 in 1.2.3
+ * @micro: micro version, like 3 in 1.2.3
+ *
+ * Evaluates to %TRUE if the version of the VA library is greater
+ * than @major, @minor and @micro
+ */
+#define VA_CHECK_VERSION(major,minor,micro) \
+        (VA_MAJOR_VERSION > (major) || \
+         (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION > (minor)) || \
+         (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION == (minor) && VA_MICRO_VERSION >= (micro)))
+
+#endif /* VA_VERSION_H */