mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 19:50:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapivideomemory: rename qdata quarks and ids

Browse source 
Also the parameter names were renamed to reflect their origin
and purpose.

https://bugzilla.gnome.org/show_bug.cgi?id=783599
This commit is contained in:
Víctor Manuel Jáquez Leal 2017-06-08 19:32:35 +02:00
parent 45faeb25e8
commit 36cf510ce8
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
gst/vaapi/gstvaapivideomemory.c
View file

@ -1159,27 +1159,27 @@ gst_vaapi_video_info_quark_get (void)
return g_quark; return g_quark;
} }
#define INFO_QUARK info_quark_get () #define ALLOCATION_VINFO_QUARK allocation_vinfo_quark_get ()
static GQuark static GQuark
info_quark_get (void) allocation_vinfo_quark_get (void)
{ {
static gsize g_quark; static gsize g_quark;
if (g_once_init_enter (&g_quark)) { if (g_once_init_enter (&g_quark)) {
gsize quark = (gsize) g_quark_from_static_string ("info"); gsize quark = (gsize) g_quark_from_static_string ("allocation-vinfo");
g_once_init_leave (&g_quark, quark); g_once_init_leave (&g_quark, quark);
} }
return g_quark; return g_quark;
} }
#define FLAGS_QUARK flags_quark_get () #define SURFACE_ALLOC_FLAGS_QUARK surface_alloc_flags_quark_get ()
static GQuark static GQuark
flags_quark_get (void) surface_alloc_flags_quark_get (void)
{ {
static gsize g_quark; static gsize g_quark;
if (g_once_init_enter (&g_quark)) { if (g_once_init_enter (&g_quark)) {
gsize quark = (gsize) g_quark_from_static_string ("flags"); gsize quark = (gsize) g_quark_from_static_string ("surface-alloc-flags");
g_once_init_leave (&g_quark, quark); g_once_init_leave (&g_quark, quark);
} }
return g_quark; return g_quark;
@ -1188,10 +1188,14 @@ flags_quark_get (void)
/** /**
* gst_allocator_get_vaapi_video_info: * gst_allocator_get_vaapi_video_info:
* @allocator: a #GstAllocator * @allocator: a #GstAllocator
* @out_flags_ptr: (out): the stored flags * @out_flags_ptr: (out): the stored surface allocation flags
* *
* Will get the @allocator qdata to fetch the flags and the * Will get the @allocator qdata to fetch the flags and the
* #GstVideoInfo stored in it. * allocation's #GstVideoInfo stored in it.
*
* The allocation video info, is the image video info in the case of
* the #GstVaapiVideoAllocator; and the allocation video info in the
* case of #GstVaapiDmaBufAllocator.
* *
* Returns: the stored #GstVideoInfo * Returns: the stored #GstVideoInfo
**/ **/
@ -1210,13 +1214,13 @@ gst_allocator_get_vaapi_video_info (GstAllocator * allocator,
return NULL; return NULL;
if (out_flags_ptr) { if (out_flags_ptr) {
value = gst_structure_id_get_value (structure, FLAGS_QUARK); value = gst_structure_id_get_value (structure, SURFACE_ALLOC_FLAGS_QUARK);
if (!value) if (!value)
return NULL; return NULL;
*out_flags_ptr = g_value_get_uint (value); *out_flags_ptr = g_value_get_uint (value);
} }
value = gst_structure_id_get_value (structure, INFO_QUARK); value = gst_structure_id_get_value (structure, ALLOCATION_VINFO_QUARK);
if (!value) if (!value)
return NULL; return NULL;
return g_value_get_boxed (value); return g_value_get_boxed (value);
@ -1225,24 +1229,26 @@ gst_allocator_get_vaapi_video_info (GstAllocator * allocator,
/** /**
* gst_allocator_set_vaapi_video_info: * gst_allocator_set_vaapi_video_info:
* @allocator: a #GstAllocator * @allocator: a #GstAllocator
* @vip: the #GstVideoInfo to store * @alloc_info: the allocation #GstVideoInfo to store
* @flags: the flags to store * @surface_alloc_flags: the flags to store
* *
* Stores as GObject's qdata the @vip and the @flags in the * Stores as GObject's qdata the @alloc_info and the
* allocator. This will "decorate" the allocator as a GstVaapi one. * @surface_alloc_flags in the allocator. This will "decorate" the
* allocator as a GstVaapi one.
* *
* Returns: always %TRUE * Returns: always %TRUE
**/ **/
gboolean gboolean
gst_allocator_set_vaapi_video_info (GstAllocator * allocator, gst_allocator_set_vaapi_video_info (GstAllocator * allocator,
const GstVideoInfo * vip, guint flags) const GstVideoInfo * alloc_info, guint surface_alloc_flags)
{ {
g_return_val_if_fail (GST_IS_ALLOCATOR (allocator), FALSE); g_return_val_if_fail (GST_IS_ALLOCATOR (allocator), FALSE);
g_return_val_if_fail (vip != NULL, FALSE); g_return_val_if_fail (alloc_info != NULL, FALSE);
g_object_set_qdata_full (G_OBJECT (allocator), GST_VAAPI_VIDEO_INFO_QUARK, g_object_set_qdata_full (G_OBJECT (allocator), GST_VAAPI_VIDEO_INFO_QUARK,
gst_structure_new_id (GST_VAAPI_VIDEO_INFO_QUARK, INFO_QUARK, gst_structure_new_id (GST_VAAPI_VIDEO_INFO_QUARK,
GST_TYPE_VIDEO_INFO, vip, FLAGS_QUARK, G_TYPE_UINT, flags, NULL), ALLOCATION_VINFO_QUARK, GST_TYPE_VIDEO_INFO, alloc_info,
SURFACE_ALLOC_FLAGS_QUARK, G_TYPE_UINT, surface_alloc_flags, NULL),
(GDestroyNotify) gst_structure_free); (GDestroyNotify) gst_structure_free);
return TRUE; return TRUE;

2
gst/vaapi/gstvaapivideomemory.h
View file

@ -276,7 +276,7 @@ gst_allocator_get_vaapi_video_info (GstAllocator * allocator,
G_GNUC_INTERNAL G_GNUC_INTERNAL
gboolean gboolean
gst_allocator_set_vaapi_video_info (GstAllocator * allocator, gst_allocator_set_vaapi_video_info (GstAllocator * allocator,
const GstVideoInfo * vip, guint flags); const GstVideoInfo * alloc_info, guint surface_alloc_flags);
G_GNUC_INTERNAL G_GNUC_INTERNAL
gboolean gboolean