Merge branch 'fdva-master'

8 files changed, 15 insertions, 22 deletions

diff --git a/dummy_drv_video/Makefile.am b/dummy_drv_video/Makefile.am
index 8c1f40a..f458dd5 100644
--- a/dummy_drv_video/Makefile.am
+++ b/dummy_drv_video/Makefile.am
@@ -23,8 +23,8 @@
 dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
 dummy_drv_video_ladir = @LIBVA_DRIVERS_PATH@
 dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined
-dummy_drv_video_la_LIBADD = $(top_srcdir)/va/$(libvabackendlib)
-dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/va/$(libvabackendlib)
+dummy_drv_video_la_LIBADD = $(top_builddir)/va/$(libvabackendlib)
+dummy_drv_video_la_DEPENDENCIES = $(top_builddir)/va/$(libvabackendlib)
 
 AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd
 dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c
diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am
index 49a54a0..a2519a2 100644
--- a/test/basic/Makefile.am
+++ b/test/basic/Makefile.am
@@ -25,7 +25,7 @@ bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
 
 AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
 
-TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
 
 test_01_LDADD = $(TEST_LIBS)
 test_01_SOURCES = test_01.c
diff --git a/test/decode/Makefile.am b/test/decode/Makefile.am
index b100421..ea30643 100644
--- a/test/decode/Makefile.am
+++ b/test/decode/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = mpeg2vldemo
 
 AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
 
-TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
 
 mpeg2vldemo_LDADD = $(TEST_LIBS)
 mpeg2vldemo_SOURCES = mpeg2vldemo.c
diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am
index 5866666..b353ca1 100644
--- a/test/encode/Makefile.am
+++ b/test/encode/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = h264encode
 
 AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
 
-TEST_LIBS = $(top_srcdir)/va/$(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 bb0cce9..1e4ecec 100644
--- a/test/encode/h264encode.c
+++ b/test/encode/h264encode.c
@@ -105,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);
 
diff --git a/test/putsurface/Makefile.am b/test/putsurface/Makefile.am
index 51edb25..fe18388 100644
--- a/test/putsurface/Makefile.am
+++ b/test/putsurface/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = putsurface
 
 AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
 
-TEST_LIBS = $(top_srcdir)/va/$(libvabackendlib) -lpthread
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
 
 putsurface_LDADD = $(TEST_LIBS)
 putsurface_SOURCES = putsurface.c
diff --git a/va/Makefile.am b/va/Makefile.am
index 8dde536..2ff3a23 100644
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -76,6 +76,7 @@ endif
 
 lib_LTLIBRARIES = libva.la libva-tpi.la $(libva_x11_backend) $(libva_dummy_backend) $(libva_glx_backend)
 
+DIST_SUBDIRS = x11 glx dummy
 
 SUBDIRS = $(libva_x11_backenddir) $(libva_dummy_backenddir) $(libva_glx_backenddir)
 
diff --git a/va/va.c b/va/va.c
index 97fb753..1632e55 100644
--- a/va/va.c
+++ b/va/va.c
@@ -60,10 +60,6 @@ extern int trace_flag;
         trace_func(__VA_ARGS__);                \
     }
 
-#define VA_MAJOR_VERSION (0)
-#define VA_MINOR_VERSION (31)
-#define VA_VERSION_S       "0.31.1"
-
 int vaDisplayIsValid(VADisplay dpy)
 {
     VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;