Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add core JPEG reader, adapted from the JPEG plugin's decoder, with some changes to prevent include conflicts between the two decoders.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20836 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andrew Mahone 2009-05-01 23:24:23 +00:00
parent b22516f995
commit 60d4209383
9 changed files with 2262 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/SOURCES
View file

@ -89,6 +89,7 @@ gui/viewport.c
#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
gui/backdrop.c
recorder/resize.c
recorder/jpeg_load.c
#endif
#ifdef HAVE_LCD_CHARCELLS

3
apps/plugin.c
View file

@ -643,6 +643,9 @@ static const struct plugin_api rockbox_api = {
lcd_pal256_update_pal,
#endif
#endif
#if defined(HAVE_LCD_BITMAP) && LCD_DEPTH > 1
read_jpeg_file,
#endif
};
int plugin_load(const char* plugin, const void* parameter)

10
apps/plugin.h
View file

@ -79,6 +79,9 @@ void* plugin_get_buffer(size_t *buffer_size);
#ifdef HAVE_LCD_BITMAP
#include "screendump.h"
#include "scrollbar.h"
#if LCD_DEPTH > 1
#include "jpeg_load.h"
#endif
#include "../recorder/bmp.h"
#endif
#include "statusbar.h"
@ -128,7 +131,7 @@ void* plugin_get_buffer(size_t *buffer_size);
#define PLUGIN_MAGIC 0x526F634B /* RocK */
/* increase this every time the api struct changes */
#define PLUGIN_API_VERSION 147
#define PLUGIN_API_VERSION 148
/* update this to latest version if a change to the api struct breaks
backwards compatibility (and please take the opportunity to sort in any
@ -802,6 +805,11 @@ struct plugin_api {
void (*lcd_pal256_update_pal)(fb_data *palette);
#endif
#endif
#if defined(HAVE_LCD_BITMAP) && LCD_DEPTH > 1
int (*read_jpeg_file)(const char* filename, struct bitmap *bm, int maxsize,
int format, const struct custom_format *cformat);
#endif
};
/* plugin header */

68
apps/plugins/jpeg/jpeg_decoder.h
View file

@ -27,62 +27,7 @@
#ifndef _JPEG_JPEG_DECODER_H
#define _JPEG_JPEG_DECODER_H
#define HUFF_LOOKAHEAD 8 /* # of bits of lookahead */
struct derived_tbl
{
/* Basic tables: (element [0] of each array is unused) */
long mincode[17]; /* smallest code of length k */
long maxcode[18]; /* largest code of length k (-1 if none) */
/* (maxcode[17] is a sentinel to ensure huff_DECODE terminates) */
int valptr[17]; /* huffval[] index of 1st symbol of length k */
/* Back link to public Huffman table (needed only in slow_DECODE) */
int* pub;
/* Lookahead tables: indexed by the next HUFF_LOOKAHEAD bits of
the input data stream. If the next Huffman code is no more
than HUFF_LOOKAHEAD bits long, we can obtain its length and
the corresponding symbol directly from these tables. */
int look_nbits[1<<HUFF_LOOKAHEAD]; /* # bits, or 0 if too long */
unsigned char look_sym[1<<HUFF_LOOKAHEAD]; /* symbol, or unused */
};
#define QUANT_TABLE_LENGTH 64
/* for type of Huffman table */
#define DC_LEN 28
#define AC_LEN 178
struct huffman_table
{ /* length and code according to JFIF format */
int huffmancodes_dc[DC_LEN];
int huffmancodes_ac[AC_LEN];
};
struct frame_component
{
int ID;
int horizontal_sampling;
int vertical_sampling;
int quanttable_select;
};
struct scan_component
{
int ID;
int DC_select;
int AC_select;
};
struct bitstream
{
unsigned long get_buffer; /* current bit-extraction buffer */
int bits_left; /* # of unused bits in it */
unsigned char* next_input_byte;
unsigned char* input_end; /* upper limit +1 */
};
#include "jpeg_common.h"
struct jpeg
{
@ -113,17 +58,6 @@ struct jpeg
int subsample_y[3];
};
/* possible return flags for process_markers() */
#define HUFFTAB 0x0001 /* with huffman table */
#define QUANTTAB 0x0002 /* with quantization table */
#define APP0_JFIF 0x0004 /* with APP0 segment following JFIF standard */
#define FILL_FF 0x0008 /* with 0xFF padding bytes at begin/end */
#define SOF0 0x0010 /* with SOF0-Segment */
#define DHT 0x0020 /* with Definition of huffman tables */
#define SOS 0x0040 /* with Start-of-Scan segment */
#define DQT 0x0080 /* with definition of quantization table */
/* various helper functions */
void default_huff_tbl(struct jpeg* p_jpeg);
void build_lut(struct jpeg* p_jpeg);

89
apps/plugins/test_core_jpeg.c Normal file
View file

@ -0,0 +1,89 @@
/*****************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// __ \_/ ___\| |/ /| __ \ / __ \ \/ /
* Jukebox | | ( (__) ) \___| ( | \_\ ( (__) ) (
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2008 Andrew Mahone
*
* This program 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; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include "plugin.h"
#include "lib/grey.h"
PLUGIN_HEADER
/* different graphics libraries */
#if LCD_DEPTH < 8
#define USEGSLIB
GREY_INFO_STRUCT
#define MYLCD(fn) grey_ub_ ## fn
#define MYLCD_UPDATE()
#define MYXLCD(fn) grey_ub_ ## fn
#define CFORMAT &format_grey
#else
#define MYLCD(fn) rb->lcd_ ## fn
#define MYLCD_UPDATE() rb->lcd_update();
#define MYXLCD(fn) xlcd_ ## fn
#define CFORMAT NULL
#endif
/* this is the plugin entry point */
enum plugin_status plugin_start(const void* parameter)
{
size_t plugin_buf_len;
unsigned char * plugin_buf =
(unsigned char *)rb->plugin_get_buffer(&plugin_buf_len);
static char filename[MAX_PATH];
struct bitmap bm = {
.width = LCD_WIDTH,
.height = LCD_HEIGHT,
};
int ret;
if(!parameter) return PLUGIN_ERROR;
rb->strcpy(filename, parameter);
#ifdef USEGSLIB
long greysize;
if (!grey_init(plugin_buf, plugin_buf_len, GREY_ON_COP,
LCD_WIDTH, LCD_HEIGHT, &greysize))
{
rb->splash(HZ, "grey buf error");
return PLUGIN_ERROR;
}
plugin_buf += greysize;
plugin_buf_len -= greysize;
#endif
bm.data = plugin_buf;
ret = rb->read_jpeg_file(filename, &bm, plugin_buf_len,
FORMAT_NATIVE|FORMAT_RESIZE|FORMAT_KEEP_ASPECT,
CFORMAT);
if (ret < 1)
return PLUGIN_ERROR;
#ifdef USEGSLIB
grey_show(true);
grey_ub_gray_bitmap((fb_data *)bm.data, (LCD_WIDTH - bm.width) >> 1,
(LCD_HEIGHT - bm.height) >> 1, bm.width, bm.height);
#else
rb->lcd_bitmap((fb_data *)bm.data, (LCD_WIDTH - bm.width) >> 1,
(LCD_HEIGHT - bm.height) >> 1, bm.width, bm.height);
#endif
MYLCD_UPDATE();
while (rb->get_action(CONTEXT_STD,1) != ACTION_STD_OK) rb->yield();
#ifdef USEGSLIB
grey_release();
#endif
return PLUGIN_OK;
}

3
apps/plugins/viewers.config
View file

@ -27,6 +27,9 @@ wav,viewers/wavplay,9
wav,viewers/wavview,10
wav,viewers/test_codec,-
bmp,viewers/test_greylib_bitmap_scale,-
jpeg,viewers/test_core_jpeg,-
jpe,viewers/test_core_jpeg,-
jpg,viewers/test_core_jpeg,-
bmp,apps/rockpaint,11
bmp,games/sliding_puzzle,11
mpg,viewers/mpegplayer,4

97
apps/recorder/jpeg_common.h Normal file
View file

@ -0,0 +1,97 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* JPEG image viewer
* Common structs and defines for plugin and core JPEG decoders
*
* File scrolling addition (C) 2005 Alexander Spyridakis
* Copyright (C) 2004 Jörg Hohensohn aka [IDC]Dragon
* Heavily borrowed from the IJG implementation (C) Thomas G. Lane
* Small & fast downscaling IDCT (C) 2002 by Guido Vollbeding JPEGclub.org
*
* This program 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; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#ifndef _JPEG_COMMON_H
#define _JPEG_COMMON_H
#define HUFF_LOOKAHEAD 8 /* # of bits of lookahead */
#define JPEG_READ_BUF_SIZE 16
struct derived_tbl
{
/* Basic tables: (element [0] of each array is unused) */
long mincode[17]; /* smallest code of length k */
long maxcode[18]; /* largest code of length k (-1 if none) */
/* (maxcode[17] is a sentinel to ensure huff_DECODE terminates) */
int valptr[17]; /* huffval[] index of 1st symbol of length k */
/* Back link to public Huffman table (needed only in slow_DECODE) */
int* pub;
/* Lookahead tables: indexed by the next HUFF_LOOKAHEAD bits of
the input data stream. If the next Huffman code is no more
than HUFF_LOOKAHEAD bits long, we can obtain its length and
the corresponding symbol directly from these tables. */
int look_nbits[1<<HUFF_LOOKAHEAD]; /* # bits, or 0 if too long */
unsigned char look_sym[1<<HUFF_LOOKAHEAD]; /* symbol, or unused */
};
#define QUANT_TABLE_LENGTH 64
/* for type of Huffman table */
#define DC_LEN 28
#define AC_LEN 178
struct huffman_table
{ /* length and code according to JFIF format */
int huffmancodes_dc[DC_LEN];
int huffmancodes_ac[AC_LEN];
};
struct frame_component
{
int ID;
int horizontal_sampling;
int vertical_sampling;
int quanttable_select;
};
struct scan_component
{
int ID;
int DC_select;
int AC_select;
};
struct bitstream
{
unsigned long get_buffer; /* current bit-extraction buffer */
int bits_left; /* # of unused bits in it */
unsigned char* next_input_byte;
unsigned char* input_end; /* upper limit +1 */
};
/* possible return flags for process_markers() */
#define HUFFTAB 0x0001 /* with huffman table */
#define QUANTTAB 0x0002 /* with quantization table */
#define APP0_JFIF 0x0004 /* with APP0 segment following JFIF standard */
#define FILL_FF 0x0008 /* with 0xFF padding bytes at begin/end */
#define SOF0 0x0010 /* with SOF0-Segment */
#define DHT 0x0020 /* with Definition of huffman tables */
#define SOS 0x0040 /* with Start-of-Scan segment */
#define DQT 0x0080 /* with definition of quantization table */
#endif /* _JPEG_COMMON_H */

2012
apps/recorder/jpeg_load.c Normal file
View file

File diff suppressed because it is too large Load diff

47
apps/recorder/jpeg_load.h Normal file
View file

@ -0,0 +1,47 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* JPEG image viewer
* (This is a real mess if it has to be coded in one single C file)
*
* File scrolling addition (C) 2005 Alexander Spyridakis
* Copyright (C) 2004 Jörg Hohensohn aka [IDC]Dragon
* Heavily borrowed from the IJG implementation (C) Thomas G. Lane
* Small & fast downscaling IDCT (C) 2002 by Guido Vollbeding JPEGclub.org
*
* This program 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; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include "resize.h"
#include "bmp.h"
#include "jpeg_common.h"
#ifndef _JPEG_LOAD_H
#define _JPEG_LOAD_H
int read_jpeg_file(const char* filename,
struct bitmap *bm,
int maxsize,
int format,
const struct custom_format *cformat);
int read_jpeg_fd(int fd,
struct bitmap *bm,
int maxsize,
int format,
const struct custom_format *cformat);
#endif /* _JPEG_JPEG_DECODER_H */