Add vainfo utility to get baseic driver info from command line

3 files changed, 85 insertions, 4 deletions

diff --git a/src/va.c b/src/va.c
index 9ff365a..5681a6e 100644
--- a/src/va.c
+++ b/src/va.c
@@ -34,9 +34,12 @@
 #include <unistd.h>
 #include "va_dri.h"
 
+#define VA_MAJOR_VERSION	0
+#define VA_MINOR_VERSION	26
+#define DRIVER_INIT_FUNC	"__vaDriverInit_0_26"
+
 #define DEFAULT_DRIVER_DIR	"/usr/X11R6/lib/modules/dri"
 #define DRIVER_EXTENSION	"_drv_video.so"
-#define DRIVER_INIT_FUNC	"__vaDriverInit_0_26"
 
 #define CTX(dpy) ((VADriverContextP) dpy );
 #define CHECK_CONTEXT(dpy) if( !vaContextIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
@@ -397,8 +400,8 @@ VAStatus vaInitialize (
       vaStatus = va_openDriver(ctx, driver_name);
       va_infoMessage("va_openDriver() returns %d\n", vaStatus);
       
-      *major_version = ctx->version_major;
-      *minor_version = ctx->version_minor;
+      *major_version = VA_MAJOR_VERSION;
+      *minor_version = VA_MINOR_VERSION;
   }
 
   if (driver_name)
diff --git a/test/Makefile.am b/test/Makefile.am
index b81e0c3..c2fb501 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -23,13 +23,18 @@
 check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
 		test_07 test_08 test_09 test_10 test_11
 
+bin_PROGRAMS = vainfo
+
 testdir = $(bindir)
 
 AM_CFLAGS = -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/src
 
 TESTS = $(check_PROGRAMS)
 
-TEST_LIBS = ../src/libva.la ../../psb-video/src/psb_drv_video.la
+TEST_LIBS = ../src/libva.la
+
+vainfo_LDADD = ../src/libva.la
+vainfo_SOURCES = vainfo.c
 
 test_01_LDADD = $(TEST_LIBS)
 test_01_SOURCES = test_01.c
diff --git a/test/vainfo.c b/test/vainfo.c
new file mode 100644
index 0000000..a793e14
--- /dev/null
+++ b/test/vainfo.c
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+#include "va.h"
+#include "X11/Xlib.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+
+int main(int argc, const char* argv[])
+{
+  Display *dpy;
+  VADisplay va_dpy;
+  VAStatus va_status;
+  int major_version, minor_version;
+  const char *driver;
+  const char *display = getenv("DISPLAY");
+  const char *name = rindex(argv[0], '/');
+
+  if (name)
+      name++;
+  else
+      name = argv[0];
+
+  dpy = XOpenDisplay(NULL);
+  if (NULL == dpy)
+  {
+      fprintf(stderr, "%s: Error, can't open display: '%s'\n", name, display ? display : "");
+      return 1;
+  }
+  
+  va_dpy = vaGetDisplay(dpy);
+  if (NULL == va_dpy)
+  {
+      fprintf(stderr, "%s: vaGetDisplay() failed\n", name);
+      return 2;
+  }
+  
+  va_status = vaInitialize(va_dpy, &major_version, &minor_version);
+  if (VA_STATUS_SUCCESS != va_status )
+  {
+      fprintf(stderr, "%s: vaInitialize failed with error code %d (%s)\n", 
+              name, va_status, vaErrorStr(va_status));
+  }
+  printf("%s: VA API version: %d.%d\n", name, major_version, minor_version);
+  driver = vaQueryVendorString(va_dpy);
+  printf("%s: Driver version: %s\n", name, driver ? driver : "<unknown>");
+  vaTerminate(va_dpy);
+  return 0;
+}