From 20dbf1dc1b3d570259ec94b5d4cb2e4f1de4e7cc Mon Sep 17 00:00:00 2001
From: Austin Yuan <shengquan.yuan@gmail.com>
Date: Thu, 20 Oct 2011 01:43:12 -0400
Subject: test: fix build warnings on Android

Change-Id: Ibc4231395af8dfcdef403d44b98c644349e2ba04
Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>
---
 test/basic/test_08.c            | 2 +-
 test/basic/test_10.c            | 2 +-
 test/basic/test_11.c            | 2 +-
 test/basic/test_common.c        | 5 +++++
 test/encode/h264encode_common.c | 2 +-
 test/vainfo/vainfo.c            | 2 ++
 va/android/va_android.cpp       | 2 +-
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/test/basic/test_08.c b/test/basic/test_08.c
index 8c743b6..ac0c09d 100644
--- a/test/basic/test_08.c
+++ b/test/basic/test_08.c
@@ -66,7 +66,7 @@ test_size_t test_sizes[] = {
 void test()
 {
     VASurfaceID surfaces[NUM_SIZES+1];
-    int i;    
+    unsigned int i;
     
     memset(surfaces, 0xff, sizeof(surfaces));
 
diff --git a/test/basic/test_10.c b/test/basic/test_10.c
index 6a7b978..3d6625e 100644
--- a/test/basic/test_10.c
+++ b/test/basic/test_10.c
@@ -103,7 +103,7 @@ unsigned int buffer_sizes[] =
 void test()
 {
     VABufferID buffer_ids[NUM_BUFFER_TYPES+1];
-    int i;
+    unsigned int i;
     memset(buffer_ids, 0xff, sizeof(buffer_ids));
     for(i=0; i < NUM_BUFFER_TYPES; i++)
     {
diff --git a/test/basic/test_11.c b/test/basic/test_11.c
index 8f3c4b8..5c20e2b 100644
--- a/test/basic/test_11.c
+++ b/test/basic/test_11.c
@@ -104,7 +104,7 @@ void test()
 {
     VABufferID buffer_ids[NUM_BUFFER_TYPES+1];
     uint32_t *input_data[NUM_BUFFER_TYPES];
-    int i, j;
+    unsigned int i, j;
     memset(buffer_ids, 0xff, sizeof(buffer_ids));
     for(i=0; i < NUM_BUFFER_TYPES; i++)
     {
diff --git a/test/basic/test_common.c b/test/basic/test_common.c
index ae730a4..5f93c25 100644
--- a/test/basic/test_common.c
+++ b/test/basic/test_common.c
@@ -96,12 +96,15 @@ const char *profile2string(VAProfile profile)
         PROFILE(MPEG4Simple)
         PROFILE(MPEG4AdvancedSimple)
         PROFILE(MPEG4Main)
+        PROFILE(H263Baseline)
         PROFILE(H264Baseline)
         PROFILE(H264Main)
         PROFILE(H264High)
+        PROFILE(H264ConstrainedBaseline)
         PROFILE(VC1Simple)
         PROFILE(VC1Main)
         PROFILE(VC1Advanced)
+        PROFILE(JPEGBaseline)
     }
     ASSERT(0);
     return "Unknown";
@@ -118,6 +121,8 @@ const char *entrypoint2string(VAEntrypoint entrypoint)
         ENTRYPOINT(IDCT)
         ENTRYPOINT(MoComp)
         ENTRYPOINT(Deblocking)
+        ENTRYPOINT(EncSlice)
+        ENTRYPOINT(EncPicture)
     }
     ASSERT(0);
     return "Unknown";
diff --git a/test/encode/h264encode_common.c b/test/encode/h264encode_common.c
index 7e8c1ad..e0a411b 100644
--- a/test/encode/h264encode_common.c
+++ b/test/encode/h264encode_common.c
@@ -198,7 +198,7 @@ static int do_h264_encoding(void)
         CHECK_VASTATUS(va_status,"vaBeginPicture");
 
         if (i == 0) {
-            VAEncSequenceParameterBufferH264 seq_h264 = {0};
+            VAEncSequenceParameterBufferH264 seq_h264;
             VABufferID seq_param_buf;
             
             seq_h264.level_idc = SH_LEVEL_3;
diff --git a/test/vainfo/vainfo.c b/test/vainfo/vainfo.c
index 24b6d70..4fc0300 100644
--- a/test/vainfo/vainfo.c
+++ b/test/vainfo/vainfo.c
@@ -57,6 +57,7 @@ static char * profile_string(VAProfile profile)
             case VAProfileVC1Advanced: return "VAProfileVC1Advanced";
             case VAProfileH263Baseline: return "VAProfileH263Baseline";
             case VAProfileH264ConstrainedBaseline: return "VAProfileH264ConstrainedBaseline";
+            case VAProfileJPEGBaseline: return "VAProfileJPEGBaseline";
     }
     return "<unknown profile>";
 }
@@ -71,6 +72,7 @@ static char * entrypoint_string(VAEntrypoint entrypoint)
             case VAEntrypointMoComp:return "VAEntrypointMoComp";
             case VAEntrypointDeblocking:return "VAEntrypointDeblocking";
             case VAEntrypointEncSlice:return "VAEntrypointEncSlice";
+            case VAEntrypointEncPicture:return "VAEntrypointEncPicture";
     }
     return "<unknown entrypoint>";
 }
diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp
index 1f114d7..4d4885a 100644
--- a/va/android/va_android.cpp
+++ b/va/android/va_android.cpp
@@ -125,7 +125,7 @@ static VAStatus va_DisplayContextGetDriverName (
     };
 
     memset(dri_state, 0, sizeof(*dri_state));
-    dri_state->fd = open_device(DEVICE_NAME);
+    dri_state->fd = open_device((char *)DEVICE_NAME);
     
     if (dri_state->fd < 0) {
         fprintf(stderr,"can't open DRM devices\n");
-- 
cgit v1.2.1