len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-18 09:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

imageviewer: Initial support for JPEG progressive images. Add decoder

Browse source 
Added jpeg decoder jpegp.c using RAINBOW lib. Currently enabled only for pictures not supported by old decoder (as old decoder more optimized for low mem targets)

Someone TODO:
 * Old decoder has optimized downscale logic which new decoder doesn't have (it gives big difference in required memory and time for decoding). This logic should be ported/adapted if possible.

 * Add smooth downscaling.

 * Grayscale support

Change-Id: Ie96bc62848b51cc6a3942f8e069ec6ab02dc1c56
This commit is contained in:
Roman Artiukhin 2024-10-09 19:39:15 +03:00 • committed by Solomon Peachy
parent 64ad7354b6
commit b8238f7b20
19 changed files with 599 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/plugins/imageviewer/jpegp/jpeg81.c
View file

@ -40,12 +40,12 @@ jpeg81.c
* SOFTWARE.
*/
#include "GETC.h"
#include "GETC.h"
#include "rb_glue.h"
#include "jpeg81.h"
#include <malloc.h> // calloc() called once
#include <stdio.h> // debug only
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
///////////////////////////////////////// LOSSLESS /////////////////////////////////////////
static int P1(struct COMP *C, TSAMP *samp) // Px = Ra
@ -63,17 +63,17 @@ static int P3(struct COMP *C, TSAMP *samp) // Px = Rc
return samp[-C->du_width-1];
}
static int P4(struct COMP *C, TSAMP *samp) // Px = Ra + Rb – Rc
static int P4(struct COMP *C, TSAMP *samp) // Px = Ra + Rb - Rc
{
return samp[-1] + samp[-C->du_width] - samp[-C->du_width-1];
}
static int P5(struct COMP *C, TSAMP *samp) // Px = Ra + ((Rb – Rc)/2)
static int P5(struct COMP *C, TSAMP *samp) // Px = Ra + ((Rb - Rc)/2)
{
return samp[-1] + ( (samp[-C->du_width] - samp[-C->du_width-1]) >> 1 );
}
static int P6(struct COMP *C, TSAMP *samp) // Px = Rb + ((Ra – Rc)/2)
static int P6(struct COMP *C, TSAMP *samp) // Px = Rb + ((Ra - Rc)/2)
{
return samp[-C->du_width] + ( (samp[-1] - samp[-C->du_width-1]) >> 1 );
}
@ -215,7 +215,7 @@ static void du_sequential_huff(struct JPEGD *j, struct COMP *sc, TCOEF *coef)
{
int s, k;
dc_decode_huff(j, sc, coef);
for (k=1; s=sc->ACS[ReadHuffmanCode(j, sc->ACB)]; k++) { // EOB?
for (k=1; (s=sc->ACS[ReadHuffmanCode(j, sc->ACB)]); k++) { // EOB?
k+= s>>4;
if (s==0xf0) continue; // ZRL
coef[k]= ReadDiff(j, s&15);
@ -496,7 +496,7 @@ static void Ri(struct JPEGD *j, int n)
printf("RST%d\n", Marker&7);
printf("%08X: ECS\n", TELL());
}
else printf("STREAM ERROR: expected RSTn missing from ECS\n");
else { printf("STREAM ERROR: expected RSTn missing from ECS\n"); }
j->Reset_decoder(j);
}
}
@ -832,7 +832,7 @@ extern enum JPEGENUM JPEGDecode(struct JPEGD *j)
}
}
printf(" Malloc for %d Data Units (%d bytes)\n\n", TotalDU, sizeof(DU)*TotalDU);
printf(" Malloc for %d Data Units (%lu bytes)\n\n", TotalDU, sizeof(DU)*TotalDU);
if (j->SOF > 0xC8) { // DCT Arithmetic
j->Reset_decoder= Reset_decoder_arith;
@ -953,7 +953,7 @@ extern enum JPEGENUM JPEGDecode(struct JPEGD *j)
for (Lq-=2; Lq; Lq -= 65 + 64*Pq)
{
int (*get)();
int (*get)(void);
int T= GETC();
int Tq= T&3;
int *qt= j->QT[Tq];
@ -993,3 +993,5 @@ extern enum JPEGENUM JPEGDecode(struct JPEGD *j)
}
}
}
#pragma GCC diagnostic pop