mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 15:22:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

query: add flags to allocation query

Browse source 
Make it possible to add API specific flags to the ALLOCATION query. This makes
it possible to also check what kinds of subfeatures of the metadata API are
supported.
This commit is contained in:
Wim Taymans 2012-07-06 11:00:38 +02:00
parent a39b13ff9f
commit 8173622844
4 changed files with 46 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gst/gstquery.c
View file

@ -1658,27 +1658,39 @@ gst_query_set_nth_allocation_pool (GstQuery * query, guint index,
g_array_index (array, AllocationPool, index) = ap;
}
typedef struct
{
GType api;
guint flags;
} AllocationMeta;
/**
* gst_query_add_allocation_meta:
* @query: a GST_QUERY_ALLOCATION type query #GstQuery
* @api: the metadata API
* @flags: API specific flags
*
* Add @api as aone of the supported metadata API to @query.
* Add @api with @flags as one of the supported metadata API to @query.
*/
void
gst_query_add_allocation_meta (GstQuery * query, GType api)
gst_query_add_allocation_meta (GstQuery * query, GType api, guint flags)
{
GArray *array;
GstStructure *structure;
AllocationMeta am;
g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_ALLOCATION);
g_return_if_fail (api != 0);
g_return_if_fail (gst_query_is_writable (query));
structure = GST_QUERY_STRUCTURE (query);
array = ensure_array (structure, GST_QUARK (META), sizeof (GType), NULL);
array =
ensure_array (structure, GST_QUARK (META), sizeof (AllocationMeta), NULL);
g_array_append_val (array, api);
am.api = api;
am.flags = flags;
g_array_append_val (array, am);
}
/**
@ -1699,7 +1711,8 @@ gst_query_get_n_allocation_metas (GstQuery * query)
g_return_val_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_ALLOCATION, 0);
structure = GST_QUERY_STRUCTURE (query);
array = ensure_array (structure, GST_QUARK (META), sizeof (GType), NULL);
array =
ensure_array (structure, GST_QUARK (META), sizeof (AllocationMeta), NULL);
return array->len;
}
@ -1708,6 +1721,7 @@ gst_query_get_n_allocation_metas (GstQuery * query)
* gst_query_parse_nth_allocation_meta:
* @query: a GST_QUERY_ALLOCATION type query #GstQuery
* @index: position in the metadata API array to read
* @flags: (out) (allow-none): API specific flags
*
* Parse an available query and get the metadata API
* at @index of the metadata API array.
@ -1715,19 +1729,27 @@ gst_query_get_n_allocation_metas (GstQuery * query)
* Returns: a #GType of the metadata API at @index.
*/
GType
gst_query_parse_nth_allocation_meta (GstQuery * query, guint index)
gst_query_parse_nth_allocation_meta (GstQuery * query, guint index,
guint * flags)
{
GArray *array;
GstStructure *structure;
AllocationMeta *am;
g_return_val_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_ALLOCATION, 0);
structure = GST_QUERY_STRUCTURE (query);
array = ensure_array (structure, GST_QUARK (META), sizeof (GType), NULL);
array =
ensure_array (structure, GST_QUARK (META), sizeof (AllocationMeta), NULL);
g_return_val_if_fail (index < array->len, 0);
return g_array_index (array, GType, index);
am = &g_array_index (array, AllocationMeta, index);
if (flags)
*flags = am->flags;
return am->api;
}
/**
@ -1747,7 +1769,8 @@ gst_query_remove_nth_allocation_meta (GstQuery * query, guint index)
g_return_if_fail (gst_query_is_writable (query));
structure = GST_QUERY_STRUCTURE (query);
array = ensure_array (structure, GST_QUARK (META), sizeof (GType), NULL);
array =
ensure_array (structure, GST_QUARK (META), sizeof (AllocationMeta), NULL);
g_return_if_fail (index < array->len);
g_array_remove_index (array, index);
@ -1773,11 +1796,13 @@ gst_query_has_allocation_meta (GstQuery * query, GType api)
g_return_val_if_fail (api != 0, FALSE);
structure = GST_QUERY_STRUCTURE (query);
array = ensure_array (structure, GST_QUARK (META), sizeof (GType), NULL);
array =
ensure_array (structure, GST_QUARK (META), sizeof (AllocationMeta), NULL);
len = array->len;
for (i = 0; i < len; i++) {
if (g_array_index (array, GType, i) == api)
AllocationMeta *am = &g_array_index (array, AllocationMeta, i);
if (am->api == api)
return TRUE;
}
return FALSE;

4
gst/gstquery.h
View file

@ -427,9 +427,9 @@ void gst_query_set_nth_allocation_param (GstQuery *query, guint ind
const GstAllocationParams *params);
/* metadata */
void gst_query_add_allocation_meta (GstQuery *query, GType api);
void gst_query_add_allocation_meta (GstQuery *query, GType api, guint flags);
guint gst_query_get_n_allocation_metas (GstQuery *query);
GType gst_query_parse_nth_allocation_meta (GstQuery *query, guint index);
GType gst_query_parse_nth_allocation_meta (GstQuery *query, guint index, guint *flags);
void gst_query_remove_nth_allocation_meta (GstQuery *query, guint index);
gboolean gst_query_has_allocation_meta (GstQuery *query, GType api);

10
libs/gst/base/gstbasetransform.c
View file

@ -813,9 +813,10 @@ gst_base_transform_default_decide_allocation (GstBaseTransform * trans,
n_metas = gst_query_get_n_allocation_metas (query);
for (i = 0; i < n_metas; i++) {
GType api;
guint flags;
gboolean remove;
api = gst_query_parse_nth_allocation_meta (query, i);
api = gst_query_parse_nth_allocation_meta (query, i, &flags);
/* by default we remove all metadata, subclasses should implement a
* filter_meta function */
@ -827,7 +828,7 @@ gst_base_transform_default_decide_allocation (GstBaseTransform * trans,
remove = TRUE;
} else if (G_LIKELY (klass->filter_meta)) {
/* remove if the subclass said so */
remove = !klass->filter_meta (trans, query, api);
remove = !klass->filter_meta (trans, query, api, flags);
GST_LOG_OBJECT (trans, "filter_meta for api %s returned: %s",
g_type_name (api), (remove ? "remove" : "keep"));
} else {
@ -1368,10 +1369,11 @@ gst_base_transform_default_propose_allocation (GstBaseTransform * trans,
n_metas = gst_query_get_n_allocation_metas (decide_query);
for (i = 0; i < n_metas; i++) {
GType api;
guint flags;
api = gst_query_parse_nth_allocation_meta (decide_query, i);
api = gst_query_parse_nth_allocation_meta (decide_query, i, &flags);
GST_DEBUG_OBJECT (trans, "proposing metadata %s", g_type_name (api));
gst_query_add_allocation_meta (query, api);
gst_query_add_allocation_meta (query, api, flags);
}
ret = TRUE;
}

3
libs/gst/base/gstbasetransform.h
View file

@ -225,7 +225,8 @@ struct _GstBaseTransformClass {
/* decide allocation query for output buffers */
gboolean (*decide_allocation) (GstBaseTransform *trans, GstQuery *query);
gboolean (*filter_meta) (GstBaseTransform *trans, GstQuery *query, GType api);
gboolean (*filter_meta) (GstBaseTransform *trans, GstQuery *query,
GType api, guint flags);
/* propose allocation query parameters for input buffers */
gboolean (*propose_allocation) (GstBaseTransform *trans, GstQuery *decide_query,