From 91e3458253a3c508f0121ce94e94ac67ae2a0294 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 14 Oct 2008 12:46:59 -0300 Subject: [PATCH] --- yaml --- r: 115631 b: refs/heads/master c: 74d7c5af78234467fed522c0f0ff47ef765cecb8 h: refs/heads/master i: 115629: 101e9fbce7183d6964969c20c8885bea99b6aaa8 115627: 4856782b9fd9cacfc7667080ccbff19bb53005c8 115623: 5b0a356b85cf721cf0c2dac66cfb85f1e6c56d44 115615: 4dce3589498656e68ec94945e0b44d06cd7a94a3 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vivi.c | 117 +++++++++++++++---------------- 2 files changed, 59 insertions(+), 60 deletions(-) diff --git a/[refs] b/[refs] index 1ad26a92f809..4d7cb5c00901 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d54c17e43514ecf0dceffbe13a324d4b6df5b6e0 +refs/heads/master: 74d7c5af78234467fed522c0f0ff47ef765cecb8 diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c index 65c8af18e767..0d1ad7f63d09 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/drivers/media/video/vivi.c @@ -190,6 +190,7 @@ struct vivi_fh { struct videobuf_queue vb_vidq; enum v4l2_buf_type type; + unsigned char bars[8][3]; }; /* ------------------------------------------------------------------ @@ -234,13 +235,41 @@ static u8 bars[8][3] = { #define TSTAMP_MAX_Y TSTAMP_MIN_Y+15 #define TSTAMP_MIN_X 64 -static void gen_line(char *basep, int inipos, int wmax, +static void gen_twopix(struct vivi_fh *fh, unsigned char *buf, int colorpos) +{ + unsigned char r_y, g_u, b_v; + unsigned char *p; + int color; + + r_y = fh->bars[colorpos][0]; /* R or precalculated Y */ + g_u = fh->bars[colorpos][1]; /* G or precalculated U */ + b_v = fh->bars[colorpos][2]; /* B or precalculated V */ + + for (color = 0; color < 4; color++) { + p = buf + color; + + switch (color) { + case 0: + case 2: + *p = r_y; + break; + case 1: + *p = g_u; + break; + case 3: + *p = b_v; + break; + } + } +} + +static void gen_line(struct vivi_fh *fh, char *basep, int inipos, int wmax, int hmax, int line, int count, char *timestr) { - int w, i, j, y; + int w, i, j; int pos = inipos; - char *p, *s; - u8 chr, r, g, b, color; + char *s; + u8 chr; /* We will just duplicate the second pixel at the packet */ wmax /= 2; @@ -248,27 +277,9 @@ static void gen_line(char *basep, int inipos, int wmax, /* Generate a standard color bar pattern */ for (w = 0; w < wmax; w++) { int colorpos = ((w + count) * 8/(wmax + 1)) % 8; - r = bars[colorpos][0]; - g = bars[colorpos][1]; - b = bars[colorpos][2]; - - for (color = 0; color < 4; color++) { - p = basep + pos; - - switch (color) { - case 0: - case 2: - *p = TO_Y(r, g, b); /* Luma */ - break; - case 1: - *p = TO_U(r, g, b); /* Cb */ - break; - case 3: - *p = TO_V(r, g, b); /* Cr */ - break; - } - pos++; - } + + gen_twopix(fh, basep + pos, colorpos); + pos += 4; /* only 16 bpp supported for now */ } /* Checks if it is possible to show timestamp */ @@ -283,38 +294,12 @@ static void gen_line(char *basep, int inipos, int wmax, for (s = timestr; *s; s++) { chr = rom8x16_bits[(*s-0x30)*16+line-TSTAMP_MIN_Y]; for (i = 0; i < 7; i++) { - if (chr & 1 << (7 - i)) { - /* Font color*/ - r = 0; - g = 198; - b = 0; - } else { - /* Background color */ - r = bars[BLACK][0]; - g = bars[BLACK][1]; - b = bars[BLACK][2]; - } - pos = inipos + j * 2; - for (color = 0; color < 4; color++) { - p = basep + pos; - - y = TO_Y(r, g, b); - - switch (color) { - case 0: - case 2: - *p = TO_Y(r, g, b); /* Luma */ - break; - case 1: - *p = TO_U(r, g, b); /* Cb */ - break; - case 3: - *p = TO_V(r, g, b); /* Cr */ - break; - } - pos++; - } + /* Draw white font on black background */ + if (chr & 1 << (7 - i)) + gen_twopix(fh, basep + pos, WHITE); + else + gen_twopix(fh, basep + pos, BLACK); j++; } } @@ -324,8 +309,9 @@ static void gen_line(char *basep, int inipos, int wmax, return; } -static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf) +static void vivi_fillbuff(struct vivi_fh *fh, struct vivi_buffer *buf) { + struct vivi_dev *dev = fh->dev; int h , pos = 0; int hmax = buf->vb.height; int wmax = buf->vb.width; @@ -341,7 +327,7 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf) return; for (h = 0; h < hmax; h++) { - gen_line(tmpbuf, 0, wmax, hmax, h, dev->mv_count, + gen_line(fh, tmpbuf, 0, wmax, hmax, h, dev->mv_count, dev->timestr); memcpy(vbuf + pos, tmpbuf, wmax * 2); pos += wmax*2; @@ -410,7 +396,7 @@ static void vivi_thread_tick(struct vivi_fh *fh) do_gettimeofday(&buf->vb.ts); /* Fill buffer */ - vivi_fillbuff(dev, buf); + vivi_fillbuff(fh, buf); dprintk(dev, 1, "filled buffer %p\n", buf); wake_up(&buf->vb.done); @@ -714,6 +700,8 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, { struct vivi_fh *fh = priv; struct videobuf_queue *q = &fh->vb_vidq; + unsigned char r, g, b; + int k; int ret = vidioc_try_fmt_vid_cap(file, fh, f); if (ret < 0) @@ -733,6 +721,17 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, fh->vb_vidq.field = f->fmt.pix.field; fh->type = f->type; + /* precalculate color bar values to speed up rendering */ + for (k = 0; k < 8; k++) { + r = bars[k][0]; + g = bars[k][1]; + b = bars[k][2]; + + fh->bars[k][0] = TO_Y(r, g, b); /* Luma */ + fh->bars[k][1] = TO_U(r, g, b); /* Cb */ + fh->bars[k][2] = TO_V(r, g, b); /* Cr */ + } + ret = 0; out: mutex_unlock(&q->vb_lock);