Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Sat Jun 24 20:06:34 CEST 2006
Subject: [cvs-checkins] MODIFIED: mb-jpeg ...
Date: 00/06/06 24:20:06

Modified: mb-jpeg/decoder JpegToBmp.c
Added: mb-jpeg/decoder decoder.c mb-jpeg.h
Log:
Create an input/output shell, decoder.c and mb-jpeg.h, to the decoder reference code. The shell is also used for platform related code.




Revision Changes Path
1.2 mb-jpeg/decoder/JpegToBmp.c

http://www.opencores.org/cvsweb.shtml/mb-jpeg/decoder/JpegToBmp.c.diff?r1=1.1&r2=1.2

(In the diff below, changes in quantity of whitespace are not shown.)

Index: JpegToBmp.c
===================================================================
RCS file: /cvsroot/quickwayne/mb-jpeg/decoder/JpegToBmp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- JpegToBmp.c 21 Jun 2006 22:33:07 -0000 1.1
+++ JpegToBmp.c 24 Jun 2006 18:06:33 -0000 1.2
@@ -46,7 +46,7 @@
/* MAIN MAIN MAIN */
/*-----------------------------------------------------------------*/

-int JpegToBmp(void)
+int decode(void)
{
char *p;
unsigned int aux, mark;



1.1 mb-jpeg/decoder/decoder.c

http://www.opencores.org/cvsweb.shtml/mb-jpeg/decoder/decoder.c?rev=1.1&content-type=text/x-cvsweb-markup

Index: decoder.c
===================================================================

#include "mb-jpeg.h"

unsigned char* jpgimage;
unsigned long jpgsize;
unsigned char* bmpimage;
unsigned long bmpsize;

int main() {
SYSACE_FILE *jpgfile;
SYSACE_FILE *bmpfile;
int i, numread, numwrite;

jpgsize = bmpsize = 0;

if ((jpgfile = sysace_fopen("image01.jpg", "r")) == NULL) {
xil_printf("Error in opening input file\r\n");
exit(1);
}

for (i = 0; i<JPG_MAXSIZE; i++) {
numread = sysace_fread(jpgimage+i, 1, 1, jpgfile);
if (numread == 0) break;
}

sysace_fclose(jpgfile);

if (i==JPG_MAXSIZE) {
xil_printf("Input file exceeds max size\r\n");
exit(1);
}

jpgsize = i;

decode();

if ((bmpfile = sysace_fopen("image01.bmp", "w")) == NULL) {
xil_printf("Error in opening output file\r\n");
exit(1);
}

numwrite = sysace_fwrite(bmpimage+i, 1, bmpsize, bmpfile);

sysace_fclose(bmpfile);

if (numwrite != bmpsize) {
xil_printf("Error in writing output file\r\n");
exit(1);
}

return 0;

}



1.1 mb-jpeg/decoder/mb-jpeg.h

http://www.opencores.org/cvsweb.shtml/mb-jpeg/decoder/mb-jpeg.h?rev=1.1&content-type=text/x-cvsweb-markup
Index: mb-jpeg.h =================================================================== #ifndef _MB_JPEG #define _MB_JPEG // Microblaze related declaration #include <xparameters.h> #include <sysace_stdio.h> #include "xio.h" // XUP2P board related declaration #define JPG_ADDRESS 0x70000000 #define JPG_MAXSIZE 0x4000 #define BMP_ADDRESS 0x70000800 #define BMP_MAXSIZE 0x1c000 // JPEG decoder related declaration extern unsigned char* jpgimage; extern unsigned char* bmpimage; extern unsigned long jpgsize; extern unsigned long bmpsize; // function declaration int decode(); #endif