[FFmpeg-devel] [PATCH]Fix some 1bpp tiff samples
Carl Eugen Hoyos
cehoyos at ag.or.at
Thu Dec 29 13:59:18 CET 2011
On Tuesday 27 December 2011 06:06:43 am Carl Eugen Hoyos wrote:
> Attached patch fixes all samples from ticket #830, I also tested the
> samples from tickets 190, 439 and 440.
Hopefully more readable patchset attached.
Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 1060a44..ba838df 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -108,19 +108,22 @@ static void av_always_inline horizontal_fill(unsigned int bpp, uint8_t* dst,
{
int i;
- if (bpp == 2) {
+ switch (bpp) {
+ case 2:
for (i = 0; i < width; i++) {
dst[(i+offset)*4+0] = (usePtr ? src[i] : c) >> 6;
dst[(i+offset)*4+1] = (usePtr ? src[i] : c) >> 4 & 0x3;
dst[(i+offset)*4+2] = (usePtr ? src[i] : c) >> 2 & 0x3;
dst[(i+offset)*4+3] = (usePtr ? src[i] : c) & 0x3;
}
- } else if (bpp == 4) {
+ break;
+ case 4:
for (i = 0; i < width; i++) {
dst[(i+offset)*2+0] = (usePtr ? src[i] : c) >> 4;
dst[(i+offset)*2+1] = (usePtr ? src[i] : c) & 0xF;
}
- } else {
+ break;
+ default:
if (usePtr) {
memcpy(dst + offset, src, width);
} else {
-------------- next part --------------
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index ba838df..f187cb2 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -106,21 +106,19 @@ static void av_always_inline horizontal_fill(unsigned int bpp, uint8_t* dst,
int usePtr, const uint8_t *src,
uint8_t c, int width, int offset)
{
- int i;
-
switch (bpp) {
case 2:
- for (i = 0; i < width; i++) {
- dst[(i+offset)*4+0] = (usePtr ? src[i] : c) >> 6;
- dst[(i+offset)*4+1] = (usePtr ? src[i] : c) >> 4 & 0x3;
- dst[(i+offset)*4+2] = (usePtr ? src[i] : c) >> 2 & 0x3;
- dst[(i+offset)*4+3] = (usePtr ? src[i] : c) & 0x3;
+ while (--width >= 0) {
+ dst[(width+offset)*4+3] = (usePtr ? src[width] : c) & 0x3;
+ dst[(width+offset)*4+2] = (usePtr ? src[width] : c) >> 2 & 0x3;
+ dst[(width+offset)*4+1] = (usePtr ? src[width] : c) >> 4 & 0x3;
+ dst[(width+offset)*4+0] = (usePtr ? src[width] : c) >> 6;
}
break;
case 4:
- for (i = 0; i < width; i++) {
- dst[(i+offset)*2+0] = (usePtr ? src[i] : c) >> 4;
- dst[(i+offset)*2+1] = (usePtr ? src[i] : c) & 0xF;
+ while (--width >= 0) {
+ dst[(width+offset)*2+1] = (usePtr ? src[width] : c) & 0xF;
+ dst[(width+offset)*2+0] = (usePtr ? src[width] : c) >> 4;
}
break;
default:
@@ -132,16 +130,6 @@ static void av_always_inline horizontal_fill(unsigned int bpp, uint8_t* dst,
}
}
-static void av_always_inline split_nibbles(uint8_t *dst, const uint8_t *src,
- int width)
-{
- while (--width >= 0) {
- // src == dst for LZW
- dst[width * 2 + 1] = src[width] & 0xF;
- dst[width * 2 + 0] = src[width] >> 4;
- }
-}
-
static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uint8_t *src, int size, int lines){
int c, line, pixels, code;
const uint8_t *ssrc = src;
@@ -162,7 +150,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin
src = zbuf;
for(line = 0; line < lines; line++){
if(s->bpp == 4){
- split_nibbles(dst, src, width);
+ horizontal_fill(s->bpp, dst, 1, src, 0, width, 0);
}else{
memcpy(dst, src, width);
}
@@ -258,7 +246,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin
return -1;
}
if(s->bpp == 4)
- split_nibbles(dst, dst, width);
+ horizontal_fill(s->bpp, dst, 1, dst, 0, width, 0);
break;
}
dst += stride;
-------------- next part --------------
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index f187cb2..c313bd7 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -107,6 +107,18 @@ static void av_always_inline horizontal_fill(unsigned int bpp, uint8_t* dst,
uint8_t c, int width, int offset)
{
switch (bpp) {
+ case 1:
+ while (--width >= 0) {
+ dst[(width+offset)*8+7] = (usePtr ? src[width] : c) & 0x1;
+ dst[(width+offset)*8+6] = (usePtr ? src[width] : c) >> 1 & 0x1;
+ dst[(width+offset)*8+5] = (usePtr ? src[width] : c) >> 2 & 0x1;
+ dst[(width+offset)*8+4] = (usePtr ? src[width] : c) >> 3 & 0x1;
+ dst[(width+offset)*8+3] = (usePtr ? src[width] : c) >> 4 & 0x1;
+ dst[(width+offset)*8+2] = (usePtr ? src[width] : c) >> 5 & 0x1;
+ dst[(width+offset)*8+1] = (usePtr ? src[width] : c) >> 6 & 0x1;
+ dst[(width+offset)*8+0] = (usePtr ? src[width] : c) >> 7;
+ }
+ break;
case 2:
while (--width >= 0) {
dst[(width+offset)*4+3] = (usePtr ? src[width] : c) & 0x3;
@@ -149,11 +161,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin
}
src = zbuf;
for(line = 0; line < lines; line++){
- if(s->bpp == 4){
- horizontal_fill(s->bpp, dst, 1, src, 0, width, 0);
- }else{
- memcpy(dst, src, width);
- }
+ horizontal_fill(s->bpp, dst, 1, src, 0, width, 0);
dst += stride;
src += width;
}
@@ -194,6 +202,11 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin
ret = ff_ccitt_unpack(s->avctx, src2, size, dst, lines, stride, s->compr, s->fax_opts);
break;
}
+ if (s->bpp < 8)
+ for (line = 0; line < lines; line++) {
+ horizontal_fill(s->bpp, dst, 1, dst, 0, width, 0);
+ dst += stride;
+ }
av_free(src2);
return ret;
}
@@ -245,7 +258,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin
av_log(s->avctx, AV_LOG_ERROR, "Decoded only %i bytes of %i\n", pixels, width);
return -1;
}
- if(s->bpp == 4)
+ if (s->bpp < 8)
horizontal_fill(s->bpp, dst, 1, dst, 0, width, 0);
break;
}
@@ -261,8 +274,6 @@ static int init_image(TiffContext *s)
switch (s->bpp * 10 + s->bppcount) {
case 11:
- s->avctx->pix_fmt = PIX_FMT_MONOBLACK;
- break;
case 21:
case 41:
case 81:
More information about the ffmpeg-devel
mailing list