virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'

Browse Source 
* commit '4af5310d29379283553bcd9f541a3f6c317f706e':
  get_bits/put_bits: K&R formatting cosmetics

Conflicts:
	libavcodec/get_bits.h
	libavcodec/put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-22 13:49:45 +01:00
commit 766f055201
2 changed files with 192 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
libavcodec/get_bits.h
View File

@ -27,6 +27,7 @@
#define AVCODEC_GET_BITS_H #define AVCODEC_GET_BITS_H
#include <stdint.h> #include <stdint.h>
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/log.h" #include "libavutil/log.h"
@ -72,45 +73,47 @@ typedef struct RL_VLC_ELEM {
} RL_VLC_ELEM; } RL_VLC_ELEM;
/* Bitstream reader API docs: /* Bitstream reader API docs:
name * name
arbitrary name which is used as prefix for the internal variables * arbitrary name which is used as prefix for the internal variables
*
gb * gb
getbitcontext * getbitcontext
*
OPEN_READER(name, gb) * OPEN_READER(name, gb)
load gb into local variables * load gb into local variables
*
CLOSE_READER(name, gb) * CLOSE_READER(name, gb)
store local vars in gb * store local vars in gb
*
UPDATE_CACHE(name, gb) * UPDATE_CACHE(name, gb)
refill the internal cache from the bitstream * Refill the internal cache from the bitstream.
after this call at least MIN_CACHE_BITS will be available, * After this call at least MIN_CACHE_BITS will be available.
*
GET_CACHE(name, gb) * GET_CACHE(name, gb)
will output the contents of the internal cache, next bit is MSB of 32 or 64 bit (FIXME 64bit) * Will output the contents of the internal cache,
* next bit is MSB of 32 or 64 bit (FIXME 64bit).
SHOW_UBITS(name, gb, num) *
will return the next num bits * SHOW_UBITS(name, gb, num)
* Will return the next num bits.
SHOW_SBITS(name, gb, num) *
will return the next num bits and do sign extension * SHOW_SBITS(name, gb, num)
* Will return the next num bits and do sign extension.
SKIP_BITS(name, gb, num) *
will skip over the next num bits * SKIP_BITS(name, gb, num)
note, this is equivalent to SKIP_CACHE; SKIP_COUNTER * Will skip over the next num bits.
* Note, this is equivalent to SKIP_CACHE; SKIP_COUNTER.
SKIP_CACHE(name, gb, num) *
will remove the next num bits from the cache (note SKIP_COUNTER MUST be called before UPDATE_CACHE / CLOSE_READER) * SKIP_CACHE(name, gb, num)
* Will remove the next num bits from the cache (note SKIP_COUNTER
SKIP_COUNTER(name, gb, num) * MUST be called before UPDATE_CACHE / CLOSE_READER).
will increment the internal bit counter (see SKIP_CACHE & SKIP_BITS) *
* SKIP_COUNTER(name, gb, num)
LAST_SKIP_BITS(name, gb, num) * Will increment the internal bit counter (see SKIP_CACHE & SKIP_BITS).
like SKIP_BITS, to be used if next call is UPDATE_CACHE or CLOSE_READER *
* LAST_SKIP_BITS(name, gb, num)
for examples see get_bits, show_bits, skip_bits, get_vlc * Like SKIP_BITS, to be used if next call is UPDATE_CACHE or CLOSE_READER.
*
* For examples see get_bits, show_bits, skip_bits, get_vlc.
*/ */
#ifdef LONG_BITSTREAM_READER #ifdef LONG_BITSTREAM_READER
@ -122,18 +125,16 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
#if UNCHECKED_BITSTREAM_READER #if UNCHECKED_BITSTREAM_READER
#define OPEN_READER(name, gb) \ #define OPEN_READER(name, gb) \
unsigned int name ## _index = (gb)->index; \ unsigned int name ## _index = (gb)->index; \
av_unused unsigned int name##_cache unsigned int av_unused name ## _cache
#define HAVE_BITS_REMAINING(name, gb) 1 #define HAVE_BITS_REMAINING(name, gb) 1
#else #else
#define OPEN_READER(name, gb) \ #define OPEN_READER(name, gb) \
unsigned int name ## _index = (gb)->index; \ unsigned int name ## _index = (gb)->index; \
unsigned int av_unused name ## _cache = 0; \ unsigned int av_unused name ## _cache = 0; \
unsigned int av_unused name##_size_plus8 = \ unsigned int av_unused name ## _size_plus8 = (gb)->size_in_bits_plus8
(gb)->size_in_bits_plus8
#define HAVE_BITS_REMAINING(name, gb) \ #define HAVE_BITS_REMAINING(name, gb) name ## _index < name ## _size_plus8
name##_index < name##_size_plus8
#endif #endif
#define CLOSE_READER(name, gb) (gb)->index = name ## _index #define CLOSE_READER(name, gb) (gb)->index = name ## _index
@ -171,7 +172,8 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
name ## _index = FFMIN(name ## _size_plus8, name ## _index + (num)) name ## _index = FFMIN(name ## _size_plus8, name ## _index + (num))
#endif #endif
#define SKIP_BITS(name, gb, num) do { \ #define SKIP_BITS(name, gb, num) \
do { \
SKIP_CACHE(name, gb, num); \ SKIP_CACHE(name, gb, num); \
SKIP_COUNTER(name, gb, num); \ SKIP_COUNTER(name, gb, num); \
} while (0) } while (0)
@ -193,7 +195,8 @@ static inline int get_bits_count(const GetBitContext *s)
return s->index; return s->index;
} }
static inline void skip_bits_long(GetBitContext *s, int n){ static inline void skip_bits_long(GetBitContext *s, int n)
{
#if UNCHECKED_BITSTREAM_READER #if UNCHECKED_BITSTREAM_READER
s->index += n; s->index += n;
#else #else
@ -304,9 +307,9 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n)
{ {
if (!n) { if (!n) {
return 0; return 0;
} else if (n <= MIN_CACHE_BITS) } else if (n <= MIN_CACHE_BITS) {
return get_bits(s, n); return get_bits(s, n);
else { } else {
#ifdef BITSTREAM_READER_LE #ifdef BITSTREAM_READER_LE
unsigned ret = get_bits(s, 16); unsigned ret = get_bits(s, 16);
return ret | (get_bits(s, n - 16) << 16); return ret | (get_bits(s, n - 16) << 16);
@ -348,9 +351,9 @@ static inline int get_sbits_long(GetBitContext *s, int n)
*/ */
static inline unsigned int show_bits_long(GetBitContext *s, int n) static inline unsigned int show_bits_long(GetBitContext *s, int n)
{ {
if (n <= MIN_CACHE_BITS) if (n <= MIN_CACHE_BITS) {
return show_bits(s, n); return show_bits(s, n);
else { } else {
GetBitContext gb = *s; GetBitContext gb = *s;
return get_bits_long(&gb, n); return get_bits_long(&gb, n);
} }
@ -392,6 +395,7 @@ static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer,
s->size_in_bits_plus8 = bit_size + 8; s->size_in_bits_plus8 = bit_size + 8;
s->buffer_end = buffer + buffer_size; s->buffer_end = buffer + buffer_size;
s->index = 0; s->index = 0;
return ret; return ret;
} }
@ -414,7 +418,8 @@ static inline int init_get_bits8(GetBitContext *s, const uint8_t *buffer,
static inline void align_get_bits(GetBitContext *s) static inline void align_get_bits(GetBitContext *s)
{ {
int n = -get_bits_count(s) & 7; int n = -get_bits_count(s) & 7;
if (n) skip_bits(s, n); if (n)
skip_bits(s, n);
} }
#define init_vlc(vlc, nb_bits, nb_codes, \ #define init_vlc(vlc, nb_bits, nb_codes, \
@ -431,18 +436,19 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
const void *codes, int codes_wrap, int codes_size, const void *codes, int codes_wrap, int codes_size,
const void *symbols, int symbols_wrap, int symbols_size, const void *symbols, int symbols_wrap, int symbols_size,
int flags); int flags);
#define INIT_VLC_LE 2
#define INIT_VLC_USE_NEW_STATIC 4
void ff_free_vlc(VLC *vlc); void ff_free_vlc(VLC *vlc);
#define INIT_VLC_STATIC(vlc, bits, a,b,c,d,e,f,g, static_size) do { \ #define INIT_VLC_LE 2
#define INIT_VLC_USE_NEW_STATIC 4
#define INIT_VLC_STATIC(vlc, bits, a, b, c, d, e, f, g, static_size) \
do { \
static VLC_TYPE table[static_size][2]; \ static VLC_TYPE table[static_size][2]; \
(vlc)->table = table; \ (vlc)->table = table; \
(vlc)->table_allocated = static_size; \ (vlc)->table_allocated = static_size; \
init_vlc(vlc, bits, a, b, c, d, e, f, g, INIT_VLC_USE_NEW_STATIC); \ init_vlc(vlc, bits, a, b, c, d, e, f, g, INIT_VLC_USE_NEW_STATIC); \
} while (0) } while (0)
/** /**
* If the vlc code is invalid and max_depth=1, then no bits will be removed. * If the vlc code is invalid and max_depth=1, then no bits will be removed.
* If the vlc code is invalid and max_depth>1, then the number of bits removed * If the vlc code is invalid and max_depth>1, then the number of bits removed
@ -480,7 +486,8 @@ void ff_free_vlc(VLC *vlc);
SKIP_BITS(name, gb, n); \ SKIP_BITS(name, gb, n); \
} while (0) } while (0)
#define GET_RL_VLC(level, run, name, gb, table, bits, max_depth, need_update) \ #define GET_RL_VLC(level, run, name, gb, table, bits, \
max_depth, need_update) \
do { \ do { \
int n, nb_bits; \ int n, nb_bits; \
unsigned int index; \ unsigned int index; \
@ -505,7 +512,6 @@ void ff_free_vlc(VLC *vlc);
SKIP_BITS(name, gb, n); \ SKIP_BITS(name, gb, n); \
} while (0) } while (0)
/** /**
* Parse a vlc code. * Parse a vlc code.
* @param bits is the number of bits which will be read at once, must be * @param bits is the number of bits which will be read at once, must be
@ -525,6 +531,7 @@ static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2],
GET_VLC(code, re, s, table, bits, max_depth); GET_VLC(code, re, s, table, bits, max_depth);
CLOSE_READER(re, s); CLOSE_READER(re, s);
return code; return code;
} }
@ -558,9 +565,8 @@ static inline void print_bin(int bits, int n)
{ {
int i; int i;
for (i = n-1; i >= 0; i--) { for (i = n - 1; i >= 0; i--)
av_log(NULL, AV_LOG_DEBUG, "%d", (bits >> i) & 1); av_log(NULL, AV_LOG_DEBUG, "%d", (bits >> i) & 1);
}
for (i = n; i < 24; i++) for (i = n; i < 24; i++)
av_log(NULL, AV_LOG_DEBUG, " "); av_log(NULL, AV_LOG_DEBUG, " ");
} }
@ -573,8 +579,10 @@ static inline int get_bits_trace(GetBitContext *s, int n, const char *file,
print_bin(r, n); print_bin(r, n);
av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d bit @%5d in %s %s:%d\n", av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d bit @%5d in %s %s:%d\n",
r, n, r, get_bits_count(s) - n, file, func, line); r, n, r, get_bits_count(s) - n, file, func, line);
return r; return r;
} }
static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2], static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2],
int bits, int max_depth, const char *file, int bits, int max_depth, const char *file,
const char *func, int line) const char *func, int line)
@ -589,8 +597,10 @@ static inline int get_vlc_trace(GetBitContext *s, VLC_TYPE (*table)[2],
av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d vlc @%5d in %s %s:%d\n", av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d vlc @%5d in %s %s:%d\n",
bits2, len, r, pos, file, func, line); bits2, len, r, pos, file, func, line);
return r; return r;
} }
static inline int get_xbits_trace(GetBitContext *s, int n, const char *file, static inline int get_xbits_trace(GetBitContext *s, int n, const char *file,
const char *func, int line) const char *func, int line)
{ {
@ -600,12 +610,14 @@ static inline int get_xbits_trace(GetBitContext *s, int n, const char *file,
print_bin(show, n); print_bin(show, n);
av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d xbt @%5d in %s %s:%d\n", av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d xbt @%5d in %s %s:%d\n",
show, n, r, get_bits_count(s) - n, file, func, line); show, n, r, get_bits_count(s) - n, file, func, line);
return r; return r;
} }
#define get_bits(s, n) get_bits_trace(s , n, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_bits(s, n) get_bits_trace(s , n, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#define get_bits1(s) get_bits_trace(s, 1, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_bits1(s) get_bits_trace(s, 1, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#define get_xbits(s, n) get_xbits_trace(s, n, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_xbits(s, n) get_xbits_trace(s, n, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#define get_vlc(s, vlc) get_vlc_trace(s, (vlc)->table, (vlc)->bits, 3, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_vlc(s, vlc) get_vlc_trace(s, (vlc)->table, (vlc)->bits, 3, __FILE__, __PRETTY_FUNCTION__, __LINE__)
#define get_vlc2(s, tab, bits, max) get_vlc_trace(s, tab, bits, max, __FILE__, __PRETTY_FUNCTION__, __LINE__) #define get_vlc2(s, tab, bits, max) get_vlc_trace(s, tab, bits, max, __FILE__, __PRETTY_FUNCTION__, __LINE__)

7
libavcodec/put_bits.h
View File

@ -29,6 +29,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
@ -50,7 +51,8 @@ typedef struct PutBitContext {
* @param buffer the buffer where to put bits * @param buffer the buffer where to put bits
* @param buffer_size the size in bytes of buffer * @param buffer_size the size in bytes of buffer
*/ */
static inline void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size) static inline void init_put_bits(PutBitContext *s, uint8_t *buffer,
int buffer_size)
{ {
if (buffer_size < 0) { if (buffer_size < 0) {
buffer_size = 0; buffer_size = 0;
@ -112,7 +114,8 @@ void avpriv_align_put_bits(PutBitContext *s);
* *
* @param terminate_string 0-terminates the written string if value is 1 * @param terminate_string 0-terminates the written string if value is 1
*/ */
void avpriv_put_string(PutBitContext *pb, const char *string, int terminate_string); void avpriv_put_string(PutBitContext *pb, const char *string,
int terminate_string);
/** /**
* Copy the content of src to the bitstream. * Copy the content of src to the bitstream.