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 Jul 29 02:22:52 CEST 2006
Subject: [cvs-checkins] MODIFIED: mb-jpeg ...
Date: 00/06/07 29:02:22

Modified: mb-jpeg/bmp2jpg_mb bmp2jpg_mb.c ColorConversion.c
Log:
1. remove an internal loop in get_MB()


Revision Changes Path
1.4 mb-jpeg/bmp2jpg_mb/bmp2jpg_mb.c

http://www.opencores.org/cvsweb.shtml/mb-jpeg/bmp2jpg_mb/bmp2jpg_mb.c.diff?r1=1.3&r2=1.4

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

Index: bmp2jpg_mb.c
===================================================================
RCS file: /cvsroot/quickwayne/mb-jpeg/bmp2jpg_mb/bmp2jpg_mb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- bmp2jpg_mb.c 28 Jul 2006 23:08:54 -0000 1.3
+++ bmp2jpg_mb.c 29 Jul 2006 00:22:51 -0000 1.4
@@ -48,8 +48,6 @@
signed char pixelmatrix[MATRIX_SIZE][MATRIX_SIZE*3];
signed char pmatrix2[MATRIX_SIZE][MATRIX_SIZE]; //YUV domain pixels

-unsigned char buffer[MATRIX_SIZE*3];
-
int ejpgl_error(int errno, void* remark);

void get_MB(int mb_row, int mb_col, signed char pixelmatrix[MATRIX_SIZE][MATRIX_SIZE*3]) {
@@ -58,10 +56,7 @@

for(row = 0;row < MATRIX_SIZE; row++) {
offset = bmpsize-3*bmpheader->width*(row + 1 + mb_row*MATRIX_SIZE)+MATRIX_SIZE*3*mb_col;
- memcpy(buffer, bmpimage + offset, MATRIX_SIZE*3);
- for(col = 0; col < MATRIX_SIZE*3; col++) {
- pixelmatrix[row][col] = buffer[col]- 128;
- }
+ memcpy(pixelmatrix[row], bmpimage + offset, MATRIX_SIZE*3);
}

}



1.2 mb-jpeg/bmp2jpg_mb/ColorConversion.c

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

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

Index: ColorConversion.c
===================================================================
RCS file: /cvsroot/quickwayne/mb-jpeg/bmp2jpg_mb/ColorConversion.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ColorConversion.c 28 Jul 2006 13:46:53 -0000 1.1
+++ ColorConversion.c 29 Jul 2006 00:22:51 -0000 1.2
@@ -35,28 +35,31 @@

void RGB2Y_matrix(signed char pixelmatrix[MATRIX_SIZE][MATRIX_SIZE*3],signed char YUVMatrix[MATRIX_SIZE][MATRIX_SIZE])
{
- unsigned int row, col;
+ unsigned int row, col, col_3;
for(row = 0;row < MATRIX_SIZE; row++) {
- for(col = 0; col < MATRIX_SIZE; col++) {
- YUVMatrix[row][col] = RGB2Y(pixelmatrix[row][col*3+2],pixelmatrix[row][col*3+1],pixelmatrix[row][col*3]) - 128;
+ for(col = 0, col_3=0; col < MATRIX_SIZE; col++, col_3+=3) {
+ pixelmatrix[row][col_3] -= 128;
+ pixelmatrix[row][col_3+1] -= 128;
+ pixelmatrix[row][col_3+2] -= 128;
+ YUVMatrix[row][col] = RGB2Y(pixelmatrix[row][col_3+2],pixelmatrix[row][col_3+1],pixelmatrix[row][col_3]) - 128;
}
}
}
void RGB2Cr_matrix(signed char pixelmatrix[MATRIX_SIZE][MATRIX_SIZE*3],signed char YUVMatrix[MATRIX_SIZE][MATRIX_SIZE])
{
- unsigned int row, col;
+ unsigned int row, col, col_3;
for(row = 0;row < MATRIX_SIZE; row++) {
- for(col = 0; col < MATRIX_SIZE; col++) {
- YUVMatrix[row][col] = RGB2Cr(pixelmatrix[row][col*3+2],pixelmatrix[row][col*3+1],pixelmatrix[row][col*3]) - 128;
+ for(col = 0, col_3=0; col < MATRIX_SIZE; col++, col_3+=3) {
+ YUVMatrix[row][col] = RGB2Cr(pixelmatrix[row][col_3+2],pixelmatrix[row][col_3+1],pixelmatrix[row][col_3]) - 128;
}
}
}
void RGB2Cb_matrix(signed char pixelmatrix[MATRIX_SIZE][MATRIX_SIZE*3],signed char YUVMatrix[MATRIX_SIZE][MATRIX_SIZE])
{
- unsigned int row, col;
+ unsigned int row, col, col_3;
for(row = 0;row < MATRIX_SIZE; row++) {
- for(col = 0; col < MATRIX_SIZE; col++) {
- YUVMatrix[row][col] = RGB2Cb(pixelmatrix[row][col*3+2],pixelmatrix[row][col*3+1],pixelmatrix[row][col*3]) - 128;
+ for(col = 0, col_3; col < MATRIX_SIZE; col++, col_3) {
+ YUVMatrix[row][col] = RGB2Cb(pixelmatrix[row][col_3+2],pixelmatrix[row][col_3+1],pixelmatrix[row][col_3]) - 128;
}
}
}