---
libavcodec/bytestream.h | 94 ++++++++++++++++++++++++++---------------------
1 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index 49d7fa4..854dd51 100644
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -1,6 +1,6 @@
/*
* Bytestream functions
- * copyright (c) 2006 Baptiste Coudurier <baptiste.coudur...@free.fr>
+ * Copyright (c) 2006 Baptiste Coudurier <baptiste.coudur...@free.fr>
* Copyright (c) 2012 Aneesh Dogra (lionaneesh) <lionane...@gmail.com>
*
* This file is part of Libav.
@@ -36,46 +36,52 @@ typedef struct {
int eof;
} PutByteContext;
-#define DEF_T(type, name, bytes, read, write) \
-static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
- (*b) += bytes;\
- return read(*b - bytes);\
-}\
-static av_always_inline void bytestream_put_ ##name(uint8_t **b, const type
value){\
- write(*b, value);\
- (*b) += bytes;\
-}\
-static av_always_inline void bytestream2_put_ ## name ## u(PutByteContext *p,
const type value)\
-{\
- bytestream_put_ ## name(&p->buffer, value);\
-}\
-static av_always_inline void bytestream2_put_ ## name(PutByteContext *p, const
type value){\
- if (!p->eof && (p->buffer_end - p->buffer >= bytes)) {\
- write(p->buffer, value);\
- p->buffer += bytes;\
- } else\
- p->eof = 1;\
-}\
-static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g)\
-{\
- return bytestream_get_ ## name(&g->buffer);\
-}\
-static av_always_inline type bytestream2_get_ ## name(GetByteContext *g)\
-{\
- if (g->buffer_end - g->buffer < bytes)\
- return 0;\
- 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_T(type, name, bytes, read, write)
\
+static av_always_inline type bytestream_get_ ## name(const uint8_t **b)
\
+{
\
+ (*b) += bytes;
\
+ return read(*b - bytes);
\
+}
\
+static av_always_inline void bytestream_put_ ## name(uint8_t **b,
\
+ const type value)
\
+{
\
+ write(*b, value);
\
+ (*b) += bytes;
\
+}
\
+static av_always_inline void bytestream2_put_ ## name ## u(PutByteContext *p,
\
+ const type value)
\
+{
\
+ bytestream_put_ ## name(&p->buffer, value);
\
+}
\
+static av_always_inline void bytestream2_put_ ## name(PutByteContext *p,
\
+ const type value)
\
+{
\
+ if (!p->eof && (p->buffer_end - p->buffer >= bytes)) {
\
+ write(p->buffer, value);
\
+ p->buffer += bytes;
\
+ } else
\
+ p->eof = 1;
\
+}
\
+static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g)
\
+{
\
+ return bytestream_get_ ## name(&g->buffer);
\
+}
\
+static av_always_inline type bytestream2_get_ ## name(GetByteContext *g)
\
+{
\
+ if (g->buffer_end - g->buffer < bytes)
\
+ return 0;
\
+ 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)
\
DEF_T(unsigned int, name, bytes, read, write)
-#define DEF64(name, bytes, read, write) \
+#define DEF64(name, bytes, read, write)
\
DEF_T(uint64_t, name, bytes, read, write)
DEF64(le64, 8, AV_RL64, AV_WL64)
@@ -131,9 +137,9 @@ DEF (byte, 1, AV_RB8 , AV_WB8 )
static av_always_inline void bytestream2_init(GetByteContext *g,
const uint8_t *buf, int buf_size)
{
- g->buffer = buf;
+ g->buffer = buf;
g->buffer_start = buf;
- g->buffer_end = buf + buf_size;
+ g->buffer_end = buf + buf_size;
}
static av_always_inline void bytestream2_init_writer(PutByteContext *p,
@@ -280,14 +286,18 @@ static av_always_inline unsigned int
bytestream2_get_eof(PutByteContext *p)
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);
(*b) += 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);
(*b) += size;
--
1.7.1
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
