From 9134c0e5ff4599137a63b0ebf5dab018f44286e6 Mon Sep 17 00:00:00 2001
From: Waldo Bastian <waldo.bastian@intel.com>
Date: Thu, 20 Sep 2007 08:38:06 -0700
Subject: [PATCH] Swapped vaGetConfigAttributes and vaQueryConfigAttributes for
 API consistency

---
 dummy_drv_video/dummy_drv_video.c |  4 ++--
 src/va.c                          | 12 ++++++------
 src/va.h                          | 10 +++++-----
 src/va_backend.h                  |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c
index 97fcc46..5963e45 100644
--- a/dummy_drv_video/dummy_drv_video.c
+++ b/dummy_drv_video/dummy_drv_video.c
@@ -141,7 +141,7 @@ VAStatus dummy_QueryConfigEntrypoints(
     return VA_STATUS_SUCCESS;
 }
 
-VAStatus dummy_QueryConfigAttributes(
+VAStatus dummy_GetConfigAttributes(
 		VADriverContextP ctx,
 		VAProfile profile,
 		VAEntrypoint entrypoint,
@@ -332,7 +332,7 @@ VAStatus dummy_DestroyConfig(
     return VA_STATUS_SUCCESS;
 }
 
-VAStatus dummy_GetConfigAttributes(
+VAStatus dummy_QueryConfigAttributes(
 		VADriverContextP ctx,
 		VAConfigID config_id,
 		VAProfile *profile,		/* out */
diff --git a/src/va.c b/src/va.c
index 2db14c7..bb02f38 100644
--- a/src/va.c
+++ b/src/va.c
@@ -477,7 +477,7 @@ VAStatus vaQueryConfigEntrypoints (
   return ctx->vtable.vaQueryConfigEntrypoints ( ctx, profile, entrypoints, num_entrypoints);
 }
 
-VAStatus vaQueryConfigAttributes (
+VAStatus vaGetConfigAttributes (
     VADisplay dpy,
     VAProfile profile,
     VAEntrypoint entrypoint,
@@ -488,8 +488,8 @@ VAStatus vaQueryConfigAttributes (
   VADriverContextP ctx = CTX(dpy);
   ASSERT_CONTEXT(ctx);
 
-  TRACE(vaQueryConfigAttributes);
-  return ctx->vtable.vaQueryConfigAttributes ( ctx, profile, entrypoint, attrib_list, num_attribs );
+  TRACE(vaGetConfigAttributes);
+  return ctx->vtable.vaGetConfigAttributes ( ctx, profile, entrypoint, attrib_list, num_attribs );
 }
 
 VAStatus vaQueryConfigProfiles (
@@ -533,7 +533,7 @@ VAStatus vaDestroyConfig (
   return ctx->vtable.vaDestroyConfig ( ctx, config_id );
 }
 
-VAStatus vaGetConfigAttributes (
+VAStatus vaQueryConfigAttributes (
     VADisplay dpy,
     VAConfigID config_id, 
     VAProfile *profile, 	/* out */
@@ -545,8 +545,8 @@ VAStatus vaGetConfigAttributes (
   VADriverContextP ctx = CTX(dpy);
   ASSERT_CONTEXT(ctx);
 
-  TRACE(vaGetConfigAttributes);
-  return ctx->vtable.vaGetConfigAttributes( ctx, config_id, profile, entrypoint, attrib_list, num_attribs);
+  TRACE(vaQueryConfigAttributes);
+  return ctx->vtable.vaQueryConfigAttributes( ctx, config_id, profile, entrypoint, attrib_list, num_attribs);
 }
 
 VAStatus vaCreateSurfaces (
diff --git a/src/va.h b/src/va.h
index 852f36f..66cc7a0 100755
--- a/src/va.h
+++ b/src/va.h
@@ -231,14 +231,14 @@ VAStatus vaQueryConfigEntrypoints (
 );
 
 /* 
- * Query attributes for a given profile/entrypoint pair 
+ * Get attributes for a given profile/entrypoint pair 
  * The caller must provide an “attrib_list” with all attributes to be 
  * queried.  Upon return, the attributes in “attrib_list” have been 
  * updated with their value.  Unknown attributes or attributes that are 
  * not supported for the given profile/entrypoint pair will have their 
  * value set to VA_ATTRIB_NOT_SUPPORTED
  */
-VAStatus vaQueryConfigAttributes (
+VAStatus vaGetConfigAttributes (
     VADisplay dpy,
     VAProfile profile,
     VAEntrypoint entrypoint,
@@ -274,14 +274,14 @@ VAStatus vaDestroyConfig (
 );
 
 /* 
- * Get all attributes for a given configuration 
+ * Query all attributes for a given configuration 
  * The profile of the configuration is returned in “profile”
  * The entrypoint of the configuration is returned in “entrypoint”
  * The caller must provide an “attrib_list” array that can hold at least 
  * vaMaxNumConfigAttributes() entries. The actual number of attributes 
  * returned in “attrib_list” is returned in “num_attribs”
  */
-VAStatus vaGetConfigAttributes (
+VAStatus vaQueryConfigAttributes (
     VADisplay dpy,
     VAConfigID config_id, 
     VAProfile *profile, 	/* out */
@@ -1459,7 +1459,7 @@ Mostly to demonstrate program flow with no error handling ...
 	/* Assuming finding VLD, find out the format for the render target */
 	VAConfigAttrib attrib;
 	attrib.type = VAConfigAttribRTFormat;
-	vaQueryConfigAttributes(dpy, VAProfileMPEG2Main, VAEntrypointVLD,
+	vaGetConfigAttributes(dpy, VAProfileMPEG2Main, VAEntrypointVLD,
                                 &attrib, 1);
 
 	if (attrib.value & VA_RT_FORMAT_YUV420)
diff --git a/src/va_backend.h b/src/va_backend.h
index e202a0e..3ffb113 100755
--- a/src/va_backend.h
+++ b/src/va_backend.h
@@ -68,7 +68,7 @@ struct VADriverContext
 		int *num_entrypoints			/* out */
 	);
 
-	VAStatus (*vaQueryConfigAttributes) (
+	VAStatus (*vaGetConfigAttributes) (
 		VADriverContextP ctx,
 		VAProfile profile,
 		VAEntrypoint entrypoint,
@@ -90,7 +90,7 @@ struct VADriverContext
 		VAConfigID config_id
 	);
 
-	VAStatus (*vaGetConfigAttributes) (
+	VAStatus (*vaQueryConfigAttributes) (
 		VADriverContextP ctx,
 		VAConfigID config_id, 
 		VAProfile *profile,		/* out */
-- 
2.7.4