mirror of https://git.ffmpeg.org/ffmpeg.git
bytestream: Eliminate one level of pointless macro indirection.
This commit is contained in:
parent
abe3c697a3
commit
f03183d9a8
|
@ -23,6 +23,7 @@
|
||||||
#ifndef AVCODEC_BYTESTREAM_H
|
#ifndef AVCODEC_BYTESTREAM_H
|
||||||
#define AVCODEC_BYTESTREAM_H
|
#define AVCODEC_BYTESTREAM_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "libavutil/common.h"
|
#include "libavutil/common.h"
|
||||||
|
@ -37,7 +38,7 @@ typedef struct {
|
||||||
int eof;
|
int eof;
|
||||||
} PutByteContext;
|
} PutByteContext;
|
||||||
|
|
||||||
#define DEF_T(type, name, bytes, read, write) \
|
#define DEF(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; \
|
(*b) += bytes; \
|
||||||
|
@ -80,24 +81,15 @@ static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g) \
|
||||||
return read(g->buffer); \
|
return read(g->buffer); \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define DEF(name, bytes, read, write) \
|
DEF(uint64_t, le64, 8, AV_RL64, AV_WL64)
|
||||||
DEF_T(unsigned int, name, bytes, read, write)
|
DEF(unsigned int, le32, 4, AV_RL32, AV_WL32)
|
||||||
#define DEF64(name, bytes, read, write) \
|
DEF(unsigned int, le24, 3, AV_RL24, AV_WL24)
|
||||||
DEF_T(uint64_t, name, bytes, read, write)
|
DEF(unsigned int, le16, 2, AV_RL16, AV_WL16)
|
||||||
|
DEF(uint64_t, be64, 8, AV_RB64, AV_WB64)
|
||||||
DEF64(le64, 8, AV_RL64, AV_WL64)
|
DEF(unsigned int, be32, 4, AV_RB32, AV_WB32)
|
||||||
DEF (le32, 4, AV_RL32, AV_WL32)
|
DEF(unsigned int, be24, 3, AV_RB24, AV_WB24)
|
||||||
DEF (le24, 3, AV_RL24, AV_WL24)
|
DEF(unsigned int, be16, 2, AV_RB16, AV_WB16)
|
||||||
DEF (le16, 2, AV_RL16, AV_WL16)
|
DEF(unsigned int, byte, 1, AV_RB8 , AV_WB8)
|
||||||
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
|
|
||||||
|
|
||||||
#if HAVE_BIGENDIAN
|
#if HAVE_BIGENDIAN
|
||||||
# define bytestream2_get_ne16 bytestream2_get_be16
|
# define bytestream2_get_ne16 bytestream2_get_be16
|
||||||
|
|
Loading…
Reference in New Issue