mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

xvidenc: don't put code with side effects into g_return_val_if_fail()

Browse source 
And don't use g_return*_if_fail() for error handling in elements.
This commit is contained in:
Tim-Philipp Müller 2011-01-07 23:57:21 +00:00
parent e5f1cdd0e9
commit 1498cbcc2d
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ext/xvid/gstxvidenc.c
View file

@ -714,11 +714,17 @@ gst_xvidenc_setcaps (GstPad * pad, GstCaps * vscaps)
structure = gst_caps_get_structure (vscaps, 0); structure = gst_caps_get_structure (vscaps, 0);
g_return_val_if_fail (gst_structure_get_int (structure, "width", &w), FALSE); if (!gst_structure_get_int (structure, "width", &w) ||
g_return_val_if_fail (gst_structure_get_int (structure, "height", &h), FALSE); !gst_structure_get_int (structure, "height", &h)) {
return FALSE;
}
fps = gst_structure_get_value (structure, "framerate"); fps = gst_structure_get_value (structure, "framerate");
g_return_val_if_fail (w > 0 && h > 0 if (fps == NULL || !GST_VALUE_HOLDS_FRACTION (fps)) {
&& fps != NULL && GST_VALUE_HOLDS_FRACTION (fps), FALSE); GST_WARNING_OBJECT (pad, "no framerate specified, or not a GstFraction");
return FALSE;
}
/* optional par info */ /* optional par info */
par = gst_structure_get_value (structure, "pixel-aspect-ratio"); par = gst_structure_get_value (structure, "pixel-aspect-ratio");
@ -1039,7 +1045,6 @@ gst_xvidenc_set_property (GObject * object,
GstXvidEnc *xvidenc; GstXvidEnc *xvidenc;
guint offset; guint offset;
g_return_if_fail (GST_IS_XVIDENC (object));
xvidenc = GST_XVIDENC (object); xvidenc = GST_XVIDENC (object);
if (prop_id > xvidenc_prop_count) { if (prop_id > xvidenc_prop_count) {
@ -1050,7 +1055,9 @@ gst_xvidenc_set_property (GObject * object,
/* our param specs should have such qdata */ /* our param specs should have such qdata */
offset = offset =
GPOINTER_TO_UINT (g_param_spec_get_qdata (pspec, xvidenc_pspec_quark)); GPOINTER_TO_UINT (g_param_spec_get_qdata (pspec, xvidenc_pspec_quark));
g_return_if_fail (offset != 0);
if (offset == 0)
return;
switch (G_PARAM_SPEC_VALUE_TYPE (pspec)) { switch (G_PARAM_SPEC_VALUE_TYPE (pspec)) {
case G_TYPE_BOOLEAN: case G_TYPE_BOOLEAN:
@ -1080,7 +1087,6 @@ gst_xvidenc_get_property (GObject * object,
GstXvidEnc *xvidenc; GstXvidEnc *xvidenc;
guint offset; guint offset;
g_return_if_fail (GST_IS_XVIDENC (object));
xvidenc = GST_XVIDENC (object); xvidenc = GST_XVIDENC (object);
if (prop_id > xvidenc_prop_count) { if (prop_id > xvidenc_prop_count) {
@ -1091,7 +1097,9 @@ gst_xvidenc_get_property (GObject * object,
/* our param specs should have such qdata */ /* our param specs should have such qdata */
offset = offset =
GPOINTER_TO_UINT (g_param_spec_get_qdata (pspec, xvidenc_pspec_quark)); GPOINTER_TO_UINT (g_param_spec_get_qdata (pspec, xvidenc_pspec_quark));
g_return_if_fail (offset != 0);
if (offset == 0)
return;
switch (G_PARAM_SPEC_VALUE_TYPE (pspec)) { switch (G_PARAM_SPEC_VALUE_TYPE (pspec)) {
case G_TYPE_BOOLEAN: case G_TYPE_BOOLEAN: