summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crete <olivier.crete@collabora.co.uk>2008-07-04 20:41:12 +0000
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2009-03-03 14:34:06 -0500
commitc6396458b7ba1cb0e2f8bfa059359d4e6bc12483 (patch)
tree4fde1f382b0d97f0a3543705ddf2827d0c6006de
parent3f12b5905b123cb9b5e66829b72f6d4e2ddc52b9 (diff)
[MOVED FROM GST-P-FARSIGHT] Remove trailing whitespace in mimic plugin
-rw-r--r--ext/mimic/gstmimdec.c10
-rw-r--r--ext/mimic/gstmimdec.h2
-rw-r--r--ext/mimic/gstmimenc.c22
-rw-r--r--ext/mimic/gstmimenc.h4
-rw-r--r--ext/mimic/gstmimic.c10
5 files changed, 24 insertions, 24 deletions
diff --git a/ext/mimic/gstmimdec.c b/ext/mimic/gstmimdec.c
index b2f15ec3d..00ce76b79 100644
--- a/ext/mimic/gstmimdec.c
+++ b/ext/mimic/gstmimdec.c
@@ -55,7 +55,7 @@ GST_STATIC_PAD_TEMPLATE (
"green_mask = (int) 65280, "
"blue_mask = (int) 255, "
"height = (int) [16, 4096], "
- "width = (int) [16, 4096]"
+ "width = (int) [16, 4096]"
)
);
@@ -64,12 +64,12 @@ static void gst_mimdec_base_init (GstMimDecClass *klass);
static void gst_mimdec_init (GstMimDec *mimdec);
static void gst_mimdec_finalize (GObject *object);
-static GstFlowReturn gst_mimdec_chain (GstPad *pad,
+static GstFlowReturn gst_mimdec_chain (GstPad *pad,
GstBuffer *in);
static GstCaps *gst_mimdec_src_getcaps (GstPad *pad);
static GstStateChangeReturn
- gst_mimdec_change_state (GstElement *element,
+ gst_mimdec_change_state (GstElement *element,
GstStateChange transition);
static GstElementClass *parent_class = NULL;
@@ -217,7 +217,7 @@ gst_mimdec_chain (GstPad *pad, GstBuffer *in)
header = (guchar *) gst_adapter_peek (mimdec->adapter, 24);
header_size = GUINT16_FROM_LE (*(guint16 *) (header + 0));
if (header_size != 24) {
- GST_WARNING_OBJECT (mimdec,
+ GST_WARNING_OBJECT (mimdec,
"invalid frame: header size %d incorrect", header_size);
gst_adapter_flush (mimdec->adapter, 24);
res = GST_FLOW_ERROR;
@@ -327,7 +327,7 @@ gst_mimdec_chain (GstPad *pad, GstBuffer *in)
mimic_get_property(mimdec->dec, "width", &width);
mimic_get_property(mimdec->dec, "height", &height);
- GST_DEBUG_OBJECT (mimdec,
+ GST_DEBUG_OBJECT (mimdec,
"got WxH %d x %d payload size %d buffer_size %d",
width, height, mimdec->payload_size, mimdec->buffer_size);
caps = gst_caps_new_simple ("video/x-raw-rgb",
diff --git a/ext/mimic/gstmimdec.h b/ext/mimic/gstmimdec.h
index ddbde8d23..8419f7fdd 100644
--- a/ext/mimic/gstmimdec.h
+++ b/ext/mimic/gstmimdec.h
@@ -60,7 +60,7 @@ struct _GstMimDec
GstClockTime gst_timestamp;
};
-struct _GstMimDecClass
+struct _GstMimDecClass
{
GstElementClass parent_class;
};
diff --git a/ext/mimic/gstmimenc.c b/ext/mimic/gstmimenc.c
index 7b0814c8a..8554e5417 100644
--- a/ext/mimic/gstmimenc.c
+++ b/ext/mimic/gstmimenc.c
@@ -1,4 +1,4 @@
- /*
+ /*
* GStreamer
* Copyright (c) 2005 INdT.
* @author Andre Moreira Magalhaes <andre.magalhaes@indt.org.br>
@@ -75,11 +75,11 @@ static void gst_mimenc_class_init (GstMimEncClass *klass);
static void gst_mimenc_base_init (GstMimEncClass *klass);
static void gst_mimenc_init (GstMimEnc *mimenc);
-static gboolean gst_mimenc_setcaps (GstPad *pad,
+static gboolean gst_mimenc_setcaps (GstPad *pad,
GstCaps *caps);
-static GstFlowReturn gst_mimenc_chain (GstPad *pad,
+static GstFlowReturn gst_mimenc_chain (GstPad *pad,
GstBuffer *in);
-static GstBuffer* gst_mimenc_create_tcp_header (GstMimEnc *mimenc,
+static GstBuffer* gst_mimenc_create_tcp_header (GstMimEnc *mimenc,
gint payload_size);
static GstStateChangeReturn
@@ -236,7 +236,7 @@ gst_mimenc_chain (GstPad *pad, GstBuffer *in)
res = GST_FLOW_ERROR;
goto out;
}
-
+
if (!mimic_encoder_init (mimenc->enc, mimenc->res)) {
GST_WARNING_OBJECT (mimenc, "mimic_encoder_init error\n");
mimic_close (mimenc->enc);
@@ -244,7 +244,7 @@ gst_mimenc_chain (GstPad *pad, GstBuffer *in)
res = GST_FLOW_ERROR;
goto out;
}
-
+
if (!mimic_get_property (mimenc->enc, "buffer_size", &mimenc->buffer_size)) {
GST_WARNING_OBJECT (mimenc, "mimic_get_property('buffer_size') error\n");
mimic_close (mimenc->enc);
@@ -260,7 +260,7 @@ gst_mimenc_chain (GstPad *pad, GstBuffer *in)
out_buf = gst_buffer_new_and_alloc (mimenc->buffer_size);
GST_BUFFER_TIMESTAMP(out_buf) = GST_BUFFER_TIMESTAMP(buf);
buffer_size = mimenc->buffer_size;
- if (!mimic_encode_frame (mimenc->enc, data, GST_BUFFER_DATA (out_buf),
+ if (!mimic_encode_frame (mimenc->enc, data, GST_BUFFER_DATA (out_buf),
&buffer_size, ((mimenc->frames % MAX_INTERFRAMES) == 0 ? TRUE : FALSE))) {
GST_WARNING_OBJECT (mimenc, "mimic_encode_frame error\n");
gst_buffer_unref (out_buf);
@@ -301,7 +301,7 @@ gst_mimenc_chain (GstPad *pad, GstBuffer *in)
return res;
}
-static GstBuffer*
+static GstBuffer*
gst_mimenc_create_tcp_header (GstMimEnc *mimenc, gint payload_size)
{
// 24 bytes
@@ -313,9 +313,9 @@ gst_mimenc_create_tcp_header (GstMimEnc *mimenc, gint payload_size)
*((guint16 *) (p + 2)) = GUINT16_TO_LE(mimenc->width);
*((guint16 *) (p + 4)) = GUINT16_TO_LE(mimenc->height);
*((guint16 *) (p + 6)) = 0;
- *((guint32 *) (p + 8)) = GUINT32_TO_LE(payload_size);
- *((guint32 *) (p + 12)) = GUINT32_TO_LE(GST_MAKE_FOURCC ('M', 'L', '2', '0'));
- *((guint32 *) (p + 16)) = 0;
+ *((guint32 *) (p + 8)) = GUINT32_TO_LE(payload_size);
+ *((guint32 *) (p + 12)) = GUINT32_TO_LE(GST_MAKE_FOURCC ('M', 'L', '2', '0'));
+ *((guint32 *) (p + 16)) = 0;
*((guint32 *) (p + 20)) = 0; /* FIXME: must be timestamp */
return buf_header;
diff --git a/ext/mimic/gstmimenc.h b/ext/mimic/gstmimenc.h
index 150e9c831..8b85745e9 100644
--- a/ext/mimic/gstmimenc.h
+++ b/ext/mimic/gstmimenc.h
@@ -53,11 +53,11 @@ struct _GstMimEnc
MimicResEnum res;
gint buffer_size;
- guint32 frames;
+ guint32 frames;
guint16 height, width;
};
-struct _GstMimEncClass
+struct _GstMimEncClass
{
GstElementClass parent_class;
};
diff --git a/ext/mimic/gstmimic.c b/ext/mimic/gstmimic.c
index 6931ebdb8..2208371ca 100644
--- a/ext/mimic/gstmimic.c
+++ b/ext/mimic/gstmimic.c
@@ -1,4 +1,4 @@
-/*
+/*
* GStreamer
* Copyright (c) 2005 INdT.
* @author Andre Moreira Magalhaes <andre.magalhaes@indt.org.br>
@@ -46,8 +46,8 @@ GST_PLUGIN_DEFINE (
GST_VERSION_MINOR,
"mimic",
"Mimic codec",
- plugin_init,
- VERSION,
- "GPL",
- "Farsight",
+ plugin_init,
+ VERSION,
+ "GPL",
+ "Farsight",
"http://farsight.sf.net/")