From c5bdeb698018f72ef2a4855a0ef2e5a906ec6c74 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Thu, 23 Jan 2014 10:20:40 +0100 Subject: [PATCH] libs: check that private headers remain private. Make sure that libgstvaapi private headers remain internally used to build libgstvaapi libraries only. All header dependencies were reviewed and checks for IN_LIBGSTVAAPI definition were added accordingly. Also rename GST_VAAPI_CORE definition to IN_LIBGSTVAAPI_CORE to keep consistency. --- gst-libs/gst/vaapi/Makefile.am | 8 +++++++- gst-libs/gst/vaapi/gstvaapidecoder_unit.h | 2 ++ gst-libs/gst/vaapi/gstvaapidisplay_priv.h | 2 +- gst-libs/gst/vaapi/gstvaapidisplaycache.h | 1 + gst-libs/gst/vaapi/gstvaapiminiobject.h | 1 + gst-libs/gst/vaapi/gstvaapiobject_priv.h | 2 +- gst-libs/gst/vaapi/gstvaapipixmap_priv.h | 2 +- gst-libs/gst/vaapi/gstvaapiutils.h | 1 + gst-libs/gst/vaapi/gstvaapiutils_glx.h | 1 + gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h | 1 + gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h | 1 + gst-libs/gst/vaapi/gstvaapiutils_x11.h | 1 + gst-libs/gst/vaapi/gstvaapiwindow_priv.h | 2 +- 13 files changed, 20 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index 390d91eb92..11efb4b63e 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -20,7 +20,8 @@ libgstvaapi_includedir = \ $(includedir)/gstreamer-$(GST_API_VERSION)/gst/vaapi libgstvaapi_cflags = \ - -DGST_VAAPI_CORE \ + -DIN_LIBGSTVAAPI \ + -DIN_LIBGSTVAAPI_CORE \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -130,6 +131,7 @@ libgstvaapi_source_priv_h = \ gstvaapivideopool_priv.h \ gstvaapiwindow_priv.h \ gstvaapiworkarounds.h \ + libgstvaapi_priv_check.h \ sysdeps.h \ $(NULL) @@ -291,6 +293,7 @@ libgstvaapi_drm_@GST_API_VERSION@includedir = \ $(libgstvaapi_includedir) libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS = \ + -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ @@ -327,6 +330,7 @@ libgstvaapi_x11_@GST_API_VERSION@includedir = \ $(libgstvaapi_includedir) libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS = \ + -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ @@ -365,6 +369,7 @@ libgstvaapi_glx_@GST_API_VERSION@includedir = \ $(libgstvaapi_includedir) libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS = \ + -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ @@ -402,6 +407,7 @@ libgstvaapi_wayland_@GST_API_VERSION@includedir = \ $(libgstvaapi_includedir) libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \ + -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_unit.h b/gst-libs/gst/vaapi/gstvaapidecoder_unit.h index 7ee77a05cf..32fa9bb458 100644 --- a/gst-libs/gst/vaapi/gstvaapidecoder_unit.h +++ b/gst-libs/gst/vaapi/gstvaapidecoder_unit.h @@ -23,6 +23,8 @@ #ifndef GST_VAAPI_DECODER_UNIT_H #define GST_VAAPI_DECODER_UNIT_H +#include "libgstvaapi_priv_check.h" + G_BEGIN_DECLS typedef struct _GstVaapiDecoderUnit GstVaapiDecoderUnit; diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_priv.h b/gst-libs/gst/vaapi/gstvaapidisplay_priv.h index 1d1396427b..92d466aa8c 100644 --- a/gst-libs/gst/vaapi/gstvaapidisplay_priv.h +++ b/gst-libs/gst/vaapi/gstvaapidisplay_priv.h @@ -227,7 +227,7 @@ gst_vaapi_display_get_display_types (GstVaapiDisplay * display) } /* Inline reference counting for core libgstvaapi library */ -#ifdef GST_VAAPI_CORE +#ifdef IN_LIBGSTVAAPI_CORE #define gst_vaapi_display_ref_internal(display) \ ((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(display))) diff --git a/gst-libs/gst/vaapi/gstvaapidisplaycache.h b/gst-libs/gst/vaapi/gstvaapidisplaycache.h index bbd2436735..62f7b901c3 100644 --- a/gst-libs/gst/vaapi/gstvaapidisplaycache.h +++ b/gst-libs/gst/vaapi/gstvaapidisplaycache.h @@ -23,6 +23,7 @@ #ifndef GSTVAAPIDISPLAYCACHE_H #define GSTVAAPIDISPLAYCACHE_H +#include "libgstvaapi_priv_check.h" #include typedef struct _GstVaapiDisplayCache GstVaapiDisplayCache; diff --git a/gst-libs/gst/vaapi/gstvaapiminiobject.h b/gst-libs/gst/vaapi/gstvaapiminiobject.h index 5f5ada948d..058378d470 100644 --- a/gst-libs/gst/vaapi/gstvaapiminiobject.h +++ b/gst-libs/gst/vaapi/gstvaapiminiobject.h @@ -24,6 +24,7 @@ #define GST_VAAPI_MINI_OBJECT_H #include +#include "libgstvaapi_priv_check.h" G_BEGIN_DECLS diff --git a/gst-libs/gst/vaapi/gstvaapiobject_priv.h b/gst-libs/gst/vaapi/gstvaapiobject_priv.h index 4c91149c9f..f6f3a5860c 100644 --- a/gst-libs/gst/vaapi/gstvaapiobject_priv.h +++ b/gst-libs/gst/vaapi/gstvaapiobject_priv.h @@ -219,7 +219,7 @@ gst_vaapi_object_new(const GstVaapiObjectClass *klass, GstVaapiDisplay *display); /* Inline reference counting for core libgstvaapi library */ -#ifdef GST_VAAPI_CORE +#ifdef IN_LIBGSTVAAPI_CORE static inline gpointer gst_vaapi_object_ref_internal(gpointer object) { diff --git a/gst-libs/gst/vaapi/gstvaapipixmap_priv.h b/gst-libs/gst/vaapi/gstvaapipixmap_priv.h index 577fda884b..9219bf6596 100644 --- a/gst-libs/gst/vaapi/gstvaapipixmap_priv.h +++ b/gst-libs/gst/vaapi/gstvaapipixmap_priv.h @@ -109,7 +109,7 @@ gst_vaapi_pixmap_new_from_native(const GstVaapiPixmapClass *pixmap_class, GstVaapiDisplay *display, gpointer native_pixmap); /* Inline reference counting for core libgstvaapi library */ -#ifdef GST_VAAPI_CORE +#ifdef IN_LIBGSTVAAPI_CORE #define gst_vaapi_pixmap_ref_internal(pixmap) \ ((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(pixmap))) diff --git a/gst-libs/gst/vaapi/gstvaapiutils.h b/gst-libs/gst/vaapi/gstvaapiutils.h index 21d13c2665..9fcab47146 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils.h +++ b/gst-libs/gst/vaapi/gstvaapiutils.h @@ -26,6 +26,7 @@ #define GST_VAAPI_UTILS_H #include "config.h" +#include "libgstvaapi_priv_check.h" #include #include diff --git a/gst-libs/gst/vaapi/gstvaapiutils_glx.h b/gst-libs/gst/vaapi/gstvaapiutils_glx.h index 5d4f75a727..3df92ae8e4 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_glx.h +++ b/gst-libs/gst/vaapi/gstvaapiutils_glx.h @@ -26,6 +26,7 @@ #define GST_VAAPI_UTILS_GLX_H #include "config.h" +#include "libgstvaapi_priv_check.h" #include #include #include diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h b/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h index 5bfbf874b0..85eb184c9e 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h +++ b/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h @@ -24,6 +24,7 @@ #define GST_VAAPI_UTILS_H264_PRIV_H #include "gstvaapiutils_h264.h" +#include "libgstvaapi_priv_check.h" G_BEGIN_DECLS diff --git a/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h b/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h index 179fed3e2b..3f96eca6ac 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h +++ b/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h @@ -24,6 +24,7 @@ #define GST_VAAPI_UTILS_MPEG2_PRIV_H #include "gstvaapiutils_mpeg2.h" +#include "libgstvaapi_priv_check.h" G_BEGIN_DECLS diff --git a/gst-libs/gst/vaapi/gstvaapiutils_x11.h b/gst-libs/gst/vaapi/gstvaapiutils_x11.h index 1229b34cff..f6faf257fc 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_x11.h +++ b/gst-libs/gst/vaapi/gstvaapiutils_x11.h @@ -26,6 +26,7 @@ #define GST_VAAPI_UTILS_X11_H #include "config.h" +#include "libgstvaapi_priv_check.h" #include #include diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_priv.h b/gst-libs/gst/vaapi/gstvaapiwindow_priv.h index f0dc9a51be..3abf421e02 100644 --- a/gst-libs/gst/vaapi/gstvaapiwindow_priv.h +++ b/gst-libs/gst/vaapi/gstvaapiwindow_priv.h @@ -108,7 +108,7 @@ gst_vaapi_window_new_from_native(const GstVaapiWindowClass *window_class, GstVaapiDisplay *display, gpointer native_window); /* Inline reference counting for core libgstvaapi library */ -#ifdef GST_VAAPI_CORE +#ifdef IN_LIBGSTVAAPI_CORE #define gst_vaapi_window_ref_internal(window) \ ((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(window)))