mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 03/11] introduce image_renderer framework
Date: Fri,  7 Sep 2012 15:10:17 +0200	[thread overview]
Message-ID: <1347023425-22462-3-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1347023425-22462-1-git-send-email-plagnioj@jcrosoft.com>

This will allow to support bmp and png

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 include/image_renderer.h |   62 +++++++++++++++++++++++++++++++++++++++
 lib/Kconfig              |    5 ++++
 lib/Makefile             |    1 +
 lib/image_renderer.c     |   73 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 141 insertions(+)
 create mode 100644 include/image_renderer.h
 create mode 100644 lib/image_renderer.c

diff --git a/include/image_renderer.h b/include/image_renderer.h
new file mode 100644
index 0000000..a93242c
--- /dev/null
+++ b/include/image_renderer.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * GPL v2
+ */
+
+#ifndef __IMAGE_RENDER_H__
+#define __IMAGE_RENDER_H__
+
+#include <filetype.h>
+#include <linux/list.h>
+#include <errno.h>
+
+struct image_renderer {
+	enum filetype type;
+	int (*renderer)(struct fb_info *info, void* data, int size, void* fb,
+		int startx, int starty, void* offscreenbuf);
+
+	struct list_head list;
+};
+
+static inline void set_pixel(struct fb_info *info, void *adr, int r, int g, int b)
+{
+	u32 px;
+
+	px = (r >> (8 - info->red.length)) << info->red.offset |
+		(g >> (8 - info->green.length)) << info->green.offset |
+		(b >> (8 - info->blue.length)) << info->blue.offset;
+
+	switch (info->bits_per_pixel) {
+	case 8:
+		break;
+	case 16:
+		*(u16 *)adr = px;
+		break;
+	case 32:
+		*(u32 *)adr = px;
+		break;
+	}
+}
+
+#ifdef CONFIG_IMAGE_RENDERER
+int image_renderer_register(struct image_renderer *ir);
+void image_render_unregister(struct image_renderer *ir);
+
+int image_renderer_file(struct fb_info *info, const char* bmpfile, void* fb,
+	    int startx, int starty, void* offscreenbuf);
+#else
+static inline int image_renderer_register(struct image_renderer *ir)
+{
+	return -EINVAL;
+}
+static inline void image_renderer_unregister(struct image_renderer *ir) {}
+
+static inline int image_renderer_file(struct fb_info *info, const char* file, void* fb,
+		    int startx, int starty, void* offscreenbuf)
+{
+	return -EINVAL;
+}
+#endif
+
+#endif /* __IMAGE_RENDERER_H__ */
diff --git a/lib/Kconfig b/lib/Kconfig
index 93e360b..be3ea1c 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -38,6 +38,11 @@ config BITREV
 config QSORT
 	bool
 
+config IMAGE_RENDERER
+	bool
+	depends on VIDEO
+	select FILETYPE
+
 config BMP
 	bool
 
diff --git a/lib/Makefile b/lib/Makefile
index df4b5e5..8fbae8a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -35,3 +35,4 @@ obj-$(CONFIG_BCH)	+= bch.o
 obj-$(CONFIG_BITREV)	+= bitrev.o
 obj-$(CONFIG_QSORT)	+= qsort.o
 obj-$(CONFIG_BMP)	+= bmp.o
+obj-$(CONFIG_IMAGE_RENDERER)	+= image_renderer.o
diff --git a/lib/image_renderer.c b/lib/image_renderer.c
new file mode 100644
index 0000000..e8d4ab5
--- /dev/null
+++ b/lib/image_renderer.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * GPL v2
+ */
+
+#include <common.h>
+#include <fb.h>
+#include <image_renderer.h>
+#include <errno.h>
+#include <fs.h>
+#include <malloc.h>
+
+static LIST_HEAD(image_renderers);
+
+static struct image_renderer *get_renderer(void* buf)
+{
+	struct image_renderer *ir;
+	enum filetype type = file_detect_type(buf);
+
+	list_for_each_entry(ir, &image_renderers, list) {
+		if (ir->type == type)
+			return ir;
+	}
+
+	return NULL;
+}
+
+int image_renderer_file(struct fb_info *info, const char* file, void* fb,
+			int startx, int starty, void* offscreenbuf)
+{
+	void *data;
+	int size;
+	struct image_renderer *ir;
+	int ret;
+
+	data = read_file(file, &size);
+	if (!data) {
+		printf("unable to read %s\n", file);
+		return -ENOMEM;
+	}
+
+	ir = get_renderer(data);
+	if (!ir) {
+		ret = -ENOENT;
+		goto out;
+	}
+
+	ret = ir->renderer(info, data, size, fb, startx, starty, offscreenbuf);
+
+out:
+	free(data);
+
+	return ret;
+}
+
+int image_renderer_register(struct image_renderer *ir)
+{
+	if (!ir || !ir->type || !ir->renderer)
+		return -EIO;
+
+	list_add_tail(&ir->list, &image_renderers);
+
+	return 0;
+}
+
+void image_renderer_unregister(struct image_renderer *ir)
+{
+	if (!ir)
+		return;
+
+	list_del(&ir->list);
+}
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2012-09-07 13:10 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-07 13:07 [PATCH 00/11 v2] add PNG support Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 13:10 ` [PATCH 01/11] bmp: rename it to splash Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 13:10   ` [PATCH 02/11] bmp: split bmp rending in lib/bmp.c Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 13:10   ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-09-07 13:10   ` [PATCH 04/11] filetype: add BMP support Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 13:10   ` [PATCH 05/11] splash/bmp: switch to image_renderer Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 13:10   ` [PATCH 06/11] splash: add support to set a background color Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 13:10   ` [PATCH 07/11] Introduce graphic utils Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 13:10   ` [PATCH 08/11] graphic_utils: add rgba support Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 13:10   ` [PATCH 09/11] filetype: add PNG support Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 13:10   ` [PATCH 10/11] " Jean-Christophe PLAGNIOL-VILLARD
2012-09-07 13:10   ` [PATCH 11/11] png: add picoPNG lib support Jean-Christophe PLAGNIOL-VILLARD
2012-09-08  3:47     ` Vikram Narayanan
2012-09-08 18:03 [PATCH 00/11 v3] add PNG support Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 18:05 ` [PATCH 01/11] bmp: rename it to splash Jean-Christophe PLAGNIOL-VILLARD
2012-09-08 18:05   ` [PATCH 03/11] introduce image_renderer framework Jean-Christophe PLAGNIOL-VILLARD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1347023425-22462-3-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox