From: Xu Guangxin <guangxin.xu@intel.com>
Date: Mon, 6 Nov 2017 02:44:34 +0000 (-0500)
Subject: android: remove useless vaPutSurface
X-Git-Tag: android-x86-8.1-r1~62
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fhardware-intel-common-libva.git;a=commitdiff_plain;h=fbf7138389f7d6adb6ca743d0ddf2dbc232895f6

android: remove useless vaPutSurface

vaPutSurface only used in libva-utils. The actual application/omx
implementation never use it.
It will introduce many header files in android framework.Android change
rapidly, the directory or file name changed in versionto version. It's
hard to catch up and maintain support for many versionof android.
---

diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp
index 4a8fe9f..daae531 100644
--- a/va/android/va_android.cpp
+++ b/va/android/va_android.cpp
@@ -160,63 +160,3 @@ VADisplay vaGetDisplay (
 
     return (VADisplay)pDisplayContext;
 }
-
-
-extern "C"  {
-    extern int va_fool_postp; /* do nothing for vaPutSurface if set */
-    extern int va_trace_flag; /* trace vaPutSurface parameters */
-
-    void va_TracePutSurface (
-        VADisplay dpy,
-        VASurfaceID surface,
-        void *draw, /* the target Drawable */
-        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 vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,
-    sp<ANativeWindow> draw, /* Android Native Window */
-    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;
-
-    if (va_fool_postp)
-        return VA_STATUS_SUCCESS;
-
-    if (draw == NULL)
-        return VA_STATUS_ERROR_UNKNOWN;
-
-    CHECK_DISPLAY(dpy);
-    ctx = CTX(dpy);
-
-    VA_TRACE_LOG(va_TracePutSurface, dpy, surface, static_cast<void*>(&draw), srcx, srcy, srcw, srch,
-                 destx, desty, destw, desth,
-                 cliprects, number_cliprects, flags );
-    
-    return ctx->vtable->vaPutSurface( ctx, surface, static_cast<void*>(&draw), srcx, srcy, srcw, srch, 
-                                     destx, desty, destw, desth,
-                                     cliprects, number_cliprects, flags );
-}
diff --git a/va/va_android.h b/va/va_android.h
index 92bf1e0..bf017e5 100644
--- a/va/va_android.h
+++ b/va/va_android.h
@@ -46,38 +46,4 @@ VADisplay vaGetDisplay (
 }
 #endif
 
-#ifdef __cplusplus
-#ifdef ANDROID
-#include <system/window.h>
-#include <utils/StrongPointer.h>
-using namespace android;
-
-/*
- * Output rendering
- * Following is the rendering interface for Android system, 
- * to get the decode output surface to an ISurface object.
- * It basically performs a de-interlacing (if needed), 
- * color space conversion and scaling to the destination
- * rectangle
- */
-VAStatus vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,	
-    sp<ANativeWindow> draw, /* Android Native Window */
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied destination clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* PutSurface flags */
-);
-
-#endif /* ANDROID */
-#endif /* __cplusplus */
-
 #endif /* _VA_ANDROID_H_ */