From c561cead2bbba77d57eca92c3afad445e1b63833 Mon Sep 17 00:00:00 2001 From: gb Date: Thu, 18 Mar 2010 08:02:25 +0000 Subject: [PATCH] Use gtypes. --- gst-libs/gst/vaapi/gstvaapidisplay.c | 26 ++++++++++++------------- gst-libs/gst/vaapi/gstvaapiimage.c | 2 +- gst-libs/gst/vaapi/gstvaapiutils_x11.c | 4 ++-- gst-libs/gst/vaapi/gstvaapiutils_x11.h | 2 +- gst-libs/gst/vaapi/gstvaapiwindow_x11.c | 6 +++--- sys/vaapiconvert/gstvaapiconvert.h | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.c b/gst-libs/gst/vaapi/gstvaapidisplay.c index ad3f2a616d..78dec96ddd 100644 --- a/gst-libs/gst/vaapi/gstvaapidisplay.c +++ b/gst-libs/gst/vaapi/gstvaapidisplay.c @@ -40,12 +40,12 @@ struct _GstVaapiDisplayPrivate { VADisplay display; gboolean create_display; VAProfile *profiles; - unsigned int num_profiles; + guint num_profiles; VAImageFormat *image_formats; - unsigned int num_image_formats; + guint num_image_formats; VAImageFormat *subpicture_formats; - unsigned int *subpicture_flags; - unsigned int num_subpicture_formats; + guint *subpicture_flags; + guint num_subpicture_formats; }; enum { @@ -57,7 +57,7 @@ enum { static void append_format( VAImageFormat **pva_formats, - unsigned int *pnum_va_formats, + guint *pnum_va_formats, GstVaapiImageFormat format ) { @@ -80,9 +80,9 @@ append_format( } static void -filter_formats(VAImageFormat **pva_formats, unsigned int *pnum_va_formats) +filter_formats(VAImageFormat **pva_formats, guint *pnum_va_formats) { - unsigned int i = 0; + guint i = 0; gboolean has_YV12 = FALSE; gboolean has_I420 = FALSE; @@ -204,7 +204,7 @@ gst_vaapi_display_create(GstVaapiDisplay *display) GstVaapiDisplayPrivate * const priv = display->priv; VAStatus status; int major_version, minor_version; - unsigned int i; + guint i; if (!priv->display && priv->create_display) { GstVaapiDisplayClass *klass = GST_VAAPI_DISPLAY_GET_CLASS(display); @@ -266,7 +266,7 @@ gst_vaapi_display_create(GstVaapiDisplay *display) priv->subpicture_formats = g_new(VAImageFormat, priv->num_subpicture_formats); if (!priv->subpicture_formats) return FALSE; - priv->subpicture_flags = g_new(unsigned int, priv->num_subpicture_formats); + priv->subpicture_flags = g_new(guint, priv->num_subpicture_formats); if (!priv->subpicture_flags) return FALSE; status = vaQuerySubpictureFormats( @@ -473,10 +473,10 @@ _gst_vaapi_display_has_format( GstVaapiDisplay *display, GstVaapiImageFormat format, const VAImageFormat *va_formats, - unsigned int num_va_formats + guint num_va_formats ) { - unsigned int i; + guint i; g_return_val_if_fail(format != 0, FALSE); @@ -490,11 +490,11 @@ static GstCaps * _gst_vaapi_display_get_caps( GstVaapiDisplay *display, const VAImageFormat *va_formats, - unsigned int num_va_formats + guint num_va_formats ) { GstCaps *out_caps; - unsigned int i; + guint i; out_caps = gst_caps_new_empty(); if (!out_caps) diff --git a/gst-libs/gst/vaapi/gstvaapiimage.c b/gst-libs/gst/vaapi/gstvaapiimage.c index 1d793a8ee7..4b0fd47b64 100644 --- a/gst-libs/gst/vaapi/gstvaapiimage.c +++ b/gst-libs/gst/vaapi/gstvaapiimage.c @@ -58,7 +58,7 @@ enum { }; #define SWAP_UINT(a, b) do { \ - unsigned int v = a; \ + guint v = a; \ a = b; \ b = v; \ } while (0) diff --git a/gst-libs/gst/vaapi/gstvaapiutils_x11.c b/gst-libs/gst/vaapi/gstvaapiutils_x11.c index dcc95b5363..1cfb66bd00 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_x11.c +++ b/gst-libs/gst/vaapi/gstvaapiutils_x11.c @@ -56,7 +56,7 @@ static const int x11_event_mask = (KeyPressMask | StructureNotifyMask); Window -x11_create_window(Display *display, unsigned int width, unsigned int height) +x11_create_window(Display *display, guint width, guint height) { Window root_window, window; int screen, depth; @@ -110,7 +110,7 @@ x11_get_geometry( { Window rootwin; int x, y; - unsigned int width, height, border_width, depth; + guint width, height, border_width, depth; x11_trap_errors(); XGetGeometry( diff --git a/gst-libs/gst/vaapi/gstvaapiutils_x11.h b/gst-libs/gst/vaapi/gstvaapiutils_x11.h index f6ed6825ed..402f00817f 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_x11.h +++ b/gst-libs/gst/vaapi/gstvaapiutils_x11.h @@ -32,7 +32,7 @@ int x11_untrap_errors(void) attribute_hidden; Window -x11_create_window(Display *display, unsigned int width, unsigned int height) +x11_create_window(Display *display, guint width, guint height) attribute_hidden; gboolean diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_x11.c b/gst-libs/gst/vaapi/gstvaapiwindow_x11.c index 63526d35c9..58fe7f9140 100644 --- a/gst-libs/gst/vaapi/gstvaapiwindow_x11.c +++ b/gst-libs/gst/vaapi/gstvaapiwindow_x11.c @@ -36,8 +36,8 @@ G_DEFINE_TYPE(GstVaapiWindowX11, gst_vaapi_window_x11, GST_VAAPI_TYPE_WINDOW); struct _GstVaapiWindowX11Private { GstVaapiDisplay *display; Window xid; - unsigned int create_window : 1; - unsigned int is_visible : 1; + guint create_window : 1; + guint is_visible : 1; }; enum { @@ -169,7 +169,7 @@ gst_vaapi_window_x11_render( GstVaapiDisplay *display; VASurfaceID surface_id; VAStatus status; - unsigned int va_flags = 0; + guint va_flags = 0; display = gst_vaapi_surface_get_display(surface); if (!display) diff --git a/sys/vaapiconvert/gstvaapiconvert.h b/sys/vaapiconvert/gstvaapiconvert.h index aee556ddbf..b37ff2d732 100644 --- a/sys/vaapiconvert/gstvaapiconvert.h +++ b/sys/vaapiconvert/gstvaapiconvert.h @@ -71,7 +71,7 @@ struct _GstVaapiConvert { GstVaapiVideoPool *surfaces; guint surface_width; guint surface_height; - unsigned int use_inout_buffers : 1; + guint use_inout_buffers : 1; }; struct _GstVaapiConvertClass { -- 2.34.1