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

[465/906] gl: Fix variable unused but set compiler warnings

Browse source
This commit is contained in:
Sebastian Dröge 2011-08-03 09:07:49 +02:00 committed by Matthew Waters
parent b1166ed0c4
commit 4732eb4d68
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/gl/gstglbumper.c
View file

@ -168,7 +168,7 @@ gst_gl_bumper_init_resources (GstGLFilter * filter)
guchar *raw_data = NULL; guchar *raw_data = NULL;
guchar **rows = NULL; guchar **rows = NULL;
png_byte magic[8]; png_byte magic[8];
gint n_read = 0; gint n_read;
if (!filter->display) if (!filter->display)
return; return;
@ -180,6 +180,10 @@ gst_gl_bumper_init_resources (GstGLFilter * filter)
/* Read magic number */ /* Read magic number */
n_read = fread (magic, 1, sizeof (magic), fp); n_read = fread (magic, 1, sizeof (magic), fp);
if (n_read != sizeof (magic)) {
fclose (fp);
LOAD_ERROR ("can't read PNG magic number");
}
/* Check for valid magic number */ /* Check for valid magic number */
if (png_sig_cmp (magic, 0, sizeof (magic))) { if (png_sig_cmp (magic, 0, sizeof (magic))) {

28
gst/gl/gstgldownload.c
View file

@ -70,7 +70,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
#ifndef OPENGL_ES2 #ifndef OPENGL_ES2
#define ADDITIONAL_CAPS \ #define ADDITIONAL_CAPS \
#else #else
#define ADDITIONAL_CAPS #define ADDITIONAL_CAPS
#endif #endif
@ -80,11 +80,10 @@ static GstStaticPadTemplate gst_gl_download_src_pad_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB ";"
GST_VIDEO_CAPS_RGB ";"
GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBx ";"
GST_VIDEO_CAPS_RGBA ";" GST_VIDEO_CAPS_RGBA ";"
GST_VIDEO_CAPS_BGR ";" GST_VIDEO_CAPS_BGR ";"
GST_VIDEO_CAPS_BGRx ";" GST_VIDEO_CAPS_BGRx ";"
GST_VIDEO_CAPS_BGRA ";" GST_VIDEO_CAPS_BGRA ";"
GST_VIDEO_CAPS_xRGB ";" GST_VIDEO_CAPS_xRGB ";"
@ -98,11 +97,9 @@ static GstStaticPadTemplate gst_gl_download_src_pad_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB ";"
GST_VIDEO_CAPS_RGB ";"
GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBx ";"
GST_VIDEO_CAPS_RGBA ";" GST_VIDEO_CAPS_RGBA ";" GST_VIDEO_CAPS_YUV ("{ YUY2, UYVY, AYUV }"))
GST_VIDEO_CAPS_YUV ("{ YUY2, UYVY, AYUV }"))
); );
#endif #endif
@ -129,7 +126,7 @@ static void gst_gl_download_set_property (GObject * object, guint prop_id,
static void gst_gl_download_get_property (GObject * object, guint prop_id, static void gst_gl_download_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static gboolean gst_gl_download_src_query (GstPad *pad, GstQuery * query); static gboolean gst_gl_download_src_query (GstPad * pad, GstQuery * query);
static void gst_gl_download_reset (GstGLDownload * download); static void gst_gl_download_reset (GstGLDownload * download);
static gboolean gst_gl_download_set_caps (GstBaseTransform * bt, static gboolean gst_gl_download_set_caps (GstBaseTransform * bt,
@ -184,10 +181,10 @@ static void
gst_gl_download_init (GstGLDownload * download, GstGLDownloadClass * klass) gst_gl_download_init (GstGLDownload * download, GstGLDownloadClass * klass)
{ {
GstBaseTransform *base_trans = GST_BASE_TRANSFORM (download); GstBaseTransform *base_trans = GST_BASE_TRANSFORM (download);
gst_pad_set_query_function (base_trans->srcpad, gst_pad_set_query_function (base_trans->srcpad,
GST_DEBUG_FUNCPTR (gst_gl_download_src_query)); GST_DEBUG_FUNCPTR (gst_gl_download_src_query));
gst_gl_download_reset (download); gst_gl_download_reset (download);
} }
@ -229,7 +226,8 @@ gst_gl_download_src_query (GstPad * pad, GstQuery * query)
case GST_QUERY_CUSTOM: case GST_QUERY_CUSTOM:
{ {
GstStructure *structure = gst_query_get_structure (query); GstStructure *structure = gst_query_get_structure (query);
gst_structure_set (structure, "gstgldisplay", G_TYPE_POINTER, download->display, NULL); gst_structure_set (structure, "gstgldisplay", G_TYPE_POINTER,
download->display, NULL);
res = gst_pad_query_default (pad, query); res = gst_pad_query_default (pad, query);
break; break;
} }
@ -254,7 +252,7 @@ gst_gl_download_reset (GstGLDownload * download)
static gboolean static gboolean
gst_gl_download_start (GstBaseTransform * bt) gst_gl_download_start (GstBaseTransform * bt)
{ {
GstGLDownload* download = GST_GL_DOWNLOAD (bt); GstGLDownload *download = GST_GL_DOWNLOAD (bt);
download->display = gst_gl_display_new (); download->display = gst_gl_display_new ();
gst_gl_display_create_context (download->display, 0); gst_gl_display_create_context (download->display, 0);
@ -276,7 +274,6 @@ static GstCaps *
gst_gl_download_transform_caps (GstBaseTransform * bt, gst_gl_download_transform_caps (GstBaseTransform * bt,
GstPadDirection direction, GstCaps * caps) GstPadDirection direction, GstCaps * caps)
{ {
GstGLDownload *download;
GstStructure *structure; GstStructure *structure;
GstCaps *newcaps, *newothercaps; GstCaps *newcaps, *newothercaps;
GstStructure *newstruct; GstStructure *newstruct;
@ -285,8 +282,6 @@ gst_gl_download_transform_caps (GstBaseTransform * bt,
const GValue *framerate_value; const GValue *framerate_value;
const GValue *par_value; const GValue *par_value;
download = GST_GL_DOWNLOAD (bt);
GST_DEBUG ("transform caps %" GST_PTR_FORMAT, caps); GST_DEBUG ("transform caps %" GST_PTR_FORMAT, caps);
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
@ -350,7 +345,6 @@ gst_gl_download_set_caps (GstBaseTransform * bt, GstCaps * incaps,
GST_ERROR ("display is null"); GST_ERROR ("display is null");
return FALSE; return FALSE;
} }
//blocking call, init color space conversion if needed //blocking call, init color space conversion if needed
gst_gl_display_init_download (download->display, download->video_format, gst_gl_display_init_download (download->display, download->video_format,
download->width, download->height); download->width, download->height);