clarify codec_tag

[ffmpeg] / libavcodec / bytestream.h

diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index bd2ce1f6bd886e08c13f66518eedfabf5850039a..d1e9f82ed733dbb6c6c574a0b1ebdb52ee154f9e 100644 (file)
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -22,29 +22,37 @@
 #ifndef FFMPEG_BYTESTREAM_H
 #define FFMPEG_BYTESTREAM_H
 
-static always_inline unsigned int bytestream_get_le32(uint8_t **b)
-{
-    (*b) += 4;
-    return LE_32(*b - 4);
-}
+#define DEF(name, bytes, read, write)\
+static av_always_inline unsigned int 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){\
+    write(*b, value);\
+    (*b) += bytes;\
+};
 
-static always_inline unsigned int bytestream_get_le16(uint8_t **b)
-{
-    (*b) += 2;
-    return LE_16(*b - 2);
-}
+DEF(le32, 4, AV_RL32, AV_WL32)
+DEF(le24, 3, AV_RL24, AV_WL24)
+DEF(le16, 2, AV_RL16, AV_WL16)
+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 )
 
-static always_inline unsigned int bytestream_get_byte(uint8_t **b)
-{
-    (*b)++;
-    return (*b)[-1];
-}
+#undef DEF
 
-static always_inline unsigned int bytestream_get_buffer(uint8_t **b, uint8_t *dst, unsigned int size)
+static av_always_inline unsigned int bytestream_get_buffer(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)
+{
+    memcpy(*b, src, size);
+    (*b) += size;
+}
+
 #endif /* FFMPEG_BYTESTREAM_H */