From bf6b3ec924b4fb64d14df33077f4d4541d525dbf Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 7 Feb 2013 22:37:00 +0100
Subject: [PATCH] dsputil: Move rnd_avg inline functions to a separate header
---
libavcodec/bit_depth_template.c | 1 +
libavcodec/dsputil.h | 23 ----------------
libavcodec/rnd_avg.h | 47 +++++++++++++++++++++++++++++++++
libavcodec/sh4/dsputil_align.c | 1 +
libavcodec/sh4/qpel.c | 1 +
libavcodec/vp3dsp.c | 1 +
6 files changed, 51 insertions(+), 23 deletions(-)
create mode 100644 libavcodec/rnd_avg.h
diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c
index 9071ec2a351..294b3bbfd25 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 112f2c44348..70e2489d326 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 00000000000..c2b90e06d42
--- /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 bf9bff2e4b5..5c3e65ba00e 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 04823edde1c..5fa41415389 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 01649f0f57b..d1a7db957d4 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
--
GitLab