mirror of https://github.com/FFmpeg/FFmpeg.git
* qatar/master: (46 commits) mtv: Make sure audio_subsegments is not 0 v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined avconv: add symbolic names for -vsync parameters flvdec: Fix compiler warning for uninitialized variables rtsp: Fix compiler warning for uninitialized variable ulti: convert to new bytestream API. swscale: Use standard multiple inclusion guards in ppc/ header files. Place some START_TIMER invocations in separate blocks. v4l2: list available formats v4l2: set the proper codec_tag v4l2: refactor device_open v4l2: simplify away io_method v4l2: cosmetics v4l2: uniform and format options v4l2: do not force interlaced mode avio: exit early in fill_buffer without read_packet vc1dec: fix invalid memory access for small video dimensions rv34: fix invalid memory access for small video dimensions rv34: joint coefficient decoding and dequantization avplay: Don't call avio_set_interrupt_cb(NULL) ... Conflicts: Changelog avconv.c doc/APIchanges doc/indevs.texi libavcodec/adxenc.c libavcodec/dnxhdenc.c libavcodec/h264.c libavdevice/v4l2.c libavformat/flvdec.c libavformat/mtv.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/3/head
Michael Niedermayer
13 years ago
commit
7f83db3124
40 changed files with 964 additions and 942 deletions
@ -0,0 +1,409 @@ |
||||
;****************************************************************************** |
||||
;* x86-optimized vertical line scaling functions |
||||
;* Copyright (c) 2011 Ronald S. Bultje <rsbultje@gmail.com> |
||||
;* Kieran Kunhya <kieran@kunhya.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 "x86inc.asm" |
||||
%include "x86util.asm" |
||||
|
||||
SECTION_RODATA |
||||
|
||||
minshort: times 8 dw 0x8000 |
||||
yuv2yuvX_16_start: times 4 dd 0x4000 - 0x40000000 |
||||
yuv2yuvX_10_start: times 4 dd 0x10000 |
||||
yuv2yuvX_9_start: times 4 dd 0x20000 |
||||
yuv2yuvX_10_upper: times 8 dw 0x3ff |
||||
yuv2yuvX_9_upper: times 8 dw 0x1ff |
||||
pd_4: times 4 dd 4 |
||||
pd_4min0x40000:times 4 dd 4 - (0x40000) |
||||
pw_16: times 8 dw 16 |
||||
pw_32: times 8 dw 32 |
||||
pw_512: times 8 dw 512 |
||||
pw_1024: times 8 dw 1024 |
||||
|
||||
SECTION .text |
||||
|
||||
;----------------------------------------------------------------------------- |
||||
; vertical line scaling |
||||
; |
||||
; void yuv2plane1_<output_size>_<opt>(const int16_t *src, uint8_t *dst, int dstW, |
||||
; const uint8_t *dither, int offset) |
||||
; and |
||||
; void yuv2planeX_<output_size>_<opt>(const int16_t *filter, int filterSize, |
||||
; const int16_t **src, uint8_t *dst, int dstW, |
||||
; const uint8_t *dither, int offset) |
||||
; |
||||
; Scale one or $filterSize lines of source data to generate one line of output |
||||
; data. The input is 15-bit in int16_t if $output_size is [8,10] and 19-bit in |
||||
; int32_t if $output_size is 16. $filter is 12-bits. $filterSize is a multiple |
||||
; of 2. $offset is either 0 or 3. $dither holds 8 values. |
||||
;----------------------------------------------------------------------------- |
||||
|
||||
%macro yuv2planeX_fn 4 |
||||
|
||||
%ifdef ARCH_X86_32 |
||||
%define cntr_reg r1 |
||||
%define movsx mov |
||||
%else |
||||
%define cntr_reg r11 |
||||
%define movsx movsxd |
||||
%endif |
||||
|
||||
cglobal yuv2planeX_%2_%1, %4, 7, %3 |
||||
%if %2 == 8 || %2 == 9 || %2 == 10 |
||||
pxor m6, m6 |
||||
%endif ; %2 == 8/9/10 |
||||
|
||||
%if %2 == 8 |
||||
%ifdef ARCH_X86_32 |
||||
%assign pad 0x2c - (stack_offset & 15) |
||||
SUB rsp, pad |
||||
%define m_dith m7 |
||||
%else ; x86-64 |
||||
%define m_dith m9 |
||||
%endif ; x86-32 |
||||
|
||||
; create registers holding dither |
||||
movq m_dith, [r5] ; dither |
||||
test r6d, r6d |
||||
jz .no_rot |
||||
%if mmsize == 16 |
||||
punpcklqdq m_dith, m_dith |
||||
%endif ; mmsize == 16 |
||||
PALIGNR m_dith, m_dith, 3, m0 |
||||
.no_rot: |
||||
%if mmsize == 16 |
||||
punpcklbw m_dith, m6 |
||||
%ifdef ARCH_X86_64 |
||||
punpcklwd m8, m_dith, m6 |
||||
pslld m8, 12 |
||||
%else ; x86-32 |
||||
punpcklwd m5, m_dith, m6 |
||||
pslld m5, 12 |
||||
%endif ; x86-32/64 |
||||
punpckhwd m_dith, m6 |
||||
pslld m_dith, 12 |
||||
%ifdef ARCH_X86_32 |
||||
mova [rsp+ 0], m5 |
||||
mova [rsp+16], m_dith |
||||
%endif |
||||
%else ; mmsize == 8 |
||||
punpcklbw m5, m_dith, m6 |
||||
punpckhbw m_dith, m6 |
||||
punpcklwd m4, m5, m6 |
||||
punpckhwd m5, m6 |
||||
punpcklwd m3, m_dith, m6 |
||||
punpckhwd m_dith, m6 |
||||
pslld m4, 12 |
||||
pslld m5, 12 |
||||
pslld m3, 12 |
||||
pslld m_dith, 12 |
||||
mova [rsp+ 0], m4 |
||||
mova [rsp+ 8], m5 |
||||
mova [rsp+16], m3 |
||||
mova [rsp+24], m_dith |
||||
%endif ; mmsize == 8/16 |
||||
%endif ; %2 == 8 |
||||
|
||||
xor r5, r5 |
||||
|
||||
.pixelloop: |
||||
%assign %%i 0 |
||||
; the rep here is for the 8bit output mmx case, where dither covers |
||||
; 8 pixels but we can only handle 2 pixels per register, and thus 4 |
||||
; pixels per iteration. In order to not have to keep track of where |
||||
; we are w.r.t. dithering, we unroll the mmx/8bit loop x2. |
||||
%if %2 == 8 |
||||
%rep 16/mmsize |
||||
%endif ; %2 == 8 |
||||
|
||||
%if %2 == 8 |
||||
%ifdef ARCH_X86_32 |
||||
mova m2, [rsp+mmsize*(0+%%i)] |
||||
mova m1, [rsp+mmsize*(1+%%i)] |
||||
%else ; x86-64 |
||||
mova m2, m8 |
||||
mova m1, m_dith |
||||
%endif ; x86-32/64 |
||||
%else ; %2 == 9/10/16 |
||||
mova m1, [yuv2yuvX_%2_start] |
||||
mova m2, m1 |
||||
%endif ; %2 == 8/9/10/16 |
||||
movsx cntr_reg, r1m |
||||
.filterloop_ %+ %%i: |
||||
; input pixels |
||||
mov r6, [r2+gprsize*cntr_reg-2*gprsize] |
||||
%if %2 == 16 |
||||
mova m3, [r6+r5*4] |
||||
mova m5, [r6+r5*4+mmsize] |
||||
%else ; %2 == 8/9/10 |
||||
mova m3, [r6+r5*2] |
||||
%endif ; %2 == 8/9/10/16 |
||||
mov r6, [r2+gprsize*cntr_reg-gprsize] |
||||
%if %2 == 16 |
||||
mova m4, [r6+r5*4] |
||||
mova m6, [r6+r5*4+mmsize] |
||||
%else ; %2 == 8/9/10 |
||||
mova m4, [r6+r5*2] |
||||
%endif ; %2 == 8/9/10/16 |
||||
|
||||
; coefficients |
||||
movd m0, [r0+2*cntr_reg-4]; coeff[0], coeff[1] |
||||
%if %2 == 16 |
||||
pshuflw m7, m0, 0 ; coeff[0] |
||||
pshuflw m0, m0, 0x55 ; coeff[1] |
||||
pmovsxwd m7, m7 ; word -> dword |
||||
pmovsxwd m0, m0 ; word -> dword |
||||
|
||||
pmulld m3, m7 |
||||
pmulld m5, m7 |
||||
pmulld m4, m0 |
||||
pmulld m6, m0 |
||||
|
||||
paddd m2, m3 |
||||
paddd m1, m5 |
||||
paddd m2, m4 |
||||
paddd m1, m6 |
||||
%else ; %2 == 10/9/8 |
||||
punpcklwd m5, m3, m4 |
||||
punpckhwd m3, m4 |
||||
SPLATD m0, m0 |
||||
|
||||
pmaddwd m5, m0 |
||||
pmaddwd m3, m0 |
||||
|
||||
paddd m2, m5 |
||||
paddd m1, m3 |
||||
%endif ; %2 == 8/9/10/16 |
||||
|
||||
sub cntr_reg, 2 |
||||
jg .filterloop_ %+ %%i |
||||
|
||||
%if %2 == 16 |
||||
psrad m2, 31 - %2 |
||||
psrad m1, 31 - %2 |
||||
%else ; %2 == 10/9/8 |
||||
psrad m2, 27 - %2 |
||||
psrad m1, 27 - %2 |
||||
%endif ; %2 == 8/9/10/16 |
||||
|
||||
%if %2 == 8 |
||||
packssdw m2, m1 |
||||
packuswb m2, m2 |
||||
movh [r3+r5*1], m2 |
||||
%else ; %2 == 9/10/16 |
||||
%if %2 == 16 |
||||
packssdw m2, m1 |
||||
paddw m2, [minshort] |
||||
%else ; %2 == 9/10 |
||||
%ifidn %1, sse4 |
||||
packusdw m2, m1 |
||||
%elifidn %1, avx |
||||
packusdw m2, m1 |
||||
%else ; mmx2/sse2 |
||||
packssdw m2, m1 |
||||
pmaxsw m2, m6 |
||||
%endif ; mmx2/sse2/sse4/avx |
||||
pminsw m2, [yuv2yuvX_%2_upper] |
||||
%endif ; %2 == 9/10/16 |
||||
mova [r3+r5*2], m2 |
||||
%endif ; %2 == 8/9/10/16 |
||||
|
||||
add r5, mmsize/2 |
||||
sub r4d, mmsize/2 |
||||
%if %2 == 8 |
||||
%assign %%i %%i+2 |
||||
%endrep |
||||
%endif ; %2 == 8 |
||||
jg .pixelloop |
||||
|
||||
%if %2 == 8 |
||||
%ifdef ARCH_X86_32 |
||||
ADD rsp, pad |
||||
RET |
||||
%else ; x86-64 |
||||
REP_RET |
||||
%endif ; x86-32/64 |
||||
%else ; %2 == 9/10/16 |
||||
REP_RET |
||||
%endif ; %2 == 8/9/10/16 |
||||
%endmacro |
||||
|
||||
%define PALIGNR PALIGNR_MMX |
||||
%ifdef ARCH_X86_32 |
||||
INIT_MMX |
||||
yuv2planeX_fn mmx2, 8, 0, 7 |
||||
yuv2planeX_fn mmx2, 9, 0, 5 |
||||
yuv2planeX_fn mmx2, 10, 0, 5 |
||||
%endif |
||||
|
||||
INIT_XMM |
||||
yuv2planeX_fn sse2, 8, 10, 7 |
||||
yuv2planeX_fn sse2, 9, 7, 5 |
||||
yuv2planeX_fn sse2, 10, 7, 5 |
||||
|
||||
%define PALIGNR PALIGNR_SSSE3 |
||||
yuv2planeX_fn sse4, 8, 10, 7 |
||||
yuv2planeX_fn sse4, 9, 7, 5 |
||||
yuv2planeX_fn sse4, 10, 7, 5 |
||||
yuv2planeX_fn sse4, 16, 8, 5 |
||||
|
||||
INIT_AVX |
||||
yuv2planeX_fn avx, 8, 10, 7 |
||||
yuv2planeX_fn avx, 9, 7, 5 |
||||
yuv2planeX_fn avx, 10, 7, 5 |
||||
|
||||
; %1=outout-bpc, %2=alignment (u/a) |
||||
%macro yuv2plane1_mainloop 2 |
||||
.loop_%2: |
||||
%if %1 == 8 |
||||
paddsw m0, m2, [r0+r2*2+mmsize*0] |
||||
paddsw m1, m3, [r0+r2*2+mmsize*1] |
||||
psraw m0, 7 |
||||
psraw m1, 7 |
||||
packuswb m0, m1 |
||||
mov%2 [r1+r2], m0 |
||||
%elif %1 == 16 |
||||
paddd m0, m4, [r0+r2*4+mmsize*0] |
||||
paddd m1, m4, [r0+r2*4+mmsize*1] |
||||
paddd m2, m4, [r0+r2*4+mmsize*2] |
||||
paddd m3, m4, [r0+r2*4+mmsize*3] |
||||
psrad m0, 3 |
||||
psrad m1, 3 |
||||
psrad m2, 3 |
||||
psrad m3, 3 |
||||
%if cpuflag(sse4) ; avx/sse4 |
||||
packusdw m0, m1 |
||||
packusdw m2, m3 |
||||
%else ; mmx/sse2 |
||||
packssdw m0, m1 |
||||
packssdw m2, m3 |
||||
paddw m0, m5 |
||||
paddw m2, m5 |
||||
%endif ; mmx/sse2/sse4/avx |
||||
mov%2 [r1+r2*2], m0 |
||||
mov%2 [r1+r2*2+mmsize], m2 |
||||
%else |
||||
paddsw m0, m2, [r0+r2*2+mmsize*0] |
||||
paddsw m1, m2, [r0+r2*2+mmsize*1] |
||||
psraw m0, 15 - %1 |
||||
psraw m1, 15 - %1 |
||||
pmaxsw m0, m4 |
||||
pmaxsw m1, m4 |
||||
pminsw m0, m3 |
||||
pminsw m1, m3 |
||||
mov%2 [r1+r2*2], m0 |
||||
mov%2 [r1+r2*2+mmsize], m1 |
||||
%endif |
||||
add r2, mmsize |
||||
jl .loop_%2 |
||||
%endmacro |
||||
|
||||
%macro yuv2plane1_fn 3 |
||||
cglobal yuv2plane1_%1, %3, %3, %2 |
||||
add r2, mmsize - 1 |
||||
and r2, ~(mmsize - 1) |
||||
%if %1 == 8 |
||||
add r1, r2 |
||||
%else ; %1 != 8 |
||||
lea r1, [r1+r2*2] |
||||
%endif ; %1 == 8 |
||||
%if %1 == 16 |
||||
lea r0, [r0+r2*4] |
||||
%else ; %1 != 16 |
||||
lea r0, [r0+r2*2] |
||||
%endif ; %1 == 16 |
||||
neg r2 |
||||
|
||||
%if %1 == 8 |
||||
pxor m4, m4 ; zero |
||||
|
||||
; create registers holding dither |
||||
movq m3, [r3] ; dither |
||||
test r4d, r4d |
||||
jz .no_rot |
||||
%if mmsize == 16 |
||||
punpcklqdq m3, m3 |
||||
%endif ; mmsize == 16 |
||||
PALIGNR_MMX m3, m3, 3, m2 |
||||
.no_rot: |
||||
%if mmsize == 8 |
||||
mova m2, m3 |
||||
punpckhbw m3, m4 ; byte->word |
||||
punpcklbw m2, m4 ; byte->word |
||||
%else |
||||
punpcklbw m3, m4 |
||||
mova m2, m3 |
||||
%endif |
||||
%elif %1 == 9 |
||||
pxor m4, m4 |
||||
mova m3, [pw_512] |
||||
mova m2, [pw_32] |
||||
%elif %1 == 10 |
||||
pxor m4, m4 |
||||
mova m3, [pw_1024] |
||||
mova m2, [pw_16] |
||||
%else ; %1 == 16 |
||||
%if cpuflag(sse4) ; sse4/avx |
||||
mova m4, [pd_4] |
||||
%else ; mmx/sse2 |
||||
mova m4, [pd_4min0x40000] |
||||
mova m5, [minshort] |
||||
%endif ; mmx/sse2/sse4/avx |
||||
%endif ; %1 == .. |
||||
|
||||
; actual pixel scaling |
||||
%if mmsize == 8 |
||||
yuv2plane1_mainloop %1, a |
||||
%else ; mmsize == 16 |
||||
test r1, 15 |
||||
jnz .unaligned |
||||
yuv2plane1_mainloop %1, a |
||||
REP_RET |
||||
.unaligned: |
||||
yuv2plane1_mainloop %1, u |
||||
%endif ; mmsize == 8/16 |
||||
REP_RET |
||||
%endmacro |
||||
|
||||
%ifdef ARCH_X86_32 |
||||
INIT_MMX mmx |
||||
yuv2plane1_fn 8, 0, 5 |
||||
yuv2plane1_fn 16, 0, 3 |
||||
|
||||
INIT_MMX mmx2 |
||||
yuv2plane1_fn 9, 0, 3 |
||||
yuv2plane1_fn 10, 0, 3 |
||||
%endif |
||||
|
||||
INIT_XMM sse2 |
||||
yuv2plane1_fn 8, 5, 5 |
||||
yuv2plane1_fn 9, 5, 3 |
||||
yuv2plane1_fn 10, 5, 3 |
||||
yuv2plane1_fn 16, 6, 3 |
||||
|
||||
INIT_XMM sse4 |
||||
yuv2plane1_fn 16, 5, 3 |
||||
|
||||
INIT_XMM avx |
||||
yuv2plane1_fn 8, 5, 5 |
||||
yuv2plane1_fn 9, 5, 3 |
||||
yuv2plane1_fn 10, 5, 3 |
||||
yuv2plane1_fn 16, 5, 3 |
||||
@ -0,0 +1,4 @@ |
||||
0a30509d9296b857e134b762b76dbc31 *./tests/data/acodec/adpcm_adx.adx |
||||
297720 ./tests/data/acodec/adpcm_adx.adx |
||||
2dbc601ed5259f4d74dc48ccd8da7eaf *./tests/data/adpcm_adx.acodec.out.wav |
||||
stddev: 6989.46 PSNR: 19.44 MAXDIFF:65398 bytes: 1058432/ 1058400 |
||||
Loading…
Reference in new issue