annotate cabac.h @ 3975:6cc9eb5ee5e3 libavcodec

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