Merge branch 'master-fd.o'

Update va.h version number

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Merge branch 'master-fd.o'

Mv libva_display.pc.in -> libva-x11.pc.in to fix autogen.sh issue

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Drop libva_display. Explicitly use libva-x11.

Fix libva-x11-VERSION.so.* dependencies.

Fix NVIDIA driver version string parser.

Add VA_STATUS_ERROR_UNIMPLEMENTATION string representation.

Drop references to SDS.

Merge branch 'master-fd.o'

__vaDriverInit_0_30 --> __vaDriverInit_0_31 for libva31

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Merge branch 'master-fd.o'

Conflicts:
Makefile.am
configure.ac
dummy_drv_video/dummy_drv_video.c
i965_drv_video/Makefile.am
i965_drv_video/i965_drv_video.c
src/Makefile.am
src/va.c
src/va.h
src/va_backend.h
src/x11/va_x11.c
test/test_12.c

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Remove context from vaSyncSurface

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Split libva DSO into core (libva.so) and display-dependent parts (libva-x11.so).

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Assgin VASurfaceRendering a non-zero value instead of 0

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Combine vaPutImage/vaPutImage2, vaAssociateSubpicture/vaAssociateSubpicture2

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Update VAAPI to 0.31, libva.so SONAME to libva.so.1

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Add VA_STATUS_ERROR_UNIMPLEMENTED.

Fix bit-fields types.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Add new bit to signal VC-1 skipped P-frames.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Add new H.264 fields for XvBA backend.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Add new VC-1 fields for VDPAU backend.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Add new H.264 fields for VDPAU backend.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Sync latest fd.o libva:master

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Merge branch 'test'

Don't include VAAPI version to SONAME

VAAPI version upgrade doesn't mean it will break binary compatibility

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Explicit API extensions versioning from SDS.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix NVIDIA driver detection.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Add <va_version.h> for versioning helpers.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

i965_drv_video: clear draw buffer before rendering.

i965_drv_video: fix rendering issue

i965_drv_driver: fix assertion failure

i965_drv_video: Eanble VAAPI on IGDNG

i965_drv_video: add new compiled shader programs for IGDNG

Check the version of intel-gen4asm in configure.ac

put drivers into /usr/lib/dri by default

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

don't build i965 driver by default

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Add VASliceParameterBufferBase.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Remove obsolete fields.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Add new DSO versioning (SONAME changed to libva-VERSION.so.CURRENT.REVISION.AGE).

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix memory leak (VADriverContext.dri_state).

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Add VA_INVALID_ID helper macro.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix make install (<va/va_x11.h>). Actually drop extraneous space. ;-)

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Add check for libXfixes.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Drop duplicate LIBDRM_DEPS pkg-config check.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix driver name retrieval for dri1 and dri2.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix va_DisplayContextGetDriverName() to check for LIBVA_DRIVER_NAME first.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Allow conditional build of video drivers (dummy, i965).

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix tests.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Install drivers into pkglibdir/va/.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix dummy_drv_video.so init function name.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix includes.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

test: Use IN_LIBVA, so that they can be built out of libva

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix test build issue

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix build of vainfo.

commit f8aebf54e0d6b2411cb495f9fab71dc8a05c245c
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date:   Thu Jun 25 14:06:38 2009 +0000

    Further fixes to vainfo: use strrchr() instead of rindex(), make
    profile_string() and entrypoint_string() always return a value.

commit 4e6d19d5588998b5a9da30500ce727410b5787ef
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date:   Wed Jun 24 12:43:55 2009 +0000

    Fix vainfo error messages.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Drop explicit CFLAGS override.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix make dist (i965_drv_video missing files, Paul Bender).

commit a02c6205509411b9e444b5546023dd8c5672fd99
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date:   Thu Jul 2 09:28:02 2009 +0000

    Fix make dist (tests).

commit 93db0794456910eb4b1daf2e1c1a7f45448897c1
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date:   Wed Jun 24 07:49:02 2009 +0000

    Fix make dist.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix build after X11 -> x11 move

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

X11->x11 per the suggestion from Gwenole

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Move back dri --> src/X11

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Added the patch from  Zou Naihai to correct DRI2XXX --> VA_DRI2XXX

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

va_backend.h: X11/va_x11.h --> dri/va_x11.h

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Remove vaSetSubpicturePalette, please use vaSetImagePalette

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Refine the directory, move src/X11 to dri/

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Apply the patch from Nanhai to support MPEG2 VLD on Intel integrated G45 graphics

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Added missing file test/mpeg2-I.jpg, mpeg2-i.mpg

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Added version number for libVA. Current version is 0.30.4

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Proposed new vaCreateSurfaceFromV4L2Buffer to replace origin vaCreateSurfaceFromMrstV4L2 buffer to make it more generic

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Added more comments for vaCreateBufferFromV4L2Buffer

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fixed dummy driver compile issue

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

refine vaCreateSurfaceFromMrstV4L2Buf to vaCreateSurfaceFromV4L2Buf to make it  more generic

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Rename vaDbgCopySurfaceToBuffer ->vaCopySurfaceToBuffer, vaDbgCreateSurfaceFromMrstVL42Buffer->vaCreateSurfaceFromMrstVL42Buffer

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

rename vaDbgCopySurfaceToBuffer ->vaCopySurfaceToBuffer, vaDbgCreateSurfaceFromMRSTVL42Buffer->vaCreateSurfaceFromMRSTVL42Buffer

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix the issue that all files are moved into a sub-directory libva.

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Upload latest libVA library

    1. Upgrade VAAPI to version 0.30 which has encode support
    2. Incorporate Gwenole Beauchesne's patches 102, 103, 104. 105, 106, 107, 109 and part of 202
       (see http://www.splitted-desktop.com/~gbeauchesne/libva/patches/)
    3. DRI2 support

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix vaSetSubpicturePalette compile issue

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

remove vaSetSubpicturePalette

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Chage VASurfaceSkipped from 3 to 4

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

remove Xv checkouk in config

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Added va_dri2tokens.h for DRI2 tokens definition

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Remove uncessary link form libva.so by adding flag RTLD_NODELETE into
dlopen

Here is the background of this fix
Investigation indicates MRST Moblin Alpha1 0529 and 0520 uses the same libva source package
(which is from graphics Alpha1.4 pakcage
\\mid-depot.amr.corp.intel.com\Exchange\Moblin2\PackageSubmit\1.0.7_05142009-4_Alpha1.4),
and the rootcause is that the linkage of libva dependence libraries is
chaned in 0529 build. I am not sure why 0529 build has this change, and this
change indeed causes libva application segment fault issue.

See the detailed investigation and explanation in the attached
libva-0520-vs-0529.PNG picture.

Reproduce Steps(steps,current result, reproduce possibility)
===========================================================
(1) boot 0529 build
(2) Install libva testsuits into 0529 build
(3) run "mpeg4vld -x -i /var/clips/demo.m4v"

Expected result:
===========================================================
libVA application should exit cleanly

Possible root cause:
================================
There was a global change which helps reduce unnecessary linking
utilizing a
feature in binutils. We could opt liva out of this easily, however I
would
recommend fixing the package to do the right linking instead of relying
on the
tools to do so, Arjan, any suggestions?

Anas
=============================
summary of the picture:

the "new" libva does no longer link to

* libXv

* libdrm

* librt

* libpthread

HOWEVER; libva doesn't USE any of these! I don't see how not linking to
these could lead to a crash, since they truely are not used.

================================
Basically it is a known issue. If we remove these library link from
libVA, we will always get a segment fault when XCloseDisplay is called in
application.
Libva doesn't use these liXv/libdrm libraries, but libVA will dlopen HW
specific driver, and the driver links with these libXv/libdrm libraries.
We found the issue can be worked around by adding the link into libVA.
Using binutil to remove unnecessary link makes sense for most of libraries,
but for libva, it disables our workaround.

Austin

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Merge branch 'master' of ssh://git@moblin-mdi.jf.intel.com/umg-moorestown-libva

Added "intra_period" into VAEncSequenceParameterBufferH263

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Make libva pass compilation with old and new dri2proto

Test write permission

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Make libva pass compilation with old DRI2 proto which dri2tokens.h hasn't DRI2DriverDRI definition

Signed-off-by: root <root@Austin-Develop.localdomain>

Added build information (build date/time, git commit point) into the library

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix binary compatibility issue caused by VAAPI ISO-C conformance fix

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Added va_dri2str.h so that don't relay on dri2proto

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Merge branch 'DRI2'

Must link with Xv, orelse segment fault when XCloseDisplay

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

More update for DRI2 support

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Merge branch 'DRI2' of ssh://git@moblin-mdi.jf.intel.com/umg-moorestown-libva into DRI2

Added DRI2 files

Initial support for DRI2

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Fix vainfo unsupported_profile vastatus issue

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

vainfo: print more information about supported profile:entrypoints

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

Revert "patch 108_drivers_path.patch"

This reverts commit adac1a519de44803b0cdfff29829508cdd419a01.

Add 'bits' field for structure VAEncSliceParameterBuffer

Add -DIN_LIBVA