bytestream: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
parent
a16c3a07a6
commit
ab9ae40152
|
@ -24,6 +24,7 @@
|
||||||
#define AVCODEC_BYTESTREAM_H
|
#define AVCODEC_BYTESTREAM_H
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "libavutil/common.h"
|
#include "libavutil/common.h"
|
||||||
#include "libavutil/intreadwrite.h"
|
#include "libavutil/intreadwrite.h"
|
||||||
|
|
||||||
|
@ -37,40 +38,46 @@ typedef struct {
|
||||||
} PutByteContext;
|
} PutByteContext;
|
||||||
|
|
||||||
#define DEF_T(type, name, bytes, read, write) \
|
#define DEF_T(type, name, bytes, read, write) \
|
||||||
static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
|
static av_always_inline type bytestream_get_ ## name(const uint8_t **b) \
|
||||||
(*b) += bytes;\
|
{ \
|
||||||
return read(*b - bytes);\
|
(*b) += bytes; \
|
||||||
}\
|
return read(*b - bytes); \
|
||||||
static av_always_inline void bytestream_put_ ##name(uint8_t **b, const type value){\
|
} \
|
||||||
write(*b, value);\
|
static av_always_inline void bytestream_put_ ## name(uint8_t **b, \
|
||||||
(*b) += bytes;\
|
const type value) \
|
||||||
}\
|
{ \
|
||||||
static av_always_inline void bytestream2_put_ ## name ## u(PutByteContext *p, const type value)\
|
write(*b, value); \
|
||||||
{\
|
(*b) += bytes; \
|
||||||
bytestream_put_ ## name(&p->buffer, value);\
|
} \
|
||||||
}\
|
static av_always_inline void bytestream2_put_ ## name ## u(PutByteContext *p, \
|
||||||
static av_always_inline void bytestream2_put_ ## name(PutByteContext *p, const type value){\
|
const type value) \
|
||||||
if (!p->eof && (p->buffer_end - p->buffer >= bytes)) {\
|
{ \
|
||||||
write(p->buffer, value);\
|
bytestream_put_ ## name(&p->buffer, value); \
|
||||||
p->buffer += bytes;\
|
} \
|
||||||
} else\
|
static av_always_inline void bytestream2_put_ ## name(PutByteContext *p, \
|
||||||
p->eof = 1;\
|
const type value) \
|
||||||
}\
|
{ \
|
||||||
static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g)\
|
if (!p->eof && (p->buffer_end - p->buffer >= bytes)) { \
|
||||||
{\
|
write(p->buffer, value); \
|
||||||
return bytestream_get_ ## name(&g->buffer);\
|
p->buffer += bytes; \
|
||||||
}\
|
} else \
|
||||||
static av_always_inline type bytestream2_get_ ## name(GetByteContext *g)\
|
p->eof = 1; \
|
||||||
{\
|
} \
|
||||||
if (g->buffer_end - g->buffer < bytes)\
|
static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g) \
|
||||||
return 0;\
|
{ \
|
||||||
return bytestream2_get_ ## name ## u(g);\
|
return bytestream_get_ ## name(&g->buffer); \
|
||||||
}\
|
} \
|
||||||
static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g)\
|
static av_always_inline type bytestream2_get_ ## name(GetByteContext *g) \
|
||||||
{\
|
{ \
|
||||||
if (g->buffer_end - g->buffer < bytes)\
|
if (g->buffer_end - g->buffer < bytes) \
|
||||||
return 0;\
|
return 0; \
|
||||||
return read(g->buffer);\
|
return bytestream2_get_ ## name ## u(g); \
|
||||||
|
} \
|
||||||
|
static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g) \
|
||||||
|
{ \
|
||||||
|
if (g->buffer_end - g->buffer < bytes) \
|
||||||
|
return 0; \
|
||||||
|
return read(g->buffer); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define DEF(name, bytes, read, write) \
|
#define DEF(name, bytes, read, write) \
|
||||||
|
@ -129,7 +136,8 @@ DEF (byte, 1, AV_RB8 , AV_WB8 )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static av_always_inline void bytestream2_init(GetByteContext *g,
|
static av_always_inline void bytestream2_init(GetByteContext *g,
|
||||||
const uint8_t *buf, int buf_size)
|
const uint8_t *buf,
|
||||||
|
int buf_size)
|
||||||
{
|
{
|
||||||
g->buffer = buf;
|
g->buffer = buf;
|
||||||
g->buffer_start = buf;
|
g->buffer_start = buf;
|
||||||
|
@ -137,7 +145,8 @@ static av_always_inline void bytestream2_init(GetByteContext *g,
|
||||||
}
|
}
|
||||||
|
|
||||||
static av_always_inline void bytestream2_init_writer(PutByteContext *p,
|
static av_always_inline void bytestream2_init_writer(PutByteContext *p,
|
||||||
uint8_t *buf, int buf_size)
|
uint8_t *buf,
|
||||||
|
int buf_size)
|
||||||
{
|
{
|
||||||
p->buffer = buf;
|
p->buffer = buf;
|
||||||
p->buffer_start = buf;
|
p->buffer_start = buf;
|
||||||
|
@ -183,7 +192,8 @@ static av_always_inline int bytestream2_tell_p(PutByteContext *p)
|
||||||
return (int)(p->buffer - p->buffer_start);
|
return (int)(p->buffer - p->buffer_start);
|
||||||
}
|
}
|
||||||
|
|
||||||
static av_always_inline int bytestream2_seek(GetByteContext *g, int offset,
|
static av_always_inline int bytestream2_seek(GetByteContext *g,
|
||||||
|
int offset,
|
||||||
int whence)
|
int whence)
|
||||||
{
|
{
|
||||||
switch (whence) {
|
switch (whence) {
|
||||||
|
@ -206,7 +216,8 @@ static av_always_inline int bytestream2_seek(GetByteContext *g, int offset,
|
||||||
return bytestream2_tell(g);
|
return bytestream2_tell(g);
|
||||||
}
|
}
|
||||||
|
|
||||||
static av_always_inline int bytestream2_seek_p(PutByteContext *p, int offset,
|
static av_always_inline int bytestream2_seek_p(PutByteContext *p,
|
||||||
|
int offset,
|
||||||
int whence)
|
int whence)
|
||||||
{
|
{
|
||||||
p->eof = 0;
|
p->eof = 0;
|
||||||
|
@ -280,14 +291,18 @@ static av_always_inline unsigned int bytestream2_get_eof(PutByteContext *p)
|
||||||
return p->eof;
|
return p->eof;
|
||||||
}
|
}
|
||||||
|
|
||||||
static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b, uint8_t *dst, unsigned int size)
|
static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b,
|
||||||
|
uint8_t *dst,
|
||||||
|
unsigned int size)
|
||||||
{
|
{
|
||||||
memcpy(dst, *b, size);
|
memcpy(dst, *b, size);
|
||||||
(*b) += size;
|
(*b) += size;
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
|
||||||
static av_always_inline void bytestream_put_buffer(uint8_t **b, const uint8_t *src, unsigned int size)
|
static av_always_inline void bytestream_put_buffer(uint8_t **b,
|
||||||
|
const uint8_t *src,
|
||||||
|
unsigned int size)
|
||||||
{
|
{
|
||||||
memcpy(*b, src, size);
|
memcpy(*b, src, size);
|
||||||
(*b) += size;
|
(*b) += size;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user