github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-03 20:35:31 +02:00
Code Releases Activity

fixed alignment bug

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10083 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael 2003-05-07 23:25:25 +00:00
parent 3f5313a9e5
commit 9109cc8d20
1 changed files with 26 additions and 2 deletions

28
liba52/bitstream.h

@ -30,6 +30,30 @@
#else #else
// alternative (faster) bitstram reader (reades upto 3 bytes over the end of the input) // alternative (faster) bitstram reader (reades upto 3 bytes over the end of the input)
#define ALT_BITSTREAM_READER #define ALT_BITSTREAM_READER
/* used to avoid missaligned exceptions on some archs (alpha, ...) */
#ifdef ARCH_X86
# define unaligned32(a) (*(uint32_t*)(a))
#else
# ifdef __GNUC__
static inline uint32_t unaligned32(const void *v) {
struct Unaligned {
uint32_t i;
} __attribute__((packed));
return ((const struct Unaligned *) v)->i;
}
# elif defined(__DECC)
static inline uint32_t unaligned32(const void *v) {
return *(const __unaligned uint32_t *) v;
}
# else
static inline uint32_t unaligned32(const void *v) {
return *(const uint32_t *) v;
}
# endif
#endif //!ARCH_X86
#endif #endif
/* (stolen from the kernel) */ /* (stolen from the kernel) */
@ -74,7 +98,7 @@ static inline uint32_t
bitstream_get(uint32_t num_bits) // note num_bits is practically a constant due to inlineing bitstream_get(uint32_t num_bits) // note num_bits is practically a constant due to inlineing
{ {
#ifdef ALT_BITSTREAM_READER #ifdef ALT_BITSTREAM_READER
uint32_t result= swab32( *(uint32_t *)(((uint8_t *)buffer_start)+(indx>>3)) ); uint32_t result= swab32( unaligned32(((uint8_t *)buffer_start)+(indx>>3)) );
result<<= (indx&0x07); result<<= (indx&0x07);
result>>= 32 - num_bits; result>>= 32 - num_bits;
@ -107,7 +131,7 @@ static inline int32_t
bitstream_get_2(uint32_t num_bits) bitstream_get_2(uint32_t num_bits)
{ {
#ifdef ALT_BITSTREAM_READER #ifdef ALT_BITSTREAM_READER
int32_t result= swab32( *(uint32_t *)(((uint8_t *)buffer_start)+(indx>>3)) ); int32_t result= swab32( unaligned32(((uint8_t *)buffer_start)+(indx>>3)) );
result<<= (indx&0x07); result<<= (indx&0x07);
result>>= 32 - num_bits; result>>= 32 - num_bits;