comparison get_bits.h @ 12128:ee740a4e80c5 libavcodec

bswap: change ME to NE in macro names Other parts of FFmpeg use NE (native endian) rather than ME (machine). This makes it consistent.
author mru
date Sat, 10 Jul 2010 22:09:01 +0000
parents 7dd2a45249a9
children 8b28e74de2c0
comparison
equal deleted inserted replaced
12127:9ba7d2a5b20a 12128:ee740a4e80c5
265 (gb)->cache1= name##_cache1;\ 265 (gb)->cache1= name##_cache1;\
266 (gb)->buffer_ptr= name##_buffer_ptr;\ 266 (gb)->buffer_ptr= name##_buffer_ptr;\
267 267
268 # define UPDATE_CACHE(name, gb)\ 268 # define UPDATE_CACHE(name, gb)\
269 if(name##_bit_count > 0){\ 269 if(name##_bit_count > 0){\
270 const uint32_t next= be2me_32( *name##_buffer_ptr );\ 270 const uint32_t next= be2ne_32( *name##_buffer_ptr );\
271 name##_cache0 |= NEG_USR32(next,name##_bit_count);\ 271 name##_cache0 |= NEG_USR32(next,name##_bit_count);\
272 name##_cache1 |= next<<name##_bit_count;\ 272 name##_cache1 |= next<<name##_bit_count;\
273 name##_buffer_ptr++;\ 273 name##_buffer_ptr++;\
274 name##_bit_count-= 32;\ 274 name##_bit_count-= 32;\
275 }\ 275 }\
317 static inline void skip_bits_long(GetBitContext *s, int n){ 317 static inline void skip_bits_long(GetBitContext *s, int n){
318 OPEN_READER(re, s) 318 OPEN_READER(re, s)
319 re_bit_count += n; 319 re_bit_count += n;
320 re_buffer_ptr += re_bit_count>>5; 320 re_buffer_ptr += re_bit_count>>5;
321 re_bit_count &= 31; 321 re_bit_count &= 31;
322 re_cache0 = be2me_32( re_buffer_ptr[-1] ) << re_bit_count; 322 re_cache0 = be2ne_32( re_buffer_ptr[-1] ) << re_bit_count;
323 re_cache1 = 0; 323 re_cache1 = 0;
324 UPDATE_CACHE(re, s) 324 UPDATE_CACHE(re, s)
325 CLOSE_READER(re, s) 325 CLOSE_READER(re, s)
326 } 326 }
327 327