diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-15 19:32:27 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-03-15 19:32:27 +0000 |
| commit | 4fd57bbe3fef59592a8664dcc9fa2ab32ae99c69 (patch) | |
| tree | 8f41b30e571aa6ed88b53f5471d5e38461136e60 /gst/overlay | |
| parent | 9f4226fe55f09cf5809376b467aa3f46dbf7b5c2 (diff) | |
| download | gst-plugins-bad-4fd57bbe3fef59592a8664dcc9fa2ab32ae99c69.tar.gz gst-plugins-bad-4fd57bbe3fef59592a8664dcc9fa2ab32ae99c69.tar.bz2 gst-plugins-bad-4fd57bbe3fef59592a8664dcc9fa2ab32ae99c69.zip | |
don't mix tabs and spaces
Original commit message from CVS:
don't mix tabs and spaces
Diffstat (limited to 'gst/overlay')
| -rw-r--r-- | gst/overlay/gstoverlay.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/gst/overlay/gstoverlay.c b/gst/overlay/gstoverlay.c index cf787e87..8efabe06 100644 --- a/gst/overlay/gstoverlay.c +++ b/gst/overlay/gstoverlay.c @@ -105,9 +105,10 @@ gst_overlay_get_type (void) 0, (GInstanceInitFunc) gst_overlay_init, }; + overlay_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstOverlay", &overlay_info, - 0); + g_type_register_static (GST_TYPE_ELEMENT, "GstOverlay", &overlay_info, + 0); } return overlay_type; } @@ -155,18 +156,18 @@ gst_overlay_getcaps (GstPad * pad) if (overlay->width && overlay->height) { caps = GST_STATIC_CAPS ("overlay_sink2", - "video/raw", - "format", GST_TYPE_FOURCC (GST_MAKE_FOURCC ('I', '4', '2', '0')), - "width", G_TYPE_INT (overlay->width), - "height", G_TYPE_INT (overlay->height) - ); + "video/raw", + "format", GST_TYPE_FOURCC (GST_MAKE_FOURCC ('I', '4', '2', '0')), + "width", G_TYPE_INT (overlay->width), + "height", G_TYPE_INT (overlay->height) + ); } else { caps = GST_STATIC_CAPS ("overlay_sink2", - "video/raw", - "format", GST_TYPE_FOURCC (GST_MAKE_FOURCC ('I', '4', '2', '0')), - "width", G_TYPE_INT_RANGE (0, 4096), - "height", G_TYPE_INT_RANGE (0, 4096) - ); + "video/raw", + "format", GST_TYPE_FOURCC (GST_MAKE_FOURCC ('I', '4', '2', '0')), + "width", G_TYPE_INT_RANGE (0, 4096), + "height", G_TYPE_INT_RANGE (0, 4096) + ); } return caps; @@ -246,22 +247,22 @@ gst_overlay_blend_i420 (guint8 * out, guint8 * in1, guint8 * in2, guint8 * in3, for (j = 0; j < width; j++) { mask = in3[i * width + j]; out[i * width + j] = ((in1[i * width + j] * mask) + - (in2[i * width + j] * (255 - mask))) >> 8; + (in2[i * width + j] * (255 - mask))) >> 8; } } for (i = 0; i < height / 2; i++) { for (j = 0; j < width / 2; j++) { mask = - (in3[(i * 2) * width + (j * 2)] + in3[(i * 2 + 1) * width + (j * 2)] + - in3[(i * 2) * width + (j * 2 + 1)] + in3[(i * 2 + 1) * width + - (j * 2 + 1)]) / 4; + (in3[(i * 2) * width + (j * 2)] + in3[(i * 2 + 1) * width + (j * 2)] + + in3[(i * 2) * width + (j * 2 + 1)] + in3[(i * 2 + 1) * width + + (j * 2 + 1)]) / 4; outu[i * width2 + j] = - ((in1u[i * width2 + j] * mask) + (in2u[i * width2 + j] * (255 - - mask))) >> 8; + ((in1u[i * width2 + j] * mask) + (in2u[i * width2 + j] * (255 - + mask))) >> 8; outv[i * width2 + j] = - ((in1v[i * width2 + j] * mask) + (in2v[i * width2 + j] * (255 - - mask))) >> 8; + ((in1v[i * width2 + j] * mask) + (in2v[i * width2 + j] * (255 - + mask))) >> 8; } } } |