annotate common.h @ 192:1e5f64be86fc libavcodec

another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
author uid46427
date Thu, 10 Jan 2002 00:56:05 +0000
parents ae0516eadae2
children b691dd3e9088
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 #ifndef COMMON_H
986e461dc072 Initial revision
glantau
parents:
diff changeset
2 #define COMMON_H
986e461dc072 Initial revision
glantau
parents:
diff changeset
3
86
5e0eb8a361b7 version change
glantau
parents: 85
diff changeset
4 #define FFMPEG_VERSION_INT 0x000406
5e0eb8a361b7 version change
glantau
parents: 85
diff changeset
5 #define FFMPEG_VERSION "0.4.6"
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
6
76
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
7 #if defined(WIN32) && !defined(__MINGW32__)
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
8 #define CONFIG_WIN32
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
9 #endif
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
10
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
11 //#define ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
12
10
f439e6867cac added HAVE_AV_CONFIG_H
glantau
parents: 2
diff changeset
13 #ifdef HAVE_AV_CONFIG_H
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
14 /* only include the following when compiling package */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
15 #include "../config.h"
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
16
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
17 #include <stdlib.h>
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
18 #include <stdio.h>
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
19 #include <string.h>
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
20 #include <errno.h>
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
21
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
22 #ifndef ENODATA
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
23 #define ENODATA 61
10
f439e6867cac added HAVE_AV_CONFIG_H
glantau
parents: 2
diff changeset
24 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
25
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
26 #endif
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
27
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
28 #ifdef CONFIG_WIN32
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
29
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
30 /* windows */
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
31
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
32 typedef unsigned short UINT16;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
33 typedef signed short INT16;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
34 typedef unsigned char UINT8;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
35 typedef unsigned int UINT32;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
36 typedef unsigned __int64 UINT64;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
37 typedef signed char INT8;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
38 typedef signed int INT32;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
39 typedef signed __int64 INT64;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
40
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
41 typedef UINT8 uint8_t;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
42 typedef INT8 int8_t;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
43 typedef UINT16 uint16_t;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
44 typedef INT16 int16_t;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
45 typedef UINT32 uint32_t;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
46 typedef INT32 int32_t;
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
47
76
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
48 #ifndef __MINGW32__
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
49 #define INT64_C(c) (c ## i64)
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
50 #define UINT64_C(c) (c ## i64)
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
51
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
52 #define inline __inline
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
53
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
54 /*
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
55 Disable warning messages:
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
56 warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
57 warning C4305: 'argument' : truncation from 'const double' to 'float'
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
58 */
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
59 #pragma warning( disable : 4244 )
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
60 #pragma warning( disable : 4305 )
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
61
76
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
62 #else
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
63 #define INT64_C(c) (c ## LL)
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
64 #define UINT64_C(c) (c ## ULL)
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
65 #endif /* __MINGW32__ */
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
66
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
67 #define M_PI 3.14159265358979323846
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
68 #define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
69
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
70 #ifdef _DEBUG
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
71 #define DEBUG
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
72 #endif
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
73
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
74 // code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc.
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
75 #define bswap_32(x) \
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
76 ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
77 (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
78 #define be2me_32(x) bswap_32(x)
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
79
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
80 #define snprintf _snprintf
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
81
76
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
82 #ifndef __MINGW32__
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
83 /* no config.h with VC */
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
84 #define CONFIG_ENCODERS 1
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
85 #define CONFIG_DECODERS 1
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
86 #define CONFIG_AC3 1
76
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
87 #endif
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
88
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
89 #else
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
90
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
91 /* unix */
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
92
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
93 #include <inttypes.h>
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
94
2
2e2c46c87460 fixed config for direct mplayer build compatibility
glantau
parents: 0
diff changeset
95 #ifndef __WINE_WINDEF16_H
2e2c46c87460 fixed config for direct mplayer build compatibility
glantau
parents: 0
diff changeset
96 /* workaround for typedef conflict in MPlayer (wine typedefs) */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 typedef unsigned short UINT16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 typedef signed short INT16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
100
986e461dc072 Initial revision
glantau
parents:
diff changeset
101 typedef unsigned char UINT8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
102 typedef unsigned int UINT32;
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 typedef unsigned long long UINT64;
986e461dc072 Initial revision
glantau
parents:
diff changeset
104 typedef signed char INT8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
105 typedef signed int INT32;
986e461dc072 Initial revision
glantau
parents:
diff changeset
106 typedef signed long long INT64;
986e461dc072 Initial revision
glantau
parents:
diff changeset
107
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
108 #ifdef HAVE_AV_CONFIG_H
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
109
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
110 #ifdef __FreeBSD__
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
111 #include <sys/param.h>
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
112 #endif
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
113
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
114 #ifndef INT64_C
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
115 #define INT64_C(c) (c ## LL)
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
116 #define UINT64_C(c) (c ## ULL)
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
117 #endif
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
118
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
119 #include "../bswap.h"
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
120
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
121 #ifdef USE_FASTMEMCPY
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
122 #include "fastmemcpy.h"
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
123 #endif
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
124
76
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
125 #endif /* HAVE_AV_CONFIG_H */
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
126
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
127 #endif /* !CONFIG_WIN32 */
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
128
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
129
76
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
130 /* debug stuff */
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
131 #ifdef HAVE_AV_CONFIG_H
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
132
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
133 #ifndef DEBUG
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
134 #define NDEBUG
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
135 #endif
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
136 #include <assert.h>
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
137
76
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
138 /* dprintf macros */
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
139 #if defined(CONFIG_WIN32) && !defined(__MINGW32__)
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
140
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
141 inline void dprintf(const char* fmt,...) {}
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
142
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
143 #else
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
144
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
145 #ifdef DEBUG
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
146 #define dprintf(fmt,args...) printf(fmt, ## args)
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
147 #else
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
148 #define dprintf(fmt,args...)
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
149 #endif
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
150
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
151 #endif /* !CONFIG_WIN32 */
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
152
76
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
153 #endif /* HAVE_AV_CONFIG_H */
0b09bd08ef4b win32 fixes
glantau
parents: 66
diff changeset
154
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
155 /* bit output */
986e461dc072 Initial revision
glantau
parents:
diff changeset
156
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 struct PutBitContext;
986e461dc072 Initial revision
glantau
parents:
diff changeset
158
986e461dc072 Initial revision
glantau
parents:
diff changeset
159 typedef void (*WriteDataFunc)(void *, UINT8 *, int);
986e461dc072 Initial revision
glantau
parents:
diff changeset
160
986e461dc072 Initial revision
glantau
parents:
diff changeset
161 typedef struct PutBitContext {
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
162 UINT32 bit_buf;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
163 int bit_cnt;
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
164 UINT8 *buf, *buf_ptr, *buf_end;
64
5aa6292a1660 win32 fixes
glantau
parents: 21
diff changeset
165 INT64 data_out_size; /* in bytes */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
166 void *opaque;
986e461dc072 Initial revision
glantau
parents:
diff changeset
167 WriteDataFunc write_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
168 } PutBitContext;
986e461dc072 Initial revision
glantau
parents:
diff changeset
169
986e461dc072 Initial revision
glantau
parents:
diff changeset
170 void init_put_bits(PutBitContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
171 UINT8 *buffer, int buffer_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
172 void *opaque,
986e461dc072 Initial revision
glantau
parents:
diff changeset
173 void (*write_data)(void *, UINT8 *, int));
986e461dc072 Initial revision
glantau
parents:
diff changeset
174 void put_bits(PutBitContext *s, int n, unsigned int value);
85
b0bdab6b8bc6 added get_bits_count()
glantau
parents: 76
diff changeset
175 INT64 get_bit_count(PutBitContext *s); /* XXX: change function name */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
176 void align_put_bits(PutBitContext *s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
177 void flush_put_bits(PutBitContext *s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
178
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 /* jpeg specific put_bits */
986e461dc072 Initial revision
glantau
parents:
diff changeset
180 void jput_bits(PutBitContext *s, int n, unsigned int value);
986e461dc072 Initial revision
glantau
parents:
diff changeset
181 void jflush_put_bits(PutBitContext *s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
182
986e461dc072 Initial revision
glantau
parents:
diff changeset
183 /* bit input */
986e461dc072 Initial revision
glantau
parents:
diff changeset
184
986e461dc072 Initial revision
glantau
parents:
diff changeset
185 typedef struct GetBitContext {
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
186 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
187 int index;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
188 UINT8 *buffer;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
189 #else
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
190 UINT32 bit_buf;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
191 int bit_cnt;
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
192 UINT8 *buf, *buf_ptr, *buf_end;
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
193 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
194 } GetBitContext;
986e461dc072 Initial revision
glantau
parents:
diff changeset
195
986e461dc072 Initial revision
glantau
parents:
diff changeset
196 typedef struct VLC {
986e461dc072 Initial revision
glantau
parents:
diff changeset
197 int bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 INT16 *table_codes;
986e461dc072 Initial revision
glantau
parents:
diff changeset
199 INT8 *table_bits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 int table_size, table_allocated;
986e461dc072 Initial revision
glantau
parents:
diff changeset
201 } VLC;
986e461dc072 Initial revision
glantau
parents:
diff changeset
202
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 void init_get_bits(GetBitContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 UINT8 *buffer, int buffer_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
205
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
206 #ifndef ALT_BITSTREAM_READER
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
207 unsigned int get_bits_long(GetBitContext *s, int n);
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
208 unsigned int show_bits_long(GetBitContext *s, int n);
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
209 #endif
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
210
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
211 static inline unsigned int get_bits(GetBitContext *s, int n){
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
212 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
213 int index= s->index;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
214 uint32_t result= be2me_32( *(uint32_t *)(((uint8_t *)s->buffer)+(index>>3)) );
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
215
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
216 result<<= (index&0x07);
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
217 result>>= 32 - n;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
218 index+= n;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
219 s->index= index;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
220
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
221 return result;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
222 #else
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
223 if(s->bit_cnt>=n){
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
224 /* most common case here */
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
225 unsigned int val = s->bit_buf >> (32 - n);
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
226 s->bit_buf <<= n;
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
227 s->bit_cnt -= n;
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
228 #ifdef STATS
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
229 st_bit_counts[st_current_index] += n;
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
230 #endif
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
231 return val;
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
232 }
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
233 return get_bits_long(s,n);
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
234 #endif
20
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
235 }
907b67420d84 inlineing common case of get_bits() -> gives 2speedup. more optim coming soon...
arpi_esp
parents: 10
diff changeset
236
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
237 static inline unsigned int get_bits1(GetBitContext *s){
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
238 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
239 int index= s->index;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
240 uint32_t result= be2me_32( *(uint32_t *)(((uint8_t *)s->buffer)+(index>>3)) );
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
241
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
242 result<<= (index&0x07);
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
243 result>>= 32 - 1;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
244 index++;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
245 s->index= index;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
246
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
247 return result;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
248 #else
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
249 if(s->bit_cnt>0){
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
250 /* most common case here */
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
251 unsigned int val = s->bit_buf >> 31;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
252 s->bit_buf <<= 1;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
253 s->bit_cnt--;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
254 #ifdef STATS
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
255 st_bit_counts[st_current_index]++;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
256 #endif
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
257 return val;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
258 }
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
259 return get_bits_long(s,1);
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
260 #endif
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
261 }
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
262
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
263 /* This function is identical to get_bits(), the only */
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
264 /* diference is that it doesn't touch the buffer */
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
265 /* it is usefull to see the buffer. */
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
266 static inline unsigned int show_bits(GetBitContext *s, int n)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
267 {
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
268 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
269 int index= s->index;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
270 uint32_t result= be2me_32( *(uint32_t *)(((uint8_t *)s->buffer)+(index>>3)) );
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
271
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
272 result<<= (index&0x07);
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
273 result>>= 32 - n;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
274
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
275 return result;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
276 #else
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
277 if(s->bit_cnt>=n) {
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
278 /* most common case here */
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
279 unsigned int val = s->bit_buf >> (32 - n);
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
280 return val;
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
281 }
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
282 return show_bits_long(s,n);
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
283 #endif
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
284 }
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 93
diff changeset
285
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
286 static inline void skip_bits(GetBitContext *s, int n){
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
287 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
288 s->index+= n;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
289 #else
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
290 if(s->bit_cnt>=n){
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
291 /* most common case here */
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
292 s->bit_buf <<= n;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
293 s->bit_cnt -= n;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
294 #ifdef STATS
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
295 st_bit_counts[st_current_index] += n;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
296 #endif
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
297 } else {
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
298 get_bits_long(s,n);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
299 }
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
300 #endif
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
301 }
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
302
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
303 static inline void skip_bits1(GetBitContext *s){
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
304 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
305 s->index++;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
306 #else
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
307 if(s->bit_cnt>0){
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
308 /* most common case here */
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
309 s->bit_buf <<= 1;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
310 s->bit_cnt--;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
311 #ifdef STATS
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
312 st_bit_counts[st_current_index]++;
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
313 #endif
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
314 } else {
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
315 get_bits_long(s,1);
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
316 }
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
317 #endif
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
318 }
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
319
85
b0bdab6b8bc6 added get_bits_count()
glantau
parents: 76
diff changeset
320 static inline int get_bits_count(GetBitContext *s)
b0bdab6b8bc6 added get_bits_count()
glantau
parents: 76
diff changeset
321 {
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
322 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
323 return s->index;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
324 #else
85
b0bdab6b8bc6 added get_bits_count()
glantau
parents: 76
diff changeset
325 return (s->buf_ptr - s->buf) * 8 - s->bit_cnt;
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
326 #endif
85
b0bdab6b8bc6 added get_bits_count()
glantau
parents: 76
diff changeset
327 }
21
20e680e7a490 get_bits() specialization, gives 4\speedup
arpi_esp
parents: 20
diff changeset
328
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
329 void align_get_bits(GetBitContext *s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
330 int init_vlc(VLC *vlc, int nb_bits, int nb_codes,
986e461dc072 Initial revision
glantau
parents:
diff changeset
331 const void *bits, int bits_wrap, int bits_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
332 const void *codes, int codes_wrap, int codes_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
333 void free_vlc(VLC *vlc);
986e461dc072 Initial revision
glantau
parents:
diff changeset
334 int get_vlc(GetBitContext *s, VLC *vlc);
986e461dc072 Initial revision
glantau
parents:
diff changeset
335
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
336 #ifdef ALT_BITSTREAM_READER
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
337 #define SHOW_BITS(s, val, n) val= show_bits(s, n);
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
338 #define FLUSH_BITS(n) skip_bits(s, n);
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
339 #define SAVE_BITS(s) ;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
340 #define RESTORE_BITS(s) ;
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
341 #else
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
342
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
343 /* macro to go faster */
986e461dc072 Initial revision
glantau
parents:
diff changeset
344 /* n must be <= 24 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
345 /* XXX: optimize buffer end test */
986e461dc072 Initial revision
glantau
parents:
diff changeset
346 #define SHOW_BITS(s, val, n)\
986e461dc072 Initial revision
glantau
parents:
diff changeset
347 {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
348 if (bit_cnt < n && buf_ptr < (s)->buf_end) {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
349 bit_buf |= *buf_ptr++ << (24 - bit_cnt);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
350 bit_cnt += 8;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
351 if (bit_cnt < n && buf_ptr < (s)->buf_end) {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
352 bit_buf |= *buf_ptr++ << (24 - bit_cnt);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
353 bit_cnt += 8;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
354 if (bit_cnt < n && buf_ptr < (s)->buf_end) {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
355 bit_buf |= *buf_ptr++ << (24 - bit_cnt);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
356 bit_cnt += 8;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
357 }\
986e461dc072 Initial revision
glantau
parents:
diff changeset
358 }\
986e461dc072 Initial revision
glantau
parents:
diff changeset
359 }\
986e461dc072 Initial revision
glantau
parents:
diff changeset
360 val = bit_buf >> (32 - n);\
986e461dc072 Initial revision
glantau
parents:
diff changeset
361 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
362
986e461dc072 Initial revision
glantau
parents:
diff changeset
363 /* SHOW_BITS with n1 >= n must be been done before */
986e461dc072 Initial revision
glantau
parents:
diff changeset
364 #define FLUSH_BITS(n)\
986e461dc072 Initial revision
glantau
parents:
diff changeset
365 {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
366 bit_buf <<= n;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
367 bit_cnt -= n;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
368 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
369
986e461dc072 Initial revision
glantau
parents:
diff changeset
370 #define SAVE_BITS(s) \
986e461dc072 Initial revision
glantau
parents:
diff changeset
371 {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
372 bit_cnt = (s)->bit_cnt;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
373 bit_buf = (s)->bit_buf;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
374 buf_ptr = (s)->buf_ptr;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
375 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
376
986e461dc072 Initial revision
glantau
parents:
diff changeset
377 #define RESTORE_BITS(s) \
986e461dc072 Initial revision
glantau
parents:
diff changeset
378 {\
986e461dc072 Initial revision
glantau
parents:
diff changeset
379 (s)->buf_ptr = buf_ptr;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
380 (s)->bit_buf = bit_buf;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
381 (s)->bit_cnt = bit_cnt;\
986e461dc072 Initial revision
glantau
parents:
diff changeset
382 }
192
1e5f64be86fc another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at>
uid46427
parents: 151
diff changeset
383 #endif // !ALT_BITSTREAM_READER
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
384 /* define it to include statistics code (useful only for optimizing
986e461dc072 Initial revision
glantau
parents:
diff changeset
385 codec efficiency */
986e461dc072 Initial revision
glantau
parents:
diff changeset
386 //#define STATS
986e461dc072 Initial revision
glantau
parents:
diff changeset
387
986e461dc072 Initial revision
glantau
parents:
diff changeset
388 #ifdef STATS
986e461dc072 Initial revision
glantau
parents:
diff changeset
389
986e461dc072 Initial revision
glantau
parents:
diff changeset
390 enum {
986e461dc072 Initial revision
glantau
parents:
diff changeset
391 ST_UNKNOWN,
986e461dc072 Initial revision
glantau
parents:
diff changeset
392 ST_DC,
986e461dc072 Initial revision
glantau
parents:
diff changeset
393 ST_INTRA_AC,
986e461dc072 Initial revision
glantau
parents:
diff changeset
394 ST_INTER_AC,
986e461dc072 Initial revision
glantau
parents:
diff changeset
395 ST_INTRA_MB,
986e461dc072 Initial revision
glantau
parents:
diff changeset
396 ST_INTER_MB,
986e461dc072 Initial revision
glantau
parents:
diff changeset
397 ST_MV,
986e461dc072 Initial revision
glantau
parents:
diff changeset
398 ST_NB,
986e461dc072 Initial revision
glantau
parents:
diff changeset
399 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
400
986e461dc072 Initial revision
glantau
parents:
diff changeset
401 extern int st_current_index;
986e461dc072 Initial revision
glantau
parents:
diff changeset
402 extern unsigned int st_bit_counts[ST_NB];
986e461dc072 Initial revision
glantau
parents:
diff changeset
403 extern unsigned int st_out_bit_counts[ST_NB];
986e461dc072 Initial revision
glantau
parents:
diff changeset
404
986e461dc072 Initial revision
glantau
parents:
diff changeset
405 void print_stats(void);
986e461dc072 Initial revision
glantau
parents:
diff changeset
406 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
407
986e461dc072 Initial revision
glantau
parents:
diff changeset
408 /* misc math functions */
986e461dc072 Initial revision
glantau
parents:
diff changeset
409
151
ae0516eadae2 fixed gcc-3.0.x compilation (by Michael Niedermayer)
nickols_k
parents: 144
diff changeset
410 static inline int av_log2(unsigned int v)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
411 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
412 int n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
413
986e461dc072 Initial revision
glantau
parents:
diff changeset
414 n = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
415 if (v & 0xffff0000) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
416 v >>= 16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
417 n += 16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
418 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
419 if (v & 0xff00) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
420 v >>= 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
421 n += 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
422 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
423 if (v & 0xf0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
424 v >>= 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
425 n += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
426 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
427 if (v & 0xc) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
428 v >>= 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
429 n += 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
430 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
431 if (v & 0x2) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
432 n++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
433 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
434 return n;
986e461dc072 Initial revision
glantau
parents:
diff changeset
435 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
436
986e461dc072 Initial revision
glantau
parents:
diff changeset
437 /* memory */
986e461dc072 Initial revision
glantau
parents:
diff changeset
438 void *av_mallocz(int size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
439
986e461dc072 Initial revision
glantau
parents:
diff changeset
440 #endif