From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from 13.mo3.mail-out.ovh.net ([188.165.33.202] helo=mo3.mail-out.ovh.net) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9yK0-0002dB-Ee for barebox@lists.infradead.org; Fri, 07 Sep 2012 13:10:10 +0000 Received: from mail91.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo3.mail-out.ovh.net (Postfix) with SMTP id F35F5FF923F for ; Fri, 7 Sep 2012 15:17:47 +0200 (CEST) From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 7 Sep 2012 15:10:17 +0200 Message-Id: <1347023425-22462-3-git-send-email-plagnioj@jcrosoft.com> In-Reply-To: <1347023425-22462-1-git-send-email-plagnioj@jcrosoft.com> References: <20120907130700.GS20330@game.jcrosoft.org> <1347023425-22462-1-git-send-email-plagnioj@jcrosoft.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 03/11] introduce image_renderer framework To: barebox@lists.infradead.org This will allow to support bmp and png Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- 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 + * + * GPL v2 + */ + +#ifndef __IMAGE_RENDER_H__ +#define __IMAGE_RENDER_H__ + +#include +#include +#include + +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 + * + * GPL v2 + */ + +#include +#include +#include +#include +#include +#include + +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