*/
#include "avcodec.h"
-#include "bitstream.h"
+#include "put_bits.h"
#include "lzw.h"
#define LZW_MAXBITS 12
int maxcode; ///< Max value of code
int output_bytes; ///< Number of written bytes
int last_code; ///< Value of last output code or LZW_PREFIX_EMPTY
+ enum FF_LZW_MODES mode; ///< TIFF or GIF
+ void (*put_bits)(PutBitContext *, int, unsigned); ///< GIF is LE while TIFF is BE
}LZWEncodeState;
static inline void writeCode(LZWEncodeState * s, int c)
{
assert(0 <= c && c < 1 << s->bits);
- put_bits(&s->pb, s->bits, c);
+ s->put_bits(&s->pb, s->bits, c);
}
s->tabsize++;
- if (s->tabsize >= 1 << s->bits)
+ if (s->tabsize >= (1 << s->bits) + (s->mode == FF_LZW_GIF))
s->bits++;
}
* @param outsize Size of output buffer
* @param maxbits Maximum length of code
*/
-void ff_lzw_encode_init(LZWEncodeState * s, uint8_t * outbuf, int outsize, int maxbits)
+void ff_lzw_encode_init(LZWEncodeState *s, uint8_t *outbuf, int outsize,
+ int maxbits, enum FF_LZW_MODES mode,
+ void (*lzw_put_bits)(PutBitContext *, int, unsigned))
{
s->clear_code = 256;
s->end_code = 257;
s->output_bytes = 0;
s->last_code = LZW_PREFIX_EMPTY;
s->bits = 9;
+ s->mode = mode;
+ s->put_bits = lzw_put_bits;
}
/**
* @param s LZW state
* @return Number of bytes written or -1 on error
*/
-int ff_lzw_encode_flush(LZWEncodeState * s)
+int ff_lzw_encode_flush(LZWEncodeState *s,
+ void (*lzw_flush_put_bits)(PutBitContext *))
{
if (s->last_code != -1)
writeCode(s, s->last_code);
writeCode(s, s->end_code);
- flush_put_bits(&s->pb);
+ lzw_flush_put_bits(&s->pb);
s->last_code = -1;
return writtenBytes(s);