mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-06 14:32:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: object: separation of internal API and plugins

Browse source 
Removed exposed macros GST_VAAPI_OBJECT_DISPLAY() and
GST_VAAPI_OBJECT_ID() to plugins, keeping them only for internal
library usage.

The purpose is readability.

https://bugzilla.gnome.org/show_bug.cgi?id=797139
This commit is contained in:
Víctor Manuel Jáquez Leal 2018-09-13 18:26:27 +02:00
parent 9970e15f67
commit 0152410c97
3 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst-libs/gst/vaapi/gstvaapiobject.h
View file

@ -35,24 +35,6 @@ G_BEGIN_DECLS
typedef struct _GstVaapiObject GstVaapiObject; typedef struct _GstVaapiObject GstVaapiObject;
/**
* GST_VAAPI_OBJECT_DISPLAY:
* @object: a #GstVaapiObject
*
* Macro that evaluates to the #GstVaapiDisplay the @object is bound to.
*/
#define GST_VAAPI_OBJECT_DISPLAY(object) \
gst_vaapi_object_get_display (GST_VAAPI_OBJECT (object))
/**
* GST_VAAPI_OBJECT_ID:
* @object: a #GstVaapiObject
*
* Macro that evaluates to the #GstVaapiID contained in @object.
*/
#define GST_VAAPI_OBJECT_ID(object) \
gst_vaapi_object_get_id (GST_VAAPI_OBJECT (object))
gpointer gpointer
gst_vaapi_object_ref (gpointer object); gst_vaapi_object_ref (gpointer object);

2
gst-libs/gst/vaapi/gstvaapiobject_priv.h
View file

@ -71,7 +71,6 @@ G_PASTE(t_n,_class) (void) \
* Macro that evaluates to the #GstVaapiID contained in @object. * Macro that evaluates to the #GstVaapiID contained in @object.
* This is an internal macro that does not do any run-time type checks. * This is an internal macro that does not do any run-time type checks.
*/ */
#undef GST_VAAPI_OBJECT_ID
#define GST_VAAPI_OBJECT_ID(object) \ #define GST_VAAPI_OBJECT_ID(object) \
(GST_VAAPI_OBJECT (object)->object_id) (GST_VAAPI_OBJECT (object)->object_id)
@ -82,7 +81,6 @@ G_PASTE(t_n,_class) (void) \
* Macro that evaluates to the #GstVaapiDisplay the @object is bound to. * Macro that evaluates to the #GstVaapiDisplay the @object is bound to.
* This is an internal macro that does not do any run-time type check. * This is an internal macro that does not do any run-time type check.
*/ */
#undef GST_VAAPI_OBJECT_DISPLAY
#define GST_VAAPI_OBJECT_DISPLAY(object) \ #define GST_VAAPI_OBJECT_DISPLAY(object) \
(GST_VAAPI_OBJECT (object)->display) (GST_VAAPI_OBJECT (object)->display)

6
gst/vaapi/gstvaapivideometa_texture.c
View file

@ -178,7 +178,8 @@ gst_vaapi_texture_upload (GstVideoGLTextureUploadMeta * meta,
GstVaapiSurfaceProxy *const proxy = GstVaapiSurfaceProxy *const proxy =
gst_vaapi_video_meta_get_surface_proxy (vmeta); gst_vaapi_video_meta_get_surface_proxy (vmeta);
GstVaapiSurface *const surface = gst_vaapi_surface_proxy_get_surface (proxy); GstVaapiSurface *const surface = gst_vaapi_surface_proxy_get_surface (proxy);
GstVaapiDisplay *const dpy = GST_VAAPI_OBJECT_DISPLAY (surface); GstVaapiDisplay *const dpy =
gst_vaapi_object_get_display (GST_VAAPI_OBJECT (surface));
GstVaapiTexture *texture = NULL; GstVaapiTexture *texture = NULL;
if (!gst_vaapi_display_has_opengl (dpy)) if (!gst_vaapi_display_has_opengl (dpy))
@ -186,7 +187,8 @@ gst_vaapi_texture_upload (GstVideoGLTextureUploadMeta * meta,
if (meta_texture->texture if (meta_texture->texture
/* Check whether VA display changed */ /* Check whether VA display changed */
&& GST_VAAPI_OBJECT_DISPLAY (meta_texture->texture) == dpy && gst_vaapi_object_get_display
(GST_VAAPI_OBJECT (meta_texture->texture)) == dpy
/* Check whether texture id changed */ /* Check whether texture id changed */
&& (gst_vaapi_texture_get_id (meta_texture->texture) == texture_id[0])) { && (gst_vaapi_texture_get_id (meta_texture->texture) == texture_id[0])) {
texture = meta_texture->texture; texture = meta_texture->texture;