/**
* CCITT Fax Group 3 and 4 decompression
- * @file libavcodec/faxcompr.c
+ * @file
* @author Konstantin Shishkov
*/
#include "avcodec.h"
if(run)
put_sbits(&pb, run, mode);
}
+ flush_put_bits(&pb);
}
static int find_group3_syncmarker(GetBitContext *gb, int srcsize)
}
int ff_ccitt_unpack(AVCodecContext *avctx,
- const uint8_t *src, int srcsize,
- uint8_t *dst, int height, int stride, enum TiffCompr compr)
+ const uint8_t *src, int srcsize,
+ uint8_t *dst, int height, int stride,
+ enum TiffCompr compr, int opts)
{
int j;
GetBitContext gb;
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);
- if(compr==TIFF_CCITT_RLE && (get_bits_count(&gb) & 7))
- skip_bits(&gb, 8 - (get_bits_count(&gb) & 7));
+ if(compr==TIFF_CCITT_RLE)
+ align_get_bits(&gb);
}
if(ret < 0){
put_line(dst, stride, avctx->width, ref);