mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-11-22 14:31:20 +03:00
[project @ 2004-01-25 20:13:51 by jmb]
Add jpeglib 6b based rendering. Attempts to use the OS routines first as they're faster. svn path=/import/netsurf/; revision=503
This commit is contained in:
John Mark Bell
parent
f7bed875d4
commit
986b650983
@ -113,8 +113,8 @@ static const struct handler_entry handler_map[] = {
|
||||
css_reformat, css_destroy, 0, 0, 0, 0},
|
||||
#ifdef riscos
|
||||
#ifdef WITH_JPEG
|
||||
{jpeg_create, jpeg_process_data, jpeg_convert, jpeg_revive,
|
||||
jpeg_reformat, jpeg_destroy, jpeg_redraw, 0, 0, 0},
|
||||
{nsjpeg_create, nsjpeg_process_data, nsjpeg_convert, nsjpeg_revive,
|
||||
nsjpeg_reformat, nsjpeg_destroy, nsjpeg_redraw, 0, 0, 0},
|
||||
#endif
|
||||
#ifdef WITH_PNG
|
||||
{nspng_create, nspng_process_data, nspng_convert, nspng_revive,
|
||||
|
||||
@ -56,6 +56,9 @@ void netsurf_init(int argc, char** argv)
|
||||
fetch_init();
|
||||
cache_init();
|
||||
fetchcache_init();
|
||||
#ifdef WITH_JPEG
|
||||
nsjpeg_init();
|
||||
#endif
|
||||
#ifdef WITH_PNG
|
||||
nspng_init();
|
||||
#endif
|
||||
|
||||
2
makefile
2
makefile
@ -39,7 +39,7 @@ CFLAGS = -std=c9x -D_BSD_SOURCE -Driscos -DBOOL_DEFINED -O $(WARNFLAGS) -I.. \
|
||||
-mpoke-function-name
|
||||
CFLAGS_DEBUG = -std=c9x -D_BSD_SOURCE $(WARNFLAGS) -I.. -I/usr/include/libxml2 -g
|
||||
LDFLAGS = -L/riscos/lib -lxml2 -lz -lcurl -lssl -lcrypto -lares -lanim -lpng \
|
||||
-lifc -loslib -luri
|
||||
-lifc -loslib -luri -ljpeg
|
||||
LDFLAGS_DEBUG = -L/usr/lib -lxml2 -lz -lm -lcurl -lssl -lcrypto -ldl -luri
|
||||
|
||||
OBJDIR = $(shell $(CC) -dumpmachine)
|
||||
|
||||
275
riscos/jpeg.c
275
riscos/jpeg.c
@ -3,31 +3,118 @@
|
||||
* Licensed under the GNU General Public License,
|
||||
* http://www.opensource.org/licenses/gpl-license
|
||||
* Copyright 2003 James Bursa <bursa@users.sourceforge.net>
|
||||
*/
|
||||
|
||||
/**
|
||||
* This is just a temporary implementation using the JPEG renderer
|
||||
* available in some versions of RISC OS.
|
||||
* Copyright 2004 John M Bell <jmb202@ecs.soton.ac.uk>
|
||||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "libjpeg/jpeglib.h"
|
||||
#include "oslib/colourtrans.h"
|
||||
#include "oslib/jpeg.h"
|
||||
#include "oslib/osfile.h"
|
||||
#include "oslib/osspriteop.h"
|
||||
#include "netsurf/utils/config.h"
|
||||
#include "netsurf/content/content.h"
|
||||
#include "netsurf/desktop/gui.h"
|
||||
#include "netsurf/riscos/jpeg.h"
|
||||
#include "netsurf/utils/log.h"
|
||||
#include "netsurf/utils/utils.h"
|
||||
#include "oslib/jpeg.h"
|
||||
|
||||
/**
|
||||
* TODO -
|
||||
* screen mode image result
|
||||
* any 8bpp or less (palette) 8bpp sprite
|
||||
* 8bpp or less 16 or 24bpp dither to 8bpp
|
||||
* 16 or 24bpp 16 or 24bpp sprite of same depth
|
||||
*/
|
||||
|
||||
#ifdef WITH_JPEG
|
||||
void jpeg_create(struct content *c, const char *params[])
|
||||
/**
|
||||
* Input source initalisation routine
|
||||
* Does nothing.
|
||||
*/
|
||||
static void init_source(j_decompress_ptr cinfo) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Routine to fill the input buffer.
|
||||
* Filling buffer is not possible => return false.
|
||||
*/
|
||||
static boolean fill_input_buffer(j_decompress_ptr cinfo) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void skip_input_data(j_decompress_ptr cinfo, long num_bytes) {
|
||||
if ((int)num_bytes > (int)cinfo->src->bytes_in_buffer) {
|
||||
cinfo->src->next_input_byte = NULL;
|
||||
cinfo->src->bytes_in_buffer = 0;
|
||||
} else {
|
||||
cinfo->src->next_input_byte += (int) num_bytes;
|
||||
cinfo->src->bytes_in_buffer -= (int) num_bytes;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Input source termination routine
|
||||
* Does nothing
|
||||
*/
|
||||
static void term_source(j_decompress_ptr cinfo) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Input source manager.
|
||||
* Sets up jpeglib appropriately
|
||||
*/
|
||||
static void jpeg_memory_src(j_decompress_ptr cinfo, char *ptr, unsigned long length) {
|
||||
|
||||
struct jpeg_source_mgr *src;
|
||||
src = cinfo->src = (struct jpeg_source_mgr *)
|
||||
(*cinfo->mem->alloc_small) ((j_common_ptr)cinfo,
|
||||
JPOOL_IMAGE,
|
||||
sizeof(*src));
|
||||
src->init_source = init_source;
|
||||
src->fill_input_buffer = fill_input_buffer;
|
||||
src->skip_input_data = skip_input_data;
|
||||
src->resync_to_restart = jpeg_resync_to_restart;
|
||||
src->term_source = term_source;
|
||||
src->next_input_byte = ptr;
|
||||
src->bytes_in_buffer = length;
|
||||
}
|
||||
|
||||
/** maps colours to 256 mode colour numbers */
|
||||
static os_colour_number colour_table[4096];
|
||||
|
||||
/**
|
||||
* Initialises the jpeg loader.
|
||||
* Currently creates the 8bpp lookup table
|
||||
*/
|
||||
void nsjpeg_init(void) {
|
||||
|
||||
unsigned int red, green, blue;
|
||||
/* generate colour lookup table for reducing to 8bpp */
|
||||
for (red = 0; red != 0x10; red++)
|
||||
for (green = 0; green != 0x10; green++)
|
||||
for (blue = 0; blue != 0x10; blue++)
|
||||
colour_table[red << 8 | green << 4 | blue] =
|
||||
colourtrans_return_colour_number_for_mode(
|
||||
blue << 28 | blue << 24 |
|
||||
green << 20 | green << 16 |
|
||||
red << 12 | red << 8,
|
||||
(os_mode)21, 0);
|
||||
}
|
||||
|
||||
void nsjpeg_create(struct content *c, const char *params[])
|
||||
{
|
||||
c->data.jpeg.sprite_area = 0;
|
||||
c->data.jpeg.data = xcalloc(0, 1);
|
||||
c->data.jpeg.length = 0;
|
||||
c->data.jpeg.use_module = true; /* assume the OS can cope */
|
||||
}
|
||||
|
||||
|
||||
void jpeg_process_data(struct content *c, char *data, unsigned long size)
|
||||
void nsjpeg_process_data(struct content *c, char *data, unsigned long size)
|
||||
{
|
||||
c->data.jpeg.data = xrealloc(c->data.jpeg.data, c->data.jpeg.length + size);
|
||||
memcpy((char*)(c->data.jpeg.data) + c->data.jpeg.length, data, size);
|
||||
@ -36,54 +123,180 @@ void jpeg_process_data(struct content *c, char *data, unsigned long size)
|
||||
}
|
||||
|
||||
|
||||
int jpeg_convert(struct content *c, unsigned int width, unsigned int height)
|
||||
|
||||
int nsjpeg_convert(struct content *c, unsigned int width, unsigned int height)
|
||||
{
|
||||
os_error *error;
|
||||
int w, h;
|
||||
error = xjpeginfo_dimensions((jpeg_image const*)c->data.jpeg.data,
|
||||
struct jpeg_decompress_struct cinfo;
|
||||
struct jpeg_error_mgr jerr;
|
||||
unsigned int line_size;
|
||||
unsigned char *dstcur;
|
||||
|
||||
/* Try to use OS routines */
|
||||
{
|
||||
os_error *e;
|
||||
int w,h;
|
||||
e = xjpeginfo_dimensions((jpeg_image const*)c->data.jpeg.data,
|
||||
(int) c->data.jpeg.length,
|
||||
0, &w, &h, 0, 0, 0);
|
||||
if (error != 0)
|
||||
return 1;
|
||||
c->width = w;
|
||||
c->height = h;
|
||||
c->title = xcalloc(100, 1);
|
||||
sprintf(c->title, "JPEG image (%ux%u, %lu bytes)", w, h, c->data.jpeg.length);
|
||||
c->status = CONTENT_STATUS_DONE;
|
||||
return 0;
|
||||
|
||||
if (!e) {
|
||||
LOG(("Using inbuilt OS routines"));
|
||||
c->width = w;
|
||||
c->height = h;
|
||||
c->title = xcalloc(100, 1);
|
||||
sprintf(c->title, "JPEG image (%ux%u, %lu bytes)", w, h, c->data.jpeg.length);
|
||||
c->status = CONTENT_STATUS_DONE;
|
||||
return 0;
|
||||
}
|
||||
/* failed, for whatever reason -> use jpeglib */
|
||||
c->data.jpeg.use_module = false;
|
||||
}
|
||||
|
||||
LOG(("beginning conversion"));
|
||||
/* TODO - provide our own error handling.
|
||||
jpeglib calls exit() on fatal error, which is a bit moose */
|
||||
cinfo.err = jpeg_std_error(&jerr);
|
||||
jpeg_create_decompress(&cinfo);
|
||||
jpeg_memory_src(&cinfo, c->data.jpeg.data, c->data.jpeg.length);
|
||||
jpeg_read_header(&cinfo, TRUE);
|
||||
jpeg_start_decompress(&cinfo);
|
||||
|
||||
c->width = cinfo.output_width;
|
||||
c->height = cinfo.output_height;
|
||||
line_size = cinfo.output_width*cinfo.output_components;
|
||||
|
||||
LOG(("creating sprite area"));
|
||||
{
|
||||
unsigned int abw = ((c->width + 3) &~ 3u) * c->height; /* sprite */
|
||||
/* nBytes = spr + msk + spr ctrl blk + area ctrl blk + palette */
|
||||
unsigned int nBytes = abw*2 + 44 + 16 /*+ 256*8*/; /* 8bpp */
|
||||
c->data.jpeg.sprite_area = xcalloc(1, nBytes);
|
||||
struct osspriteop_header *spr = (osspriteop_header*)
|
||||
(c->data.jpeg.sprite_area + 1);
|
||||
|
||||
/* area control block */
|
||||
c->data.jpeg.sprite_area->size = nBytes;
|
||||
c->data.jpeg.sprite_area->sprite_count = 1;
|
||||
c->data.jpeg.sprite_area->first = sizeof(*c->data.jpeg.sprite_area);
|
||||
c->data.jpeg.sprite_area->used = nBytes;
|
||||
|
||||
/* sprite control block */
|
||||
spr->size = nBytes-sizeof(*c->data.jpeg.sprite_area);
|
||||
strncpy(spr->name, "jpeg", 12);
|
||||
spr->width = ((c->width+3)>>2)-1; /* in words-1 */
|
||||
spr->height = c->height-1; /* in scanlines-1 */
|
||||
spr->left_bit = 0;
|
||||
spr->right_bit = ((c->width & 3) * 8 - 1) & 31;
|
||||
spr->image = sizeof(*spr) /*+ 256*8*/;
|
||||
spr->mask = sizeof(*spr) /*+ 256*8*/ /*+ abw*/;
|
||||
spr->mode = os_MODE8BPP90X90; /* 28 */
|
||||
/* TODO - create palette entries */
|
||||
|
||||
c->data.jpeg.sprite_image = ((char*)spr) + spr->image;
|
||||
|
||||
LOG(("done"));
|
||||
}
|
||||
|
||||
LOG(("processing image: %ldx%ld,%d", c->width, c->height, cinfo.actual_number_of_colors));
|
||||
|
||||
{
|
||||
JSAMPARRAY buf = (*cinfo.mem->alloc_sarray)
|
||||
((j_common_ptr)&cinfo, JPOOL_IMAGE, line_size, 1);
|
||||
unsigned int col;
|
||||
JSAMPROW row;
|
||||
|
||||
gui_multitask(); /* this takes some time so poll the wimp */
|
||||
while (cinfo.output_scanline < cinfo.output_height) {
|
||||
|
||||
jpeg_read_scanlines(&cinfo, buf, 1);
|
||||
|
||||
row = buf[0];
|
||||
dstcur = c->data.jpeg.sprite_image +
|
||||
cinfo.output_scanline * ((c->width +3) & ~3u);
|
||||
for (col = 0; col != cinfo.output_width; col++) {
|
||||
dstcur[col] = colour_table[((GETJSAMPLE(row[0])>>4)<<8) /* R */
|
||||
| ((GETJSAMPLE(row[1])>>4)<<4) /* G */
|
||||
| (GETJSAMPLE(row[2])>>4)]; /* B */
|
||||
row += 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
jpeg_finish_decompress(&cinfo);
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
LOG(("image decompressed"));
|
||||
|
||||
/*{
|
||||
os_error *e;
|
||||
e = xosspriteop_save_sprite_file(osspriteop_USER_AREA,
|
||||
c->data.jpeg.sprite_area, "jpeg");
|
||||
}*/
|
||||
|
||||
c->status = CONTENT_STATUS_DONE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
void jpeg_revive(struct content *c, unsigned int width, unsigned int height)
|
||||
void nsjpeg_revive(struct content *c, unsigned int width, unsigned int height)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
void jpeg_reformat(struct content *c, unsigned int width, unsigned int height)
|
||||
void nsjpeg_reformat(struct content *c, unsigned int width, unsigned int height)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
void jpeg_destroy(struct content *c)
|
||||
void nsjpeg_destroy(struct content *c)
|
||||
{
|
||||
xfree(c->data.jpeg.sprite_area);
|
||||
xfree(c->data.jpeg.data);
|
||||
xfree(c->title);
|
||||
}
|
||||
|
||||
|
||||
void jpeg_redraw(struct content *c, long x, long y,
|
||||
void nsjpeg_redraw(struct content *c, long x, long y,
|
||||
unsigned long width, unsigned long height,
|
||||
long clip_x0, long clip_y0, long clip_x1, long clip_y1)
|
||||
{
|
||||
os_factors factors;
|
||||
factors.xmul = width;
|
||||
factors.ymul = height;
|
||||
factors.xdiv = c->width * 2;
|
||||
factors.ydiv = c->height * 2;
|
||||
unsigned int size;
|
||||
osspriteop_trans_tab *table;
|
||||
os_factors factors;
|
||||
|
||||
xjpeg_plot_scaled((jpeg_image *) c->data.jpeg.data,
|
||||
factors.xmul = width;
|
||||
factors.ymul = height;
|
||||
factors.xdiv = c->width * 2;
|
||||
factors.ydiv = c->height * 2;
|
||||
|
||||
if (c->data.jpeg.use_module) { /* we can use the OS for this one */
|
||||
xjpeg_plot_scaled((jpeg_image *) c->data.jpeg.data,
|
||||
x, (int)(y - height),
|
||||
&factors, (int) c->data.jpeg.length,
|
||||
jpeg_SCALE_DITHERED);
|
||||
return;
|
||||
}
|
||||
|
||||
xcolourtrans_generate_table_for_sprite(c->data.jpeg.sprite_area,
|
||||
(osspriteop_id) (c->data.jpeg.sprite_area + 1),
|
||||
colourtrans_CURRENT_MODE, colourtrans_CURRENT_PALETTE,
|
||||
0, colourtrans_GIVEN_SPRITE, 0, 0, &size);
|
||||
|
||||
table = xcalloc(size, 1);
|
||||
|
||||
xcolourtrans_generate_table_for_sprite(c->data.jpeg.sprite_area,
|
||||
(osspriteop_id) (c->data.jpeg.sprite_area + 1),
|
||||
colourtrans_CURRENT_MODE, colourtrans_CURRENT_PALETTE,
|
||||
table, colourtrans_GIVEN_SPRITE, 0, 0, 0);
|
||||
|
||||
xosspriteop_put_sprite_scaled(osspriteop_PTR,
|
||||
c->data.jpeg.sprite_area,
|
||||
(osspriteop_id) (c->data.jpeg.sprite_area + 1),
|
||||
x, (int)(y - height),
|
||||
/* osspriteop_USE_PALETTE is RO 3.5+ only.
|
||||
* behaviour on RO < 3.5 is unknown...
|
||||
*/
|
||||
(osspriteop_action)(osspriteop_USE_MASK |
|
||||
osspriteop_USE_PALETTE),
|
||||
&factors, table);
|
||||
|
||||
xfree(table);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -8,20 +8,27 @@
|
||||
#ifndef _NETSURF_RISCOS_JPEG_H_
|
||||
#define _NETSURF_RISCOS_JPEG_H_
|
||||
|
||||
#include <stdbool.h>
|
||||
#include "oslib/osspriteop.h"
|
||||
|
||||
struct content;
|
||||
|
||||
struct content_jpeg_data {
|
||||
void *data;
|
||||
unsigned long length;
|
||||
osspriteop_area *sprite_area;
|
||||
char *sprite_image;
|
||||
bool use_module;
|
||||
};
|
||||
|
||||
void jpeg_create(struct content *c, const char *params[]);
|
||||
void jpeg_process_data(struct content *c, char *data, unsigned long size);
|
||||
int jpeg_convert(struct content *c, unsigned int width, unsigned int height);
|
||||
void jpeg_revive(struct content *c, unsigned int width, unsigned int height);
|
||||
void jpeg_reformat(struct content *c, unsigned int width, unsigned int height);
|
||||
void jpeg_destroy(struct content *c);
|
||||
void jpeg_redraw(struct content *c, long x, long y,
|
||||
void nsjpeg_init(void);
|
||||
void nsjpeg_create(struct content *c, const char *params[]);
|
||||
void nsjpeg_process_data(struct content *c, char *data, unsigned long size);
|
||||
int nsjpeg_convert(struct content *c, unsigned int width, unsigned int height);
|
||||
void nsjpeg_revive(struct content *c, unsigned int width, unsigned int height);
|
||||
void nsjpeg_reformat(struct content *c, unsigned int width, unsigned int height);
|
||||
void nsjpeg_destroy(struct content *c);
|
||||
void nsjpeg_redraw(struct content *c, long x, long y,
|
||||
unsigned long width, unsigned long height,
|
||||
long clip_x0, long clip_y0, long clip_x1, long clip_y1);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user