diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-06-30 22:33:38 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-06-30 22:33:38 +0000 |
| commit | cf60d669a6a5405b8ecdc5d2f59296e1c6b5198b (patch) | |
| tree | a1e7a9e3f50d1d09169c126ce5b46850fa12a462 | |
| parent | bce3bd1ced8ff651d141f3d4f09e9ed903fee325 (diff) | |
| download | ffmpeg-cf60d669a6a5405b8ecdc5d2f59296e1c6b5198b.tar.gz | |
Add more int packing macros, name them consistently
Originally committed as revision 23916 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264pred.c | 2 | ||||
| -rw-r--r-- | libavcodec/mathops.h | 34 |
2 files changed, 30 insertions, 6 deletions
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 64c4882f89..5706c97e16 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -109,7 +109,7 @@ static void pred4x4_vertical_vp8_c(uint8_t *src, const uint8_t *topright, int st const int lt= src[-1-1*stride]; LOAD_TOP_EDGE LOAD_TOP_RIGHT_EDGE - uint32_t v = PACK4UINT8((lt + 2*t0 + t1 + 2) >> 2, + uint32_t v = PACK_4U8((lt + 2*t0 + t1 + 2) >> 2, (t0 + 2*t1 + t2 + 2) >> 2, (t1 + 2*t2 + t3 + 2) >> 2, (t2 + 2*t3 + t4 + 2) >> 2); diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index ebf57f5a4f..4d88ed14c9 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -146,12 +146,36 @@ if ((y) < (x)) {\ # define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s))) #endif -#ifndef PACK4x8 -# if HAVE_BIGENDIAN -# define PACK4UINT8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) -# else -# define PACK4UINT8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) +#if HAVE_BIGENDIAN +# ifndef PACK_2U8 +# define PACK_2U8(a,b) (((a) << 8) | (b)) # endif +# ifndef PACK_4U8 +# define PACK_4U8(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) +# endif +# ifndef PACK_2U16 +# define PACK_2U16(a,b) (((a) << 16) | (b)) +# endif +#else +# ifndef PACK_2U8 +# define PACK_2U8(a,b) (((b) << 8) | (a)) +# endif +# ifndef PACK_4U2 +# define PACK_4U8(a,b,c,d) (((d) << 24) | ((c) << 16) | ((b) << 8) | (a)) +# endif +# ifndef PACK_2U16 +# define PACK_2U16(a,b) (((b) << 16) | (a)) +# endif +#endif + +#ifndef PACK_2S8 +# define PACK_2S8(a,b) PACK_2U8((a)&255, (b)&255) +#endif +#ifndef PACK_4S8 +# define PACK_4S8(a,b,c,d) PACK_4U8((a)&255, (b)&255, (c)&255, (d)&255) +#endif +#ifndef PACK_2S16 +# define PACK_2S16(a,b) PACK_2U16((a)&0xffff, (b)&0xffff) #endif #endif /* AVCODEC_MATHOPS_H */ |