/**
* CCITT Fax Group 3 and 4 decompression
- * @file faxcompr.c
+ * @file
* @author Konstantin Shishkov
*/
#include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
+#include "put_bits.h"
#include "faxcompr.h"
#define CCITT_SYMS 104
static VLC ccitt_vlc[2], ccitt_group3_2d_vlc;
-av_cold void ff_ccitt_unpack_init()
+av_cold void ff_ccitt_unpack_init(void)
{
static VLC_TYPE code_table1[528][2];
static VLC_TYPE code_table2[648][2];
}
static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
- int width, int *runs, const int *runend, const int *ref)
+ unsigned int width, int *runs, const int *runend, const int *ref)
{
- int mode = 0, offs = 0, run = 0, saved_run = 0, t;
+ int mode = 0, saved_run = 0, t;
int run_off = *ref++;
+ unsigned int offs=0, run= 0;
runend--; // for the last written 0
}
saved_run = 0;
offs += run;
- if(offs > width){
+ if(offs > width || run > width){
av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
return -1;
}
return -1;
}else{//vertical mode
run = run_off - offs + (cmode - 5);
- if(cmode >= 5)
- run_off += *ref++;
- else
- run_off -= *--ref;
+ run_off -= *--ref;
offs += run;
- if(offs > width){
+ if(offs > width || run > width){
av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
return -1;
}
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{
- if(find_group3_syncmarker(&gb, srcsize*8) < 0)
+ 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)
+ align_get_bits(&gb);
}
if(ret < 0){
put_line(dst, stride, avctx->width, ref);