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.
This commit is contained in:
Gwenole Beauchesne 2014-01-23 10:20:40 +01:00
parent ed302d091e
commit c5bdeb6980
13 changed files with 20 additions and 5 deletions

View file

@ -20,7 +20,8 @@ libgstvaapi_includedir = \
$(includedir)/gstreamer-$(GST_API_VERSION)/gst/vaapi $(includedir)/gstreamer-$(GST_API_VERSION)/gst/vaapi
libgstvaapi_cflags = \ libgstvaapi_cflags = \
-DGST_VAAPI_CORE \ -DIN_LIBGSTVAAPI \
-DIN_LIBGSTVAAPI_CORE \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \ -I$(top_builddir)/gst-libs \
@ -130,6 +131,7 @@ libgstvaapi_source_priv_h = \
gstvaapivideopool_priv.h \ gstvaapivideopool_priv.h \
gstvaapiwindow_priv.h \ gstvaapiwindow_priv.h \
gstvaapiworkarounds.h \ gstvaapiworkarounds.h \
libgstvaapi_priv_check.h \
sysdeps.h \ sysdeps.h \
$(NULL) $(NULL)
@ -291,6 +293,7 @@ libgstvaapi_drm_@GST_API_VERSION@includedir = \
$(libgstvaapi_includedir) $(libgstvaapi_includedir)
libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS = \ libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS = \
-DIN_LIBGSTVAAPI \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
@ -327,6 +330,7 @@ libgstvaapi_x11_@GST_API_VERSION@includedir = \
$(libgstvaapi_includedir) $(libgstvaapi_includedir)
libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS = \ libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS = \
-DIN_LIBGSTVAAPI \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
@ -365,6 +369,7 @@ libgstvaapi_glx_@GST_API_VERSION@includedir = \
$(libgstvaapi_includedir) $(libgstvaapi_includedir)
libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS = \ libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS = \
-DIN_LIBGSTVAAPI \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
@ -402,6 +407,7 @@ libgstvaapi_wayland_@GST_API_VERSION@includedir = \
$(libgstvaapi_includedir) $(libgstvaapi_includedir)
libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \ libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \
-DIN_LIBGSTVAAPI \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \

View file

@ -23,6 +23,8 @@
#ifndef GST_VAAPI_DECODER_UNIT_H #ifndef GST_VAAPI_DECODER_UNIT_H
#define GST_VAAPI_DECODER_UNIT_H #define GST_VAAPI_DECODER_UNIT_H
#include "libgstvaapi_priv_check.h"
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _GstVaapiDecoderUnit GstVaapiDecoderUnit; typedef struct _GstVaapiDecoderUnit GstVaapiDecoderUnit;

View file

@ -227,7 +227,7 @@ gst_vaapi_display_get_display_types (GstVaapiDisplay * display)
} }
/* Inline reference counting for core libgstvaapi library */ /* Inline reference counting for core libgstvaapi library */
#ifdef GST_VAAPI_CORE #ifdef IN_LIBGSTVAAPI_CORE
#define gst_vaapi_display_ref_internal(display) \ #define gst_vaapi_display_ref_internal(display) \
((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(display))) ((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(display)))

View file

@ -23,6 +23,7 @@
#ifndef GSTVAAPIDISPLAYCACHE_H #ifndef GSTVAAPIDISPLAYCACHE_H
#define GSTVAAPIDISPLAYCACHE_H #define GSTVAAPIDISPLAYCACHE_H
#include "libgstvaapi_priv_check.h"
#include <gst/vaapi/gstvaapidisplay.h> #include <gst/vaapi/gstvaapidisplay.h>
typedef struct _GstVaapiDisplayCache GstVaapiDisplayCache; typedef struct _GstVaapiDisplayCache GstVaapiDisplayCache;

View file

@ -24,6 +24,7 @@
#define GST_VAAPI_MINI_OBJECT_H #define GST_VAAPI_MINI_OBJECT_H
#include <glib.h> #include <glib.h>
#include "libgstvaapi_priv_check.h"
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -219,7 +219,7 @@ gst_vaapi_object_new(const GstVaapiObjectClass *klass,
GstVaapiDisplay *display); GstVaapiDisplay *display);
/* Inline reference counting for core libgstvaapi library */ /* Inline reference counting for core libgstvaapi library */
#ifdef GST_VAAPI_CORE #ifdef IN_LIBGSTVAAPI_CORE
static inline gpointer static inline gpointer
gst_vaapi_object_ref_internal(gpointer object) gst_vaapi_object_ref_internal(gpointer object)
{ {

View file

@ -109,7 +109,7 @@ gst_vaapi_pixmap_new_from_native(const GstVaapiPixmapClass *pixmap_class,
GstVaapiDisplay *display, gpointer native_pixmap); GstVaapiDisplay *display, gpointer native_pixmap);
/* Inline reference counting for core libgstvaapi library */ /* Inline reference counting for core libgstvaapi library */
#ifdef GST_VAAPI_CORE #ifdef IN_LIBGSTVAAPI_CORE
#define gst_vaapi_pixmap_ref_internal(pixmap) \ #define gst_vaapi_pixmap_ref_internal(pixmap) \
((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(pixmap))) ((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(pixmap)))

View file

@ -26,6 +26,7 @@
#define GST_VAAPI_UTILS_H #define GST_VAAPI_UTILS_H
#include "config.h" #include "config.h"
#include "libgstvaapi_priv_check.h"
#include <glib.h> #include <glib.h>
#include <va/va.h> #include <va/va.h>

View file

@ -26,6 +26,7 @@
#define GST_VAAPI_UTILS_GLX_H #define GST_VAAPI_UTILS_GLX_H
#include "config.h" #include "config.h"
#include "libgstvaapi_priv_check.h"
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glext.h> #include <GL/glext.h>
#include <GL/glx.h> #include <GL/glx.h>

View file

@ -24,6 +24,7 @@
#define GST_VAAPI_UTILS_H264_PRIV_H #define GST_VAAPI_UTILS_H264_PRIV_H
#include "gstvaapiutils_h264.h" #include "gstvaapiutils_h264.h"
#include "libgstvaapi_priv_check.h"
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -24,6 +24,7 @@
#define GST_VAAPI_UTILS_MPEG2_PRIV_H #define GST_VAAPI_UTILS_MPEG2_PRIV_H
#include "gstvaapiutils_mpeg2.h" #include "gstvaapiutils_mpeg2.h"
#include "libgstvaapi_priv_check.h"
G_BEGIN_DECLS G_BEGIN_DECLS

View file

@ -26,6 +26,7 @@
#define GST_VAAPI_UTILS_X11_H #define GST_VAAPI_UTILS_X11_H
#include "config.h" #include "config.h"
#include "libgstvaapi_priv_check.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <glib.h> #include <glib.h>

View file

@ -108,7 +108,7 @@ gst_vaapi_window_new_from_native(const GstVaapiWindowClass *window_class,
GstVaapiDisplay *display, gpointer native_window); GstVaapiDisplay *display, gpointer native_window);
/* Inline reference counting for core libgstvaapi library */ /* Inline reference counting for core libgstvaapi library */
#ifdef GST_VAAPI_CORE #ifdef IN_LIBGSTVAAPI_CORE
#define gst_vaapi_window_ref_internal(window) \ #define gst_vaapi_window_ref_internal(window) \
((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(window))) ((gpointer)gst_vaapi_mini_object_ref(GST_VAAPI_MINI_OBJECT(window)))