annotate cabac.h @ 3972:f5f1c9af095d libavcodec

move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
author michael
date Mon, 09 Oct 2006 18:20:00 +0000
parents e8a6d5c1ab0b
children 93746612bc78
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1287
michaelni
parents:
diff changeset
1 /*
michaelni
parents:
diff changeset
2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
michaelni
parents:
diff changeset
3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
michaelni
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3946
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3946
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3946
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
1287
michaelni
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
michaelni
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3946
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
1287
michaelni
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3946
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
1287
michaelni
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
michaelni
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
michaelni
parents:
diff changeset
15 * Lesser General Public License for more details.
michaelni
parents:
diff changeset
16 *
michaelni
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3946
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2967
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1287
michaelni
parents:
diff changeset
20 *
michaelni
parents:
diff changeset
21 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
22
1287
michaelni
parents:
diff changeset
23 /**
michaelni
parents:
diff changeset
24 * @file cabac.h
michaelni
parents:
diff changeset
25 * Context Adaptive Binary Arithmetic Coder.
michaelni
parents:
diff changeset
26 */
michaelni
parents:
diff changeset
27
michaelni
parents:
diff changeset
28
3284
a224d9752912 don't force asserts in release builds. 2% faster h264.
lorenm
parents: 3036
diff changeset
29 //#undef NDEBUG
1287
michaelni
parents:
diff changeset
30 #include <assert.h>
michaelni
parents:
diff changeset
31
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
32 #define CABAC_BITS 16
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
33 #define CABAC_MASK ((1<<CABAC_BITS)-1)
1c39d9786efd optimization
michael
parents: 2116
diff changeset
34
1287
michaelni
parents:
diff changeset
35 typedef struct CABACContext{
michaelni
parents:
diff changeset
36 int low;
michaelni
parents:
diff changeset
37 int range;
michaelni
parents:
diff changeset
38 int outstanding_count;
michaelni
parents:
diff changeset
39 #ifdef STRICT_LIMITS
michaelni
parents:
diff changeset
40 int symCount;
michaelni
parents:
diff changeset
41 #endif
3955
051a9c8b257f 5% faster get_cabac()
michael
parents: 3951
diff changeset
42 uint8_t lps_range[2*66][4]; ///< rangeTabLPS
051a9c8b257f 5% faster get_cabac()
michael
parents: 3951
diff changeset
43 uint8_t lps_state[2*65]; ///< transIdxLPS
051a9c8b257f 5% faster get_cabac()
michael
parents: 3951
diff changeset
44 uint8_t mps_state[2*65]; ///< transIdxMPS
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 1787
diff changeset
45 const uint8_t *bytestream_start;
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 1787
diff changeset
46 const uint8_t *bytestream;
2116
48d9f86fb047 overread fix
michael
parents: 2024
diff changeset
47 const uint8_t *bytestream_end;
1287
michaelni
parents:
diff changeset
48 PutBitContext pb;
michaelni
parents:
diff changeset
49 }CABACContext;
michaelni
parents:
diff changeset
50
1301
michaelni
parents: 1300
diff changeset
51 extern const uint8_t ff_h264_lps_range[64][4];
michaelni
parents: 1300
diff changeset
52 extern const uint8_t ff_h264_mps_state[64];
michaelni
parents: 1300
diff changeset
53 extern const uint8_t ff_h264_lps_state[64];
3964
162bea01a5d4 decrease ff_h264_norm_shift[] size
michael
parents: 3962
diff changeset
54 extern const uint8_t ff_h264_norm_shift[128];
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
55
1287
michaelni
parents:
diff changeset
56
michaelni
parents:
diff changeset
57 void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size);
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 1787
diff changeset
58 void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
59 void ff_init_cabac_states(CABACContext *c, uint8_t const (*lps_range)[4],
1287
michaelni
parents:
diff changeset
60 uint8_t const *mps_state, uint8_t const *lps_state, int state_count);
michaelni
parents:
diff changeset
61
michaelni
parents:
diff changeset
62
michaelni
parents:
diff changeset
63 static inline void put_cabac_bit(CABACContext *c, int b){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
64 put_bits(&c->pb, 1, b);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
65 for(;c->outstanding_count; c->outstanding_count--){
1287
michaelni
parents:
diff changeset
66 put_bits(&c->pb, 1, 1-b);
michaelni
parents:
diff changeset
67 }
michaelni
parents:
diff changeset
68 }
michaelni
parents:
diff changeset
69
michaelni
parents:
diff changeset
70 static inline void renorm_cabac_encoder(CABACContext *c){
michaelni
parents:
diff changeset
71 while(c->range < 0x100){
michaelni
parents:
diff changeset
72 //FIXME optimize
michaelni
parents:
diff changeset
73 if(c->low<0x100){
michaelni
parents:
diff changeset
74 put_cabac_bit(c, 0);
michaelni
parents:
diff changeset
75 }else if(c->low<0x200){
michaelni
parents:
diff changeset
76 c->outstanding_count++;
michaelni
parents:
diff changeset
77 c->low -= 0x100;
michaelni
parents:
diff changeset
78 }else{
michaelni
parents:
diff changeset
79 put_cabac_bit(c, 1);
michaelni
parents:
diff changeset
80 c->low -= 0x200;
michaelni
parents:
diff changeset
81 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
82
1287
michaelni
parents:
diff changeset
83 c->range+= c->range;
michaelni
parents:
diff changeset
84 c->low += c->low;
michaelni
parents:
diff changeset
85 }
michaelni
parents:
diff changeset
86 }
michaelni
parents:
diff changeset
87
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
88 static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
89 int RangeLPS= c->lps_range[*state][c->range>>6];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
90
1287
michaelni
parents:
diff changeset
91 if(bit == ((*state)&1)){
michaelni
parents:
diff changeset
92 c->range -= RangeLPS;
michaelni
parents:
diff changeset
93 *state= c->mps_state[*state];
michaelni
parents:
diff changeset
94 }else{
michaelni
parents:
diff changeset
95 c->low += c->range - RangeLPS;
michaelni
parents:
diff changeset
96 c->range = RangeLPS;
michaelni
parents:
diff changeset
97 *state= c->lps_state[*state];
michaelni
parents:
diff changeset
98 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
99
1287
michaelni
parents:
diff changeset
100 renorm_cabac_encoder(c);
michaelni
parents:
diff changeset
101
michaelni
parents:
diff changeset
102 #ifdef STRICT_LIMITS
michaelni
parents:
diff changeset
103 c->symCount++;
michaelni
parents:
diff changeset
104 #endif
michaelni
parents:
diff changeset
105 }
michaelni
parents:
diff changeset
106
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
107 static void put_cabac_static(CABACContext *c, int RangeLPS, int bit){
1287
michaelni
parents:
diff changeset
108 assert(c->range > RangeLPS);
michaelni
parents:
diff changeset
109
michaelni
parents:
diff changeset
110 if(!bit){
michaelni
parents:
diff changeset
111 c->range -= RangeLPS;
michaelni
parents:
diff changeset
112 }else{
michaelni
parents:
diff changeset
113 c->low += c->range - RangeLPS;
michaelni
parents:
diff changeset
114 c->range = RangeLPS;
michaelni
parents:
diff changeset
115 }
michaelni
parents:
diff changeset
116
michaelni
parents:
diff changeset
117 renorm_cabac_encoder(c);
michaelni
parents:
diff changeset
118
michaelni
parents:
diff changeset
119 #ifdef STRICT_LIMITS
michaelni
parents:
diff changeset
120 c->symCount++;
michaelni
parents:
diff changeset
121 #endif
michaelni
parents:
diff changeset
122 }
michaelni
parents:
diff changeset
123
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
124 /**
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
125 * @param bit 0 -> write zero bit, !=0 write one bit
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
126 */
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
127 static void put_cabac_bypass(CABACContext *c, int bit){
1287
michaelni
parents:
diff changeset
128 c->low += c->low;
michaelni
parents:
diff changeset
129
michaelni
parents:
diff changeset
130 if(bit){
michaelni
parents:
diff changeset
131 c->low += c->range;
michaelni
parents:
diff changeset
132 }
michaelni
parents:
diff changeset
133 //FIXME optimize
michaelni
parents:
diff changeset
134 if(c->low<0x200){
michaelni
parents:
diff changeset
135 put_cabac_bit(c, 0);
michaelni
parents:
diff changeset
136 }else if(c->low<0x400){
michaelni
parents:
diff changeset
137 c->outstanding_count++;
michaelni
parents:
diff changeset
138 c->low -= 0x200;
michaelni
parents:
diff changeset
139 }else{
michaelni
parents:
diff changeset
140 put_cabac_bit(c, 1);
michaelni
parents:
diff changeset
141 c->low -= 0x400;
michaelni
parents:
diff changeset
142 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
143
1287
michaelni
parents:
diff changeset
144 #ifdef STRICT_LIMITS
michaelni
parents:
diff changeset
145 c->symCount++;
michaelni
parents:
diff changeset
146 #endif
michaelni
parents:
diff changeset
147 }
michaelni
parents:
diff changeset
148
1300
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
149 /**
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
150 *
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
151 * @return the number of bytes written
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
152 */
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
153 static int put_cabac_terminate(CABACContext *c, int bit){
1287
michaelni
parents:
diff changeset
154 c->range -= 2;
michaelni
parents:
diff changeset
155
michaelni
parents:
diff changeset
156 if(!bit){
michaelni
parents:
diff changeset
157 renorm_cabac_encoder(c);
michaelni
parents:
diff changeset
158 }else{
michaelni
parents:
diff changeset
159 c->low += c->range;
michaelni
parents:
diff changeset
160 c->range= 2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
161
1287
michaelni
parents:
diff changeset
162 renorm_cabac_encoder(c);
michaelni
parents:
diff changeset
163
michaelni
parents:
diff changeset
164 assert(c->low <= 0x1FF);
michaelni
parents:
diff changeset
165 put_cabac_bit(c, c->low>>9);
michaelni
parents:
diff changeset
166 put_bits(&c->pb, 2, ((c->low>>7)&3)|1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
167
1287
michaelni
parents:
diff changeset
168 flush_put_bits(&c->pb); //FIXME FIXME FIXME XXX wrong
michaelni
parents:
diff changeset
169 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
170
1287
michaelni
parents:
diff changeset
171 #ifdef STRICT_LIMITS
michaelni
parents:
diff changeset
172 c->symCount++;
michaelni
parents:
diff changeset
173 #endif
1300
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
174
1787
752b51a3c8ed get_bit_count -> put_bits_count
alex
parents: 1301
diff changeset
175 return (put_bits_count(&c->pb)+7)>>3;
1287
michaelni
parents:
diff changeset
176 }
michaelni
parents:
diff changeset
177
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
178 /**
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
179 * put (truncated) unary binarization.
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
180 */
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
181 static void put_cabac_u(CABACContext *c, uint8_t * state, int v, int max, int max_index, int truncated){
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
182 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
183
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
184 assert(v <= max);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
185
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
186 #if 1
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
187 for(i=0; i<v; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
188 put_cabac(c, state, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
189 if(i < max_index) state++;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
190 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
191 if(truncated==0 || v<max)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
192 put_cabac(c, state, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
193 #else
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
194 if(v <= max_index){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
195 for(i=0; i<v; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
196 put_cabac(c, state+i, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
197 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
198 if(truncated==0 || v<max)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
199 put_cabac(c, state+i, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
200 }else{
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
201 for(i=0; i<=max_index; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
202 put_cabac(c, state+i, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
203 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
204 for(; i<v; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
205 put_cabac(c, state+max_index, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
206 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
207 if(truncated==0 || v<max)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
208 put_cabac(c, state+max_index, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
209 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
210 #endif
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
211 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
212
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
213 /**
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
214 * put unary exp golomb k-th order binarization.
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
215 */
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
216 static void put_cabac_ueg(CABACContext *c, uint8_t * state, int v, int max, int is_signed, int k, int max_index){
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
217 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
218
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
219 if(v==0)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
220 put_cabac(c, state, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
221 else{
1298
5bc3184810dc cleanup
michaelni
parents: 1290
diff changeset
222 const int sign= v < 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
223
1298
5bc3184810dc cleanup
michaelni
parents: 1290
diff changeset
224 if(is_signed) v= ABS(v);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
225
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
226 if(v<max){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
227 for(i=0; i<v; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
228 put_cabac(c, state, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
229 if(i < max_index) state++;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
230 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
231
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
232 put_cabac(c, state, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
233 }else{
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
234 int m= 1<<k;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
235
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
236 for(i=0; i<max; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
237 put_cabac(c, state, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
238 if(i < max_index) state++;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
239 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
240
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
241 v -= max;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
242 while(v >= m){ //FIXME optimize
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
243 put_cabac_bypass(c, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
244 v-= m;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
245 m+= m;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
246 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
247 put_cabac_bypass(c, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
248 while(m>>=1){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
249 put_cabac_bypass(c, v&m);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
250 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
251 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
252
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
253 if(is_signed)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
254 put_cabac_bypass(c, sign);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
255 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
256 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
257
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
258 static void refill(CABACContext *c){
1c39d9786efd optimization
michael
parents: 2116
diff changeset
259 #if CABAC_BITS == 16
3946
michael
parents: 3943
diff changeset
260 c->low+= (c->bytestream[0]<<9) + (c->bytestream[1]<<1);
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
261 #else
1c39d9786efd optimization
michael
parents: 2116
diff changeset
262 c->low+= c->bytestream[0]<<1;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
263 #endif
1c39d9786efd optimization
michael
parents: 2116
diff changeset
264 c->low -= CABAC_MASK;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
265 c->bytestream+= CABAC_BITS/8;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
266 }
1c39d9786efd optimization
michael
parents: 2116
diff changeset
267
1c39d9786efd optimization
michael
parents: 2116
diff changeset
268 static void refill2(CABACContext *c){
1c39d9786efd optimization
michael
parents: 2116
diff changeset
269 int i, x;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
270
1c39d9786efd optimization
michael
parents: 2116
diff changeset
271 x= c->low ^ (c->low-1);
3964
162bea01a5d4 decrease ff_h264_norm_shift[] size
michael
parents: 3962
diff changeset
272 i= 7 - ff_h264_norm_shift[x>>(CABAC_BITS+1)];
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
273
1c39d9786efd optimization
michael
parents: 2116
diff changeset
274 x= -CABAC_MASK;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
275
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
276 #if CABAC_BITS == 16
1c39d9786efd optimization
michael
parents: 2116
diff changeset
277 x+= (c->bytestream[0]<<9) + (c->bytestream[1]<<1);
1c39d9786efd optimization
michael
parents: 2116
diff changeset
278 #else
1c39d9786efd optimization
michael
parents: 2116
diff changeset
279 x+= c->bytestream[0]<<1;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
280 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
281
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
282 c->low += x<<i;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
283 c->bytestream+= CABAC_BITS/8;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
284 }
1c39d9786efd optimization
michael
parents: 2116
diff changeset
285
1287
michaelni
parents:
diff changeset
286 static inline void renorm_cabac_decoder(CABACContext *c){
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
287 while(c->range < (0x200 << CABAC_BITS)){
1287
michaelni
parents:
diff changeset
288 c->range+= c->range;
michaelni
parents:
diff changeset
289 c->low+= c->low;
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
290 if(!(c->low & CABAC_MASK))
1c39d9786efd optimization
michael
parents: 2116
diff changeset
291 refill(c);
1287
michaelni
parents:
diff changeset
292 }
michaelni
parents:
diff changeset
293 }
michaelni
parents:
diff changeset
294
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
295 static inline void renorm_cabac_decoder_once(CABACContext *c){
3951
751bfc30df72 disable benchmarking code
michael
parents: 3950
diff changeset
296 #ifdef ARCH_X86_DISABLED
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
297 int temp;
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
298 #if 0
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
299 //P3:683 athlon:475
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
300 asm(
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
301 "lea -0x2000000(%0), %2 \n\t"
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
302 "shr $31, %2 \n\t" //FIXME 31->63 for x86-64
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
303 "shl %%cl, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
304 "shl %%cl, %1 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
305 : "+r"(c->range), "+r"(c->low), "+c"(temp)
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
306 );
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
307 #elif 0
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
308 //P3:680 athlon:474
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
309 asm(
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
310 "cmp $0x2000000, %0 \n\t"
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
311 "setb %%cl \n\t" //FIXME 31->63 for x86-64
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
312 "shl %%cl, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
313 "shl %%cl, %1 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
314 : "+r"(c->range), "+r"(c->low), "+c"(temp)
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
315 );
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
316 #elif 1
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
317 int temp2;
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
318 //P3:665 athlon:517
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
319 asm(
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
320 "lea -0x2000000(%0), %%eax \n\t"
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
321 "cdq \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
322 "mov %0, %%eax \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
323 "and %%edx, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
324 "and %1, %%edx \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
325 "add %%eax, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
326 "add %%edx, %1 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
327 : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2)
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
328 );
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
329 #elif 0
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
330 int temp2;
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
331 //P3:673 athlon:509
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
332 asm(
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
333 "cmp $0x2000000, %0 \n\t"
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
334 "sbb %%edx, %%edx \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
335 "mov %0, %%eax \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
336 "and %%edx, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
337 "and %1, %%edx \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
338 "add %%eax, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
339 "add %%edx, %1 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
340 : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2)
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
341 );
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
342 #else
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
343 int temp2;
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
344 //P3:677 athlon:511
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
345 asm(
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
346 "cmp $0x2000000, %0 \n\t"
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
347 "lea (%0, %0), %%eax \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
348 "lea (%1, %1), %%edx \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
349 "cmovb %%eax, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
350 "cmovb %%edx, %1 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
351 : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2)
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
352 );
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
353 #endif
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
354 #else
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
355 //P3:675 athlon:476
3642
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
356 int shift= (uint32_t)(c->range - (0x200 << CABAC_BITS))>>31;
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
357 c->range<<= shift;
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
358 c->low <<= shift;
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
359 #endif
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
360 if(!(c->low & CABAC_MASK))
1c39d9786efd optimization
michael
parents: 2116
diff changeset
361 refill(c);
1c39d9786efd optimization
michael
parents: 2116
diff changeset
362 }
1c39d9786efd optimization
michael
parents: 2116
diff changeset
363
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
364 static int get_cabac(CABACContext *c, uint8_t * const state){
3642
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
365 //FIXME gcc generates duplicate load/stores for c->low and c->range
3969
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
366 #ifdef ARCH_X86
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
367 int bit;
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
368
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
369 #define LOW "0"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
370 #define RANGE "4"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
371 #define LPS_RANGE "12"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
372 #define LPS_STATE "12+2*66*4"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
373 #define MPS_STATE "12+2*66*4+2*65"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
374 #define BYTESTART "12+2*66*4+4*65"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
375 #define BYTE "16+2*66*4+4*65"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
376 #define BYTEEND "20+2*66*4+4*65"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
377
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
378 asm volatile(
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
379 "movzbl (%1), %%eax \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
380 "movl "RANGE "(%2), %%ebx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
381 "movl "RANGE "(%2), %%edx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
382 "shrl $23, %%ebx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
383 "leal "LPS_RANGE"(%2, %%eax, 4), %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
384 "movzbl (%%ebx, %%esi), %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
385 "shll $17, %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
386 "movl "LOW "(%2), %%ebx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
387 //eax:state ebx:low, edx:range, esi:RangeLPS
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
388 "subl %%esi, %%edx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
389 "cmpl %%edx, %%ebx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
390 " ja 1f \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
391 "cmp $0x2000000, %%edx \n\t" //FIXME avoidable
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
392 "setb %%cl \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
393 "shl %%cl, %%edx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
394 "shl %%cl, %%ebx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
395 "movb "MPS_STATE"(%2, %%eax), %%cl \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
396 "movb %%cl, (%1) \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
397 //eax:state ebx:low, edx:range, esi:RangeLPS
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
398 "test %%bx, %%bx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
399 " jnz 2f \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
400 "movl "BYTE "(%2), %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
401 "subl $0xFFFF, %%ebx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
402 "movzwl (%%esi), %%ecx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
403 "bswap %%ecx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
404 "shrl $15, %%ecx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
405 "addl $2, %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
406 "addl %%ecx, %%ebx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
407 "movl %%esi, "BYTE "(%2) \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
408 "jmp 2f \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
409 "1: \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
410 //eax:state ebx:low, edx:range, esi:RangeLPS
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
411 "subl %%edx, %%ebx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
412 "movl %%esi, %%edx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
413 "shr $19, %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
414 "movb " MANGLE(ff_h264_norm_shift) "(%%esi), %%cl \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
415 "shll %%cl, %%ebx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
416 "shll %%cl, %%edx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
417 "movb "LPS_STATE"(%2, %%eax), %%cl \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
418 "movb %%cl, (%1) \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
419 "incl %%eax \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
420 "test %%bx, %%bx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
421 " jnz 2f \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
422
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
423 "movl "BYTE "(%2), %%ecx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
424 "movzwl (%%ecx), %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
425 "bswap %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
426 "shrl $15, %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
427 "subl $0xFFFF, %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
428 "addl $2, %%ecx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
429 "movl %%ecx, "BYTE "(%2) \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
430
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
431 "leal -1(%%ebx), %%ecx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
432 "xorl %%ebx, %%ecx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
433 "shrl $17, %%ecx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
434 "movb " MANGLE(ff_h264_norm_shift) "(%%ecx), %%cl \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
435 "neg %%cl \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
436 "add $7, %%cl \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
437
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
438 "shll %%cl , %%esi \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
439 "addl %%esi, %%ebx \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
440 "2: \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
441 "movl %%edx, "RANGE "(%2) \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
442 "movl %%ebx, "LOW "(%2) \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
443 "andl $1, %%eax \n\t"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
444
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
445 :"=&a"(bit) //FIXME this is fragile gcc either runs out of registers or misscompiles it (for example if "+a"(bit) or "+m"(*state) is used
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
446 :"r"(state), "r"(c)
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
447 : "%ecx", "%ebx", "%edx", "%esi"
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
448 );
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
449 #else
3642
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
450 int s = *state;
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
451 int RangeLPS= c->lps_range[s][c->range>>(CABAC_BITS+7)]<<(CABAC_BITS+1);
2522
e25782262d7d kill warnings patch by (M«©ns Rullg«©rd <mru inprovide com>)
michael
parents: 2323
diff changeset
452 int bit, lps_mask attribute_unused;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
453
1287
michaelni
parents:
diff changeset
454 c->range -= RangeLPS;
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
455 #if 1
1287
michaelni
parents:
diff changeset
456 if(c->low < c->range){
3642
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
457 bit= s&1;
3971
e8a6d5c1ab0b drop failed attempt to optimize *state= c->mps_state[s];
michael
parents: 3970
diff changeset
458 *state= c->mps_state[s];
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
459 renorm_cabac_decoder_once(c);
1287
michaelni
parents:
diff changeset
460 }else{
3964
162bea01a5d4 decrease ff_h264_norm_shift[] size
michael
parents: 3962
diff changeset
461 bit= ff_h264_norm_shift[RangeLPS>>19];
1287
michaelni
parents:
diff changeset
462 c->low -= c->range;
3642
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
463 *state= c->lps_state[s];
3956
0910f2844f9a branchless renormalization (1% faster get_cabac) old branchless renormalization wasnt faster because gcc was scared of the shift variable (missusing bit variable now)
michael
parents: 3955
diff changeset
464 c->range = RangeLPS<<bit;
0910f2844f9a branchless renormalization (1% faster get_cabac) old branchless renormalization wasnt faster because gcc was scared of the shift variable (missusing bit variable now)
michael
parents: 3955
diff changeset
465 c->low <<= bit;
0910f2844f9a branchless renormalization (1% faster get_cabac) old branchless renormalization wasnt faster because gcc was scared of the shift variable (missusing bit variable now)
michael
parents: 3955
diff changeset
466 bit= (s&1)^1;
0910f2844f9a branchless renormalization (1% faster get_cabac) old branchless renormalization wasnt faster because gcc was scared of the shift variable (missusing bit variable now)
michael
parents: 3955
diff changeset
467
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
468 if(!(c->low & 0xFFFF)){
1c39d9786efd optimization
michael
parents: 2116
diff changeset
469 refill2(c);
3956
0910f2844f9a branchless renormalization (1% faster get_cabac) old branchless renormalization wasnt faster because gcc was scared of the shift variable (missusing bit variable now)
michael
parents: 3955
diff changeset
470 }
1287
michaelni
parents:
diff changeset
471 }
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
472 #else
1c39d9786efd optimization
michael
parents: 2116
diff changeset
473 lps_mask= (c->range - c->low)>>31;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
474
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
475 c->low -= c->range & lps_mask;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
476 c->range += (RangeLPS - c->range) & lps_mask;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
477
3642
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
478 bit= (s^lps_mask)&1;
3970
508d759b6906 10l bugfix for some disabled code
michael
parents: 3969
diff changeset
479 *state= c->mps_state[s - (130&lps_mask)];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
480
3970
508d759b6906 10l bugfix for some disabled code
michael
parents: 3969
diff changeset
481 lps_mask= ff_h264_norm_shift[c->range>>(CABAC_BITS+3)];
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
482 c->range<<= lps_mask;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
483 c->low <<= lps_mask;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
484 if(!(c->low & CABAC_MASK))
1c39d9786efd optimization
michael
parents: 2116
diff changeset
485 refill2(c);
1c39d9786efd optimization
michael
parents: 2116
diff changeset
486 #endif
3969
fc6e0942353b first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents: 3967
diff changeset
487 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
488 return bit;
1287
michaelni
parents:
diff changeset
489 }
michaelni
parents:
diff changeset
490
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
491 static int get_cabac_bypass(CABACContext *c){
1287
michaelni
parents:
diff changeset
492 c->low += c->low;
michaelni
parents:
diff changeset
493
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
494 if(!(c->low & CABAC_MASK))
1c39d9786efd optimization
michael
parents: 2116
diff changeset
495 refill(c);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
496
1287
michaelni
parents:
diff changeset
497 if(c->low < c->range){
michaelni
parents:
diff changeset
498 return 0;
michaelni
parents:
diff changeset
499 }else{
michaelni
parents:
diff changeset
500 c->low -= c->range;
michaelni
parents:
diff changeset
501 return 1;
michaelni
parents:
diff changeset
502 }
michaelni
parents:
diff changeset
503 }
michaelni
parents:
diff changeset
504
1300
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
505 /**
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
506 *
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
507 * @return the number of bytes read or 0 if no end
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
508 */
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
509 static int get_cabac_terminate(CABACContext *c){
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
510 c->range -= 4<<CABAC_BITS;
1287
michaelni
parents:
diff changeset
511 if(c->low < c->range){
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
512 renorm_cabac_decoder_once(c);
1287
michaelni
parents:
diff changeset
513 return 0;
michaelni
parents:
diff changeset
514 }else{
1300
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
515 return c->bytestream - c->bytestream_start;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
516 }
1287
michaelni
parents:
diff changeset
517 }
michaelni
parents:
diff changeset
518
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
519 /**
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
520 * get (truncated) unnary binarization.
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
521 */
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
522 static int get_cabac_u(CABACContext *c, uint8_t * state, int max, int max_index, int truncated){
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
523 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
524
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
525 for(i=0; i<max; i++){
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
526 if(get_cabac(c, state)==0)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
527 return i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
528
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
529 if(i< max_index) state++;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
530 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
531
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
532 return truncated ? max : -1;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
533 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
534
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
535 /**
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
536 * get unary exp golomb k-th order binarization.
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
537 */
3928
987fffdf6ae7 don't try to inline cabac functions. gcc ignored the hint anyway, and forcing it would make h264 slower.
lorenm
parents: 3642
diff changeset
538 static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signed, int k, int max_index){
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
539 int i, v;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
540 int m= 1<<k;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
541
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
542 if(get_cabac(c, state)==0)
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
543 return 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
544
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
545 if(0 < max_index) state++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
546
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
547 for(i=1; i<max; i++){
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
548 if(get_cabac(c, state)==0){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
549 if(is_signed && get_cabac_bypass(c)){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
550 return -i;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
551 }else
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
552 return i;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
553 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
554
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
555 if(i < max_index) state++;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
556 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
557
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
558 while(get_cabac_bypass(c)){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
559 i+= m;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
560 m+= m;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
561 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
562
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
563 v=0;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
564 while(m>>=1){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
565 v+= v + get_cabac_bypass(c);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
566 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
567 i += v;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
568
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
569 if(is_signed && get_cabac_bypass(c)){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
570 return -i;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
571 }else
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
572 return i;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
573 }