Commit 9134c0e5 authored by Waldo Bastian's avatar Waldo Bastian

Swapped vaGetConfigAttributes and vaQueryConfigAttributes for API consistency

parent de4abcf3
...@@ -141,7 +141,7 @@ VAStatus dummy_QueryConfigEntrypoints( ...@@ -141,7 +141,7 @@ VAStatus dummy_QueryConfigEntrypoints(
return VA_STATUS_SUCCESS; return VA_STATUS_SUCCESS;
} }
VAStatus dummy_QueryConfigAttributes( VAStatus dummy_GetConfigAttributes(
VADriverContextP ctx, VADriverContextP ctx,
VAProfile profile, VAProfile profile,
VAEntrypoint entrypoint, VAEntrypoint entrypoint,
...@@ -332,7 +332,7 @@ VAStatus dummy_DestroyConfig( ...@@ -332,7 +332,7 @@ VAStatus dummy_DestroyConfig(
return VA_STATUS_SUCCESS; return VA_STATUS_SUCCESS;
} }
VAStatus dummy_GetConfigAttributes( VAStatus dummy_QueryConfigAttributes(
VADriverContextP ctx, VADriverContextP ctx,
VAConfigID config_id, VAConfigID config_id,
VAProfile *profile, /* out */ VAProfile *profile, /* out */
......
...@@ -477,7 +477,7 @@ VAStatus vaQueryConfigEntrypoints ( ...@@ -477,7 +477,7 @@ VAStatus vaQueryConfigEntrypoints (
return ctx->vtable.vaQueryConfigEntrypoints ( ctx, profile, entrypoints, num_entrypoints); return ctx->vtable.vaQueryConfigEntrypoints ( ctx, profile, entrypoints, num_entrypoints);
} }
VAStatus vaQueryConfigAttributes ( VAStatus vaGetConfigAttributes (
VADisplay dpy, VADisplay dpy,
VAProfile profile, VAProfile profile,
VAEntrypoint entrypoint, VAEntrypoint entrypoint,
...@@ -488,8 +488,8 @@ VAStatus vaQueryConfigAttributes ( ...@@ -488,8 +488,8 @@ VAStatus vaQueryConfigAttributes (
VADriverContextP ctx = CTX(dpy); VADriverContextP ctx = CTX(dpy);
ASSERT_CONTEXT(ctx); ASSERT_CONTEXT(ctx);
TRACE(vaQueryConfigAttributes); TRACE(vaGetConfigAttributes);
return ctx->vtable.vaQueryConfigAttributes ( ctx, profile, entrypoint, attrib_list, num_attribs ); return ctx->vtable.vaGetConfigAttributes ( ctx, profile, entrypoint, attrib_list, num_attribs );
} }
VAStatus vaQueryConfigProfiles ( VAStatus vaQueryConfigProfiles (
...@@ -533,7 +533,7 @@ VAStatus vaDestroyConfig ( ...@@ -533,7 +533,7 @@ VAStatus vaDestroyConfig (
return ctx->vtable.vaDestroyConfig ( ctx, config_id ); return ctx->vtable.vaDestroyConfig ( ctx, config_id );
} }
VAStatus vaGetConfigAttributes ( VAStatus vaQueryConfigAttributes (
VADisplay dpy, VADisplay dpy,
VAConfigID config_id, VAConfigID config_id,
VAProfile *profile, /* out */ VAProfile *profile, /* out */
...@@ -545,8 +545,8 @@ VAStatus vaGetConfigAttributes ( ...@@ -545,8 +545,8 @@ VAStatus vaGetConfigAttributes (
VADriverContextP ctx = CTX(dpy); VADriverContextP ctx = CTX(dpy);
ASSERT_CONTEXT(ctx); ASSERT_CONTEXT(ctx);
TRACE(vaGetConfigAttributes); TRACE(vaQueryConfigAttributes);
return ctx->vtable.vaGetConfigAttributes( ctx, config_id, profile, entrypoint, attrib_list, num_attribs); return ctx->vtable.vaQueryConfigAttributes( ctx, config_id, profile, entrypoint, attrib_list, num_attribs);
} }
VAStatus vaCreateSurfaces ( VAStatus vaCreateSurfaces (
......
...@@ -231,14 +231,14 @@ VAStatus vaQueryConfigEntrypoints ( ...@@ -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 * The caller must provide an “attrib_list” with all attributes to be
* queried. Upon return, the attributes in “attrib_list” have been * queried. Upon return, the attributes in “attrib_list” have been
* updated with their value. Unknown attributes or attributes that are * updated with their value. Unknown attributes or attributes that are
* not supported for the given profile/entrypoint pair will have their * not supported for the given profile/entrypoint pair will have their
* value set to VA_ATTRIB_NOT_SUPPORTED * value set to VA_ATTRIB_NOT_SUPPORTED
*/ */
VAStatus vaQueryConfigAttributes ( VAStatus vaGetConfigAttributes (
VADisplay dpy, VADisplay dpy,
VAProfile profile, VAProfile profile,
VAEntrypoint entrypoint, VAEntrypoint entrypoint,
...@@ -274,14 +274,14 @@ VAStatus vaDestroyConfig ( ...@@ -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 profile of the configuration is returned in “profile”
* The entrypoint of the configuration is returned in “entrypoint” * The entrypoint of the configuration is returned in “entrypoint”
* The caller must provide an “attrib_list” array that can hold at least * The caller must provide an “attrib_list” array that can hold at least
* vaMaxNumConfigAttributes() entries. The actual number of attributes * vaMaxNumConfigAttributes() entries. The actual number of attributes
* returned in “attrib_list” is returned in “num_attribs” * returned in “attrib_list” is returned in “num_attribs”
*/ */
VAStatus vaGetConfigAttributes ( VAStatus vaQueryConfigAttributes (
VADisplay dpy, VADisplay dpy,
VAConfigID config_id, VAConfigID config_id,
VAProfile *profile, /* out */ VAProfile *profile, /* out */
...@@ -1459,7 +1459,7 @@ Mostly to demonstrate program flow with no error handling ... ...@@ -1459,7 +1459,7 @@ Mostly to demonstrate program flow with no error handling ...
/* Assuming finding VLD, find out the format for the render target */ /* Assuming finding VLD, find out the format for the render target */
VAConfigAttrib attrib; VAConfigAttrib attrib;
attrib.type = VAConfigAttribRTFormat; attrib.type = VAConfigAttribRTFormat;
vaQueryConfigAttributes(dpy, VAProfileMPEG2Main, VAEntrypointVLD, vaGetConfigAttributes(dpy, VAProfileMPEG2Main, VAEntrypointVLD,
&attrib, 1); &attrib, 1);
if (attrib.value & VA_RT_FORMAT_YUV420) if (attrib.value & VA_RT_FORMAT_YUV420)
......
...@@ -68,7 +68,7 @@ struct VADriverContext ...@@ -68,7 +68,7 @@ struct VADriverContext
int *num_entrypoints /* out */ int *num_entrypoints /* out */
); );
VAStatus (*vaQueryConfigAttributes) ( VAStatus (*vaGetConfigAttributes) (
VADriverContextP ctx, VADriverContextP ctx,
VAProfile profile, VAProfile profile,
VAEntrypoint entrypoint, VAEntrypoint entrypoint,
...@@ -90,7 +90,7 @@ struct VADriverContext ...@@ -90,7 +90,7 @@ struct VADriverContext
VAConfigID config_id VAConfigID config_id
); );
VAStatus (*vaGetConfigAttributes) ( VAStatus (*vaQueryConfigAttributes) (
VADriverContextP ctx, VADriverContextP ctx,
VAConfigID config_id, VAConfigID config_id,
VAProfile *profile, /* out */ VAProfile *profile, /* out */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment