[FFmpeg-cvslog] arm: dsputil: Coalesce all init files
Diego Biurrun
git at videolan.org
Wed Jul 16 20:49:03 CEST 2014
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Jul 8 08:47:52 2014 -0700| [adff0a8166345bb9513f0f658043fb6387e90122] | committer: Diego Biurrun
arm: dsputil: Coalesce all init files
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adff0a8166345bb9513f0f658043fb6387e90122
---
libavcodec/arm/Makefile | 3 +-
libavcodec/arm/dsputil_arm.h | 29 -------------------
libavcodec/arm/dsputil_init_arm.c | 33 +++++++++++++++++----
libavcodec/arm/dsputil_init_armv6.c | 54 -----------------------------------
4 files changed, 28 insertions(+), 91 deletions(-)
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 9ba6c20..aab39c8 100644
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -53,8 +53,7 @@ ARMV5TE-OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_armv5te.o \
ARMV5TE-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv5te.o
ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o
-ARMV6-OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_init_armv6.o \
- arm/dsputil_armv6.o
+ARMV6-OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_armv6.o
ARMV6-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_armv6.o
ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \
arm/hpeldsp_armv6.o
diff --git a/libavcodec/arm/dsputil_arm.h b/libavcodec/arm/dsputil_arm.h
deleted file mode 100644
index 1265f39..0000000
--- a/libavcodec/arm/dsputil_arm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2009 Mans Rullgard <mans at mansr.com>
- *
- * 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_ARM_DSPUTIL_ARM_H
-#define AVCODEC_ARM_DSPUTIL_ARM_H
-
-#include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
-
-void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx);
-
-#endif /* AVCODEC_ARM_DSPUTIL_ARM_H */
diff --git a/libavcodec/arm/dsputil_init_arm.c b/libavcodec/arm/dsputil_init_arm.c
index 6fb1b5c..f3fa61f 100644
--- a/libavcodec/arm/dsputil_init_arm.c
+++ b/libavcodec/arm/dsputil_init_arm.c
@@ -1,7 +1,4 @@
/*
- * ARM optimized DSP utils
- * Copyright (c) 2001 Lionel Ulmer
- *
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
@@ -26,12 +23,36 @@
#include "libavutil/arm/cpu.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
-#include "dsputil_arm.h"
+#include "libavcodec/mpegvideo.h"
+
+int ff_pix_abs16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
+ int line_size, int h);
+int ff_pix_abs16_x2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
+ int line_size, int h);
+int ff_pix_abs16_y2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
+ int line_size, int h);
+
+int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
+ int line_size, int h);
+
+int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
+ int line_size, int h);
+
av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx)
{
int cpu_flags = av_get_cpu_flags();
- if (have_armv6(cpu_flags))
- ff_dsputil_init_armv6(c, avctx);
+ if (have_armv6(cpu_flags)) {
+ c->pix_abs[0][0] = ff_pix_abs16_armv6;
+ c->pix_abs[0][1] = ff_pix_abs16_x2_armv6;
+ c->pix_abs[0][2] = ff_pix_abs16_y2_armv6;
+
+ c->pix_abs[1][0] = ff_pix_abs8_armv6;
+
+ c->sad[0] = ff_pix_abs16_armv6;
+ c->sad[1] = ff_pix_abs8_armv6;
+
+ c->sse[0] = ff_sse16_armv6;
+ }
}
diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c
deleted file mode 100644
index 1d47af4..0000000
--- a/libavcodec/arm/dsputil_init_armv6.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2009 Mans Rullgard <mans at mansr.com>
- *
- * 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
- */
-
-#include <stdint.h>
-
-#include "libavutil/attributes.h"
-#include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/mpegvideo.h"
-#include "dsputil_arm.h"
-
-int ff_pix_abs16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
- int line_size, int h);
-int ff_pix_abs16_x2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
- int line_size, int h);
-int ff_pix_abs16_y2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
- int line_size, int h);
-
-int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
- int line_size, int h);
-
-int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
- int line_size, int h);
-
-av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx)
-{
- c->pix_abs[0][0] = ff_pix_abs16_armv6;
- c->pix_abs[0][1] = ff_pix_abs16_x2_armv6;
- c->pix_abs[0][2] = ff_pix_abs16_y2_armv6;
-
- c->pix_abs[1][0] = ff_pix_abs8_armv6;
-
- c->sad[0] = ff_pix_abs16_armv6;
- c->sad[1] = ff_pix_abs8_armv6;
-
- c->sse[0] = ff_sse16_armv6;
-}
More information about the ffmpeg-cvslog
mailing list