summaryrefslogtreecommitdiffstats
path: root/ext/jpeg
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-03-15 19:32:27 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-03-15 19:32:27 +0000
commit6cc1c73d2baa95c46edc04f57cbe9ed690dc2f21 (patch)
tree82b5546809a42a56a7bc18bacf8ed6e209ad006e /ext/jpeg
parentd07ec45fa47fbd0e36224e11bcd8ba2faee1a78c (diff)
don't mix tabs and spaces
Original commit message from CVS: don't mix tabs and spaces
Diffstat (limited to 'ext/jpeg')
-rw-r--r--ext/jpeg/gstjpeg.c4
-rw-r--r--ext/jpeg/gstjpegdec.c25
-rw-r--r--ext/jpeg/gstjpegenc.c25
3 files changed, 28 insertions, 26 deletions
diff --git a/ext/jpeg/gstjpeg.c b/ext/jpeg/gstjpeg.c
index add7435e..cf8af9fc 100644
--- a/ext/jpeg/gstjpeg.c
+++ b/ext/jpeg/gstjpeg.c
@@ -27,11 +27,11 @@ static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "jpegenc", GST_RANK_NONE,
- GST_TYPE_JPEGENC))
+ GST_TYPE_JPEGENC))
return FALSE;
if (!gst_element_register (plugin, "jpegdec", GST_RANK_PRIMARY,
- GST_TYPE_JPEGDEC))
+ GST_TYPE_JPEGDEC))
return FALSE;
return TRUE;
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 10156559..a7bdb8fa 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -76,9 +76,10 @@ gst_jpegdec_get_type (void)
0,
(GInstanceInitFunc) gst_jpegdec_init,
};
+
jpegdec_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstJpegDec", &jpegdec_info,
- 0);
+ g_type_register_static (GST_TYPE_ELEMENT, "GstJpegDec", &jpegdec_info,
+ 0);
}
return jpegdec_type;
}
@@ -95,8 +96,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("image/jpeg, "
- "width = (int) [ 16, 4096 ], "
- "height = (int) [ 16, 4096 ], " "framerate = (double) [ 1, MAX ]")
+ "width = (int) [ 16, 4096 ], "
+ "height = (int) [ 16, 4096 ], " "framerate = (double) [ 1, MAX ]")
);
static void
@@ -417,10 +418,10 @@ gst_jpegdec_chain (GstPad * pad, GstData * _data)
jpegdec->height = height;
caps = gst_caps_new_simple ("video/x-raw-yuv",
- "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I', '4', '2', '0'),
- "width", G_TYPE_INT, width,
- "height", G_TYPE_INT, height,
- "framerate", G_TYPE_DOUBLE, jpegdec->fps, NULL);
+ "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('I', '4', '2', '0'),
+ "width", G_TYPE_INT, width,
+ "height", G_TYPE_INT, height,
+ "framerate", G_TYPE_DOUBLE, jpegdec->fps, NULL);
gst_pad_set_explicit_caps (jpegdec->srcpad, caps);
gst_caps_free (caps);
}
@@ -439,14 +440,14 @@ gst_jpegdec_chain (GstPad * pad, GstData * _data)
jpegdec->line[0][j] = base[0];
base[0] += width;
if (r_v == 2) {
- jpegdec->line[0][j + 1] = base[0];
- base[0] += width;
+ jpegdec->line[0][j + 1] = base[0];
+ base[0] += width;
}
jpegdec->line[1][k] = base[1];
jpegdec->line[2][k] = base[2];
if (r_v == 2 || k & 1) {
- base[1] += width2;
- base[2] += width2;
+ base[1] += width2;
+ base[2] += width2;
}
}
/*g_print ("%d\n", jpegdec->cinfo.output_scanline); */
diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c
index 44941719..f8657013 100644
--- a/ext/jpeg/gstjpegenc.c
+++ b/ext/jpeg/gstjpegenc.c
@@ -84,9 +84,10 @@ gst_jpegenc_get_type (void)
0,
(GInstanceInitFunc) gst_jpegenc_init,
};
+
jpegenc_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstJpegEnc", &jpegenc_info,
- 0);
+ g_type_register_static (GST_TYPE_ELEMENT, "GstJpegEnc", &jpegenc_info,
+ 0);
}
return jpegenc_type;
}
@@ -103,8 +104,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("image/jpeg, "
- "width = (int) [ 16, 4096 ], "
- "height = (int) [ 16, 4096 ], " "framerate = (double) [ 1, MAX ]")
+ "width = (int) [ 16, 4096 ], "
+ "height = (int) [ 16, 4096 ], " "framerate = (double) [ 1, MAX ]")
);
static void
@@ -137,12 +138,12 @@ gst_jpegenc_class_init (GstJpegEnc * klass)
g_object_class_install_property (gobject_class, ARG_QUALITY,
g_param_spec_int ("quality", "Quality", "Quality of encoding",
- 0, 100, 85, G_PARAM_READWRITE));
+ 0, 100, 85, G_PARAM_READWRITE));
#if 0
/* disabled, since it doesn't seem to work */
g_object_class_install_property (gobject_class, ARG_SMOOTHING,
g_param_spec_int ("smoothing", "Smoothing", "Smoothing factor",
- 0, 100, 0, G_PARAM_READWRITE));
+ 0, 100, 0, G_PARAM_READWRITE));
#endif
gobject_class->set_property = gst_jpegenc_set_property;
@@ -314,12 +315,12 @@ gst_jpegenc_resync (GstJpegEnc * jpegenc)
jpegenc->cinfo.comp_info[2].v_samp_factor = 1;
if (height != -1) {
- jpegenc->line[0] =
- g_realloc (jpegenc->line[0], height * sizeof (char *));
- jpegenc->line[1] =
- g_realloc (jpegenc->line[1], height * sizeof (char *) / 2);
- jpegenc->line[2] =
- g_realloc (jpegenc->line[2], height * sizeof (char *) / 2);
+ jpegenc->line[0] =
+ g_realloc (jpegenc->line[0], height * sizeof (char *));
+ jpegenc->line[1] =
+ g_realloc (jpegenc->line[1], height * sizeof (char *) / 2);
+ jpegenc->line[2] =
+ g_realloc (jpegenc->line[2], height * sizeof (char *) / 2);
}
GST_DEBUG ("gst_jpegenc_resync: setting format done");