diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:39:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:40:54 +0200 |
| commit | b0387edd5e766b1032f946d6cdb35b765bb45435 (patch) | |
| tree | dd3ca8577a8d3b05efee8b1214a80f845ddeb47f /libavcodec | |
| parent | 8619362ff1de6605ffe6da8a42bdfe4fb7be75c1 (diff) | |
| parent | f919cc7df6ab844bc12f89fe7bef4fb915a47725 (diff) | |
| download | ffmpeg-b0387edd5e766b1032f946d6cdb35b765bb45435.tar.gz | |
Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'
* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
fate: fix acodec/vsynth tests for make 3.81
pcm_mpeg: fix number of consumed bytes to include the header.
avfilter: include required header file avfilter.h in video.h
x86: Avoid movs on BUTTERFLYPS when in AVX mode
x86: use new schema for ASM macros
fate: convert codec-regression.sh to makefile rules
fate: allow tests to specify unit size for psnr comparison
fate: teach videogen/rotozoom to output a single raw video stream
http: Add support for reusing the http socket for subsequent requests
http: Add support for using persistent connections
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pcm-mpeg.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/fft_mmx.asm | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c index 8e1c924021..a268a64c11 100644 --- a/libavcodec/pcm-mpeg.c +++ b/libavcodec/pcm-mpeg.c @@ -312,7 +312,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, if (avctx->debug & FF_DEBUG_BITSTREAM) av_dlog(avctx, "pcm_bluray_decode_frame: decoded %d -> %d bytes\n", retval, buf_size); - return retval; + return retval + 4; } AVCodec ff_pcm_bluray_decoder = { diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm index e50dfb94c2..e1b485b697 100644 --- a/libavcodec/x86/fft_mmx.asm +++ b/libavcodec/x86/fft_mmx.asm @@ -442,7 +442,7 @@ fft16_sse: %macro FFT48_3DN 0 align 16 -fft4_ %+ cpuname: +fft4 %+ SUFFIX: T2_3DN m0, m1, Z(0), Z(1) mova m2, Z(2) mova m3, Z(3) @@ -456,7 +456,7 @@ fft4_ %+ cpuname: ret align 16 -fft8_ %+ cpuname: +fft8 %+ SUFFIX: T2_3DN m0, m1, Z(0), Z(1) mova m2, Z(2) mova m3, Z(3) @@ -593,12 +593,15 @@ DECL_PASS pass_interleave_3dnow, PASS_BIG 0 call r2 %endmacro ; FFT_DISPATCH -%macro DECL_FFT 1-2 ; nbits, cpu, suffix -%xdefine cpusuffix _ %+ cpuname -%xdefine fullsuffix %2_ %+ cpuname -%xdefine list_of_fft fft4 %+ cpusuffix SECTION_REL, fft8 %+ cpusuffix SECTION_REL +%macro DECL_FFT 1-2 ; nbits, suffix +%ifidn %0, 1 +%xdefine fullsuffix SUFFIX +%else +%xdefine fullsuffix %2 %+ SUFFIX +%endif +%xdefine list_of_fft fft4 %+ SUFFIX SECTION_REL, fft8 %+ SUFFIX SECTION_REL %if %1>=5 -%xdefine list_of_fft list_of_fft, fft16 %+ cpusuffix SECTION_REL +%xdefine list_of_fft list_of_fft, fft16 %+ SUFFIX SECTION_REL %endif %if %1>=6 %xdefine list_of_fft list_of_fft, fft32 %+ fullsuffix SECTION_REL @@ -612,11 +615,11 @@ DECL_PASS pass_interleave_3dnow, PASS_BIG 0 align 16 fft %+ n %+ fullsuffix: - call fft %+ n2 %+ cpusuffix + call fft %+ n2 %+ SUFFIX add r0, n*4 - (n&(-2<<%1)) - call fft %+ n4 %+ cpusuffix + call fft %+ n4 %+ SUFFIX add r0, n*2 - (n2&(-2<<%1)) - call fft %+ n4 %+ cpusuffix + call fft %+ n4 %+ SUFFIX sub r0, n*6 + (n2&(-2<<%1)) lea r1, [cos_ %+ n] mov r2d, n4/2 @@ -825,7 +828,7 @@ cglobal imdct_half, 3,12,8; FFTContext *s, FFTSample *output, const FFTSample *i mov r0, r1 mov r1d, [r5+FFTContext.nbits] - FFT_DISPATCH _ %+ cpuname, r1 + FFT_DISPATCH SUFFIX, r1 mov r0d, [r5+FFTContext.mdctsize] add r6, r0 |