Originally committed as revision 2567 to svn://svn.ffmpeg.org/ffmpeg/trunk
{
s->buf = buffer;
s->buf_end = s->buf + buffer_size;
{
s->buf = buffer;
s->buf_end = s->buf + buffer_size;
#ifdef ALT_BITSTREAM_WRITER
s->index=0;
((uint32_t*)(s->buf))[0]=0;
#ifdef ALT_BITSTREAM_WRITER
s->index=0;
((uint32_t*)(s->buf))[0]=0;
#ifdef CONFIG_ENCODERS
/* return the number of bits output */
#ifdef CONFIG_ENCODERS
/* return the number of bits output */
-int64_t get_bit_count(PutBitContext *s)
+int get_bit_count(PutBitContext *s)
{
#ifdef ALT_BITSTREAM_WRITER
{
#ifdef ALT_BITSTREAM_WRITER
- return s->data_out_size * 8 + s->index;
- return (s->buf_ptr - s->buf + s->data_out_size) * 8 + 32 - (int64_t)s->bit_left;
+ return (s->buf_ptr - s->buf) * 8 + 32 - s->bit_left;
int bit_left;
uint8_t *buf, *buf_ptr, *buf_end;
#endif
int bit_left;
uint8_t *buf, *buf_ptr, *buf_end;
#endif
- int64_t data_out_size; /* in bytes */
} PutBitContext;
void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size);
} PutBitContext;
void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size);
-int64_t get_bit_count(PutBitContext *s); /* XXX: change function name */
+int get_bit_count(PutBitContext *s); /* XXX: change function name */
void align_put_bits(PutBitContext *s);
void flush_put_bits(PutBitContext *s);
void put_string(PutBitContext * pbc, char *s);
void align_put_bits(PutBitContext *s);
void flush_put_bits(PutBitContext *s);
void put_string(PutBitContext * pbc, char *s);
static always_inline int dv_bits_left(PutBitContext* s)
{
return (s->buf_end - s->buf) * 8 -
static always_inline int dv_bits_left(PutBitContext* s)
{
return (s->buf_end - s->buf) * 8 -
- ((s->buf_ptr - s->buf + s->data_out_size) * 8 + 32 - (int64_t)s->bit_left);
+ ((s->buf_ptr - s->buf) * 8 + 32 - (int64_t)s->bit_left);
}
static always_inline void dv_encode_ac(EncBlockInfo* bi, PutBitContext* pb_pool,
}
static always_inline void dv_encode_ac(EncBlockInfo* bi, PutBitContext* pb_pool,
if(pbBufPtr(&p) - p.buf > 0) {
put_byte(pb, pbBufPtr(&p) - p.buf); /* byte count of the packet */
put_buffer(pb, p.buf, pbBufPtr(&p) - p.buf); /* the actual buffer */
if(pbBufPtr(&p) - p.buf > 0) {
put_byte(pb, pbBufPtr(&p) - p.buf); /* byte count of the packet */
put_buffer(pb, p.buf, pbBufPtr(&p) - p.buf); /* the actual buffer */
- p.data_out_size += pbBufPtr(&p) - p.buf;
p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */
}
if(left<=GIF_CHUNKS) {
p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */
}
if(left<=GIF_CHUNKS) {