0cb233cf46
* commit 'b2c087871d':
Move x86util.asm from libavcodec/ to libavutil/.
Move x86inc.asm to libavutil/.
APIchanges: note error_recognition in lavf
lavf: add support for error_recognition, use it in avidec, and bump minor API version
avconv: change semantics of -map
avconv: get rid of new* options.
cmdutils: allow precisely specifying a stream for AVOptions.
configure: add missing CFLAGS to fix building on the HURD
libx264: Include hint for possible values for configuring libx264
cmdutils: allow ':'-separated modifiers in option names.
avconv: make -map_metadata work consistently with the other options
avconv: remove deprecated options.
avconv: make -map_chapters accept only the input file index.
Make a copy of ffmpeg under a new name -- avconv.
ffmpeg: add a warning stating that the program is deprecated.
Add weighted motion compensation for RV40 B-frames
RV3/4: calculate B-frame motion weights once per frame
Move RV3/4-specific DSP functions into their own context
mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
h264: notice memory allocation failure
Conflicts:
.gitignore
Makefile
cmdutils.c
configure
doc/ffplay.texi
doc/ffprobe.texi
doc/ffserver.texi
libavcodec/libx264.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/version.h
tests/lavf-regression.sh
tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
83 lines
2.5 KiB
NASM
83 lines
2.5 KiB
NASM
;******************************************************************************
|
|
;* MMX 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/x86inc.asm"
|
|
%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_mmx, 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_mmx, 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
|
|
|
|
DEINTERLACE ""
|
|
|
|
DEINTERLACE inplace
|