Commit 30b05520 authored by Mans Rullgard's avatar Mans Rullgard

put_bits: always use intreadwrite.h macros

This fixes invalid unaligned stores in some ARM configurations.
Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent 12489443
...@@ -70,8 +70,7 @@ static inline void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_s ...@@ -70,8 +70,7 @@ static inline void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_s
s->buf_end = s->buf + buffer_size; s->buf_end = s->buf + buffer_size;
#ifdef ALT_BITSTREAM_WRITER #ifdef ALT_BITSTREAM_WRITER
s->index=0; s->index=0;
((uint32_t*)(s->buf))[0]=0; AV_ZERO32(s->buf);
// memset(buffer, 0, buffer_size);
#else #else
s->buf_ptr = s->buf; s->buf_ptr = s->buf;
s->bit_left=32; s->bit_left=32;
...@@ -164,12 +163,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) ...@@ -164,12 +163,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value)
#ifdef BITSTREAM_WRITER_LE #ifdef BITSTREAM_WRITER_LE
bit_buf |= value << (32 - bit_left); bit_buf |= value << (32 - bit_left);
if (n >= bit_left) { if (n >= bit_left) {
#if !HAVE_FAST_UNALIGNED
if (3 & (intptr_t) s->buf_ptr) {
AV_WL32(s->buf_ptr, bit_buf); AV_WL32(s->buf_ptr, bit_buf);
} else
#endif
*(uint32_t *)s->buf_ptr = av_le2ne32(bit_buf);
s->buf_ptr+=4; s->buf_ptr+=4;
bit_buf = (bit_left==32)?0:value >> bit_left; bit_buf = (bit_left==32)?0:value >> bit_left;
bit_left+=32; bit_left+=32;
...@@ -182,12 +176,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) ...@@ -182,12 +176,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value)
} else { } else {
bit_buf<<=bit_left; bit_buf<<=bit_left;
bit_buf |= value >> (n - bit_left); bit_buf |= value >> (n - bit_left);
#if !HAVE_FAST_UNALIGNED
if (3 & (intptr_t) s->buf_ptr) {
AV_WB32(s->buf_ptr, bit_buf); AV_WB32(s->buf_ptr, bit_buf);
} else
#endif
*(uint32_t *)s->buf_ptr = av_be2ne32(bit_buf);
//printf("bitbuf = %08x\n", bit_buf); //printf("bitbuf = %08x\n", bit_buf);
s->buf_ptr+=4; s->buf_ptr+=4;
bit_left+=32 - n; bit_left+=32 - n;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment