summaryrefslogtreecommitdiff
path: root/libavcodec/bytestream.h
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2007-07-07 20:50:27 +0000
committerMåns Rullgård <mans@mansr.com>2007-07-07 20:50:27 +0000
commita7b67850f4139386294e57372a5d7d8e7949cfe9 (patch)
tree9c0f36ec6d1370d1f219c8eb4273ac3e5e1e949b /libavcodec/bytestream.h
parentf015e411d78d9e9ae179170beafe4951b778ac50 (diff)
add 64-bit bytestream read/write functions
Originally committed as revision 9523 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/bytestream.h')
-rw-r--r--libavcodec/bytestream.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index b316f2d3f3..88f08873b8 100644
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -24,25 +24,34 @@
#include "common.h"
-#define DEF(name, bytes, read, write)\
-static av_always_inline unsigned int bytestream_get_ ## name(uint8_t **b){\
+#define DEF_T(type, name, bytes, read, write) \
+static av_always_inline type bytestream_get_ ## name(uint8_t **b){\
(*b) += bytes;\
return read(*b - bytes);\
}\
-static av_always_inline void bytestream_put_ ##name(uint8_t **b, const unsigned int value){\
+static av_always_inline void bytestream_put_ ##name(uint8_t **b, const type value){\
write(*b, value);\
(*b) += bytes;\
}
+#define DEF(name, bytes, read, write) \
+ DEF_T(unsigned int, 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)
DEF(le32, 4, AV_RL32, AV_WL32)
DEF(le24, 3, AV_RL24, AV_WL24)
DEF(le16, 2, AV_RL16, AV_WL16)
+DEF64(be64, 8, AV_RB64, AV_WB64)
DEF(be32, 4, AV_RB32, AV_WB32)
DEF(be24, 3, AV_RB24, AV_WB24)
DEF(be16, 2, AV_RB16, AV_WB16)
DEF(byte, 1, AV_RB8 , AV_WB8 )
#undef DEF
+#undef DEF64
+#undef DEF_T
static av_always_inline unsigned int bytestream_get_buffer(uint8_t **b, uint8_t *dst, unsigned int size)
{