* commit 'adff0a8166345bb9513f0f658043fb6387e90122': arm: dsputil: Coalesce all init files Conflicts: libavcodec/arm/Makefile libavcodec/arm/dsputil_arm.h libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c
Showing the changes to libavcodec/arm (4 of 4 files). Show all
Unified · Split
| @@ -54,8 +54,7 @@ ARMV5TE-OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_armv5te.o \ · 53 unmodified lines | |||
| 54 | ARMV5TE-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv5te.o | 54 | ARMV5TE-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv5te.o |
| 55 | 55 | ||
| 56 | ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o | 56 | ARMV6-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_armv6.o |
| 57 | ARMV6-OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_init_armv6.o \ | 57 | ARMV6-OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_armv6.o |
| 58 | arm/dsputil_armv6.o | ||
| 59 | ARMV6-OBJS-$(CONFIG_H264DSP) += arm/startcode_armv6.o | 58 | ARMV6-OBJS-$(CONFIG_H264DSP) += arm/startcode_armv6.o |
| 60 | ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \ | 59 | ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \ |
| 61 | arm/hpeldsp_armv6.o | 60 | arm/hpeldsp_armv6.o |
| @@ -1,29 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2009 Mans Rullgard <mans@mansr.com> | ||
| 3 | * | ||
| 4 | * This file is part of FFmpeg. | ||
| 5 | * | ||
| 6 | * FFmpeg is free software; you can redistribute it and/or | ||
| 7 | * modify it under the terms of the GNU Lesser General Public | ||
| 8 | * License as published by the Free Software Foundation; either | ||
| 9 | * version 2.1 of the License, or (at your option) any later version. | ||
| 10 | * | ||
| 11 | * FFmpeg is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 14 | * Lesser General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU Lesser General Public | ||
| 17 | * License along with FFmpeg; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 19 | */ | ||
| 20 | |||
| 21 | #ifndef AVCODEC_ARM_DSPUTIL_ARM_H | ||
| 22 | #define AVCODEC_ARM_DSPUTIL_ARM_H | ||
| 23 | |||
| 24 | #include "libavcodec/avcodec.h" | ||
| 25 | #include "libavcodec/dsputil.h" | ||
| 26 | |||
| 27 | void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx); | ||
| 28 | |||
| 29 | #endif /* AVCODEC_ARM_DSPUTIL_ARM_H */ | ||
| @@ -1,7 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * ARM optimized DSP utils | ||
| 3 | * Copyright (c) 2001 Lionel Ulmer | ||
| 4 | * | ||
| 5 | * This file is part of FFmpeg. | 2 | * This file is part of FFmpeg. |
| 6 | * | 3 | * |
| 7 | * FFmpeg is free software; you can redistribute it and/or | 4 | * FFmpeg is free software; you can redistribute it and/or |
| @@ -26,12 +23,36 @@ · 18 unmodified lines | |||
| 26 | #include "libavutil/arm/cpu.h" | 23 | #include "libavutil/arm/cpu.h" |
| 27 | #include "libavcodec/avcodec.h" | 24 | #include "libavcodec/avcodec.h" |
| 28 | #include "libavcodec/dsputil.h" | 25 | #include "libavcodec/dsputil.h" |
| 29 | #include "dsputil_arm.h" | 26 | #include "libavcodec/mpegvideo.h" |
| 27 | |||
| 28 | int ff_pix_abs16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | ||
| 29 | int line_size, int h); | ||
| 30 | int ff_pix_abs16_x2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | ||
| 31 | int line_size, int h); | ||
| 32 | int ff_pix_abs16_y2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | ||
| 33 | int line_size, int h); | ||
| 34 | |||
| 35 | int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | ||
| 36 | int line_size, int h); | ||
| 37 | |||
| 38 | int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | ||
| 39 | int line_size, int h); | ||
| 40 | |||
| 30 | 41 | ||
| 31 | av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx) | 42 | av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx) |
| 32 | { | 43 | { |
| 33 | int cpu_flags = av_get_cpu_flags(); | 44 | int cpu_flags = av_get_cpu_flags(); |
| 34 | 45 | ||
| 35 | if (have_armv6(cpu_flags)) | 46 | if (have_armv6(cpu_flags)) { |
| 36 | ff_dsputil_init_armv6(c, avctx); | 47 | c->pix_abs[0][0] = ff_pix_abs16_armv6; |
| 48 | c->pix_abs[0][1] = ff_pix_abs16_x2_armv6; | ||
| 49 | c->pix_abs[0][2] = ff_pix_abs16_y2_armv6; | ||
| 50 | |||
| 51 | c->pix_abs[1][0] = ff_pix_abs8_armv6; | ||
| 52 | |||
| 53 | c->sad[0] = ff_pix_abs16_armv6; | ||
| 54 | c->sad[1] = ff_pix_abs8_armv6; | ||
| 55 | |||
| 56 | c->sse[0] = ff_sse16_armv6; | ||
| 57 | } | ||
| 37 | } | 58 | } |
| @@ -1,54 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2009 Mans Rullgard <mans@mansr.com> | ||
| 3 | * | ||
| 4 | * This file is part of FFmpeg. | ||
| 5 | * | ||
| 6 | * FFmpeg is free software; you can redistribute it and/or | ||
| 7 | * modify it under the terms of the GNU Lesser General Public | ||
| 8 | * License as published by the Free Software Foundation; either | ||
| 9 | * version 2.1 of the License, or (at your option) any later version. | ||
| 10 | * | ||
| 11 | * FFmpeg is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 14 | * Lesser General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU Lesser General Public | ||
| 17 | * License along with FFmpeg; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 19 | */ | ||
| 20 | |||
| 21 | #include <stdint.h> | ||
| 22 | |||
| 23 | #include "libavutil/attributes.h" | ||
| 24 | #include "libavcodec/avcodec.h" | ||
| 25 | #include "libavcodec/dsputil.h" | ||
| 26 | #include "libavcodec/mpegvideo.h" | ||
| 27 | #include "dsputil_arm.h" | ||
| 28 | |||
| 29 | int ff_pix_abs16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | ||
| 30 | int line_size, int h); | ||
| 31 | int ff_pix_abs16_x2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | ||
| 32 | int line_size, int h); | ||
| 33 | int ff_pix_abs16_y2_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | ||
| 34 | int line_size, int h); | ||
| 35 | |||
| 36 | int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | ||
| 37 | int line_size, int h); | ||
| 38 | |||
| 39 | int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, | ||
| 40 | int line_size, int h); | ||
| 41 | |||
| 42 | av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx) | ||
| 43 | { | ||
| 44 | c->pix_abs[0][0] = ff_pix_abs16_armv6; | ||
| 45 | c->pix_abs[0][1] = ff_pix_abs16_x2_armv6; | ||
| 46 | c->pix_abs[0][2] = ff_pix_abs16_y2_armv6; | ||
| 47 | |||
| 48 | c->pix_abs[1][0] = ff_pix_abs8_armv6; | ||
| 49 | |||
| 50 | c->sad[0] = ff_pix_abs16_armv6; | ||
| 51 | c->sad[1] = ff_pix_abs8_armv6; | ||
| 52 | |||
| 53 | c->sse[0] = ff_sse16_armv6; | ||
| 54 | } | ||