Commit 03d61679 authored by michael's avatar michael

make reverse[] non static


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4084 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4966673d
...@@ -63,7 +63,7 @@ static const uint8_t scantab[64]={ ...@@ -63,7 +63,7 @@ static const uint8_t scantab[64]={
}; };
static const uint8_t reverse[256]={ const uint8_t ff_reverse[256]={
0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, 0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, 0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8,
0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4, 0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4,
...@@ -155,11 +155,11 @@ static void init_vlcs(ASV1Context *a){ ...@@ -155,11 +155,11 @@ static void init_vlcs(ASV1Context *a){
//FIXME write a reversed bitstream reader to avoid the double reverse //FIXME write a reversed bitstream reader to avoid the double reverse
static inline int asv2_get_bits(GetBitContext *gb, int n){ static inline int asv2_get_bits(GetBitContext *gb, int n){
return reverse[ get_bits(gb, n) << (8-n) ]; return ff_reverse[ get_bits(gb, n) << (8-n) ];
} }
static inline void asv2_put_bits(PutBitContext *pb, int n, int v){ static inline void asv2_put_bits(PutBitContext *pb, int n, int v){
put_bits(pb, n, reverse[ v << (8-n) ]); put_bits(pb, n, ff_reverse[ v << (8-n) ]);
} }
static inline int asv1_get_level(GetBitContext *gb){ static inline int asv1_get_level(GetBitContext *gb){
...@@ -427,7 +427,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -427,7 +427,7 @@ static int decode_frame(AVCodecContext *avctx,
else{ else{
int i; int i;
for(i=0; i<buf_size; i++) for(i=0; i<buf_size; i++)
a->bitstream_buffer[i]= reverse[ buf[i] ]; a->bitstream_buffer[i]= ff_reverse[ buf[i] ];
} }
init_get_bits(&a->gb, a->bitstream_buffer, buf_size*8); init_get_bits(&a->gb, a->bitstream_buffer, buf_size*8);
...@@ -528,7 +528,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, ...@@ -528,7 +528,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
else{ else{
int i; int i;
for(i=0; i<4*size; i++) for(i=0; i<4*size; i++)
buf[i]= reverse[ buf[i] ]; buf[i]= ff_reverse[ buf[i] ];
} }
return size*4; return size*4;
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
//#define A32_BITSTREAM_READER //#define A32_BITSTREAM_READER
#define LIBMPEG2_BITSTREAM_READER_HACK //add BERO #define LIBMPEG2_BITSTREAM_READER_HACK //add BERO
extern const uint8_t ff_reverse[256];
#if defined(ARCH_X86) || defined(ARCH_X86_64) #if defined(ARCH_X86) || defined(ARCH_X86_64)
// avoid +32 for shift optimization (gcc should do that ...) // avoid +32 for shift optimization (gcc should do that ...)
static inline int32_t NEG_SSR32( int32_t a, int8_t s){ static inline int32_t NEG_SSR32( int32_t a, int8_t s){
......
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