simplify and remove useless index in AV_W*

Originally committed as revision 7852 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 33 insertions, 66 deletions

diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index ae5438b49c..547b28ae45 100644
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -22,23 +22,23 @@
 #ifndef FFMPEG_BYTESTREAM_H
 #define FFMPEG_BYTESTREAM_H
 
-static av_always_inline unsigned int bytestream_get_le32(uint8_t **b)
-{
-    (*b) += 4;
-    return AV_RL32(*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 av_always_inline unsigned int bytestream_get_le16(uint8_t **b)
-{
-    (*b) += 2;
-    return AV_RL16(*b - 2);
-}
+DEF(le32, 4, AV_RL32, AV_WL32)
+DEF(le16, 2, AV_RL16, AV_WL16)
+DEF(be32, 4, AV_RB32, AV_WB32)
+DEF(be16, 2, AV_RB16, AV_WB16)
+DEF(byte, 1, AV_RB8 , AV_WB8 )
 
-static av_always_inline unsigned int bytestream_get_byte(uint8_t **b)
-{
-    (*b)++;
-    return (*b)[-1];
-}
+#undef DEF
 
 static av_always_inline unsigned int bytestream_get_buffer(uint8_t **b, uint8_t *dst, unsigned int size)
 {
@@ -47,39 +47,6 @@ static av_always_inline unsigned int bytestream_get_buffer(uint8_t **b, uint8_t
     return size;
 }
 
-static av_always_inline void bytestream_put_be32(uint8_t **b, const unsigned int value)
-{
-    *(*b)++ = value >> 24;
-    *(*b)++ = value >> 16;
-    *(*b)++ = value >> 8;
-    *(*b)++ = value;
-};
-
-static av_always_inline void bytestream_put_be16(uint8_t **b, const unsigned int value)
-{
-    *(*b)++ = value >> 8;
-    *(*b)++ = value;
-}
-
-static av_always_inline void bytestream_put_le32(uint8_t **b, const unsigned int value)
-{
-    *(*b)++ = value;
-    *(*b)++ = value >> 8;
-    *(*b)++ = value >> 16;
-    *(*b)++ = value >> 24;
-}
-
-static av_always_inline void bytestream_put_le16(uint8_t **b, const unsigned int value)
-{
-    *(*b)++ = value;
-    *(*b)++ = value >> 8;
-}
-
-static av_always_inline void bytestream_put_byte(uint8_t **b, const unsigned int value)
-{
-    *(*b)++ = value;
-}
-
 static av_always_inline void bytestream_put_buffer(uint8_t **b, const uint8_t *src, unsigned int size)
 {
     memcpy(*b, src, size);
diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h
index e6db5ce6f5..593962eb16 100644
--- a/libavutil/intreadwrite.h
+++ b/libavutil/intreadwrite.h
@@ -27,39 +27,39 @@ struct unaligned_16 { uint16_t l; } __attribute__((packed));
 
 /* endian macros */
 #define AV_RB8(x)  (((uint8_t*)(x))[0])
-#define AV_WB8(p, i, d)  { ((uint8_t*)(p))[(i)] = (d); }
+#define AV_WB8(p, d)  { ((uint8_t*)(p))[0] = (d); }
 
 #define AV_RB16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
-#define AV_WB16(p, i, d) { \
-                    ((uint8_t*)(p))[(i)+1] = (d); \
-                    ((uint8_t*)(p))[(i)] = (d)>>8; }
+#define AV_WB16(p, d) { \
+                    ((uint8_t*)(p))[1] = (d); \
+                    ((uint8_t*)(p))[0] = (d)>>8; }
 
 #define AV_RB32(x) ((((uint8_t*)(x))[0] << 24) | \
                    (((uint8_t*)(x))[1] << 16) | \
                    (((uint8_t*)(x))[2] << 8) | \
                     ((uint8_t*)(x))[3])
-#define AV_WB32(p, i, d) { \
-                    ((uint8_t*)(p))[(i)+3] = (d); \
-                    ((uint8_t*)(p))[(i)+2] = (d)>>8; \
-                    ((uint8_t*)(p))[(i)+1] = (d)>>16; \
-                    ((uint8_t*)(p))[(i)] = (d)>>24; }
+#define AV_WB32(p, d) { \
+                    ((uint8_t*)(p))[3] = (d); \
+                    ((uint8_t*)(p))[2] = (d)>>8; \
+                    ((uint8_t*)(p))[1] = (d)>>16; \
+                    ((uint8_t*)(p))[0] = (d)>>24; }
 
 #define AV_RL8(x)  AV_RB8(x)
-#define AV_WL8(p, i, d)  AV_WB8(p, i, d)
+#define AV_WL8(p, d)  AV_WB8(p, d)
 
 #define AV_RL16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
-#define AV_WL16(p, i, d) { \
-                    ((uint8_t*)(p))[(i)] = (d); \
-                    ((uint8_t*)(p))[(i)+1] = (d)>>8; }
+#define AV_WL16(p, d) { \
+                    ((uint8_t*)(p))[0] = (d); \
+                    ((uint8_t*)(p))[1] = (d)>>8; }
 
 #define AV_RL32(x) ((((uint8_t*)(x))[3] << 24) | \
                    (((uint8_t*)(x))[2] << 16) | \
                    (((uint8_t*)(x))[1] << 8) | \
                     ((uint8_t*)(x))[0])
-#define AV_WL32(p, i, d) { \
-                    ((uint8_t*)(p))[(i)] = (d); \
-                    ((uint8_t*)(p))[(i)+1] = (d)>>8; \
-                    ((uint8_t*)(p))[(i)+2] = (d)>>16; \
-                    ((uint8_t*)(p))[(i)+3] = (d)>>24; }
+#define AV_WL32(p, d) { \
+                    ((uint8_t*)(p))[0] = (d); \
+                    ((uint8_t*)(p))[1] = (d)>>8; \
+                    ((uint8_t*)(p))[2] = (d)>>16; \
+                    ((uint8_t*)(p))[3] = (d)>>24; }
 
 #endif /* INTREADWRITE_H */