mirror of https://git.ffmpeg.org/ffmpeg.git
arm: dsputil: Coalesce all init files
This commit is contained in:
parent
14b4e64eab
commit
adff0a8166
|
@ -53,8 +53,7 @@ ARMV5TE-OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_armv5te.o \
|
||||||
ARMV5TE-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv5te.o
|
ARMV5TE-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv5te.o
|
||||||
|
|
||||||
ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o
|
ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o
|
||||||
ARMV6-OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_init_armv6.o \
|
ARMV6-OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_armv6.o
|
||||||
arm/dsputil_armv6.o
|
|
||||||
ARMV6-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_armv6.o
|
ARMV6-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_armv6.o
|
||||||
ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \
|
ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \
|
||||||
arm/hpeldsp_armv6.o
|
arm/hpeldsp_armv6.o
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2009 Mans Rullgard <mans@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 */
|
|
|
@ -1,7 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* ARM optimized DSP utils
|
|
||||||
* Copyright (c) 2001 Lionel Ulmer
|
|
||||||
*
|
|
||||||
* This file is part of Libav.
|
* This file is part of Libav.
|
||||||
*
|
*
|
||||||
* Libav is free software; you can redistribute it and/or
|
* Libav is free software; you can redistribute it and/or
|
||||||
|
@ -26,12 +23,36 @@
|
||||||
#include "libavutil/arm/cpu.h"
|
#include "libavutil/arm/cpu.h"
|
||||||
#include "libavcodec/avcodec.h"
|
#include "libavcodec/avcodec.h"
|
||||||
#include "libavcodec/dsputil.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)
|
av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx)
|
||||||
{
|
{
|
||||||
int cpu_flags = av_get_cpu_flags();
|
int cpu_flags = av_get_cpu_flags();
|
||||||
|
|
||||||
if (have_armv6(cpu_flags))
|
if (have_armv6(cpu_flags)) {
|
||||||
ff_dsputil_init_armv6(c, 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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,54 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2009 Mans Rullgard <mans@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;
|
|
||||||
}
|
|
Loading…
Reference in New Issue