[FFmpeg-cvslog] r20065 - in trunk/libavcodec: faxcompr.c faxcompr.h tiff.c

[kostya]

Author: kostya
Date: Mon Sep 28 07:17:20 2009
New Revision: 20065

Log:
Finally distinguish TIFF_CCITT_RLE and TIFF_G3 1-D case, so both of them
will be decoded correctly.
This fixes issue 1423.

Modified:
   trunk/libavcodec/faxcompr.c
   trunk/libavcodec/faxcompr.h
   trunk/libavcodec/tiff.c

Modified: trunk/libavcodec/faxcompr.c
==============================================================================
--- trunk/libavcodec/faxcompr.c	Mon Sep 28 07:15:27 2009	(r20064)
+++ trunk/libavcodec/faxcompr.c	Mon Sep 28 07:17:20 2009	(r20065)
@@ -269,7 +269,7 @@ static int find_group3_syncmarker(GetBit
 
 int ff_ccitt_unpack(AVCodecContext *avctx,
                        const uint8_t *src, int srcsize,
-                       uint8_t *dst, int height, int stride, enum TiffCompr compr)
+                       uint8_t *dst, int height, int stride, enum TiffCompr compr, int opts)
 {
     int j;
     GetBitContext gb;
@@ -293,9 +293,10 @@ int ff_ccitt_unpack(AVCodecContext *avct
                 return -1;
             }
         }else{
+            int g3d1 = (compr == TIFF_G3) && !(opts & 1);
             if(compr!=TIFF_CCITT_RLE && find_group3_syncmarker(&gb, srcsize*8) < 0)
                 break;
-            if(compr==TIFF_CCITT_RLE || get_bits1(&gb))
+            if(compr==TIFF_CCITT_RLE || g3d1 || get_bits1(&gb))
                 ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, runend);
             else
                 ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ref);

Modified: trunk/libavcodec/faxcompr.h
==============================================================================
--- trunk/libavcodec/faxcompr.h	Mon Sep 28 07:15:27 2009	(r20064)
+++ trunk/libavcodec/faxcompr.h	Mon Sep 28 07:17:20 2009	(r20065)
@@ -40,6 +40,6 @@ void ff_ccitt_unpack_init(void);
  */
 int ff_ccitt_unpack(AVCodecContext *avctx,
                        const uint8_t *src, int srcsize,
-                       uint8_t *dst, int height, int stride, enum TiffCompr compr);
+                       uint8_t *dst, int height, int stride, enum TiffCompr compr, int opts);
 
 #endif /* AVCODEC_FAXCOMPR_H */

Modified: trunk/libavcodec/tiff.c
==============================================================================
--- trunk/libavcodec/tiff.c	Mon Sep 28 07:15:27 2009	(r20064)
+++ trunk/libavcodec/tiff.c	Mon Sep 28 07:17:20 2009	(r20065)
@@ -146,13 +146,11 @@ static int tiff_unpack_strip(TiffContext
                 src2[i] = ff_reverse[src[i]];
         }
         memset(src2+size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-        if(s->compr == TIFF_G3 && !(s->fax_opts & 1))
-            s->compr = TIFF_CCITT_RLE;
         switch(s->compr){
         case TIFF_CCITT_RLE:
         case TIFF_G3:
         case TIFF_G4:
-            ret = ff_ccitt_unpack(s->avctx, src2, size, dst, lines, stride, s->compr);
+            ret = ff_ccitt_unpack(s->avctx, src2, size, dst, lines, stride, s->compr, s->fax_opts);
             break;
         }
         av_free(src2);