[498/906] gldisplay: don't pass non-constant strings as printf format strings

Fixes 'format not a string literal and no format arguments' on darwin
This commit is contained in:
Julien Isorce 2012-04-20 10:41:51 +02:00 committed by Matthew Waters
parent 5d752d6422
commit 0c7080e7a1
22 changed files with 47 additions and 49 deletions

View file

@ -78,7 +78,7 @@ typedef void (*GstGLDisplayThreadFunc) (GstGLDisplay * display, gpointer data);
typedef void (*GLCB) (gint, gint, guint, gpointer stuff);
typedef void (*GLCB_V2) (gpointer stuff);
#define GST_GL_DISPLAY_ERR_MSG(obj) (GST_GL_DISPLAY_CAST(obj)->error_message)
#define GST_GL_DISPLAY_ERR_MSG(obj) ("%s", GST_GL_DISPLAY_CAST(obj)->error_message)
struct _GstGLDisplay
{

View file

@ -270,7 +270,7 @@ gst_gl_filter_start (GstBaseTransform * bt)
if (!isPerformed)
GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (filter->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
}
}
@ -407,7 +407,7 @@ gst_gl_filter_set_caps (GstBaseTransform * bt, GstCaps * incaps,
if (!ret) {
GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (filter->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
return FALSE;
}
@ -420,7 +420,7 @@ gst_gl_filter_set_caps (GstBaseTransform * bt, GstCaps * incaps,
if (!ret) {
GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (filter->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
return FALSE;
}
@ -429,7 +429,7 @@ gst_gl_filter_set_caps (GstBaseTransform * bt, GstCaps * incaps,
if (!ret) {
GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (filter->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
return FALSE;
}

View file

@ -638,7 +638,7 @@ gst_gl_mixer_query (GstPad * pad, GstQuery * query)
sink_pad->display, NULL);
else
GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (sink_pad->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (sink_pad->display), (NULL));
/* does not work:
* res = gst_pad_query_default (GST_PAD_CAST (sink_pad), query);*/
@ -704,7 +704,7 @@ gst_gl_mixer_setcaps (GstPad * pad, GstCaps * caps)
if (!gst_gl_display_gen_fbo (mix->display, mix->width, mix->height,
&mix->fbo, &mix->depthbuffer)) {
GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (mix->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (mix->display), (NULL));
gst_object_unref (mix);
return FALSE;
}

View file

@ -40,7 +40,7 @@ gst_gl_effects_bulge_callback (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize bulge shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -40,7 +40,7 @@ gst_gl_effects_fisheye_callback (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize fisheye shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -43,7 +43,7 @@ gst_gl_effects_glow_step_one (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize luma threshold shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}
@ -85,7 +85,7 @@ gst_gl_effects_glow_step_two (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize hconv7 shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}
@ -124,7 +124,7 @@ gst_gl_effects_glow_step_three (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize vcon7 shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}
@ -163,7 +163,7 @@ gst_gl_effects_glow_step_four (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize sum shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -40,7 +40,7 @@ gst_gl_effects_luma_to_curve (GstGLEffects * effects,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize luma to curve shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -48,8 +48,7 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture,
error = NULL;
gst_gl_shader_use (NULL);
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)),
(NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
} else {
effects->draw_attr_position_loc =
gst_gl_shader_get_attribute_location (shader, "a_position");
@ -65,7 +64,7 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize mirror shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -40,7 +40,7 @@ gst_gl_effects_rgb_to_curve (GstGLEffects * effects,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize rgb to curve shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -40,7 +40,7 @@ gst_gl_effects_sin_callback (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize sin shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -40,7 +40,7 @@ gst_gl_effects_square_callback (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize square shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -49,8 +49,7 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture,
error = NULL;
gst_gl_shader_use (NULL);
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)),
(NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
} else {
effects->draw_attr_position_loc =
gst_gl_shader_get_attribute_location (shader, "a_position");
@ -66,7 +65,7 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize squeeze shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}
glMatrixMode (GL_PROJECTION);

View file

@ -40,7 +40,7 @@ gst_gl_effects_stretch_callback (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize stretch shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -40,7 +40,7 @@ gst_gl_effects_tunnel_callback (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize tunnel shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -40,7 +40,7 @@ gst_gl_effects_twirl_callback (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize twirl shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -59,7 +59,7 @@ gst_gl_effects_xray_step_two (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize hconv7 shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}
@ -98,7 +98,7 @@ gst_gl_effects_xray_step_three (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize vconv7 shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}
@ -138,7 +138,7 @@ gst_gl_effects_xray_desaturate (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize desaturate shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}
@ -175,7 +175,7 @@ gst_gl_effects_xray_sobel_hconv (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize sobel hvonc3 shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}
@ -212,7 +212,7 @@ gst_gl_effects_xray_sobel_vconv (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize sobel vconv3 shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}
@ -249,7 +249,7 @@ gst_gl_effects_xray_sobel_length (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize seobel length shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}
@ -289,7 +289,7 @@ gst_gl_effects_xray_step_five (gint width, gint height, guint texture,
gst_gl_display_set_error (GST_GL_FILTER (effects)->display,
"Failed to initialize multiply shader");
GST_ELEMENT_ERROR (effects, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (effects)->display), (NULL));
return;
}

View file

@ -394,7 +394,7 @@ gst_gl_colorscale_set_caps (GstBaseTransform * bt, GstCaps * incaps,
if (!ret) {
GST_ELEMENT_ERROR (colorscale, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (colorscale->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (colorscale->display), (NULL));
return FALSE;
}
//blocking call, init colorspace conversion if needed
@ -405,7 +405,7 @@ gst_gl_colorscale_set_caps (GstBaseTransform * bt, GstCaps * incaps,
if (!ret) {
GST_ELEMENT_ERROR (colorscale, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (colorscale->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (colorscale->display), (NULL));
return FALSE;
}
//blocking call, init colorspace conversion if needed
@ -415,7 +415,7 @@ gst_gl_colorscale_set_caps (GstBaseTransform * bt, GstCaps * incaps,
if (!ret)
GST_ELEMENT_ERROR (colorscale, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (colorscale->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (colorscale->display), (NULL));
return ret;
}

View file

@ -103,7 +103,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
"Failed to initialize difference shader");
GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display)),
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
(NULL));
return;
}
@ -113,7 +113,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
"Failed to initialize hconv7 shader");
GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display)),
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
(NULL));
return;
}
@ -123,7 +123,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
"Failed to initialize vconv7 shader");
GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display)),
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
(NULL));
return;
}
@ -133,7 +133,7 @@ gst_gl_differencematte_init_gl_resources (GstGLFilter * filter)
gst_gl_display_set_error (GST_GL_FILTER (differencematte)->display,
"Failed to initialize interp shader");
GST_ELEMENT_ERROR (differencematte, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display)),
GST_GL_DISPLAY_ERR_MSG (GST_GL_FILTER (differencematte)->display),
(NULL));
return;
}

View file

@ -259,7 +259,7 @@ gst_gl_download_start (GstBaseTransform * bt)
download->display = gst_gl_display_new ();
if (!gst_gl_display_create_context (download->display, 0)) {
GST_ELEMENT_ERROR (download, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (download->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (download->display), (NULL));
return FALSE;
}
@ -356,7 +356,7 @@ gst_gl_download_set_caps (GstBaseTransform * bt, GstCaps * incaps,
download->width, download->height);
if (!ret)
GST_ELEMENT_ERROR (download, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (download->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (download->display), (NULL));
return ret;
}

View file

@ -426,7 +426,7 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition)
ok = gst_gl_display_create_context (glimage_sink->display, 0);
if (!ok) {
GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (glimage_sink->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL));
if (glimage_sink->display) {
g_object_unref (glimage_sink->display);
@ -539,7 +539,7 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
if (!ok) {
GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (glimage_sink->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL));
return FALSE;
}
}
@ -662,7 +662,7 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf)
return GST_FLOW_OK;
else {
GST_ELEMENT_ERROR (glimage_sink, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (glimage_sink->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (glimage_sink->display), (NULL));
return GST_FLOW_ERROR;
}
}

View file

@ -392,7 +392,7 @@ gst_gl_test_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps)
if (!res)
GST_ELEMENT_ERROR (gltestsrc, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (gltestsrc->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (gltestsrc->display), (NULL));
}
return res;
}
@ -651,7 +651,7 @@ gst_gl_test_src_start (GstBaseSrc * basesrc)
if (!isPerformed)
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (src->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (src->display), (NULL));
}
}

View file

@ -305,7 +305,7 @@ gst_gl_upload_start (GstBaseTransform * bt)
if (!isPerformed)
GST_ELEMENT_ERROR (upload, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (upload->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (upload->display), (NULL));
}
}
@ -511,7 +511,7 @@ gst_gl_upload_set_caps (GstBaseTransform * bt, GstCaps * incaps,
if (!ret)
GST_ELEMENT_ERROR (upload, RESOURCE, NOT_FOUND,
(GST_GL_DISPLAY_ERR_MSG (upload->display)), (NULL));
GST_GL_DISPLAY_ERR_MSG (upload->display), (NULL));
return ret;
}