Mercurial > libavcodec.hg
annotate cabac.h @ 4975:9a6a0818e93f libavcodec
split h264.c to move parser in its own file
| author | aurel |
|---|---|
| date | Thu, 10 May 2007 22:26:44 +0000 |
| parents | 777f250df232 |
| children | ce36118abbbb |
| rev | line source |
|---|---|
| 1287 | 1 /* |
| 2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder | |
| 3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> | |
| 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 | 8 * modify it under the terms of the GNU Lesser General Public |
| 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 | 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 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Lesser General Public License for more details. | |
| 16 * | |
| 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 | 20 * |
| 21 */ | |
| 2967 | 22 |
| 1287 | 23 /** |
| 24 * @file cabac.h | |
| 25 * Context Adaptive Binary Arithmetic Coder. | |
| 26 */ | |
| 27 | |
| 4975 | 28 #ifndef CABAC_H |
| 29 #define CABAC_H | |
| 30 | |
| 31 #include "bitstream.h" | |
| 1287 | 32 |
|
3284
a224d9752912
don't force asserts in release builds. 2% faster h264.
lorenm
parents:
3036
diff
changeset
|
33 //#undef NDEBUG |
| 1287 | 34 #include <assert.h> |
| 4064 | 35 #ifdef ARCH_X86 |
| 36 #include "x86_cpu.h" | |
| 37 #endif | |
| 1287 | 38 |
|
3948
3edbf131ee44
refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents:
3947
diff
changeset
|
39 #define CABAC_BITS 16 |
| 2323 | 40 #define CABAC_MASK ((1<<CABAC_BITS)-1) |
| 3984 | 41 #define BRANCHLESS_CABAC_DECODER 1 |
| 4039 | 42 //#define ARCH_X86_DISABLED 1 |
| 2323 | 43 |
| 1287 | 44 typedef struct CABACContext{ |
| 45 int low; | |
| 46 int range; | |
| 47 int outstanding_count; | |
| 48 #ifdef STRICT_LIMITS | |
| 49 int symCount; | |
| 50 #endif | |
|
2024
f65d87bfdd5a
some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
1787
diff
changeset
|
51 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
|
52 const uint8_t *bytestream; |
| 2116 | 53 const uint8_t *bytestream_end; |
| 1287 | 54 PutBitContext pb; |
| 55 }CABACContext; | |
| 56 | |
|
4014
b2582438effe
dehack *ps_state indexing in the branchless decoder
michael
parents:
4012
diff
changeset
|
57 extern uint8_t ff_h264_mlps_state[4*64]; |
| 4039 | 58 extern uint8_t ff_h264_lps_range[4*2*64]; ///< 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
|
59 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
|
60 extern uint8_t ff_h264_lps_state[2*64]; ///< transIdxLPS |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
61 extern const uint8_t ff_h264_norm_shift[512]; |
| 2323 | 62 |
| 1287 | 63 |
| 64 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
|
65 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
|
66 void ff_init_cabac_states(CABACContext *c); |
| 1287 | 67 |
| 68 | |
| 69 static inline void put_cabac_bit(CABACContext *c, int b){ | |
| 2967 | 70 put_bits(&c->pb, 1, b); |
| 71 for(;c->outstanding_count; c->outstanding_count--){ | |
| 1287 | 72 put_bits(&c->pb, 1, 1-b); |
| 73 } | |
| 74 } | |
| 75 | |
| 76 static inline void renorm_cabac_encoder(CABACContext *c){ | |
| 77 while(c->range < 0x100){ | |
| 78 //FIXME optimize | |
| 79 if(c->low<0x100){ | |
| 80 put_cabac_bit(c, 0); | |
| 81 }else if(c->low<0x200){ | |
| 82 c->outstanding_count++; | |
| 83 c->low -= 0x100; | |
| 84 }else{ | |
| 85 put_cabac_bit(c, 1); | |
| 86 c->low -= 0x200; | |
| 87 } | |
| 2967 | 88 |
| 1287 | 89 c->range+= c->range; |
| 90 c->low += c->low; | |
| 91 } | |
| 92 } | |
| 93 | |
|
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
|
94 static void put_cabac(CABACContext *c, uint8_t * const state, int bit){ |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
95 int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state]; |
| 2967 | 96 |
| 1287 | 97 if(bit == ((*state)&1)){ |
| 98 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
|
99 *state= ff_h264_mps_state[*state]; |
| 1287 | 100 }else{ |
| 101 c->low += c->range - RangeLPS; | |
| 102 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
|
103 *state= ff_h264_lps_state[*state]; |
| 1287 | 104 } |
| 2967 | 105 |
| 1287 | 106 renorm_cabac_encoder(c); |
| 107 | |
| 108 #ifdef STRICT_LIMITS | |
| 109 c->symCount++; | |
| 110 #endif | |
| 111 } | |
| 112 | |
|
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
|
113 static void put_cabac_static(CABACContext *c, int RangeLPS, int bit){ |
| 1287 | 114 assert(c->range > RangeLPS); |
| 115 | |
| 116 if(!bit){ | |
| 117 c->range -= RangeLPS; | |
| 118 }else{ | |
| 119 c->low += c->range - RangeLPS; | |
| 120 c->range = RangeLPS; | |
| 121 } | |
| 122 | |
| 123 renorm_cabac_encoder(c); | |
| 124 | |
| 125 #ifdef STRICT_LIMITS | |
| 126 c->symCount++; | |
| 127 #endif | |
| 128 } | |
| 129 | |
| 1290 | 130 /** |
| 131 * @param bit 0 -> write zero bit, !=0 write one bit | |
| 132 */ | |
|
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
|
133 static void put_cabac_bypass(CABACContext *c, int bit){ |
| 1287 | 134 c->low += c->low; |
| 135 | |
| 136 if(bit){ | |
| 137 c->low += c->range; | |
| 138 } | |
| 139 //FIXME optimize | |
| 140 if(c->low<0x200){ | |
| 141 put_cabac_bit(c, 0); | |
| 142 }else if(c->low<0x400){ | |
| 143 c->outstanding_count++; | |
| 144 c->low -= 0x200; | |
| 145 }else{ | |
| 146 put_cabac_bit(c, 1); | |
| 147 c->low -= 0x400; | |
| 148 } | |
| 2967 | 149 |
| 1287 | 150 #ifdef STRICT_LIMITS |
| 151 c->symCount++; | |
| 152 #endif | |
| 153 } | |
| 154 | |
|
1300
e18667d1e94d
FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents:
1298
diff
changeset
|
155 /** |
|
e18667d1e94d
FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents:
1298
diff
changeset
|
156 * |
|
e18667d1e94d
FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents:
1298
diff
changeset
|
157 * @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
|
158 */ |
|
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
|
159 static int put_cabac_terminate(CABACContext *c, int bit){ |
| 1287 | 160 c->range -= 2; |
| 161 | |
| 162 if(!bit){ | |
| 163 renorm_cabac_encoder(c); | |
| 164 }else{ | |
| 165 c->low += c->range; | |
| 166 c->range= 2; | |
| 2967 | 167 |
| 1287 | 168 renorm_cabac_encoder(c); |
| 169 | |
| 170 assert(c->low <= 0x1FF); | |
| 171 put_cabac_bit(c, c->low>>9); | |
| 172 put_bits(&c->pb, 2, ((c->low>>7)&3)|1); | |
| 2967 | 173 |
| 1287 | 174 flush_put_bits(&c->pb); //FIXME FIXME FIXME XXX wrong |
| 175 } | |
| 2967 | 176 |
| 1287 | 177 #ifdef STRICT_LIMITS |
| 178 c->symCount++; | |
| 179 #endif | |
|
1300
e18667d1e94d
FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents:
1298
diff
changeset
|
180 |
| 1787 | 181 return (put_bits_count(&c->pb)+7)>>3; |
| 1287 | 182 } |
| 183 | |
| 1290 | 184 /** |
| 185 * put (truncated) unary binarization. | |
| 186 */ | |
|
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
|
187 static void put_cabac_u(CABACContext *c, uint8_t * state, int v, int max, int max_index, int truncated){ |
| 1290 | 188 int i; |
| 2967 | 189 |
| 1290 | 190 assert(v <= max); |
| 2967 | 191 |
| 1290 | 192 #if 1 |
| 193 for(i=0; i<v; i++){ | |
| 194 put_cabac(c, state, 1); | |
| 195 if(i < max_index) state++; | |
| 196 } | |
| 197 if(truncated==0 || v<max) | |
| 198 put_cabac(c, state, 0); | |
| 199 #else | |
| 200 if(v <= max_index){ | |
| 201 for(i=0; i<v; i++){ | |
| 202 put_cabac(c, state+i, 1); | |
| 203 } | |
| 204 if(truncated==0 || v<max) | |
| 205 put_cabac(c, state+i, 0); | |
| 206 }else{ | |
| 207 for(i=0; i<=max_index; i++){ | |
| 208 put_cabac(c, state+i, 1); | |
| 209 } | |
| 210 for(; i<v; i++){ | |
| 211 put_cabac(c, state+max_index, 1); | |
| 212 } | |
| 213 if(truncated==0 || v<max) | |
| 214 put_cabac(c, state+max_index, 0); | |
| 215 } | |
| 216 #endif | |
| 217 } | |
| 218 | |
| 219 /** | |
| 220 * put unary exp golomb k-th order binarization. | |
| 221 */ | |
|
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
|
222 static void put_cabac_ueg(CABACContext *c, uint8_t * state, int v, int max, int is_signed, int k, int max_index){ |
| 1290 | 223 int i; |
| 2967 | 224 |
| 1290 | 225 if(v==0) |
| 226 put_cabac(c, state, 0); | |
| 227 else{ | |
| 1298 | 228 const int sign= v < 0; |
| 2967 | 229 |
| 4001 | 230 if(is_signed) v= FFABS(v); |
| 2967 | 231 |
| 1290 | 232 if(v<max){ |
| 233 for(i=0; i<v; i++){ | |
| 234 put_cabac(c, state, 1); | |
| 235 if(i < max_index) state++; | |
| 236 } | |
| 237 | |
| 238 put_cabac(c, state, 0); | |
| 239 }else{ | |
| 240 int m= 1<<k; | |
| 241 | |
| 242 for(i=0; i<max; i++){ | |
| 243 put_cabac(c, state, 1); | |
| 244 if(i < max_index) state++; | |
| 245 } | |
| 246 | |
| 247 v -= max; | |
| 248 while(v >= m){ //FIXME optimize | |
| 249 put_cabac_bypass(c, 1); | |
| 250 v-= m; | |
| 251 m+= m; | |
| 252 } | |
| 253 put_cabac_bypass(c, 0); | |
| 254 while(m>>=1){ | |
| 255 put_cabac_bypass(c, v&m); | |
| 256 } | |
| 257 } | |
| 258 | |
| 259 if(is_signed) | |
| 260 put_cabac_bypass(c, sign); | |
| 261 } | |
| 262 } | |
| 263 | |
| 2323 | 264 static void refill(CABACContext *c){ |
| 265 #if CABAC_BITS == 16 | |
| 3946 | 266 c->low+= (c->bytestream[0]<<9) + (c->bytestream[1]<<1); |
| 2323 | 267 #else |
| 268 c->low+= c->bytestream[0]<<1; | |
| 269 #endif | |
| 270 c->low -= CABAC_MASK; | |
| 271 c->bytestream+= CABAC_BITS/8; | |
| 272 } | |
| 273 | |
| 274 static void refill2(CABACContext *c){ | |
| 275 int i, x; | |
| 276 | |
| 277 x= c->low ^ (c->low-1); | |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
278 i= 7 - ff_h264_norm_shift[x>>(CABAC_BITS-1)]; |
| 2323 | 279 |
| 280 x= -CABAC_MASK; | |
| 2967 | 281 |
| 2323 | 282 #if CABAC_BITS == 16 |
| 283 x+= (c->bytestream[0]<<9) + (c->bytestream[1]<<1); | |
| 284 #else | |
| 285 x+= c->bytestream[0]<<1; | |
| 286 #endif | |
| 2967 | 287 |
| 2323 | 288 c->low += x<<i; |
| 289 c->bytestream+= CABAC_BITS/8; | |
| 290 } | |
| 291 | |
| 1287 | 292 static inline void renorm_cabac_decoder(CABACContext *c){ |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
293 while(c->range < 0x100){ |
| 1287 | 294 c->range+= c->range; |
| 295 c->low+= c->low; | |
| 2323 | 296 if(!(c->low & CABAC_MASK)) |
| 297 refill(c); | |
| 1287 | 298 } |
| 299 } | |
| 300 | |
| 2323 | 301 static inline void renorm_cabac_decoder_once(CABACContext *c){ |
| 3951 | 302 #ifdef ARCH_X86_DISABLED |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
303 int temp; |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
304 #if 0 |
|
3950
900d21b85dd6
renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents:
3948
diff
changeset
|
305 //P3:683 athlon:475 |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
306 asm( |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
307 "lea -0x100(%0), %2 \n\t" |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
308 "shr $31, %2 \n\t" //FIXME 31->63 for x86-64 |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
309 "shl %%cl, %0 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
310 "shl %%cl, %1 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
311 : "+r"(c->range), "+r"(c->low), "+c"(temp) |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
312 ); |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
313 #elif 0 |
|
3950
900d21b85dd6
renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents:
3948
diff
changeset
|
314 //P3:680 athlon:474 |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
315 asm( |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
316 "cmp $0x100, %0 \n\t" |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
317 "setb %%cl \n\t" //FIXME 31->63 for x86-64 |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
318 "shl %%cl, %0 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
319 "shl %%cl, %1 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
320 : "+r"(c->range), "+r"(c->low), "+c"(temp) |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
321 ); |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
322 #elif 1 |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
323 int temp2; |
|
3950
900d21b85dd6
renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents:
3948
diff
changeset
|
324 //P3:665 athlon:517 |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
325 asm( |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
326 "lea -0x100(%0), %%eax \n\t" |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
327 "cdq \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
328 "mov %0, %%eax \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
329 "and %%edx, %0 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
330 "and %1, %%edx \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
331 "add %%eax, %0 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
332 "add %%edx, %1 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
333 : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2) |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
334 ); |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
335 #elif 0 |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
336 int temp2; |
|
3950
900d21b85dd6
renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents:
3948
diff
changeset
|
337 //P3:673 athlon:509 |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
338 asm( |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
339 "cmp $0x100, %0 \n\t" |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
340 "sbb %%edx, %%edx \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
341 "mov %0, %%eax \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
342 "and %%edx, %0 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
343 "and %1, %%edx \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
344 "add %%eax, %0 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
345 "add %%edx, %1 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
346 : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2) |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
347 ); |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
348 #else |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
349 int temp2; |
|
3950
900d21b85dd6
renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents:
3948
diff
changeset
|
350 //P3:677 athlon:511 |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
351 asm( |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
352 "cmp $0x100, %0 \n\t" |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
353 "lea (%0, %0), %%eax \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
354 "lea (%1, %1), %%edx \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
355 "cmovb %%eax, %0 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
356 "cmovb %%edx, %1 \n\t" |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
357 : "+r"(c->range), "+r"(c->low), "+a"(temp), "+d"(temp2) |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
358 ); |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
359 #endif |
|
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
360 #else |
|
3950
900d21b85dd6
renorm_cabac_decoder_once START/STOP_TIMER scores for athlon
michael
parents:
3948
diff
changeset
|
361 //P3:675 athlon:476 |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
362 int shift= (uint32_t)(c->range - 0x100)>>31; |
| 3642 | 363 c->range<<= shift; |
| 364 c->low <<= shift; | |
|
3943
811a9b0d9f32
several x86 renorm_cabac_decoder_once optimizations
michael
parents:
3928
diff
changeset
|
365 #endif |
| 2323 | 366 if(!(c->low & CABAC_MASK)) |
| 367 refill(c); | |
| 368 } | |
| 369 | |
|
4908
777f250df232
Fix multiple "?inline/static? is not at beginning of declaration" warnings.
diego
parents:
4882
diff
changeset
|
370 static av_always_inline int get_cabac_inline(CABACContext *c, uint8_t * const state){ |
| 3642 | 371 //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
|
372 #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
|
373 #define RANGE "4" |
| 4064 | 374 #ifdef ARCH_X86_64 |
| 375 #define BYTESTART "16" | |
| 376 #define BYTE "24" | |
| 377 #define BYTEEND "32" | |
| 378 #else | |
|
3993
8b7c59b7af01
make state transition tables global as they are constant and the code is slightly faster that way
michael
parents:
3992
diff
changeset
|
379 #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
|
380 #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
|
381 #define BYTEEND "20" |
| 4064 | 382 #endif |
|
4882
8131ccb4ea72
Mark code parts that cannot work on AMD64 due to broken relocations as such.
diego
parents:
4881
diff
changeset
|
383 #if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) |
|
4044
5ccdefd60f61
Fix PIC compilation, some defines were under #ifdef !PIC but used
diego
parents:
4043
diff
changeset
|
384 int bit; |
|
5ccdefd60f61
Fix PIC compilation, some defines were under #ifdef !PIC but used
diego
parents:
4043
diff
changeset
|
385 |
| 3984 | 386 #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
|
387 asm volatile( |
| 4035 | 388 "movzbl (%1), %0 \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
|
389 "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
|
390 "movl "RANGE "(%2), %%edx \n\t" |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
391 "andl $0xC0, %%ebx \n\t" |
| 4035 | 392 "movzbl "MANGLE(ff_h264_lps_range)"(%0, %%ebx, 2), %%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
|
393 "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
|
394 //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
|
395 "subl %%esi, %%edx \n\t" |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
396 "movl %%edx, %%ecx \n\t" |
|
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
397 "shll $17, %%ecx \n\t" |
|
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
398 "cmpl %%ecx, %%ebx \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
|
399 " ja 1f \n\t" |
|
3999
6cbad3675632
slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents:
3996
diff
changeset
|
400 |
|
6cbad3675632
slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents:
3996
diff
changeset
|
401 #if 1 |
|
6cbad3675632
slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents:
3996
diff
changeset
|
402 //athlon:4067 P3:4110 |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
403 "lea -0x100(%%edx), %%ecx \n\t" |
|
3999
6cbad3675632
slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents:
3996
diff
changeset
|
404 "shr $31, %%ecx \n\t" |
|
6cbad3675632
slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents:
3996
diff
changeset
|
405 "shl %%cl, %%edx \n\t" |
|
6cbad3675632
slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents:
3996
diff
changeset
|
406 "shl %%cl, %%ebx \n\t" |
|
6cbad3675632
slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents:
3996
diff
changeset
|
407 #else |
|
6cbad3675632
slightly faster on P3 slightly slower on athlon and probably faster on P4
michael
parents:
3996
diff
changeset
|
408 //athlon:4057 P3:4130 |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
409 "cmp $0x100, %%edx \n\t" //FIXME avoidable |
|
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
|
410 "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
|
411 "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
|
412 "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
|
413 #endif |
| 4035 | 414 "movzbl "MANGLE(ff_h264_mps_state)"(%0), %%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
|
415 "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
|
416 //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
|
417 "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
|
418 " jnz 2f \n\t" |
| 4064 | 419 "mov "BYTE "(%2), %%"REG_S" \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
|
420 "subl $0xFFFF, %%ebx \n\t" |
| 4064 | 421 "movzwl (%%"REG_S"), %%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
|
422 "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
|
423 "shrl $15, %%ecx \n\t" |
| 4064 | 424 "add $2, %%"REG_S" \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
|
425 "addl %%ecx, %%ebx \n\t" |
| 4064 | 426 "mov %%"REG_S", "BYTE "(%2) \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
|
427 "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
|
428 "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
|
429 //eax:state ebx:low, edx:range, esi:RangeLPS |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
430 "subl %%ecx, %%ebx \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
|
431 "movl %%esi, %%edx \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
|
432 "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
|
433 "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
|
434 "shll %%cl, %%edx \n\t" |
| 4035 | 435 "movzbl "MANGLE(ff_h264_lps_state)"(%0), %%ecx \n\t" |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
436 "movb %%cl, (%1) \n\t" |
| 4064 | 437 "add $1, %0 \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
|
438 "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
|
439 " 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
|
440 |
| 4064 | 441 "mov "BYTE "(%2), %%"REG_c" \n\t" |
| 442 "movzwl (%%"REG_c"), %%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
|
443 "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
|
444 "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
|
445 "subl $0xFFFF, %%esi \n\t" |
| 4064 | 446 "add $2, %%"REG_c" \n\t" |
| 447 "mov %%"REG_c", "BYTE "(%2) \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
|
448 |
|
fc6e0942353b
first try of a handwritten get_cabac() for x86, this is 10-20% faster on P3 depening on if you try to subtract the START/STOP_TIMER overhead
michael
parents:
3967
diff
changeset
|
449 "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
|
450 "xorl %%ebx, %%ecx \n\t" |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
451 "shrl $15, %%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
|
452 "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
|
453 "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
|
454 "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
|
455 |
|
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
|
456 "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
|
457 "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
|
458 "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
|
459 "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
|
460 "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
|
461 :"=&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
|
462 :"r"(state), "r"(c) |
| 4064 | 463 : "%"REG_c, "%ebx", "%edx", "%"REG_S, "memory" |
|
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
|
464 ); |
|
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
|
465 bit&=1; |
|
4002
ec426fa57dfe
adds some useful comments after some of the #else, #elseif,
gpoirier
parents:
4001
diff
changeset
|
466 #else /* BRANCHLESS_CABAC_DECODER */ |
|
4046
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
467 |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
468 |
|
4418
4cceb7c877af
rename CMOV_IS_FAST to HAVE_FAST_CMOV and simplify configure
mru
parents:
4345
diff
changeset
|
469 #if defined HAVE_FAST_CMOV |
|
4046
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
470 #define BRANCHLESS_GET_CABAC_UPDATE(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
471 "mov "tmp" , %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
472 "shl $17 , "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
473 "cmp "low" , "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
474 "cmova %%ecx , "range" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
475 "sbb %%ecx , %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
476 "and %%ecx , "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
477 "sub "tmp" , "low" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
478 "xor %%ecx , "ret" \n\t" |
|
4418
4cceb7c877af
rename CMOV_IS_FAST to HAVE_FAST_CMOV and simplify configure
mru
parents:
4345
diff
changeset
|
479 #else /* HAVE_FAST_CMOV */ |
|
4046
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
480 #define BRANCHLESS_GET_CABAC_UPDATE(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
481 "mov "tmp" , %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
482 "shl $17 , "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
483 "sub "low" , "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
484 "sar $31 , "tmp" \n\t" /*lps_mask*/\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
485 "sub %%ecx , "range" \n\t" /*RangeLPS - range*/\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
486 "and "tmp" , "range" \n\t" /*(RangeLPS - range)&lps_mask*/\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
487 "add %%ecx , "range" \n\t" /*new range*/\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
488 "shl $17 , %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
489 "and "tmp" , %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
490 "sub %%ecx , "low" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
491 "xor "tmp" , "ret" \n\t" |
|
4418
4cceb7c877af
rename CMOV_IS_FAST to HAVE_FAST_CMOV and simplify configure
mru
parents:
4345
diff
changeset
|
492 #endif /* HAVE_FAST_CMOV */ |
| 3975 | 493 |
| 494 | |
|
4046
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
495 #define BRANCHLESS_GET_CABAC(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
496 "movzbl "statep" , "ret" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
497 "mov "range" , "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
498 "and $0xC0 , "range" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
499 "movzbl "MANGLE(ff_h264_lps_range)"("ret", "range", 2), "range" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
500 "sub "range" , "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
501 BRANCHLESS_GET_CABAC_UPDATE(ret, cabac, statep, low, lowword, range, tmp, tmpbyte)\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
502 "movzbl " MANGLE(ff_h264_norm_shift) "("range"), %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
503 "shl %%cl , "range" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
504 "movzbl "MANGLE(ff_h264_mlps_state)"+128("ret"), "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
505 "mov "tmpbyte" , "statep" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
506 "shl %%cl , "low" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
507 "test "lowword" , "lowword" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
508 " jnz 1f \n\t"\ |
| 4064 | 509 "mov "BYTE"("cabac"), %%"REG_c" \n\t"\ |
| 510 "movzwl (%%"REG_c") , "tmp" \n\t"\ | |
|
4046
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
511 "bswap "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
512 "shr $15 , "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
513 "sub $0xFFFF , "tmp" \n\t"\ |
| 4064 | 514 "add $2 , %%"REG_c" \n\t"\ |
| 515 "mov %%"REG_c" , "BYTE "("cabac") \n\t"\ | |
|
4046
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
516 "lea -1("low") , %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
517 "xor "low" , %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
518 "shr $15 , %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
519 "movzbl " MANGLE(ff_h264_norm_shift) "(%%ecx), %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
520 "neg %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
521 "add $7 , %%ecx \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
522 "shl %%cl , "tmp" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
523 "add "tmp" , "low" \n\t"\ |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
524 "1: \n\t" |
| 3975 | 525 |
|
4046
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
526 asm volatile( |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
527 "movl "RANGE "(%2), %%esi \n\t" |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
528 "movl "LOW "(%2), %%ebx \n\t" |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
529 BRANCHLESS_GET_CABAC("%0", "%2", "(%1)", "%%ebx", "%%bx", "%%esi", "%%edx", "%%dl") |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
530 "movl %%esi, "RANGE "(%2) \n\t" |
|
8bbc695c9603
factorize get_cabac asm (0.5% slower but its much cleaner)
michael
parents:
4044
diff
changeset
|
531 "movl %%ebx, "LOW "(%2) \n\t" |
| 3975 | 532 |
| 533 :"=&a"(bit) | |
| 534 :"r"(state), "r"(c) | |
| 4064 | 535 : "%"REG_c, "%ebx", "%edx", "%esi", "memory" |
| 3975 | 536 ); |
|
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
|
537 bit&=1; |
|
4002
ec426fa57dfe
adds some useful comments after some of the #else, #elseif,
gpoirier
parents:
4001
diff
changeset
|
538 #endif /* BRANCHLESS_CABAC_DECODER */ |
|
4882
8131ccb4ea72
Mark code parts that cannot work on AMD64 due to broken relocations as such.
diego
parents:
4881
diff
changeset
|
539 #else /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ |
| 3642 | 540 int s = *state; |
| 4039 | 541 int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s]; |
|
2522
e25782262d7d
kill warnings patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2323
diff
changeset
|
542 int bit, lps_mask attribute_unused; |
| 2967 | 543 |
| 1287 | 544 c->range -= RangeLPS; |
| 3984 | 545 #ifndef BRANCHLESS_CABAC_DECODER |
|
4345
88967250d718
replace a few hardcoded numbers with their correct named ones
michael
parents:
4283
diff
changeset
|
546 if(c->low < (c->range<<(CABAC_BITS+1))){ |
| 3642 | 547 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
|
548 *state= ff_h264_mps_state[s]; |
| 2323 | 549 renorm_cabac_decoder_once(c); |
| 1287 | 550 }else{ |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
551 bit= ff_h264_norm_shift[RangeLPS]; |
|
4345
88967250d718
replace a few hardcoded numbers with their correct named ones
michael
parents:
4283
diff
changeset
|
552 c->low -= (c->range<<(CABAC_BITS+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
|
553 *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
|
554 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
|
555 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
|
556 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
|
557 |
|
4345
88967250d718
replace a few hardcoded numbers with their correct named ones
michael
parents:
4283
diff
changeset
|
558 if(!(c->low & CABAC_MASK)){ |
| 2323 | 559 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
|
560 } |
| 1287 | 561 } |
|
4002
ec426fa57dfe
adds some useful comments after some of the #else, #elseif,
gpoirier
parents:
4001
diff
changeset
|
562 #else /* BRANCHLESS_CABAC_DECODER */ |
|
4345
88967250d718
replace a few hardcoded numbers with their correct named ones
michael
parents:
4283
diff
changeset
|
563 lps_mask= ((c->range<<(CABAC_BITS+1)) - c->low)>>31; |
| 2967 | 564 |
|
4345
88967250d718
replace a few hardcoded numbers with their correct named ones
michael
parents:
4283
diff
changeset
|
565 c->low -= (c->range<<(CABAC_BITS+1)) & lps_mask; |
| 2323 | 566 c->range += (RangeLPS - c->range) & lps_mask; |
| 2967 | 567 |
| 3974 | 568 s^=lps_mask; |
|
4014
b2582438effe
dehack *ps_state indexing in the branchless decoder
michael
parents:
4012
diff
changeset
|
569 *state= (ff_h264_mlps_state+128)[s]; |
| 3974 | 570 bit= s&1; |
| 2967 | 571 |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
572 lps_mask= ff_h264_norm_shift[c->range]; |
| 2323 | 573 c->range<<= lps_mask; |
| 574 c->low <<= lps_mask; | |
| 575 if(!(c->low & CABAC_MASK)) | |
| 576 refill2(c); | |
|
4002
ec426fa57dfe
adds some useful comments after some of the #else, #elseif,
gpoirier
parents:
4001
diff
changeset
|
577 #endif /* BRANCHLESS_CABAC_DECODER */ |
|
4882
8131ccb4ea72
Mark code parts that cannot work on AMD64 due to broken relocations as such.
diego
parents:
4881
diff
changeset
|
578 #endif /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ |
| 2967 | 579 return bit; |
| 1287 | 580 } |
| 581 | |
| 4579 | 582 static int av_noinline get_cabac_noinline(CABACContext *c, uint8_t * const state){ |
|
4008
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4002
diff
changeset
|
583 return get_cabac_inline(c,state); |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4002
diff
changeset
|
584 } |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4002
diff
changeset
|
585 |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4002
diff
changeset
|
586 static int get_cabac(CABACContext *c, uint8_t * const state){ |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4002
diff
changeset
|
587 return get_cabac_inline(c,state); |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4002
diff
changeset
|
588 } |
|
b636f3d59283
prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents:
4002
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_bypass(CABACContext *c){ |
| 4040 | 591 #if 0 //not faster |
| 592 int bit; | |
| 593 asm volatile( | |
| 594 "movl "RANGE "(%1), %%ebx \n\t" | |
| 595 "movl "LOW "(%1), %%eax \n\t" | |
| 596 "shl $17, %%ebx \n\t" | |
| 597 "add %%eax, %%eax \n\t" | |
| 598 "sub %%ebx, %%eax \n\t" | |
| 599 "cdq \n\t" | |
| 600 "and %%edx, %%ebx \n\t" | |
| 601 "add %%ebx, %%eax \n\t" | |
| 602 "test %%ax, %%ax \n\t" | |
| 603 " jnz 1f \n\t" | |
| 4064 | 604 "movl "BYTE "(%1), %%"REG_b" \n\t" |
| 4040 | 605 "subl $0xFFFF, %%eax \n\t" |
| 4064 | 606 "movzwl (%%"REG_b"), %%ecx \n\t" |
| 4040 | 607 "bswap %%ecx \n\t" |
| 608 "shrl $15, %%ecx \n\t" | |
| 4064 | 609 "addl $2, %%"REG_b" \n\t" |
| 4040 | 610 "addl %%ecx, %%eax \n\t" |
| 4064 | 611 "movl %%"REG_b", "BYTE "(%1) \n\t" |
| 4040 | 612 "1: \n\t" |
| 613 "movl %%eax, "LOW "(%1) \n\t" | |
| 614 | |
| 615 :"=&d"(bit) | |
| 616 :"r"(c) | |
| 4064 | 617 : "%eax", "%"REG_b, "%ecx", "memory" |
| 4040 | 618 ); |
| 619 return bit+1; | |
| 620 #else | |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
621 int range; |
| 1287 | 622 c->low += c->low; |
| 623 | |
| 2323 | 624 if(!(c->low & CABAC_MASK)) |
| 625 refill(c); | |
| 2967 | 626 |
|
4345
88967250d718
replace a few hardcoded numbers with their correct named ones
michael
parents:
4283
diff
changeset
|
627 range= c->range<<(CABAC_BITS+1); |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
628 if(c->low < range){ |
| 1287 | 629 return 0; |
| 630 }else{ | |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
631 c->low -= range; |
| 1287 | 632 return 1; |
| 633 } | |
| 4040 | 634 #endif |
| 1287 | 635 } |
| 4040 | 636 |
| 637 | |
|
4283
d6f83e2f8804
rename always_inline to av_always_inline and move to common.h
mru
parents:
4241
diff
changeset
|
638 static av_always_inline int get_cabac_bypass_sign(CABACContext *c, int val){ |
| 4241 | 639 #if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) |
| 4040 | 640 asm volatile( |
| 641 "movl "RANGE "(%1), %%ebx \n\t" | |
| 642 "movl "LOW "(%1), %%eax \n\t" | |
| 643 "shl $17, %%ebx \n\t" | |
| 644 "add %%eax, %%eax \n\t" | |
| 645 "sub %%ebx, %%eax \n\t" | |
| 646 "cdq \n\t" | |
| 647 "and %%edx, %%ebx \n\t" | |
| 648 "add %%ebx, %%eax \n\t" | |
| 649 "xor %%edx, %%ecx \n\t" | |
| 650 "sub %%edx, %%ecx \n\t" | |
| 651 "test %%ax, %%ax \n\t" | |
| 652 " jnz 1f \n\t" | |
| 4064 | 653 "mov "BYTE "(%1), %%"REG_b" \n\t" |
| 4040 | 654 "subl $0xFFFF, %%eax \n\t" |
| 4064 | 655 "movzwl (%%"REG_b"), %%edx \n\t" |
| 4040 | 656 "bswap %%edx \n\t" |
| 657 "shrl $15, %%edx \n\t" | |
| 4064 | 658 "add $2, %%"REG_b" \n\t" |
| 4040 | 659 "addl %%edx, %%eax \n\t" |
| 4064 | 660 "mov %%"REG_b", "BYTE "(%1) \n\t" |
| 4040 | 661 "1: \n\t" |
| 662 "movl %%eax, "LOW "(%1) \n\t" | |
| 663 | |
| 664 :"+c"(val) | |
| 665 :"r"(c) | |
| 4064 | 666 : "%eax", "%"REG_b, "%edx", "memory" |
| 4040 | 667 ); |
| 668 return val; | |
| 669 #else | |
| 670 int range, mask; | |
| 671 c->low += c->low; | |
| 672 | |
| 673 if(!(c->low & CABAC_MASK)) | |
| 674 refill(c); | |
| 675 | |
|
4345
88967250d718
replace a few hardcoded numbers with their correct named ones
michael
parents:
4283
diff
changeset
|
676 range= c->range<<(CABAC_BITS+1); |
| 4040 | 677 c->low -= range; |
| 678 mask= c->low >> 31; | |
| 679 range &= mask; | |
| 680 c->low += range; | |
| 681 return (val^mask)-mask; | |
| 682 #endif | |
| 683 } | |
| 684 | |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
685 //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!) |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
686 //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard) |
|
4882
8131ccb4ea72
Mark code parts that cannot work on AMD64 due to broken relocations as such.
diego
parents:
4881
diff
changeset
|
687 #if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
688 static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){ |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
689 void *end= significant_coeff_ctx_base + max_coeff - 1; |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
690 int minusstart= -(int)significant_coeff_ctx_base; |
|
4049
8c1a5ed03a00
another instruction less in decode_significance_x86() -> 1% faster ion P3
michael
parents:
4048
diff
changeset
|
691 int minusindex= 4-(int)index; |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
692 int coeff_count; |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
693 asm volatile( |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
694 "movl "RANGE "(%3), %%esi \n\t" |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
695 "movl "LOW "(%3), %%ebx \n\t" |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
696 |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
697 "2: \n\t" |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
698 |
|
4047
61a4e7218a45
reordering instructions a little in decode_significance_x86() -> 2 instructions less / 1% faster decode_residual on P3
michael
parents:
4046
diff
changeset
|
699 BRANCHLESS_GET_CABAC("%%edx", "%3", "(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
700 |
|
4047
61a4e7218a45
reordering instructions a little in decode_significance_x86() -> 2 instructions less / 1% faster decode_residual on P3
michael
parents:
4046
diff
changeset
|
701 "test $1, %%edx \n\t" |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
702 " jz 3f \n\t" |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
703 |
|
4047
61a4e7218a45
reordering instructions a little in decode_significance_x86() -> 2 instructions less / 1% faster decode_residual on P3
michael
parents:
4046
diff
changeset
|
704 BRANCHLESS_GET_CABAC("%%edx", "%3", "61(%1)", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") |
|
61a4e7218a45
reordering instructions a little in decode_significance_x86() -> 2 instructions less / 1% faster decode_residual on P3
michael
parents:
4046
diff
changeset
|
705 |
| 4064 | 706 "mov %2, %%"REG_a" \n\t" |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
707 "movl %4, %%ecx \n\t" |
| 4064 | 708 "add %1, %%"REG_c" \n\t" |
| 709 "movl %%ecx, (%%"REG_a") \n\t" | |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
710 |
|
4047
61a4e7218a45
reordering instructions a little in decode_significance_x86() -> 2 instructions less / 1% faster decode_residual on P3
michael
parents:
4046
diff
changeset
|
711 "test $1, %%edx \n\t" |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
712 " jnz 4f \n\t" |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
713 |
| 4064 | 714 "add $4, %%"REG_a" \n\t" |
| 715 "mov %%"REG_a", %2 \n\t" | |
| 4048 | 716 |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
717 "3: \n\t" |
| 4064 | 718 "add $1, %1 \n\t" |
| 719 "cmp %5, %1 \n\t" | |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
720 " jb 2b \n\t" |
| 4064 | 721 "mov %2, %%"REG_a" \n\t" |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
722 "movl %4, %%ecx \n\t" |
| 4064 | 723 "add %1, %%"REG_c" \n\t" |
| 724 "movl %%ecx, (%%"REG_a") \n\t" | |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
725 "4: \n\t" |
| 4064 | 726 "add %6, %%eax \n\t" |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
727 "shr $2, %%eax \n\t" |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
728 |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
729 "movl %%esi, "RANGE "(%3) \n\t" |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
730 "movl %%ebx, "LOW "(%3) \n\t" |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
731 :"=&a"(coeff_count), "+r"(significant_coeff_ctx_base), "+m"(index)\ |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
732 :"r"(c), "m"(minusstart), "m"(end), "m"(minusindex)\ |
| 4064 | 733 : "%"REG_c, "%ebx", "%edx", "%esi", "memory"\ |
|
4037
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
734 ); |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
735 return coeff_count; |
|
53be304c7f54
x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents:
4035
diff
changeset
|
736 } |
| 4051 | 737 |
| 738 static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coeff_ctx_base, int *index, uint8_t *sig_off){ | |
| 739 int minusindex= 4-(int)index; | |
| 740 int coeff_count; | |
| 4064 | 741 long last=0; |
| 4051 | 742 asm volatile( |
| 743 "movl "RANGE "(%3), %%esi \n\t" | |
| 744 "movl "LOW "(%3), %%ebx \n\t" | |
| 745 | |
| 4064 | 746 "mov %1, %%"REG_D" \n\t" |
| 4051 | 747 "2: \n\t" |
| 748 | |
| 4064 | 749 "mov %6, %%"REG_a" \n\t" |
| 750 "movzbl (%%"REG_a", %%"REG_D"), %%edi \n\t" | |
| 751 "add %5, %%"REG_D" \n\t" | |
| 4051 | 752 |
| 4064 | 753 BRANCHLESS_GET_CABAC("%%edx", "%3", "(%%"REG_D")", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") |
| 4051 | 754 |
| 755 "mov %1, %%edi \n\t" | |
| 756 "test $1, %%edx \n\t" | |
| 757 " jz 3f \n\t" | |
| 758 | |
| 759 "movzbl "MANGLE(last_coeff_flag_offset_8x8)"(%%edi), %%edi\n\t" | |
| 4064 | 760 "add %5, %%"REG_D" \n\t" |
| 4051 | 761 |
| 4064 | 762 BRANCHLESS_GET_CABAC("%%edx", "%3", "15(%%"REG_D")", "%%ebx", "%%bx", "%%esi", "%%eax", "%%al") |
| 4051 | 763 |
| 4064 | 764 "mov %2, %%"REG_a" \n\t" |
| 4051 | 765 "mov %1, %%edi \n\t" |
| 4064 | 766 "movl %%edi, (%%"REG_a") \n\t" |
| 4051 | 767 |
| 768 "test $1, %%edx \n\t" | |
| 769 " jnz 4f \n\t" | |
| 770 | |
| 4064 | 771 "add $4, %%"REG_a" \n\t" |
| 772 "mov %%"REG_a", %2 \n\t" | |
| 4051 | 773 |
| 774 "3: \n\t" | |
| 775 "addl $1, %%edi \n\t" | |
| 776 "mov %%edi, %1 \n\t" | |
| 777 "cmpl $63, %%edi \n\t" | |
| 778 " jb 2b \n\t" | |
| 4064 | 779 "mov %2, %%"REG_a" \n\t" |
| 780 "movl %%edi, (%%"REG_a") \n\t" | |
| 4051 | 781 "4: \n\t" |
| 782 "addl %4, %%eax \n\t" | |
| 783 "shr $2, %%eax \n\t" | |
| 784 | |
| 785 "movl %%esi, "RANGE "(%3) \n\t" | |
| 786 "movl %%ebx, "LOW "(%3) \n\t" | |
| 787 :"=&a"(coeff_count),"+m"(last), "+m"(index)\ | |
| 788 :"r"(c), "m"(minusindex), "m"(significant_coeff_ctx_base), "m"(sig_off)\ | |
| 4064 | 789 : "%"REG_c, "%ebx", "%edx", "%esi", "%"REG_D, "memory"\ |
| 4051 | 790 ); |
| 791 return coeff_count; | |
| 792 } | |
|
4882
8131ccb4ea72
Mark code parts that cannot work on AMD64 due to broken relocations as such.
diego
parents:
4881
diff
changeset
|
793 #endif /* defined(ARCH_X86) && && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ |
| 1287 | 794 |
|
1300
e18667d1e94d
FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents:
1298
diff
changeset
|
795 /** |
|
e18667d1e94d
FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents:
1298
diff
changeset
|
796 * |
|
e18667d1e94d
FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents:
1298
diff
changeset
|
797 * @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
|
798 */ |
|
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
|
799 static int get_cabac_terminate(CABACContext *c){ |
|
4024
d550343b5dac
shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds)
michael
parents:
4014
diff
changeset
|
800 c->range -= 2; |
|
4345
88967250d718
replace a few hardcoded numbers with their correct named ones
michael
parents:
4283
diff
changeset
|
801 if(c->low < c->range<<(CABAC_BITS+1)){ |
| 2323 | 802 renorm_cabac_decoder_once(c); |
| 1287 | 803 return 0; |
| 804 }else{ | |
|
1300
e18667d1e94d
FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv)
michaelni
parents:
1298
diff
changeset
|
805 return c->bytestream - c->bytestream_start; |
| 2967 | 806 } |
| 1287 | 807 } |
| 808 | |
| 1290 | 809 /** |
| 810 * get (truncated) unnary binarization. | |
| 811 */ | |
|
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
|
812 static int get_cabac_u(CABACContext *c, uint8_t * state, int max, int max_index, int truncated){ |
| 1290 | 813 int i; |
| 2967 | 814 |
| 815 for(i=0; i<max; i++){ | |
| 1290 | 816 if(get_cabac(c, state)==0) |
| 817 return i; | |
| 2967 | 818 |
| 1290 | 819 if(i< max_index) state++; |
| 820 } | |
| 821 | |
| 822 return truncated ? max : -1; | |
| 823 } | |
| 824 | |
| 825 /** | |
| 826 * get unary exp golomb k-th order binarization. | |
| 827 */ | |
|
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
|
828 static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signed, int k, int max_index){ |
| 1290 | 829 int i, v; |
| 830 int m= 1<<k; | |
| 2967 | 831 |
| 832 if(get_cabac(c, state)==0) | |
| 1290 | 833 return 0; |
| 2967 | 834 |
| 1290 | 835 if(0 < max_index) state++; |
| 2967 | 836 |
| 837 for(i=1; i<max; i++){ | |
| 1290 | 838 if(get_cabac(c, state)==0){ |
| 839 if(is_signed && get_cabac_bypass(c)){ | |
| 840 return -i; | |
| 841 }else | |
| 842 return i; | |
| 843 } | |
| 844 | |
| 845 if(i < max_index) state++; | |
| 846 } | |
| 2967 | 847 |
| 1290 | 848 while(get_cabac_bypass(c)){ |
| 849 i+= m; | |
| 850 m+= m; | |
| 851 } | |
| 2967 | 852 |
| 1290 | 853 v=0; |
| 854 while(m>>=1){ | |
| 855 v+= v + get_cabac_bypass(c); | |
| 856 } | |
| 857 i += v; | |
| 858 | |
| 859 if(is_signed && get_cabac_bypass(c)){ | |
| 860 return -i; | |
| 861 }else | |
| 862 return i; | |
| 863 } | |
| 4975 | 864 |
| 865 #endif /* CABAC_H */ |
