From 66935a98728d1fdcaf2ba17180d97709dbefdac9 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Fri, 14 Mar 2008 18:42:35 +0000 Subject: [PATCH] gst/videotestsrc/videotestsrc.c: Oops, revert last change because -base is in freeze. Original commit message from CVS: * gst/videotestsrc/videotestsrc.c: Oops, revert last change because -base is in freeze. --- ChangeLog | 5 +++++ gst/videotestsrc/videotestsrc.c | 47 ++++++----------------------------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c2b86b..f34b8f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-03-14 David Schleef + * gst/videotestsrc/videotestsrc.c: Oops, revert last change + because -base is in freeze. + +2008-03-14 David Schleef + Patch by: William M. Brack * gst/videotestsrc/videotestsrc.c: Fix Bayer pattern generation. diff --git a/gst/videotestsrc/videotestsrc.c b/gst/videotestsrc/videotestsrc.c index 2becd0b3..bf70a8b 100644 --- a/gst/videotestsrc/videotestsrc.c +++ b/gst/videotestsrc/videotestsrc.c @@ -304,10 +304,7 @@ static void paint_hline_str3 (paintinfo * p, int x, int y, int w); static void paint_hline_RGB565 (paintinfo * p, int x, int y, int w); static void paint_hline_xRGB1555 (paintinfo * p, int x, int y, int w); -#if 0 -static void paint_hline_bayer_GRBG (paintinfo * p, int x, int y, int w); -#endif -static void paint_hline_bayer_BGGR (paintinfo * p, int x, int y, int w); +static void paint_hline_bayer (paintinfo * p, int x, int y, int w); struct fourcc_list_struct fourcc_list[] = { /* packed */ @@ -393,11 +390,7 @@ struct fourcc_list_struct fourcc_list[] = { 15, 0x00007c00, 0x000003e0, 0x0000001f}, - /* Need to know if this is correct */ -#if 0 - {VTS_BAYER, "BAY8", "BayerRGGB", 8, paint_setup_bayer, paint_hline_bayer_GRBG} -#endif - {VTS_BAYER, "BA81", "BayerBGGR", 8, paint_setup_bayer, paint_hline_bayer_BGGR} + {VTS_BAYER, "BAY8", "Bayer", 8, paint_setup_bayer, paint_hline_bayer} }; int n_fourccs = G_N_ELEMENTS (fourcc_list); @@ -1474,17 +1467,16 @@ paint_setup_bayer (paintinfo * p, unsigned char *dest) p->endptr = p->dest + p->ystride * p->height; } -#if 0 static void -paint_hline_bayer_GRBG (paintinfo * p, int x, int y, int w) +paint_hline_bayer (paintinfo * p, int x, int y, int w) { int offset = y * p->ystride; uint8_t *dest = p->yp + offset; int i; - if ((y & 1) == 0) { + if (y & 1) { for (i = x; i < x + w; i++) { - if ((i & 1) == 0) { + if (i & 1) { dest[i] = p->color->G; } else { dest[i] = p->color->B; @@ -1492,7 +1484,7 @@ paint_hline_bayer_GRBG (paintinfo * p, int x, int y, int w) } } else { for (i = x; i < x + w; i++) { - if ((i & 1) == 0) { + if (i & 1) { dest[i] = p->color->R; } else { dest[i] = p->color->G; @@ -1500,30 +1492,3 @@ paint_hline_bayer_GRBG (paintinfo * p, int x, int y, int w) } } } -#endif - -static void -paint_hline_bayer_BGGR (paintinfo * p, int x, int y, int w) -{ - int offset = y * p->ystride; - uint8_t *dest = p->yp + offset; - int i; - - if ((y & 1) == 0) { - for (i = x; i < x + w; i++) { - if ((i & 1) == 0) { - dest[i] = p->color->B; - } else { - dest[i] = p->color->G; - } - } - } else { - for (i = x; i < x + w; i++) { - if ((i & 1) == 0) { - dest[i] = p->color->G; - } else { - dest[i] = p->color->R; - } - } - } -} -- 2.7.4