summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAustin Yuan <shengquan.yuan@gmail.com>2010-10-28 07:18:18 +0800
committerAustin Yuan <shengquan.yuan@gmail.com>2010-10-28 07:18:18 +0800
commit881b49c5f154ee6603eee4aebb8becae6097a4bd (patch)
tree0df6ffc997871a8675636c522ab47b35a2fe961c /test
parent6c372035373e531d2bb5608861adab3f6b2ff471 (diff)
libva-1.0.6
1) Refinement for VA_TRACE, new LIBVA_FOOL, see the description in va_trace.c/va_fool.c 2) vaPutSurface flag VA_ENABLE_BLEND to blend the surface with a color 3) libva.spec for RPM package 4) Update VAAPI for dynamic bit rate control/AIR/maximum slice size ctrl 5) Added VA_STATUS_ERROR_DECODING/ENCODING_ERROR to report decode/encode error 6) Add config.h/va_vesion.h for Android 7) Update "vainfo.c" for Android Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com> Signed-off-by: Binglin Chen <binglin.chen@intel.com> Signed-off-by: Fei Jiang <fei.jiang@intel.com> Signed-off-by: Elaine Wang <elaine.wang@intel.com> Signed-off-by: Ren Zhaohan <zhaohan.ren@intel.com> Signed-off-by: Jerry Dong <jerry.dong@intel.com> Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/vainfo.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/vainfo.c b/test/vainfo.c
index 33d6ea4..847e57e 100644
--- a/test/vainfo.c
+++ b/test/vainfo.c
@@ -22,7 +22,12 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#ifndef ANDROID
#include <va/va_x11.h>
+#else
+#include "va/va_android.h"
+#define Display unsigned int
+#endif
#include <stdarg.h>
#include <stdio.h>
@@ -87,7 +92,11 @@ int main(int argc, const char* argv[])
else
name = argv[0];
+#ifndef ANDROID
dpy = XOpenDisplay(":0.0");
+#else
+ dpy = (Display*)malloc(sizeof(Display));
+#endif
if (NULL == dpy)
{
fprintf(stderr, "%s: Error, can't open display: '%s'\n", name, display ? display : "");