diff options
| -rw-r--r-- | libavcodec/bit_depth_template.c | 1 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 23 | ||||
| -rw-r--r-- | libavcodec/rnd_avg.h | 47 | ||||
| -rw-r--r-- | libavcodec/sh4/dsputil_align.c | 1 | ||||
| -rw-r--r-- | libavcodec/sh4/qpel.c | 1 | ||||
| -rw-r--r-- | libavcodec/vp3dsp.c | 1 |
6 files changed, 51 insertions, 23 deletions
diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c index 9071ec2a35..294b3bbfd2 100644 --- a/libavcodec/bit_depth_template.c +++ b/libavcodec/bit_depth_template.c @@ -17,6 +17,7 @@ */ #include "dsputil.h" +#include "rnd_avg.h" #ifndef BIT_DEPTH #define BIT_DEPTH 8 diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 112f2c4434..70e2489d32 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -403,29 +403,6 @@ int ff_check_alignment(void); void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int type); -#define BYTE_VEC32(c) ((c)*0x01010101UL) -#define BYTE_VEC64(c) ((c)*0x0001000100010001UL) - -static inline uint32_t rnd_avg32(uint32_t a, uint32_t b) -{ - return (a | b) - (((a ^ b) & ~BYTE_VEC32(0x01)) >> 1); -} - -static inline uint32_t no_rnd_avg32(uint32_t a, uint32_t b) -{ - return (a & b) + (((a ^ b) & ~BYTE_VEC32(0x01)) >> 1); -} - -static inline uint64_t rnd_avg64(uint64_t a, uint64_t b) -{ - return (a | b) - (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1); -} - -static inline uint64_t no_rnd_avg64(uint64_t a, uint64_t b) -{ - return (a & b) + (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1); -} - void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_bfin(DSPContext* c, AVCodecContext *avctx); diff --git a/libavcodec/rnd_avg.h b/libavcodec/rnd_avg.h new file mode 100644 index 0000000000..c2b90e06d4 --- /dev/null +++ b/libavcodec/rnd_avg.h @@ -0,0 +1,47 @@ +/* + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_RND_AVG_H +#define AVCODEC_RND_AVG_H + +#include <stdint.h> + +#define BYTE_VEC32(c) ((c)*0x01010101UL) +#define BYTE_VEC64(c) ((c)*0x0001000100010001UL) + +static inline uint32_t rnd_avg32(uint32_t a, uint32_t b) +{ + return (a | b) - (((a ^ b) & ~BYTE_VEC32(0x01)) >> 1); +} + +static inline uint32_t no_rnd_avg32(uint32_t a, uint32_t b) +{ + return (a & b) + (((a ^ b) & ~BYTE_VEC32(0x01)) >> 1); +} + +static inline uint64_t rnd_avg64(uint64_t a, uint64_t b) +{ + return (a | b) - (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1); +} + +static inline uint64_t no_rnd_avg64(uint64_t a, uint64_t b) +{ + return (a & b) + (((a ^ b) & ~BYTE_VEC64(0x01)) >> 1); +} + +#endif /* AVCODEC_RND_AVG_H */ diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c index bf9bff2e4b..5c3e65ba00 100644 --- a/libavcodec/sh4/dsputil_align.c +++ b/libavcodec/sh4/dsputil_align.c @@ -23,6 +23,7 @@ #include "libavutil/attributes.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" +#include "libavcodec/rnd_avg.h" #include "dsputil_sh4.h" diff --git a/libavcodec/sh4/qpel.c b/libavcodec/sh4/qpel.c index 04823edde1..5fa4141538 100644 --- a/libavcodec/sh4/qpel.c +++ b/libavcodec/sh4/qpel.c @@ -23,6 +23,7 @@ #include "libavutil/common.h" #include "libavcodec/copy_block.h" +#include "libavcodec/rnd_avg.h" #define PIXOP2(OPNAME, OP) \ \ diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index 01649f0f57..d1a7db957d 100644 --- a/libavcodec/vp3dsp.c +++ b/libavcodec/vp3dsp.c @@ -28,6 +28,7 @@ #include "libavutil/common.h" #include "avcodec.h" #include "dsputil.h" +#include "rnd_avg.h" #include "vp3dsp.h" #define IdctAdjustBeforeShift 8 |