From c0b63c111b86492f0571efeab5183ba1ff2be5ad Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 3 Oct 2010 20:41:31 +0000 Subject: WebP image support, needs libwebp (from trunk/libwebp) and libvpx. Only enabled for Amiga build currently, may have colour issues on little-endian CPUs svn path=/trunk/netsurf/; revision=10860 --- image/webp.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ image/webp.h | 47 ++++++++++++++++++++ 2 files changed, 184 insertions(+) create mode 100644 image/webp.c create mode 100644 image/webp.h (limited to 'image') diff --git a/image/webp.c b/image/webp.c new file mode 100644 index 000000000..7df6ccf35 --- /dev/null +++ b/image/webp.c @@ -0,0 +1,137 @@ + /* + * Copyright 2010 Chris Young + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file + * Content for image/webp (libwebp implementation). + * + */ + +#include "utils/config.h" +#ifdef WITH_WEBP + +#include +#include +#include +#include +#include "desktop/plotters.h" +#include "image/bitmap.h" +#include "content/content_protected.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" + +/** + * Convert a CONTENT_WEBP for display. + * + * No conversion is necessary. We merely read the WebP dimensions. + */ + +bool webp_convert(struct content *c) +{ + union content_msg_data msg_data; + const char *data; + unsigned long size; + uint8 *Y = NULL, *U = NULL, *V = NULL; + uint32 width = 0, height = 0; + char title[100]; + WebPResult res = webp_success; + + data = content__get_source_data(c, &size); + + res = WebPDecode(data, size, &Y, &U, &V, &width, &height); + if (res != webp_success) { + msg_data.error = messages_get("NoMemory"); + content_broadcast(c, CONTENT_MSG_ERROR, msg_data); + if(Y) free(Y); + return false; + } + + c->bitmap = bitmap_create(width, height, BITMAP_NEW | BITMAP_OPAQUE); + if (!c->bitmap) { + msg_data.error = messages_get("NoMemory"); + content_broadcast(c, CONTENT_MSG_ERROR, msg_data); + if(Y) free(Y); + return false; + } + unsigned char* imagebuf = bitmap_get_buffer(c->bitmap); + if (!imagebuf) { + msg_data.error = messages_get("NoMemory"); + content_broadcast(c, CONTENT_MSG_ERROR, msg_data); + if(Y) free(Y); + return false; + } + unsigned int row_width = bitmap_get_rowstride(c->bitmap) / 4; + + YUV420toRGBA(Y, U, V, row_width, width, height, imagebuf); + + if(Y) free(Y); + + /* I think we may need to reverse the byte order here, as it is fixed + * to RGBA on both big- and little-endian platforms. */ + + c->width = width; + c->height = height; + snprintf(title, sizeof(title), messages_get("WebPTitle"), + width, height, size); + content__set_title(c, title); + + bitmap_modified(c->bitmap); + c->status = CONTENT_STATUS_DONE; + + return true; +} + + +/** + * Destroy a CONTENT_WEBP and free all resources it owns. + */ + +void webp_destroy(struct content *c) +{ + if (c->bitmap != NULL) + bitmap_destroy(c->bitmap); +} + + +/** + * Redraw a CONTENT_WEBP. + */ + +bool webp_redraw(struct content *c, int x, int y, + int width, int height, + int clip_x0, int clip_y0, int clip_x1, int clip_y1, + float scale, colour background_colour) +{ + return plot.bitmap(x, y, width, height, + c->bitmap, background_colour, BITMAPF_NONE); +} + + +bool webp_clone(const struct content *old, struct content *new_content) +{ + /* Simply replay convert */ + if (old->status == CONTENT_STATUS_READY || + old->status == CONTENT_STATUS_DONE) { + if (webp_convert(new_content) == false) + return false; + } + + return true; +} + +#endif diff --git a/image/webp.h b/image/webp.h new file mode 100644 index 000000000..5ff38c900 --- /dev/null +++ b/image/webp.h @@ -0,0 +1,47 @@ +/* + * Copyright 2010 Chris Young + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file + * Content for image/webp (libwebp interface). + */ + +#ifndef _NETSURF_WEBP_H_ +#define _NETSURF_WEBP_H_ + +#include "utils/config.h" +#ifdef WITH_WEBP + +#include + +struct content; + +struct content_webp_data { +/* empty */ +}; + +bool webp_convert(struct content *c); +void webp_destroy(struct content *c); +bool webp_redraw(struct content *c, int x, int y, + int width, int height, + int clip_x0, int clip_y0, int clip_x1, int clip_y1, + float scale, colour background_colour); +bool webp_clone(const struct content *old, struct content *new_content); + +#endif /* WITH_WEBP */ + +#endif -- cgit v1.2.3