annotate cabac.h @ 4001:34fdffe98bd0 libavcodec

Rename ABS macro to FFABS.
author diego
date Wed, 11 Oct 2006 23:17:58 +0000
parents 6cbad3675632
children ec426fa57dfe
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)
3984
bb186452e7da BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER
diego
parents: 3982
diff changeset
34 #define BRANCHLESS_CABAC_DECODER 1
3990
746a60ba3177 enable CMOV_IS_FAST as its faster or equal speed on every cpu (duron, athlon, PM, P3) from which ive seen benchmarks, it might be slower on P4 but noone has posted benchmarks ...
michael
parents: 3984
diff changeset
35 #define CMOV_IS_FAST 1
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
36
1287
michaelni
parents:
diff changeset
37 typedef struct CABACContext{
michaelni
parents:
diff changeset
38 int low;
michaelni
parents:
diff changeset
39 int range;
michaelni
parents:
diff changeset
40 int outstanding_count;
michaelni
parents:
diff changeset
41 #ifdef STRICT_LIMITS
michaelni
parents:
diff changeset
42 int symCount;
michaelni
parents:
diff changeset
43 #endif
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 1787
diff changeset
44 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
45 const uint8_t *bytestream;
2116
48d9f86fb047 overread fix
michael
parents: 2024
diff changeset
46 const uint8_t *bytestream_end;
1287
michaelni
parents:
diff changeset
47 PutBitContext pb;
michaelni
parents:
diff changeset
48 }CABACContext;
michaelni
parents:
diff changeset
49
3991
72bae00a317f make lps_range a global table its constant anyway (saves 1 addition for accessing it)
michael
parents: 3990
diff changeset
50 extern uint8_t ff_h264_lps_range[2*65][4]; ///< rangeTabLPS
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
51 extern uint8_t ff_h264_mps_state[2*64]; ///< transIdxMPS
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
52 extern uint8_t ff_h264_lps_state[2*64]; ///< transIdxLPS
3964
162bea01a5d4 decrease ff_h264_norm_shift[] size
michael
parents: 3962
diff changeset
53 extern const uint8_t ff_h264_norm_shift[128];
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
54
1287
michaelni
parents:
diff changeset
55
michaelni
parents:
diff changeset
56 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
57 void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size);
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
58 void ff_init_cabac_states(CABACContext *c);
1287
michaelni
parents:
diff changeset
59
michaelni
parents:
diff changeset
60
michaelni
parents:
diff changeset
61 static inline void put_cabac_bit(CABACContext *c, int b){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
62 put_bits(&c->pb, 1, b);
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
63 for(;c->outstanding_count; c->outstanding_count--){
1287
michaelni
parents:
diff changeset
64 put_bits(&c->pb, 1, 1-b);
michaelni
parents:
diff changeset
65 }
michaelni
parents:
diff changeset
66 }
michaelni
parents:
diff changeset
67
michaelni
parents:
diff changeset
68 static inline void renorm_cabac_encoder(CABACContext *c){
michaelni
parents:
diff changeset
69 while(c->range < 0x100){
michaelni
parents:
diff changeset
70 //FIXME optimize
michaelni
parents:
diff changeset
71 if(c->low<0x100){
michaelni
parents:
diff changeset
72 put_cabac_bit(c, 0);
michaelni
parents:
diff changeset
73 }else if(c->low<0x200){
michaelni
parents:
diff changeset
74 c->outstanding_count++;
michaelni
parents:
diff changeset
75 c->low -= 0x100;
michaelni
parents:
diff changeset
76 }else{
michaelni
parents:
diff changeset
77 put_cabac_bit(c, 1);
michaelni
parents:
diff changeset
78 c->low -= 0x200;
michaelni
parents:
diff changeset
79 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
80
1287
michaelni
parents:
diff changeset
81 c->range+= c->range;
michaelni
parents:
diff changeset
82 c->low += c->low;
michaelni
parents:
diff changeset
83 }
michaelni
parents:
diff changeset
84 }
michaelni
parents:
diff changeset
85
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
86 static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
3991
72bae00a317f make lps_range a global table its constant anyway (saves 1 addition for accessing it)
michael
parents: 3990
diff changeset
87 int RangeLPS= ff_h264_lps_range[*state][c->range>>6];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
88
1287
michaelni
parents:
diff changeset
89 if(bit == ((*state)&1)){
michaelni
parents:
diff changeset
90 c->range -= RangeLPS;
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
91 *state= ff_h264_mps_state[*state];
1287
michaelni
parents:
diff changeset
92 }else{
michaelni
parents:
diff changeset
93 c->low += c->range - RangeLPS;
michaelni
parents:
diff changeset
94 c->range = RangeLPS;
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
95 *state= ff_h264_lps_state[*state];
1287
michaelni
parents:
diff changeset
96 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
97
1287
michaelni
parents:
diff changeset
98 renorm_cabac_encoder(c);
michaelni
parents:
diff changeset
99
michaelni
parents:
diff changeset
100 #ifdef STRICT_LIMITS
michaelni
parents:
diff changeset
101 c->symCount++;
michaelni
parents:
diff changeset
102 #endif
michaelni
parents:
diff changeset
103 }
michaelni
parents:
diff changeset
104
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
105 static void put_cabac_static(CABACContext *c, int RangeLPS, int bit){
1287
michaelni
parents:
diff changeset
106 assert(c->range > RangeLPS);
michaelni
parents:
diff changeset
107
michaelni
parents:
diff changeset
108 if(!bit){
michaelni
parents:
diff changeset
109 c->range -= RangeLPS;
michaelni
parents:
diff changeset
110 }else{
michaelni
parents:
diff changeset
111 c->low += c->range - RangeLPS;
michaelni
parents:
diff changeset
112 c->range = RangeLPS;
michaelni
parents:
diff changeset
113 }
michaelni
parents:
diff changeset
114
michaelni
parents:
diff changeset
115 renorm_cabac_encoder(c);
michaelni
parents:
diff changeset
116
michaelni
parents:
diff changeset
117 #ifdef STRICT_LIMITS
michaelni
parents:
diff changeset
118 c->symCount++;
michaelni
parents:
diff changeset
119 #endif
michaelni
parents:
diff changeset
120 }
michaelni
parents:
diff changeset
121
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
122 /**
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
123 * @param bit 0 -> write zero bit, !=0 write one bit
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
124 */
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
125 static void put_cabac_bypass(CABACContext *c, int bit){
1287
michaelni
parents:
diff changeset
126 c->low += c->low;
michaelni
parents:
diff changeset
127
michaelni
parents:
diff changeset
128 if(bit){
michaelni
parents:
diff changeset
129 c->low += c->range;
michaelni
parents:
diff changeset
130 }
michaelni
parents:
diff changeset
131 //FIXME optimize
michaelni
parents:
diff changeset
132 if(c->low<0x200){
michaelni
parents:
diff changeset
133 put_cabac_bit(c, 0);
michaelni
parents:
diff changeset
134 }else if(c->low<0x400){
michaelni
parents:
diff changeset
135 c->outstanding_count++;
michaelni
parents:
diff changeset
136 c->low -= 0x200;
michaelni
parents:
diff changeset
137 }else{
michaelni
parents:
diff changeset
138 put_cabac_bit(c, 1);
michaelni
parents:
diff changeset
139 c->low -= 0x400;
michaelni
parents:
diff changeset
140 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
141
1287
michaelni
parents:
diff changeset
142 #ifdef STRICT_LIMITS
michaelni
parents:
diff changeset
143 c->symCount++;
michaelni
parents:
diff changeset
144 #endif
michaelni
parents:
diff changeset
145 }
michaelni
parents:
diff changeset
146
1300
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
147 /**
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
148 *
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
149 * @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
150 */
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
151 static int put_cabac_terminate(CABACContext *c, int bit){
1287
michaelni
parents:
diff changeset
152 c->range -= 2;
michaelni
parents:
diff changeset
153
michaelni
parents:
diff changeset
154 if(!bit){
michaelni
parents:
diff changeset
155 renorm_cabac_encoder(c);
michaelni
parents:
diff changeset
156 }else{
michaelni
parents:
diff changeset
157 c->low += c->range;
michaelni
parents:
diff changeset
158 c->range= 2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
159
1287
michaelni
parents:
diff changeset
160 renorm_cabac_encoder(c);
michaelni
parents:
diff changeset
161
michaelni
parents:
diff changeset
162 assert(c->low <= 0x1FF);
michaelni
parents:
diff changeset
163 put_cabac_bit(c, c->low>>9);
michaelni
parents:
diff changeset
164 put_bits(&c->pb, 2, ((c->low>>7)&3)|1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
165
1287
michaelni
parents:
diff changeset
166 flush_put_bits(&c->pb); //FIXME FIXME FIXME XXX wrong
michaelni
parents:
diff changeset
167 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
168
1287
michaelni
parents:
diff changeset
169 #ifdef STRICT_LIMITS
michaelni
parents:
diff changeset
170 c->symCount++;
michaelni
parents:
diff changeset
171 #endif
1300
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
172
1787
752b51a3c8ed get_bit_count -> put_bits_count
alex
parents: 1301
diff changeset
173 return (put_bits_count(&c->pb)+7)>>3;
1287
michaelni
parents:
diff changeset
174 }
michaelni
parents:
diff changeset
175
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
176 /**
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
177 * put (truncated) unary binarization.
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
178 */
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
179 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
180 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
181
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
182 assert(v <= max);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
183
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
184 #if 1
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
185 for(i=0; i<v; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
186 put_cabac(c, state, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
187 if(i < max_index) state++;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
188 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
189 if(truncated==0 || v<max)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
190 put_cabac(c, state, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
191 #else
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
192 if(v <= max_index){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
193 for(i=0; i<v; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
194 put_cabac(c, state+i, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
195 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
196 if(truncated==0 || v<max)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
197 put_cabac(c, state+i, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
198 }else{
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
199 for(i=0; i<=max_index; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
200 put_cabac(c, state+i, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
201 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
202 for(; i<v; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
203 put_cabac(c, state+max_index, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
204 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
205 if(truncated==0 || v<max)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
206 put_cabac(c, state+max_index, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
207 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
208 #endif
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
209 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
210
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
211 /**
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
212 * put unary exp golomb k-th order binarization.
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
213 */
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
214 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
215 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
216
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
217 if(v==0)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
218 put_cabac(c, state, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
219 else{
1298
5bc3184810dc cleanup
michaelni
parents: 1290
diff changeset
220 const int sign= v < 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
221
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3999
diff changeset
222 if(is_signed) v= FFABS(v);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
223
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
224 if(v<max){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
225 for(i=0; i<v; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
226 put_cabac(c, state, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
227 if(i < max_index) state++;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
228 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
229
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
230 put_cabac(c, state, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
231 }else{
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
232 int m= 1<<k;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
233
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
234 for(i=0; i<max; i++){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
235 put_cabac(c, state, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
236 if(i < max_index) state++;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
237 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
238
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
239 v -= max;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
240 while(v >= m){ //FIXME optimize
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
241 put_cabac_bypass(c, 1);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
242 v-= m;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
243 m+= m;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
244 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
245 put_cabac_bypass(c, 0);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
246 while(m>>=1){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
247 put_cabac_bypass(c, v&m);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
248 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
249 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
250
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
251 if(is_signed)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
252 put_cabac_bypass(c, sign);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
253 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
254 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
255
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
256 static void refill(CABACContext *c){
1c39d9786efd optimization
michael
parents: 2116
diff changeset
257 #if CABAC_BITS == 16
3946
michael
parents: 3943
diff changeset
258 c->low+= (c->bytestream[0]<<9) + (c->bytestream[1]<<1);
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
259 #else
1c39d9786efd optimization
michael
parents: 2116
diff changeset
260 c->low+= c->bytestream[0]<<1;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
261 #endif
1c39d9786efd optimization
michael
parents: 2116
diff changeset
262 c->low -= CABAC_MASK;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
263 c->bytestream+= CABAC_BITS/8;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
264 }
1c39d9786efd optimization
michael
parents: 2116
diff changeset
265
1c39d9786efd optimization
michael
parents: 2116
diff changeset
266 static void refill2(CABACContext *c){
1c39d9786efd optimization
michael
parents: 2116
diff changeset
267 int i, x;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
268
1c39d9786efd optimization
michael
parents: 2116
diff changeset
269 x= c->low ^ (c->low-1);
3964
162bea01a5d4 decrease ff_h264_norm_shift[] size
michael
parents: 3962
diff changeset
270 i= 7 - ff_h264_norm_shift[x>>(CABAC_BITS+1)];
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
271
1c39d9786efd optimization
michael
parents: 2116
diff changeset
272 x= -CABAC_MASK;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
273
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
274 #if CABAC_BITS == 16
1c39d9786efd optimization
michael
parents: 2116
diff changeset
275 x+= (c->bytestream[0]<<9) + (c->bytestream[1]<<1);
1c39d9786efd optimization
michael
parents: 2116
diff changeset
276 #else
1c39d9786efd optimization
michael
parents: 2116
diff changeset
277 x+= c->bytestream[0]<<1;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
278 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
279
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
280 c->low += x<<i;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
281 c->bytestream+= CABAC_BITS/8;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
282 }
1c39d9786efd optimization
michael
parents: 2116
diff changeset
283
1287
michaelni
parents:
diff changeset
284 static inline void renorm_cabac_decoder(CABACContext *c){
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
285 while(c->range < (0x200 << CABAC_BITS)){
1287
michaelni
parents:
diff changeset
286 c->range+= c->range;
michaelni
parents:
diff changeset
287 c->low+= c->low;
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
288 if(!(c->low & CABAC_MASK))
1c39d9786efd optimization
michael
parents: 2116
diff changeset
289 refill(c);
1287
michaelni
parents:
diff changeset
290 }
michaelni
parents:
diff changeset
291 }
michaelni
parents:
diff changeset
292
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
293 static inline void renorm_cabac_decoder_once(CABACContext *c){
3951
751bfc30df72 disable benchmarking code
michael
parents: 3950
diff changeset
294 #ifdef ARCH_X86_DISABLED
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
295 int temp;
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
296 #if 0
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
297 //P3:683 athlon:475
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
298 asm(
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
299 "lea -0x2000000(%0), %2 \n\t"
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
300 "shr $31, %2 \n\t" //FIXME 31->63 for x86-64
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
301 "shl %%cl, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
302 "shl %%cl, %1 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
303 : "+r"(c->range), "+r"(c->low), "+c"(temp)
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
304 );
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
305 #elif 0
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
306 //P3:680 athlon:474
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
307 asm(
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
308 "cmp $0x2000000, %0 \n\t"
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
309 "setb %%cl \n\t" //FIXME 31->63 for x86-64
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
310 "shl %%cl, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
311 "shl %%cl, %1 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
312 : "+r"(c->range), "+r"(c->low), "+c"(temp)
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
313 );
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
314 #elif 1
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
315 int temp2;
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
316 //P3:665 athlon:517
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
317 asm(
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
318 "lea -0x2000000(%0), %%eax \n\t"
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
319 "cdq \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
320 "mov %0, %%eax \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
321 "and %%edx, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
322 "and %1, %%edx \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
323 "add %%eax, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
324 "add %%edx, %1 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
325 : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2)
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
326 );
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
327 #elif 0
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
328 int temp2;
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
329 //P3:673 athlon:509
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
330 asm(
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
331 "cmp $0x2000000, %0 \n\t"
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
332 "sbb %%edx, %%edx \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
333 "mov %0, %%eax \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
334 "and %%edx, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
335 "and %1, %%edx \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
336 "add %%eax, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
337 "add %%edx, %1 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
338 : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2)
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
339 );
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
340 #else
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
341 int temp2;
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
342 //P3:677 athlon:511
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
343 asm(
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
344 "cmp $0x2000000, %0 \n\t"
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
345 "lea (%0, %0), %%eax \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
346 "lea (%1, %1), %%edx \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
347 "cmovb %%eax, %0 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
348 "cmovb %%edx, %1 \n\t"
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
349 : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2)
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
350 );
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
351 #endif
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
352 #else
3950
900d21b85dd6 renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents: 3948
diff changeset
353 //P3:675 athlon:476
3642
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
354 int shift= (uint32_t)(c->range - (0x200 << CABAC_BITS))>>31;
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
355 c->range<<= shift;
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
356 c->low <<= shift;
3943
811a9b0d9f32 several x86 renorm_cabac_decoder_once optimizations
michael
parents: 3928
diff changeset
357 #endif
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
358 if(!(c->low & CABAC_MASK))
1c39d9786efd optimization
michael
parents: 2116
diff changeset
359 refill(c);
1c39d9786efd optimization
michael
parents: 2116
diff changeset
360 }
1c39d9786efd optimization
michael
parents: 2116
diff changeset
361
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
362 static int get_cabac(CABACContext *c, uint8_t * const state){
3642
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
363 //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
364 #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
365 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
366
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 #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
368 #define RANGE "4"
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
369 #define BYTESTART "12"
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
370 #define BYTE "16"
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
371 #define BYTEEND "20"
3984
bb186452e7da BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER
diego
parents: 3982
diff changeset
372 #ifndef BRANCHLESS_CABAC_DECODER
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
373 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
374 "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
375 "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
376 "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
377 "shrl $23, %%ebx \n\t"
3992
michael
parents: 3991
diff changeset
378 "movzbl "MANGLE(ff_h264_lps_range)"(%%ebx, %%eax, 4), %%esi\n\t"
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
379 "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
380 "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
381 //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
382 "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
383 "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
384 " ja 1f \n\t"
3999
6cbad3675632 slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents: 3996
diff changeset
385
6cbad3675632 slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents: 3996
diff changeset
386 #if 1
6cbad3675632 slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents: 3996
diff changeset
387 //athlon:4067 P3:4110
6cbad3675632 slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents: 3996
diff changeset
388 "lea -0x2000000(%%edx), %%ecx \n\t"
6cbad3675632 slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents: 3996
diff changeset
389 "shr $31, %%ecx \n\t"
6cbad3675632 slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents: 3996
diff changeset
390 "shl %%cl, %%edx \n\t"
6cbad3675632 slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents: 3996
diff changeset
391 "shl %%cl, %%ebx \n\t"
6cbad3675632 slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents: 3996
diff changeset
392 #else
6cbad3675632 slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents: 3996
diff changeset
393 //athlon:4057 P3:4130
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
394 "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
395 "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
396 "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
397 "shl %%cl, %%ebx \n\t"
3999
6cbad3675632 slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents: 3996
diff changeset
398 #endif
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
399 "movzbl "MANGLE(ff_h264_mps_state)"(%%eax), %%ecx \n\t"
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
400 "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
401 //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
402 "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
403 " 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
404 "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
405 "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
406 "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
407 "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
408 "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
409 "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
410 "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
411 "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
412 "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
413 "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
414 //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
415 "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
416 "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
417 "shr $19, %%esi \n\t"
3996
c4ff7d570f19 moving lps state transition code a little up in the branched asm code (1% faster on P3)
michael
parents: 3995
diff changeset
418 "movzbl "MANGLE(ff_h264_lps_state)"(%%eax), %%ecx \n\t"
c4ff7d570f19 moving lps state transition code a little up in the branched asm code (1% faster on P3)
michael
parents: 3995
diff changeset
419 "movb %%cl, (%1) \n\t"
3979
ce16f66a48ad reading 8bit mem into a 8bit register needs 2 uops on P4, 8bit->32bit with zero extension needs just 1
michael
parents: 3978
diff changeset
420 "movzbl " MANGLE(ff_h264_norm_shift) "(%%esi), %%ecx \n\t"
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
421 "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
422 "shll %%cl, %%edx \n\t"
3978
db01070401c7 on the P4 inc needs twice as much time a add
michael
parents: 3977
diff changeset
423 "addl $1, %%eax \n\t"
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
424 "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
425 " 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
426
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 "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
428 "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
429 "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
430 "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
431 "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
432 "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
433 "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
434
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 "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
436 "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
437 "shrl $17, %%ecx \n\t"
3979
ce16f66a48ad reading 8bit mem into a 8bit register needs 2 uops on P4, 8bit->32bit with zero extension needs just 1
michael
parents: 3978
diff changeset
438 "movzbl " MANGLE(ff_h264_norm_shift) "(%%ecx), %%ecx \n\t"
3994
2734b228fc87 use ecx instead of cl (no speed change on P3 but might avoid partial register stalls on some cpus)
michael
parents: 3993
diff changeset
439 "neg %%ecx \n\t"
2734b228fc87 use ecx instead of cl (no speed change on P3 but might avoid partial register stalls on some cpus)
michael
parents: 3993
diff changeset
440 "add $7, %%ecx \n\t"
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
441
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 "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
443 "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
444 "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
445 "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
446 "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
447 :"=&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
448 :"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
449 : "%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
450 );
3982
af16271634c2 moving another bit&1 out, this is as fast as with it in there, but it makes more sense with it outside of the loop
michael
parents: 3981
diff changeset
451 bit&=1;
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
452 #else
3975
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
453 asm volatile(
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
454 "movzbl (%1), %%eax \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
455 "movl "RANGE "(%2), %%ebx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
456 "movl "RANGE "(%2), %%edx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
457 "shrl $23, %%ebx \n\t"
3992
michael
parents: 3991
diff changeset
458 "movzbl "MANGLE(ff_h264_lps_range)"(%%ebx, %%eax, 4), %%esi\n\t"
3975
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
459 "shll $17, %%esi \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
460 "movl "LOW "(%2), %%ebx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
461 //eax:state ebx:low, edx:range, esi:RangeLPS
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
462 "subl %%esi, %%edx \n\t"
3980
5afe4253a220 replace a few and/sub/... by cmov
michael
parents: 3979
diff changeset
463 #ifdef CMOV_IS_FAST //FIXME actually define this somewhere
5afe4253a220 replace a few and/sub/... by cmov
michael
parents: 3979
diff changeset
464 "cmpl %%ebx, %%edx \n\t"
5afe4253a220 replace a few and/sub/... by cmov
michael
parents: 3979
diff changeset
465 "cmova %%edx, %%esi \n\t"
5afe4253a220 replace a few and/sub/... by cmov
michael
parents: 3979
diff changeset
466 "sbbl %%ecx, %%ecx \n\t"
5afe4253a220 replace a few and/sub/... by cmov
michael
parents: 3979
diff changeset
467 "andl %%ecx, %%edx \n\t"
5afe4253a220 replace a few and/sub/... by cmov
michael
parents: 3979
diff changeset
468 "subl %%edx, %%ebx \n\t"
5afe4253a220 replace a few and/sub/... by cmov
michael
parents: 3979
diff changeset
469 "xorl %%ecx, %%eax \n\t"
5afe4253a220 replace a few and/sub/... by cmov
michael
parents: 3979
diff changeset
470 #else
3975
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
471 "movl %%edx, %%ecx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
472 "subl %%ebx, %%edx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
473 "sarl $31, %%edx \n\t" //lps_mask
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
474 "subl %%ecx, %%esi \n\t" //RangeLPS - range
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
475 "andl %%edx, %%esi \n\t" //(RangeLPS - range)&lps_mask
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
476 "addl %%ecx, %%esi \n\t" //new range
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
477 "andl %%edx, %%ecx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
478 "subl %%ecx, %%ebx \n\t"
3980
5afe4253a220 replace a few and/sub/... by cmov
michael
parents: 3979
diff changeset
479 "xorl %%edx, %%eax \n\t"
5afe4253a220 replace a few and/sub/... by cmov
michael
parents: 3979
diff changeset
480 #endif
3975
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
481
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
482 //eax:state ebx:low edx:mask esi:range
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
483 "movzbl "MANGLE(ff_h264_mps_state)"(%%eax), %%ecx \n\t"
3975
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
484 "movb %%cl, (%1) \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
485
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
486 "movl %%esi, %%edx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
487 //eax:bit ebx:low edx:range esi:range
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
488
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
489 "shr $19, %%esi \n\t"
3979
ce16f66a48ad reading 8bit mem into a 8bit register needs 2 uops on P4, 8bit->32bit with zero extension needs just 1
michael
parents: 3978
diff changeset
490 "movzbl " MANGLE(ff_h264_norm_shift) "(%%esi), %%ecx \n\t"
3995
b00c06477dff write cabac low and range variables as early as possible to prevent stalls from reading them before they where written, the P4 is said to disslike that alot, on P3 its 2% faster (START/STOP_TIMER over decode_residual)
michael
parents: 3994
diff changeset
491 "shll %%cl, %%edx \n\t"
b00c06477dff write cabac low and range variables as early as possible to prevent stalls from reading them before they where written, the P4 is said to disslike that alot, on P3 its 2% faster (START/STOP_TIMER over decode_residual)
michael
parents: 3994
diff changeset
492 "movl %%edx, "RANGE "(%2) \n\t"
3975
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
493 "shll %%cl, %%ebx \n\t"
3995
b00c06477dff write cabac low and range variables as early as possible to prevent stalls from reading them before they where written, the P4 is said to disslike that alot, on P3 its 2% faster (START/STOP_TIMER over decode_residual)
michael
parents: 3994
diff changeset
494 "movl %%ebx, "LOW "(%2) \n\t"
3975
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
495 "test %%bx, %%bx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
496 " jnz 1f \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
497
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
498 "movl "BYTE "(%2), %%ecx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
499 "movzwl (%%ecx), %%esi \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
500 "bswap %%esi \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
501 "shrl $15, %%esi \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
502 "subl $0xFFFF, %%esi \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
503 "addl $2, %%ecx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
504 "movl %%ecx, "BYTE "(%2) \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
505
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
506 "leal -1(%%ebx), %%ecx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
507 "xorl %%ebx, %%ecx \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
508 "shrl $17, %%ecx \n\t"
3979
ce16f66a48ad reading 8bit mem into a 8bit register needs 2 uops on P4, 8bit->32bit with zero extension needs just 1
michael
parents: 3978
diff changeset
509 "movzbl " MANGLE(ff_h264_norm_shift) "(%%ecx), %%ecx \n\t"
3994
2734b228fc87 use ecx instead of cl (no speed change on P3 but might avoid partial register stalls on some cpus)
michael
parents: 3993
diff changeset
510 "neg %%ecx \n\t"
2734b228fc87 use ecx instead of cl (no speed change on P3 but might avoid partial register stalls on some cpus)
michael
parents: 3993
diff changeset
511 "add $7, %%ecx \n\t"
3975
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
512
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
513 "shll %%cl , %%esi \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
514 "addl %%esi, %%ebx \n\t"
3995
b00c06477dff write cabac low and range variables as early as possible to prevent stalls from reading them before they where written, the P4 is said to disslike that alot, on P3 its 2% faster (START/STOP_TIMER over decode_residual)
michael
parents: 3994
diff changeset
515 "movl %%ebx, "LOW "(%2) \n\t"
3975
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
516 "1: \n\t"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
517 :"=&a"(bit)
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
518 :"r"(state), "r"(c)
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
519 : "%ecx", "%ebx", "%edx", "%esi"
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
520 );
3981
9854f686ba79 move the &1 out of the asm so gcc can optimize it away in inlined cases (yes this is slightly faster)
michael
parents: 3980
diff changeset
521 bit&=1;
3975
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
522 #endif
6cc9eb5ee5e3 x86 branchless cabac decoder
michael
parents: 3974
diff changeset
523 #else
3642
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
524 int s = *state;
3991
72bae00a317f make lps_range a global table its constant anyway (saves 1 addition for accessing it)
michael
parents: 3990
diff changeset
525 int RangeLPS= ff_h264_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
526 int bit, lps_mask attribute_unused;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
527
1287
michaelni
parents:
diff changeset
528 c->range -= RangeLPS;
3984
bb186452e7da BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER
diego
parents: 3982
diff changeset
529 #ifndef BRANCHLESS_CABAC_DECODER
1287
michaelni
parents:
diff changeset
530 if(c->low < c->range){
3642
0efda682253c tweak cabac. 0.5% faster h264.
lorenm
parents: 3284
diff changeset
531 bit= s&1;
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
532 *state= ff_h264_mps_state[s];
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
533 renorm_cabac_decoder_once(c);
1287
michaelni
parents:
diff changeset
534 }else{
3964
162bea01a5d4 decrease ff_h264_norm_shift[] size
michael
parents: 3962
diff changeset
535 bit= ff_h264_norm_shift[RangeLPS>>19];
1287
michaelni
parents:
diff changeset
536 c->low -= c->range;
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
537 *state= ff_h264_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
538 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
539 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
540 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
541
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
542 if(!(c->low & 0xFFFF)){
1c39d9786efd optimization
michael
parents: 2116
diff changeset
543 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
544 }
1287
michaelni
parents:
diff changeset
545 }
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
546 #else
1c39d9786efd optimization
michael
parents: 2116
diff changeset
547 lps_mask= (c->range - c->low)>>31;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
548
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
549 c->low -= c->range & lps_mask;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
550 c->range += (RangeLPS - c->range) & lps_mask;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
551
3974
93746612bc78 optimize branchless C CABAC decoder
michael
parents: 3972
diff changeset
552 s^=lps_mask;
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3992
diff changeset
553 *state= ff_h264_mps_state[s];
3974
93746612bc78 optimize branchless C CABAC decoder
michael
parents: 3972
diff changeset
554 bit= s&1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
555
3970
508d759b6906 10l bugfix for some disabled code
michael
parents: 3969
diff changeset
556 lps_mask= ff_h264_norm_shift[c->range>>(CABAC_BITS+3)];
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
557 c->range<<= lps_mask;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
558 c->low <<= lps_mask;
1c39d9786efd optimization
michael
parents: 2116
diff changeset
559 if(!(c->low & CABAC_MASK))
1c39d9786efd optimization
michael
parents: 2116
diff changeset
560 refill2(c);
1c39d9786efd optimization
michael
parents: 2116
diff changeset
561 #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
562 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
563 return bit;
1287
michaelni
parents:
diff changeset
564 }
michaelni
parents:
diff changeset
565
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
566 static int get_cabac_bypass(CABACContext *c){
1287
michaelni
parents:
diff changeset
567 c->low += c->low;
michaelni
parents:
diff changeset
568
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
569 if(!(c->low & CABAC_MASK))
1c39d9786efd optimization
michael
parents: 2116
diff changeset
570 refill(c);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
571
1287
michaelni
parents:
diff changeset
572 if(c->low < c->range){
michaelni
parents:
diff changeset
573 return 0;
michaelni
parents:
diff changeset
574 }else{
michaelni
parents:
diff changeset
575 c->low -= c->range;
michaelni
parents:
diff changeset
576 return 1;
michaelni
parents:
diff changeset
577 }
michaelni
parents:
diff changeset
578 }
michaelni
parents:
diff changeset
579
1300
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
580 /**
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
581 *
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
582 * @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
583 */
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
584 static int get_cabac_terminate(CABACContext *c){
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
585 c->range -= 4<<CABAC_BITS;
1287
michaelni
parents:
diff changeset
586 if(c->low < c->range){
2323
1c39d9786efd optimization
michael
parents: 2116
diff changeset
587 renorm_cabac_decoder_once(c);
1287
michaelni
parents:
diff changeset
588 return 0;
michaelni
parents:
diff changeset
589 }else{
1300
e18667d1e94d FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents: 1298
diff changeset
590 return c->bytestream - c->bytestream_start;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
591 }
1287
michaelni
parents:
diff changeset
592 }
michaelni
parents:
diff changeset
593
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
594 /**
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
595 * get (truncated) unnary binarization.
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
596 */
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
597 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
598 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
599
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
600 for(i=0; i<max; i++){
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
601 if(get_cabac(c, state)==0)
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
602 return i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
603
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
604 if(i< max_index) state++;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
605 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
606
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
607 return truncated ? max : -1;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
608 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
609
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
610 /**
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
611 * get unary exp golomb k-th order binarization.
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
612 */
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
613 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
614 int i, v;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
615 int m= 1<<k;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
616
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
617 if(get_cabac(c, state)==0)
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
618 return 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
619
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
620 if(0 < max_index) state++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
621
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
622 for(i=1; i<max; i++){
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
623 if(get_cabac(c, state)==0){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
624 if(is_signed && get_cabac_bypass(c)){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
625 return -i;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
626 }else
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
627 return i;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
628 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
629
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
630 if(i < max_index) state++;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
631 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
632
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
633 while(get_cabac_bypass(c)){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
634 i+= m;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
635 m+= m;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
636 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2736
diff changeset
637
1290
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
638 v=0;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
639 while(m>>=1){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
640 v+= v + get_cabac_bypass(c);
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
641 }
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
642 i += v;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
643
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
644 if(is_signed && get_cabac_bypass(c)){
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
645 return -i;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
646 }else
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
647 return i;
dae280b939ca (truncated) unary binerization
michaelni
parents: 1287
diff changeset
648 }