mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
cleanup get_unary()
Originally committed as revision 10241 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
28296f9c9e
commit
2407a7c10f
@ -25,48 +25,17 @@
|
||||
|
||||
/**
|
||||
* Get unary code of limited length
|
||||
* @todo FIXME Slow and ugly
|
||||
* @param gb GetBitContext
|
||||
* @param[in] stop The bitstop value (unary code of 1's or 0's)
|
||||
* @param[in] len Maximum length
|
||||
* @return Unary length/index
|
||||
*/
|
||||
static int get_unary(GetBitContext *gb, int stop, int len)
|
||||
static inline int get_unary(GetBitContext *gb, int stop, int len)
|
||||
{
|
||||
#if 1
|
||||
int i;
|
||||
|
||||
for(i = 0; i < len && get_bits1(gb) != stop; i++);
|
||||
return i;
|
||||
/* int i = 0, tmp = !stop;
|
||||
|
||||
while (i != len && tmp != stop)
|
||||
{
|
||||
tmp = get_bits(gb, 1);
|
||||
i++;
|
||||
}
|
||||
if (i == len && tmp != stop) return len+1;
|
||||
return i;*/
|
||||
#else
|
||||
unsigned int buf;
|
||||
int log;
|
||||
|
||||
OPEN_READER(re, gb);
|
||||
UPDATE_CACHE(re, gb);
|
||||
buf=GET_CACHE(re, gb); //Still not sure
|
||||
if (stop) buf = ~buf;
|
||||
|
||||
log= av_log2(-buf); //FIXME: -?
|
||||
if (log < limit){
|
||||
LAST_SKIP_BITS(re, gb, log+1);
|
||||
CLOSE_READER(re, gb);
|
||||
return log;
|
||||
}
|
||||
|
||||
LAST_SKIP_BITS(re, gb, limit);
|
||||
CLOSE_READER(re, gb);
|
||||
return limit;
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif /* AVCODEC_UNARY_H */
|
||||
|
Loading…
Reference in New Issue
Block a user