Add the missing entrypoints in vainfo list

[android-x86/hardware-intel-common-libva.git] / test / vainfo / vainfo.c

diff --git a/test/vainfo/vainfo.c b/test/vainfo/vainfo.c
index 24b6d70..c7082ae 100644 (file)
--- a/test/vainfo/vainfo.c
+++ b/test/vainfo/vainfo.c
@@ -22,28 +22,25 @@
  * 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 "sysdeps.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-
+#include "va_display.h"
+#include "va/sysdeps.h"
 
 #define CHECK_VASTATUS(va_status,func, ret)                             \
 if (va_status != VA_STATUS_SUCCESS) {                                   \
     fprintf(stderr,"%s failed with error code %d (%s),exit\n",func, va_status, vaErrorStr(va_status)); \
-    exit(ret);                                                          \
+    ret_val = ret;                                                      \
+    goto error;                                                         \
 }
 
 static char * profile_string(VAProfile profile)
 {
     switch (profile) {
+            case VAProfileNone: return "VAProfileNone";
             case VAProfileMPEG2Simple: return "VAProfileMPEG2Simple";
             case VAProfileMPEG2Main: return "VAProfileMPEG2Main";
             case VAProfileMPEG4Simple: return "VAProfileMPEG4Simple";
@@ -57,6 +54,19 @@ static char * profile_string(VAProfile profile)
             case VAProfileVC1Advanced: return "VAProfileVC1Advanced";
             case VAProfileH263Baseline: return "VAProfileH263Baseline";
             case VAProfileH264ConstrainedBaseline: return "VAProfileH264ConstrainedBaseline";
+            case VAProfileJPEGBaseline: return "VAProfileJPEGBaseline";
+            case VAProfileVP8Version0_3: return "VAProfileVP8Version0_3";
+            case VAProfileH264MultiviewHigh: return "VAProfileH264MultiviewHigh";
+            case VAProfileH264StereoHigh: return "VAProfileH264StereoHigh";
+            case VAProfileHEVCMain: return "VAProfileHEVCMain";
+            case VAProfileHEVCMain10: return "VAProfileHEVCMain10";
+            case VAProfileVP9Profile0: return "VAProfileVP9Profile0";
+            case VAProfileVP9Profile1: return "VAProfileVP9Profile1";
+            case VAProfileVP9Profile2: return "VAProfileVP9Profile2";
+            case VAProfileVP9Profile3: return "VAProfileVP9Profile3";
+
+            default:
+                break;
     }
     return "<unknown profile>";
 }
@@ -71,40 +81,36 @@ static char * entrypoint_string(VAEntrypoint entrypoint)
             case VAEntrypointMoComp:return "VAEntrypointMoComp";
             case VAEntrypointDeblocking:return "VAEntrypointDeblocking";
             case VAEntrypointEncSlice:return "VAEntrypointEncSlice";
+            case VAEntrypointEncPicture:return "VAEntrypointEncPicture";
+            case VAEntrypointEncSliceLP:return "VAEntrypointEncSliceLP";
+            case VAEntrypointVideoProc:return "VAEntrypointVideoProc";
+            default:
+                break;
     }
     return "<unknown entrypoint>";
 }
 
 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 = strrchr(argv[0], '/'); 
-  VAProfile profile;
+  VAProfile profile, *profile_list = NULL;
+  int num_profiles, max_num_profiles, i;
   VAEntrypoint entrypoint, entrypoints[10];
   int num_entrypoint;
+  int ret_val = 0;
   
   if (name)
       name++;
   else
       name = argv[0];
 
-#ifndef ANDROID
-  dpy = XOpenDisplay(NULL);
-#else
-  dpy = (Display*)malloc(sizeof(Display));
-#endif
-  if (NULL == dpy)
-  {
-      fprintf(stderr, "%s: Error, can't open display: '%s'\n", name, display ? display : "");
-      return 1;
-  }
-  
-  va_dpy = vaGetDisplay(dpy);
+  va_init_display_args(&argc, (char **)argv);
+
+  va_dpy = va_open_display();
   if (NULL == va_dpy)
   {
       fprintf(stderr, "%s: vaGetDisplay() failed\n", name);
@@ -114,15 +120,29 @@ int main(int argc, const char* argv[])
   va_status = vaInitialize(va_dpy, &major_version, &minor_version);
   CHECK_VASTATUS(va_status, "vaInitialize", 3);
   
-  printf("%s: VA API version: %d.%d\n", name, major_version, minor_version);
+  printf("%s: VA-API version: %d.%d (libva %s)\n",
+         name, major_version, minor_version, LIBVA_VERSION_S);
 
   driver = vaQueryVendorString(va_dpy);
   printf("%s: Driver version: %s\n", name, driver ? driver : "<unknown>");
 
   printf("%s: Supported profile and entrypoints\n", name);
-  for  (profile = VAProfileMPEG2Simple; profile <= VAProfileH263Baseline; profile++) {
+  max_num_profiles = vaMaxNumProfiles(va_dpy);
+  profile_list = malloc(max_num_profiles * sizeof(VAProfile));
+
+  if (!profile_list) {
+      printf("Failed to allocate memory for profile list\n");
+      ret_val = 5;
+      goto error;
+  }
+
+  va_status = vaQueryConfigProfiles(va_dpy, profile_list, &num_profiles);
+  CHECK_VASTATUS(va_status, "vaQueryConfigProfiles", 6);
+
+  for (i = 0; i < num_profiles; i++) {
       char *profile_str;
 
+      profile = profile_list[i];
       va_status = vaQueryConfigEntrypoints(va_dpy, profile, entrypoints, 
                                            &num_entrypoint);
       if (va_status == VA_STATUS_ERROR_UNSUPPORTED_PROFILE)
@@ -135,7 +155,10 @@ int main(int argc, const char* argv[])
           printf("      %-32s: %s\n", profile_str, entrypoint_string(entrypoints[entrypoint]));
   }
   
+error:
+  free(profile_list);
   vaTerminate(va_dpy);
+  va_close_display(va_dpy);
   
-  return 0;
+  return ret_val;
 }