comparison golomb.h @ 2439:6684c0e9e28f libavcodec

svq3_get_se_golomb() fix
author michael
date Wed, 19 Jan 2005 13:03:38 +0000
parents e98b5e0de86b
children b47af698085e
comparison
equal deleted inserted replaced
2438:e98b5e0de86b 2439:6684c0e9e28f
165 LAST_SKIP_BITS(re, gb, ff_interleaved_golomb_vlc_len[buf]); 165 LAST_SKIP_BITS(re, gb, ff_interleaved_golomb_vlc_len[buf]);
166 CLOSE_READER(re, gb); 166 CLOSE_READER(re, gb);
167 167
168 return ff_interleaved_se_golomb_vlc_code[buf]; 168 return ff_interleaved_se_golomb_vlc_code[buf];
169 }else{ 169 }else{
170 buf |=1; 170 LAST_SKIP_BITS(re, gb, 8);
171 UPDATE_CACHE(re, gb);
172 buf |= 1 | (GET_CACHE(re, gb) >> 8);
173
171 if((buf & 0xAAAAAAAA) == 0) 174 if((buf & 0xAAAAAAAA) == 0)
172 return INVALID_VLC; 175 return INVALID_VLC;
173 176
174 for(log=31; (buf & 0x80000000) == 0; log--){ 177 for(log=31; (buf & 0x80000000) == 0; log--){
175 buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30); 178 buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30);
176 } 179 }
177 180
178 LAST_SKIP_BITS(re, gb, 63 - 2*log); 181 LAST_SKIP_BITS(re, gb, 63 - 2*log - 8);
179 CLOSE_READER(re, gb); 182 CLOSE_READER(re, gb);
180 183
181 return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1; 184 return (signed) (((((buf << log) >> log) - 1) ^ -(buf & 0x1)) + 1) >> 1;
182 } 185 }
183 } 186 }