Delete libva-tpi and libva-egl backends

The APIs/data structures defined in va_tpi.h and va_egl.h are used
to implement buffer sharing between libva and the 3rd party libraries.
We have an official buffer sharing machnism in VA core, so libva-tpi and
libva-egl are unnecessary any more.

However va_egl.h or va_tpi.h is included uselessly in a few places,
e.g. https://github.com/01org/libyami/blob/apache/vaapi/vaapidisplay.h#L22
So va_egl.h and va_tpi.h are kept with a deprecation warning message.

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>

12 files changed, 4 insertions, 507 deletions

diff --git a/configure.ac b/configure.ac
index 923ffdc..a0216f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,11 +144,6 @@ AC_ARG_ENABLE(glx,
                     [build with VA/GLX API support @<:@default=auto@:>@])],
     [], [enable_glx="auto"])
 
-AC_ARG_ENABLE(egl,
-    [AC_HELP_STRING([--enable-egl],
-                    [build with VA/EGL API support @<:@default=auto@:>@])],
-    [], [enable_egl="auto"])
-
 AC_ARG_ENABLE([wayland],
     [AC_HELP_STRING([--enable-wayland],
                     [build with VA/Wayland API support @<:@default=auto@:>@])],
@@ -269,29 +264,6 @@ if test "$USE_X11:$enable_glx" != "yes:no"; then
 fi
 AM_CONDITIONAL(USE_GLX, test "$USE_GLX" = "yes")
 
-# Check for EGL
-USE_EGL="no"
-if test "x$enable_egl" != "xno"; then
-    PKG_CHECK_MODULES([EGL], [egl], [USE_EGL="yes"], [:])
-    saved_CPPFLAGS="$CPPFLAGS"
-    saved_LIBS="$LIBS"
-    CPPFLAGS="$CPPFLAGS $EGL_CFLAGS"
-    LIBS="$LIBS $EGL_LIBS"
-    AC_CHECK_HEADERS([EGL/egl.h], [:], [USE_EGL="no"])
-    AC_CHECK_LIB([EGL], [eglGetDisplay], [:], [USE_EGL="no"])
-    CPPFLAGS="$saved_CPPFLAGS"
-    LIBS="$saved_LIBS"
-
-    if test "x$USE_EGL" = "xno" -a "x$enable_egl" = "xyes"; then
-       AC_MSG_ERROR([VA/EGL explicitly enabled, but libEGL couldn't be found])
-    fi
-
-    if test "$USE_EGL" = "yes"; then
-        AC_DEFINE([HAVE_VA_EGL], [1], [Defined to 1 if VA/EGL API is built])
-    fi
-fi
-AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes")
-
 # Check for Wayland
 WAYLAND_API_VERSION=wayland_api_version
 AC_SUBST(WAYLAND_API_VERSION)
@@ -334,15 +306,12 @@ AC_OUTPUT([
     doc/Makefile
     pkgconfig/Makefile
     pkgconfig/libva-drm.pc
-    pkgconfig/libva-egl.pc
     pkgconfig/libva-glx.pc
-    pkgconfig/libva-tpi.pc
     pkgconfig/libva-wayland.pc
     pkgconfig/libva-x11.pc
     pkgconfig/libva.pc
     va/Makefile
     va/drm/Makefile
-    va/egl/Makefile
     va/glx/Makefile
     va/va_version.h
     va/wayland/Makefile
@@ -354,7 +323,6 @@ BACKENDS=""
 AS_IF([test x$USE_DRM = xyes], [BACKENDS="$BACKENDS drm"])
 AS_IF([test x$USE_X11 = xyes], [BACKENDS="$BACKENDS x11"])
 AS_IF([test x$USE_GLX = xyes], [BACKENDS="$BACKENDS glx"])
-AS_IF([test x$USE_EGL = xyes], [BACKENDS="$BACKENDS egl"])
 AS_IF([test x$USE_WAYLAND = xyes], [BACKENDS="$BACKENDS wayland"])
 
 echo
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index a3435a4..4582531 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -21,7 +21,6 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 pcfiles		 = libva.pc
-pcfiles		+= libva-tpi.pc
 if USE_DRM
 pcfiles		+= libva-drm.pc
 endif
@@ -31,19 +30,14 @@ endif
 if USE_GLX
 pcfiles		+= libva-glx.pc
 endif
-if USE_EGL
-pcfiles		+= libva-egl.pc
-endif
 if USE_WAYLAND
 pcfiles		+= libva-wayland.pc
 endif
 
 all_pcfiles_in	 = libva.pc.in
-all_pcfiles_in	+= libva-tpi.pc.in
 all_pcfiles_in	+= libva-drm.pc.in
 all_pcfiles_in	+= libva-x11.pc.in
 all_pcfiles_in	+= libva-glx.pc.in
-all_pcfiles_in	+= libva-egl.pc.in
 all_pcfiles_in	+= libva-wayland.pc.in
 
 pkgconfigdir = @pkgconfigdir@
diff --git a/pkgconfig/libva-egl.pc.in b/pkgconfig/libva-egl.pc.in
deleted file mode 100644
index d80fcc8..0000000
--- a/pkgconfig/libva-egl.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-display=egl
-
-Name: libva-${display}
-Description: Userspace Video Acceleration (VA) ${display} interface
-Requires: libva
-Version: @VA_API_VERSION@
-Libs: -L${libdir} -lva-${display}
-Cflags: -I${includedir}
-
diff --git a/pkgconfig/libva-tpi.pc.in b/pkgconfig/libva-tpi.pc.in
deleted file mode 100644
index bc7fdd7..0000000
--- a/pkgconfig/libva-tpi.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libva-tpi
-Description: Userspace Video Acceleration (VA) 3rd party interface
-Requires: libva
-Version: @VA_API_VERSION@
-Libs: -L${libdir} -lva-tpi
-Cflags: -I${includedir}
diff --git a/va/Makefile.am b/va/Makefile.am
index d74f1c1..7430b3e 100644
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -39,7 +39,6 @@ libva_source_c = \
 libva_source_h = \
 	va.h			\
 	va_backend.h		\
-	va_backend_tpi.h	\
 	va_backend_vpp.h	\
 	va_compat.h		\
 	va_dec_hevc.h		\
@@ -47,6 +46,7 @@ libva_source_h = \
 	va_dec_vp8.h		\
 	va_dec_vp9.h		\
 	va_drmcommon.h		\
+	va_egl.h		\
 	va_enc_hevc.h		\
 	va_enc_h264.h		\
 	va_enc_jpeg.h		\
@@ -80,12 +80,6 @@ libva_la_LDFLAGS		= $(libva_ldflags)
 libva_la_DEPENDENCIES		= libva.syms
 libva_la_LIBADD			= $(LIBVA_LIBS) -ldl
 
-lib_LTLIBRARIES			+= libva-tpi.la
-libva_tpi_la_SOURCES		= va_tpi.c
-libva_tpi_la_LDFLAGS		= $(LDADD) -no-undefined
-libva_tpi_la_DEPENDENCIES	= libva.la 
-libva_tpi_la_LIBADD		= libva.la -ldl
-
 if USE_DRM
 SUBDIRS				+= drm
 lib_LTLIBRARIES			+= libva-drm.la
@@ -117,16 +111,6 @@ libva_glx_la_LIBADD		= libva.la glx/libva_glx.la libva-x11.la \
 	$(GLX_LIBS) -ldl
 endif
 
-if USE_EGL
-SUBDIRS				+= egl
-lib_LTLIBRARIES			+= libva-egl.la
-libva_egl_la_SOURCES		=
-libva_egl_la_LDFLAGS		= $(LDADD)
-libva_egl_la_DEPENDENCIES	= libva.la egl/libva_egl.la 
-libva_egl_la_LIBADD		= libva.la egl/libva_egl.la \
-	$(EGL_LIBS) -ldl
-endif
-
 if USE_WAYLAND
 SUBDIRS				+= wayland
 lib_LTLIBRARIES			+= libva-wayland.la
@@ -137,7 +121,7 @@ libva_wayland_la_LIBADD		= libva.la wayland/libva_wayland.la \
 	$(WAYLAND_LIBS) $(DRM_LIBS) -ldl
 endif
 
-DIST_SUBDIRS = x11 glx egl drm wayland
+DIST_SUBDIRS = x11 glx drm wayland
 
 DISTCLEANFILES = \
 	va_version.h		\
diff --git a/va/egl/Makefile.am b/va/egl/Makefile.am
deleted file mode 100644
index aee4975..0000000
--- a/va/egl/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.
-
-AM_CPPFLAGS = \
-	-DLINUX			\
-	-I$(top_srcdir)		\
-	-I$(top_srcdir)/va	\
-	$(EGL_CFLAGS)		\
-	$(NULL)
-
-source_c = \
-	va_egl.c		
-
-source_h = \
-	va_egl.h		\
-	va_backend_egl.h
-
-source_h_priv = 
-
-noinst_LTLIBRARIES	 = libva_egl.la
-libva_eglincludedir	 = ${includedir}/va
-libva_eglinclude_HEADERS = $(source_h)
-libva_egl_la_SOURCES	 = $(source_c)
-noinst_HEADERS		 = $(source_h_priv)
diff --git a/va/egl/va_backend_egl.h b/va/egl/va_backend_egl.h
deleted file mode 100644
index 925d933..0000000
--- a/va/egl/va_backend_egl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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_BACKEND_EGL_H
-#define VA_BACKEND_EGL_H
-
-#include <va/va.h>
-#include <va/va_backend.h>
-
-struct VADriverVTableEGL {
-    /* Get EGL ClientBufer buffer index and device id from surface id*/
-    VAStatus (*vaGetEGLClientBufferFromSurface) (
-        VADriverContextP ctx,
-        VASurfaceID surface,
-        void **buffer
-    );
-    /* TBD: more APIs for EGL */
-};
-
-#endif /* VA_BACKEND_EGL_H */
diff --git a/va/egl/va_egl.c b/va/egl/va_egl.c
deleted file mode 100644
index 3462183..0000000
--- a/va/egl/va_egl.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-/*
- * Initial EGL backend, and subject to change
- *
- * Gstreamer gst-gltexture has a framework to support associating a buffer
- * to a texture via EGL_KHR_image_base and GL_OES_EGL_image_external.
- *
- * EGL_KHR_image_base:
- *   EGLImageKHR eglCreateImageKHR(
- *                           EGLDisplay dpy,
- *                           EGLContext ctx,
- *                           EGLenum target,
- *                           EGLClientBuffer buffer,
- *                           const EGLint *attrib_list)
- *
- * GL_OES_EGL_image_external:
- * This extension provides a mechanism for creating EGLImage texture targets
- * from EGLImages.  This extension defines a new texture target TEXTURE_EXTERNAL_OES.
- * This texture target can only be specified using an EGLImage.
- * The first eglCreateImageKHR will create an EGLImage from an EGLClientBufferm, and with
- * an EGLImage, gst-gltexture can use GL_OES_EGL_image_external extension to create textures.
- *
- * eglCreateImageKHR and GL_OES_EGL_image_external are all called directly from gst-gltexture,
- * thus the simplest way to support gst-gltexture is defining a new API to pass EGLClientBuffer
- * to gst-gltexture.
- *
- * EGLClientBuffer is gfx/video driver implementation specific (?). It means we need to pass up
- * the low-level buffer ID (or handle) of the decoded surface to gst-gltexture, and gst-gltexture
- * then pass down it to gfx driver.  
- *
- * Bellow API vaGetEGLClientBufferFromSurface is for this purpose
- */
-
-#include "va.h"
-#include "va_backend_egl.h"
-#include "va_egl.h"
-#include "va_internal.h"
-
-
-VAStatus vaGetEGLClientBufferFromSurface (
-    VADisplay dpy,
-    VASurfaceID surface,
-    EGLClientBuffer *buffer /* out*/
-)
-{
-  VADriverContextP ctx;
-  struct VADriverVTableEGL *va_egl;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  va_egl = (struct VADriverVTableEGL *)ctx->vtable_egl;
-  if (va_egl && va_egl->vaGetEGLClientBufferFromSurface) {
-      return va_egl->vaGetEGLClientBufferFromSurface(ctx, surface, buffer);
-  } else
-      return VA_STATUS_ERROR_UNIMPLEMENTED;
-}
-  
-  
diff --git a/va/va_backend_tpi.h b/va/va_backend_tpi.h
deleted file mode 100644
index 141eb75..0000000
--- a/va/va_backend_tpi.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-/*
- * Video Decode Acceleration -Backend API
- */
-
-#ifndef _VA_BACKEND_TPI_H_
-#define _VA_BACKEND_TPI_H_
-
-#include <va/va.h>
-#include <va/va_backend.h>
-#include <va/va_tpi.h>
-
-struct VADriverVTableTPI
-{
-    VAStatus (*vaCreateSurfacesWithAttribute) (
-        VADisplay dpy,
-        int width,
-        int height,
-        int format,
-        int num_surfaces,
-        VASurfaceID *surfaces,       /* out */
-        VASurfaceAttributeTPI *attribute_tpi
-        );
-    
-
-    VAStatus (*vaPutSurfaceBuf) (
-        VADriverContextP ctx,
-        VASurfaceID surface,
-        unsigned char* data,
-        int* data_len,
-        short srcx,
-        short srcy,
-        unsigned short srcw,
-        unsigned short srch,
-        short destx,
-        short desty,
-        unsigned short destw,
-        unsigned short desth,
-        VARectangle *cliprects, /* client supplied clip list */
-        unsigned int number_cliprects, /* number of clip rects in the clip list */
-        unsigned int flags /* de-interlacing flags */
-        );
-};
-
-
-#endif /* _VA_BACKEND_TPI_H_ */
diff --git a/va/egl/va_egl.h b/va/va_egl.h
index 93781c1..d6acb7d 100644
--- a/va/egl/va_egl.h
+++ b/va/va_egl.h
@@ -24,27 +24,6 @@
 #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
+#warning The APIs / data structures included in this file are deprecated
 
 #endif /* _VA_EGL_H_ */
diff --git a/va/va_tpi.c b/va/va_tpi.c
deleted file mode 100644
index 46cf384..0000000
--- a/va/va_tpi.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-#define _GNU_SOURCE 1
-#include "sysdeps.h"
-#include "va.h"
-#include "va_backend.h"
-#include "va_backend_tpi.h"
-#include "va_internal.h"
-
-#include <assert.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <unistd.h>
-
-
-/*
- * Create surfaces with special inputs/requirements
- */
-VAStatus vaCreateSurfacesWithAttribute (
-        VADisplay dpy,
-        int width,
-        int height,
-        int format,
-        int num_surfaces,
-        VASurfaceID *surfaces,       /* out */
-        VASurfaceAttributeTPI *attribute_tpi
-)
-{
-  VADriverContextP ctx;
-  struct VADriverVTableTPI *tpi;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  tpi = (struct VADriverVTableTPI *)ctx->vtable_tpi;
-  if (tpi && tpi->vaCreateSurfacesWithAttribute) {
-      return tpi->vaCreateSurfacesWithAttribute( ctx, width, height, format, num_surfaces, surfaces, attribute_tpi);
-  } else
-      return VA_STATUS_ERROR_UNIMPLEMENTED;
-}
-
-
-VAStatus vaPutSurfaceBuf (
-    VADisplay dpy,
-    VASurfaceID surface,
-    unsigned char* data,
-    int* data_len,
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* de-interlacing flags */
-)
-{
-  VADriverContextP ctx;
-  struct VADriverVTableTPI *tpi;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-  
-  tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi;
-  if (tpi && tpi->vaPutSurfaceBuf) {
-      return tpi->vaPutSurfaceBuf( ctx, surface, data, data_len, srcx, srcy, srcw, srch,
-                                  destx, desty, destw, desth, cliprects, number_cliprects, flags );
-  } else
-      return VA_STATUS_ERROR_UNIMPLEMENTED;
-}
diff --git a/va/va_tpi.h b/va/va_tpi.h
index d4a9d06..12e0379 100644
--- a/va/va_tpi.h
+++ b/va/va_tpi.h
@@ -24,80 +24,6 @@
 #ifndef _VA_TPI_H_
 #define _VA_TPI_H_
 
-#include <va/va.h>
+#warning The APIs / data structures included in this file are deprecated
 
-#ifdef __cplusplus
-extern "C" {
 #endif
-
-
-typedef enum {
-    VAExternalMemoryNULL, /* it is not external buffer, but requires the implementation allocates
-                           * the surface with the input attribute
-                           */
-    VAExternalMemoryV4L2Buffer,
-    VAExternalMemoryCIFrame, /* the memory is from camera frames and buffers points the frame ID list */
-    VAExternalMemoryUserPointer, /* the memory is malloc-ed and buffers points to the buffers */
-    VAExternalMemoryKernelDRMBufffer, /* the memory is from kernel DRM buffers and buffers points the
-                                       * DRM buffer handle list
-                                       */
-    VAExternalMemoryAndroidGrallocBuffer, /* the memory is from Android Gralloc memory, and buffers points
-                                           * the gralloc native_handle_t list
-                                           */
-} VASurfaceMemoryType;
-
-typedef struct _VASurfaceAttributeTPI {
-    VASurfaceMemoryType type;
-    unsigned int width;
-    unsigned int height;
-    unsigned int size;
-    unsigned int pixel_format; /* buffer format */
-    unsigned int tiling; /* the memory is tiling or not */
-    unsigned int luma_stride; /* luma stride, could be width aligned with a special value */
-    unsigned int chroma_u_stride; /* chroma stride */
-    unsigned int chroma_v_stride;
-    unsigned int luma_offset; /* could be 0 */
-    unsigned int chroma_u_offset; /* U offset from the beginning of the memory */
-    unsigned int chroma_v_offset; /* V offset from the beginning of the memory */
-    unsigned int count; /* buffer count for surface creation */
-    unsigned int *buffers; /* buffer handles or user pointers */
-    unsigned int reserved[4]; /* used to pass additional information, like
-                               * Android native window pointer
-                               */
-} VASurfaceAttributeTPI;
-
-
-VAStatus vaPutSurfaceBuf (
-    VADisplay dpy,
-    VASurfaceID surface,
-    unsigned char* data,
-    int* data_len,
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* de-interlacing flags */
-);
-
-
-VAStatus vaCreateSurfacesWithAttribute (
-    VADisplay dpy,
-    int width,
-    int height,
-    int format,
-    int num_surfaces,
-    VASurfaceID *surfaces,       /* out */
-    VASurfaceAttributeTPI *attribute_tpi
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif