diff options
author | Hyunjun Ko <zzoon@igalia.com> | 2016-10-07 18:46:22 +0900 |
---|---|---|
committer | Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com> | 2016-10-25 11:35:22 +0200 |
commit | abc2480b10e9be723b89acb6b0b5235ef05e9f6f (patch) | |
tree | 730cc6e470d21397eded94a7f2073a87c2039434 | |
parent | 84f7a3ec516155314c07ad6c7d45954d2cfd33da (diff) |
libs: minor correction for logical consistency
GstVaapiDecode is a descendant of GstVaapiMiniObject, so, thought we should
use its methods, even though it doesn't change functionality.
GstVaapiPixmap, GstVaapiTexture and GstVaapiWindow are descendant of
GstVaapiObject, hence its methods shall be used.
https://bugzilla.gnome.org/show_bug.cgi?id=772554
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapidecoder.c | 3 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapipixmap_priv.h | 8 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapitexture_priv.h | 8 | ||||
-rw-r--r-- | gst-libs/gst/vaapi/gstvaapiwindow_priv.h | 8 |
4 files changed, 14 insertions, 13 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder.c b/gst-libs/gst/vaapi/gstvaapidecoder.c index 7de5276c..498cbc17 100644 --- a/gst-libs/gst/vaapi/gstvaapidecoder.c +++ b/gst-libs/gst/vaapi/gstvaapidecoder.c @@ -576,7 +576,8 @@ void gst_vaapi_decoder_replace (GstVaapiDecoder ** old_decoder_ptr, GstVaapiDecoder * new_decoder) { - gst_vaapi_object_replace (old_decoder_ptr, new_decoder); + gst_vaapi_mini_object_replace ((GstVaapiMiniObject **) old_decoder_ptr, + GST_VAAPI_MINI_OBJECT (new_decoder)); } /** diff --git a/gst-libs/gst/vaapi/gstvaapipixmap_priv.h b/gst-libs/gst/vaapi/gstvaapipixmap_priv.h index 9219bf65..9dd6bc51 100644 --- a/gst-libs/gst/vaapi/gstvaapipixmap_priv.h +++ b/gst-libs/gst/vaapi/gstvaapipixmap_priv.h @@ -111,14 +111,14 @@ gst_vaapi_pixmap_new_from_native(const GstVaapiPixmapClass *pixmap_class, /* Inline reference counting for core libgstvaapi library */ #ifdef IN_LIBGSTVAAPI_CORE #define gst_vaapi_pixmap_ref_internal(pixmap) \ - ((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(pixmap))) + ((gpointer)gst_vaapi_object_ref(GST_VAAPI_OBJECT(pixmap))) #define gst_vaapi_pixmap_unref_internal(pixmap) \ - gst_vaapi_mini_object_unref(GST_VAAPI_MINI_OBJECT(pixmap)) + gst_vaapi_object_unref(GST_VAAPI_OBJECT(pixmap)) #define gst_vaapi_pixmap_replace_internal(old_pixmap_ptr, new_pixmap) \ - gst_vaapi_mini_object_replace((GstVaapiMiniObject **)(old_pixmap_ptr), \ - GST_VAAPI_MINI_OBJECT(new_pixmap)) + gst_vaapi_object_replace((GstVaapiObject **)(old_pixmap_ptr), \ + GST_VAAPI_OBJECT(new_pixmap)) #undef gst_vaapi_pixmap_ref #define gst_vaapi_pixmap_ref(pixmap) \ diff --git a/gst-libs/gst/vaapi/gstvaapitexture_priv.h b/gst-libs/gst/vaapi/gstvaapitexture_priv.h index 782ae783..86befe67 100644 --- a/gst-libs/gst/vaapi/gstvaapitexture_priv.h +++ b/gst-libs/gst/vaapi/gstvaapitexture_priv.h @@ -138,14 +138,14 @@ gst_vaapi_texture_new_internal (const GstVaapiTextureClass * klass, /* Inline reference counting for core libgstvaapi library */ #ifdef IN_LIBGSTVAAPI_CORE #define gst_vaapi_texture_ref_internal(texture) \ - ((gpointer)gst_vaapi_mini_object_ref (GST_VAAPI_MINI_OBJECT (texture))) + ((gpointer)gst_vaapi_object_ref (GST_VAAPI_OBJECT (texture))) #define gst_vaapi_texture_unref_internal(texture) \ - gst_vaapi_mini_object_unref (GST_VAAPI_MINI_OBJECT (texture)) + gst_vaapi_object_unref (GST_VAAPI_OBJECT (texture)) #define gst_vaapi_texture_replace_internal(old_texture_ptr, new_texture) \ - gst_vaapi_mini_object_replace ((GstVaapiMiniObject **)(old_texture_ptr), \ - GST_VAAPI_MINI_OBJECT (new_texture)) + gst_vaapi_object_replace ((GstVaapiObject **)(old_texture_ptr), \ + GST_VAAPI_OBJECT (new_texture)) #undef gst_vaapi_texture_ref #define gst_vaapi_texture_ref(texture) \ diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_priv.h b/gst-libs/gst/vaapi/gstvaapiwindow_priv.h index 3d0a5963..ea0e19a1 100644 --- a/gst-libs/gst/vaapi/gstvaapiwindow_priv.h +++ b/gst-libs/gst/vaapi/gstvaapiwindow_priv.h @@ -123,14 +123,14 @@ gst_vaapi_window_new_internal (const GstVaapiWindowClass * window_class, /* Inline reference counting for core libgstvaapi library */ #ifdef IN_LIBGSTVAAPI_CORE #define gst_vaapi_window_ref_internal(window) \ - ((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(window))) + ((gpointer)gst_vaapi_object_ref(GST_VAAPI_OBJECT(window))) #define gst_vaapi_window_unref_internal(window) \ - gst_vaapi_mini_object_unref(GST_VAAPI_MINI_OBJECT(window)) + gst_vaapi_object_unref(GST_VAAPI_OBJECT(window)) #define gst_vaapi_window_replace_internal(old_window_ptr, new_window) \ - gst_vaapi_mini_object_replace((GstVaapiMiniObject **)(old_window_ptr), \ - GST_VAAPI_MINI_OBJECT(new_window)) + gst_vaapi_object_replace((GstVaapiObject **)(old_window_ptr), \ + GST_VAAPI_OBJECT(new_window)) #undef gst_vaapi_window_ref #define gst_vaapi_window_ref(window) \ |