/**
* TIFF image decoder
- * @file libavcodec/tiff.c
+ * @file
* @author Konstantin Shishkov
*/
#include "avcodec.h"
#include "lzw.h"
#include "tiff.h"
#include "faxcompr.h"
-
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
typedef struct TiffContext {
AVCodecContext *avctx;
av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
return -1;
}
+ if(s->fax_opts & 2){
+ av_log(s->avctx, AV_LOG_ERROR, "Uncompressed fax mode is not supported (yet)\n");
+ av_free(src2);
+ return -1;
+ }
if(!s->fill_order){
memcpy(src2, src, size);
}else{
for(i = 0; i < size; i++)
- src2[i] = ff_reverse[src[i]];
+ src2[i] = av_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);
}
/* now we have the data and may start decoding */
if(!p->data[0]){
- av_log(s->avctx, AV_LOG_ERROR, "Picture initialization missing\n");
- return -1;
+ s->bpp = 1;
+ avctx->pix_fmt = PIX_FMT_MONOBLACK;
+ if(s->width != s->avctx->width || s->height != s->avctx->height){
+ if(avcodec_check_dimensions(s->avctx, s->width, s->height))
+ return -1;
+ avcodec_set_dimensions(s->avctx, s->width, s->height);
+ }
+ if(s->picture.data[0])
+ s->avctx->release_buffer(s->avctx, &s->picture);
+ if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){
+ av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return -1;
+ }
}
if(s->strips == 1 && !s->stripsize){
av_log(avctx, AV_LOG_WARNING, "Image data size missing\n");
AVCodec tiff_decoder = {
"tiff",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_TIFF,
sizeof(TiffContext),
tiff_init,