Replace wind river libva with intel UMG libva.

OpencoreHw will call the same vaPutSurface for texture streaming and overlay display.
Divide libva into three libraries: libva, libva-android, libva-tpi
libva: general va API
libva-android: va API used for android platform
libva-tpi: third party interface
Reviewed-by:Francis Tharappel

Change-Id: Ib8fb9da3b6a463af9b91241392a07fdbd9e1beb9

12 files changed, 55 insertions, 371 deletions

diff --git a/test/Android.mk b/test/Android.mk
deleted file mode 100644
index e7fa8a3..0000000
--- a/test/Android.mk
+++ /dev/null
@@ -1,283 +0,0 @@
-#BUILD_LIBVA_TESTS := true
-
-ifeq ($(strip $(BUILD_LIBVA_TESTS)),true)
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := vainfo.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_info
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_01.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_01
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_02.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_02
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_03.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_03
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_04.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_04
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_05.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_05
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_06.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_06
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_07.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_07
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_08.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_08
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_09.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_09
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_10.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_10
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := basic/test_11.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_11
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := decode/mpeg2vldemo.c
-       
-LOCAL_CFLAGS += -DHAVE_CONFIG_H        \
-       -DIN_LIBVA      \
-       -I $(TOPDIR)kernel/include  \
-       -I $(TARGET_OUT_HEADERS)/psb_video
-
-LOCAL_C_INCLUDES +=            \
-   $(TOPDIR)kernel/include     \
-   $(LOCAL_PATH)/../src/       \
-   $(LOCAL_PATH)/../src/x11
-
-LOCAL_MODULE := libva_test_12
-
-LOCAL_SHARED_LIBRARIES := libdrm libva
-
-include $(BUILD_EXECUTABLE)
-
-endif
diff --git a/test/Makefile.am b/test/Makefile.am
index 5734226..7153b10 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -23,11 +23,10 @@
 
 bin_PROGRAMS = vainfo
 
-AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA
+AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11
 
-
-vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib)
-vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
+vainfo_LDADD = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
+vainfo_DEPENDENCIES =  $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
 vainfo_SOURCES = vainfo.c
 
 SUBDIRS = basic decode encode putsurface
diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am
index 24de161..a2519a2 100644
--- a/test/basic/Makefile.am
+++ b/test/basic/Makefile.am
@@ -23,9 +23,9 @@
 bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
 		test_07 test_08 test_09 test_10 test_11
 
-AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
 
-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
 
 test_01_LDADD = $(TEST_LIBS)
 test_01_SOURCES = test_01.c
diff --git a/test/basic/test.c b/test/basic/test.c
index 7fb861a..a03a8b2 100644
--- a/test/basic/test.c
+++ b/test/basic/test.c
@@ -22,11 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef IN_LIBVA
-#include <va_x11.h>
-#else
 #include <va/va_x11.h>
-#endif
 
 #include "assert.h"
 #include <stdarg.h>
@@ -43,12 +39,8 @@ int main(int argc, const char* argv[])
   VAStatus va_status;
   int major_version, minor_version; 
    
-#ifndef ANDROID
   dpy = XOpenDisplay(NULL);
   ASSERT( dpy );
-#else
-  dpy = 0;
-#endif
   printf("XOpenDisplay: dpy = %08x\n", dpy);
   
   va_dpy = vaGetDisplay(dpy);
@@ -71,12 +63,10 @@ int main(int argc, const char* argv[])
       {
           printf("Surface %d surface_id = %08x\n", i, surfaces[i]);
       }
-#ifndef ANDROID
       Window win = XCreateSimpleWindow(dpy, RootWindow(dpy, 0), 0, 0, 720, 480, 0, 0, WhitePixel(dpy, 0));
       printf("Window = %08x\n", win); 
       XMapWindow(dpy, win);
       XSync(dpy, False);
-#endif
       
       vaPutSurface(va_dpy, surfaces[0], win, 0, 0, 720, 480, 0, 0, 720, 480, 0); 
 
diff --git a/test/basic/test_common.c b/test/basic/test_common.c
index 6fac2a6..8287d1e 100644
--- a/test/basic/test_common.c
+++ b/test/basic/test_common.c
@@ -22,11 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef IN_LIBVA
-#include <va_x11.h>
-#else
 #include <va/va_x11.h>
-#endif
 
 #include "assert.h"
 #include <stdarg.h>
@@ -80,14 +76,10 @@ int main(int argc, const char* argv[])
 
 void test_init()
 {
-#ifndef ANDROID
   dpy = XOpenDisplay(NULL);
   ASSERT( dpy );
   status("XOpenDisplay: dpy = %08x\n", dpy);
-#else
-  dpy = malloc(sizeof(Display));
-  *dpy = 0;
-#endif
+  
   va_dpy = vaGetDisplay(dpy);
   ASSERT( va_dpy );  
   status("vaGetDisplay: va_dpy = %08x\n", va_dpy);
@@ -103,13 +95,8 @@ void test_terminate()
   ASSERT( VA_STATUS_SUCCESS == va_status );
   status("vaTerminate\n");
 
-#ifndef ANDROID
   XCloseDisplay(dpy);
   status("XCloseDisplay\n");
-#else
-  free(dpy);
-  dpy = NULL;
-#endif
 
   if (profiles)
   {
diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am
index 9283671..ea30643 100644
--- a/test/decode/Makefile.am
+++ b/test/decode/Makefile.am
@@ -22,9 +22,9 @@
 
 bin_PROGRAMS = mpeg2vldemo
 
-AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
 
-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
 
 mpeg2vldemo_LDADD = $(TEST_LIBS)
 mpeg2vldemo_SOURCES = mpeg2vldemo.c
diff --git a/test/decode/mpeg2vldemo.c b/test/decode/mpeg2vldemo.c
index 57972a9..7057675 100644
--- a/test/decode/mpeg2vldemo.c
+++ b/test/decode/mpeg2vldemo.c
@@ -47,8 +47,8 @@
 
 #include <assert.h>
 
-#include "va.h"
-#include "va_x11.h"
+#include <va/va.h>
+#include <va/va_x11.h>
 
 #define CHECK_VASTATUS(va_status,func)                                  \
 if (va_status != VA_STATUS_SUCCESS) {                                   \
@@ -156,11 +156,7 @@ int main(int argc,char **argv)
     if (argc > 1)
         putsurface=1;
  
-#ifndef ANDROID
     x11_display = XOpenDisplay(":0.0");
-#endif
-    x11_display = malloc(sizeof(Display));
-    *x11_display = 0x8c2c2c2c;
 
     if (x11_display == NULL) {
       fprintf(stderr, "Can't connect X server!\n");
@@ -264,7 +260,6 @@ int main(int argc,char **argv)
     CHECK_VASTATUS(va_status, "vaSyncSurface");
     
     if (putsurface) {
-#ifndef ANDROID
         Window  win;
         win = XCreateSimpleWindow(x11_display, RootWindow(x11_display, 0), 0, 0,
                               WIN_WIDTH,WIN_HEIGHT, 0, 0, WhitePixel(x11_display, 0));
@@ -275,7 +270,6 @@ int main(int argc,char **argv)
                                 0,0,WIN_WIDTH,WIN_HEIGHT,
                                 NULL,0,0);
         CHECK_VASTATUS(va_status, "vaPutSurface");
-#endif
     }
 
     printf("press any key to exit\n");
@@ -286,10 +280,7 @@ int main(int argc,char **argv)
     vaDestroyContext(va_dpy,context_id);
 
     vaTerminate(va_dpy);
-    free(x11_display);
-#ifndef ANDROID
     XCloseDisplay(x11_display);
-#endif
     
     return 0;
 }
diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am
index 6d2d5a9..b353ca1 100644
--- a/test/encode/Makefile.am
+++ b/test/encode/Makefile.am
@@ -22,9 +22,9 @@
 
 bin_PROGRAMS = h264encode
 
-AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
 
-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
 
 h264encode_LDADD = $(TEST_LIBS)
 h264encode_SOURCES = h264encode.c
diff --git a/test/encode/h264encode.c b/test/encode/h264encode.c
index 46f1ff6..1e4ecec 100644
--- a/test/encode/h264encode.c
+++ b/test/encode/h264encode.c
@@ -26,7 +26,7 @@
  * it is a real program to show how VAAPI encoding work,
  * It does H264 element stream level encoding on auto-generated YUV data
  *
- * gcc -o  h264encode  h264encode -lva -lva-x11 -I/usr/include/va
+ * gcc -o  h264encode  h264encode -lva -lva-x11
  * ./h264encode -w <width> -h <height> -n <frame_num>
  *
  */  
@@ -44,9 +44,8 @@
 
 #include <assert.h>
 
-#include "va.h"
-#include "va_x11.h"
-
+#include <va/va.h>
+#include <va/va_x11.h>
 
 #define CHECK_VASTATUS(va_status,func)                                  \
 if (va_status != VA_STATUS_SUCCESS) {                                   \
@@ -106,20 +105,16 @@ static int upload_source_YUV_once_for_all()
 static int save_coded_buf(VABufferID coded_buf, int current_frame, int frame_skipped)
 {    
     void *coded_p=NULL;
-    int coded_size,coded_offset,wrt_size;
+    VACodedBufferSegment *buf_list = NULL;
     VAStatus va_status;
-
-    va_status = vaMapBuffer(va_dpy,coded_buf,&coded_p);
-    CHECK_VASTATUS(va_status,"vaMapBuffer");
+    unsigned int coded_size = 0;
     
-    coded_size = *((unsigned long *) coded_p); /* first DWord is the coded video size */
-    coded_offset = *((unsigned long *) (coded_p + 4)); /* second DWord is byte offset */
-
-    wrt_size = write(coded_fd,coded_p+coded_offset,coded_size);
-    if (wrt_size != coded_size) {
-        fprintf(stderr, "Trying to write %d bytes, but actual %d bytes\n",
-                coded_size, wrt_size);
-        exit(1);
+    va_status = vaMapBuffer(va_dpy,coded_buf,(void **)(&buf_list));
+    CHECK_VASTATUS(va_status,"vaMapBuffer");
+    while (buf_list != NULL) {
+        printf("Write %d bytes\n", buf_list->size);
+        coded_size += write(coded_fd, buf_list->buf, buf_list->size);
+        buf_list = buf_list->next;
     }
     vaUnmapBuffer(va_dpy,coded_buf);
 
@@ -212,10 +207,11 @@ static int do_h264_encoding(void)
     VAEncPictureParameterBufferH264 pic_h264;
     VAEncSliceParameterBuffer slice_h264;
     VAStatus va_status;
-    VABufferID coded_buf, seq_param_buf, pic_param_buf, slice_param_buf;
+    VABufferID seq_param_buf, pic_param_buf, slice_param_buf;
     int codedbuf_size;
     VASurfaceStatus surface_status;
     int src_surface, dst_surface, ref_surface;
+    int codedbuf_idx = 0;
     int frame_skipped = 0;
     int i;
 
@@ -229,12 +225,24 @@ static int do_h264_encoding(void)
     
     codedbuf_size = (frame_width * frame_height * 400) / (16*16);
 
+    for (i = 0; i < CODEDBUF_NUM; i++) {
+        /* create coded buffer once for all
+         * other VA buffers which won't be used again after vaRenderPicture.
+         * so APP can always vaCreateBuffer for every frame
+         * but coded buffer need to be mapped and accessed after vaRenderPicture/vaEndPicture
+         * so VA won't maintain the coded buffer
+         */
+        va_status = vaCreateBuffer(va_dpy,context_id,VAEncCodedBufferType,
+                                   codedbuf_size, 1, NULL, &coded_buf[i]);
+        CHECK_VASTATUS(va_status,"vaBeginPicture");
+    }
+
     src_surface = 0;
     /* the last two frames are reference/reconstructed frame */
     dst_surface = SURFACE_NUM - 1;
     ref_surface = SURFACE_NUM - 2;
     
-    for (i=0; i < frame_count; i++) {
+    for (i = 0; i < frame_count; i++) {
         va_status = vaBeginPicture(va_dpy, context_id, surface_id[src_surface]);
         CHECK_VASTATUS(va_status,"vaBeginPicture");
 
@@ -249,7 +257,7 @@ static int do_h264_encoding(void)
             seq_h264.frame_rate = frame_rate;
             seq_h264.initial_qp = initial_qp;
             seq_h264.min_qp = minimal_qp;
-            seq_h264.basic_unit_size = 6;
+            seq_h264.basic_unit_size = 0;
             seq_h264.intra_period = intra_count;
             
             va_status = vaCreateBuffer(va_dpy, context_id,
@@ -261,12 +269,10 @@ static int do_h264_encoding(void)
             CHECK_VASTATUS(va_status,"vaRenderPicture");;
         }
 
-        va_status = vaCreateBuffer(va_dpy,context_id,VAEncCodedBufferType,
-                                   codedbuf_size, 1, NULL, &coded_buf);
 
         pic_h264.reference_picture = surface_id[ref_surface];
         pic_h264.reconstructed_picture= surface_id[dst_surface];
-        pic_h264.coded_buf = coded_buf;
+        pic_h264.coded_buf = coded_buf[codedbuf_idx];
         pic_h264.picture_width = frame_width;
         pic_h264.picture_height = frame_height;
         pic_h264.last_picture = (i==frame_count);
@@ -300,7 +306,7 @@ static int do_h264_encoding(void)
         va_status = vaQuerySurfaceStatus(va_dpy, surface_id[src_surface],&surface_status);
         frame_skipped = (surface_status & VASurfaceSkipped);
 
-        save_coded_buf(coded_buf, i, frame_skipped);
+        save_coded_buf(coded_buf[codedbuf_idx], i, frame_skipped);
         
         /* should display reconstructed frame, but just diplay source frame */
         if (frame_display) {
@@ -316,6 +322,11 @@ static int do_h264_encoding(void)
         if (src_surface == (SURFACE_NUM - 2))
             src_surface = 0;
 
+        /* use next codedbuf */
+        codedbuf_idx++;
+        if (codedbuf_idx == (CODEDBUF_NUM - 1))
+            codedbuf_idx = 0;
+        
         /* if a frame is skipped, current frame still use last reference frame */
         if (frame_skipped == 0) {
             /* swap ref/dst */
@@ -375,7 +386,8 @@ int main(int argc,char **argv)
                 case '?':
                     printf("./h264encode <options>\n");
                     printf("   -w -h: resolution\n");
-                    printf("   -n frame number\n");
+                    printf("   -n frame number\n"); 
+                    printf("   -d display the source frame\n");
                     printf("   -p P frame count between two I frames\n");
                     printf("   -f frame rate\n");
                     printf("   -r bit rate\n");
diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am
index 3e5c864..fe18388 100644
--- a/test/putsurface/Makefile.am
+++ b/test/putsurface/Makefile.am
@@ -22,13 +22,15 @@
 
 bin_PROGRAMS = putsurface
 
-AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
 
-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
 
 putsurface_LDADD = $(TEST_LIBS)
 putsurface_SOURCES = putsurface.c
 
+EXTRA_DIST = loadsurface.h
+
 
 valgrind:	$(bin_PROGRAMS)
 	for a in $(bin_PROGRAMS); do \
diff --git a/test/putsurface/putsurface.c b/test/putsurface/putsurface.c
index 335368a..0de786c 100644
--- a/test/putsurface/putsurface.c
+++ b/test/putsurface/putsurface.c
@@ -23,7 +23,7 @@
  */
 
 
-/* gcc -o putsurface putsurface.c -lva -lva-x11 -I/usr/include/va */
+/* gcc -o putsurface putsurface.c -lva -lva-x11 */
 
 #include <stdio.h>
 #include <string.h>
@@ -39,8 +39,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "va.h"
-#include "va_x11.h"
+#include <va/va.h>
+#include <va/va_x11.h>
 
 #include <assert.h>
 
diff --git a/test/vainfo.c b/test/vainfo.c
index 388249e..33d6ea4 100644
--- a/test/vainfo.c
+++ b/test/vainfo.c
@@ -22,11 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef IN_LIBVA
-#include <va_x11.h>
-#else
 #include <va/va_x11.h>
-#endif
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -91,17 +87,12 @@ int main(int argc, const char* argv[])
   else
       name = argv[0];
 
-#ifndef ANDROID
   dpy = XOpenDisplay(":0.0");
   if (NULL == dpy)
   {
       fprintf(stderr, "%s: Error, can't open display: '%s'\n", name, display ? display : "");
       return 1;
   }
-#else
-  dpy = malloc(sizeof(Display));
-  *dpy = 0;
-#endif
   
   va_dpy = vaGetDisplay(dpy);
   if (NULL == va_dpy)
@@ -135,11 +126,6 @@ int main(int argc, const char* argv[])
   }
   
   vaTerminate(va_dpy);
-
-#ifdef ANDROID
-    free(dpy);
-    dpy = NULL;
-#endif
   
   return 0;
 }