diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:05:46 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:06:14 +0200 |
commit | 41194f065c8e9b138db069417494e2f845c7b275 (patch) | |
tree | 5018c3ba815df1f581b3016c1578603363a2b77b /libavcodec/x86 | |
parent | 7f6b794da051ff4e4235bbc2b84469ff2807a453 (diff) | |
parent | cad40a3833ad81a352e7657ec6f7d637cea3b798 (diff) |
Merge commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798'
* commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798':
lavc: Drop deprecated deinterlace module
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/x86')
-rw-r--r-- | libavcodec/x86/Makefile | 4 | ||||
-rw-r--r-- | libavcodec/x86/deinterlace.asm | 84 |
2 files changed, 0 insertions, 88 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index c4037700df..3c3cc1cebb 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -77,10 +77,6 @@ MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp.o MMX-OBJS-$(CONFIG_SNOW_ENCODER) += x86/snowdsp.o MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o - -# YASM optimizations -YASM-OBJS += x86/deinterlace.o \ - # subsystems YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o YASM-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp.o diff --git a/libavcodec/x86/deinterlace.asm b/libavcodec/x86/deinterlace.asm deleted file mode 100644 index c421385fbb..0000000000 --- a/libavcodec/x86/deinterlace.asm +++ /dev/null @@ -1,84 +0,0 @@ -;****************************************************************************** -;* SIMD-optimized deinterlacing functions -;* Copyright (c) 2010 Vitor Sessak -;* Copyright (c) 2002 Michael Niedermayer -;* -;* This file is part of FFmpeg. -;* -;* FFmpeg 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. -;* -;* FFmpeg 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 FFmpeg; if not, write to the Free Software -;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -;****************************************************************************** - -%include "libavutil/x86/x86util.asm" - -SECTION_RODATA - -cextern pw_4 - -SECTION .text - -%macro DEINTERLACE 1 -%ifidn %1, inplace -;void ff_deinterlace_line_inplace_mmx(const uint8_t *lum_m4, const uint8_t *lum_m3, const uint8_t *lum_m2, const uint8_t *lum_m1, const uint8_t *lum, int size) -cglobal deinterlace_line_inplace, 6,6,7, lum_m4, lum_m3, lum_m2, lum_m1, lum, size -%else -;void ff_deinterlace_line_mmx(uint8_t *dst, const uint8_t *lum_m4, const uint8_t *lum_m3, const uint8_t *lum_m2, const uint8_t *lum_m1, const uint8_t *lum, int size) -cglobal deinterlace_line, 7,7,7, dst, lum_m4, lum_m3, lum_m2, lum_m1, lum, size -%endif - pxor mm7, mm7 - movq mm6, [pw_4] -.nextrow: - movd mm0, [lum_m4q] - movd mm1, [lum_m3q] - movd mm2, [lum_m2q] -%ifidn %1, inplace - movd [lum_m4q], mm2 -%endif - movd mm3, [lum_m1q] - movd mm4, [lumq] - punpcklbw mm0, mm7 - punpcklbw mm1, mm7 - punpcklbw mm2, mm7 - punpcklbw mm3, mm7 - punpcklbw mm4, mm7 - paddw mm1, mm3 - psllw mm2, 1 - paddw mm0, mm4 - psllw mm1, 2 - paddw mm2, mm6 - paddw mm1, mm2 - psubusw mm1, mm0 - psrlw mm1, 3 - packuswb mm1, mm7 -%ifidn %1, inplace - movd [lum_m2q], mm1 -%else - movd [dstq], mm1 - add dstq, 4 -%endif - add lum_m4q, 4 - add lum_m3q, 4 - add lum_m2q, 4 - add lum_m1q, 4 - add lumq, 4 - sub sized, 4 - jg .nextrow - REP_RET -%endmacro - -INIT_MMX mmx - -DEINTERLACE "" - -DEINTERLACE inplace |