mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'
* commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed': fate-vc1: add dependencies ARM: fix overreads in neon h264 chroma mc rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet gitignore: ignore files created by msvc fate: Add proper dependencies for the tests in video.mak configure: Disable Snow decoder and encoder by default lzo: Drop obsolete fast_memcpy reference build: Drop OBJS declaration for non-existing PCM_DVD encoder mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all Conflicts: libavcodec/mpegvideo.c libavformat/rtsp.c tests/fate/microsoft.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
04c6ecb7da
3
.gitignore
vendored
3
.gitignore
vendored
@ -5,9 +5,12 @@
|
||||
*.dll
|
||||
*.dylib
|
||||
*.exe
|
||||
*.exp
|
||||
*.h.c
|
||||
*.ilk
|
||||
*.lib
|
||||
*.pc
|
||||
*.pdb
|
||||
*.so
|
||||
*.so.*
|
||||
*.ver
|
||||
|
||||
@ -506,7 +506,6 @@ OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o
|
||||
OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o
|
||||
OBJS-$(CONFIG_PCM_BLURAY_DECODER) += pcm-mpeg.o
|
||||
OBJS-$(CONFIG_PCM_DVD_DECODER) += pcm.o
|
||||
OBJS-$(CONFIG_PCM_DVD_ENCODER) += pcm.o
|
||||
OBJS-$(CONFIG_PCM_F32BE_DECODER) += pcm.o
|
||||
OBJS-$(CONFIG_PCM_F32BE_ENCODER) += pcm.o
|
||||
OBJS-$(CONFIG_PCM_F32LE_DECODER) += pcm.o
|
||||
|
||||
@ -51,24 +51,20 @@ T cmp r7, #0
|
||||
|
||||
beq 2f
|
||||
|
||||
add r5, r1, r2
|
||||
|
||||
vdup.8 d0, r4
|
||||
lsl r4, r2, #1
|
||||
vdup.8 d1, r12
|
||||
vld1.8 {d4, d5}, [r1], r4
|
||||
vld1.8 {d4, d5}, [r1], r2
|
||||
vdup.8 d2, r6
|
||||
vld1.8 {d6, d7}, [r5], r4
|
||||
vdup.8 d3, r7
|
||||
|
||||
vext.8 d5, d4, d5, #1
|
||||
vext.8 d7, d6, d7, #1
|
||||
|
||||
1: pld [r5]
|
||||
1: vld1.8 {d6, d7}, [r1], r2
|
||||
vmull.u8 q8, d4, d0
|
||||
vmlal.u8 q8, d5, d1
|
||||
vld1.8 {d4, d5}, [r1], r4
|
||||
vext.8 d7, d6, d7, #1
|
||||
vld1.8 {d4, d5}, [r1], r2
|
||||
vmlal.u8 q8, d6, d2
|
||||
pld [r1]
|
||||
vext.8 d5, d4, d5, #1
|
||||
vmlal.u8 q8, d7, d3
|
||||
vmull.u8 q9, d6, d0
|
||||
@ -76,8 +72,7 @@ T cmp r7, #0
|
||||
vmlal.u8 q9, d7, d1
|
||||
vmlal.u8 q9, d4, d2
|
||||
vmlal.u8 q9, d5, d3
|
||||
vld1.8 {d6, d7}, [r5], r4
|
||||
pld [r1]
|
||||
pld [r1, r2]
|
||||
.ifc \codec,h264
|
||||
vrshrn.u16 d16, q8, #6
|
||||
vrshrn.u16 d17, q9, #6
|
||||
@ -92,7 +87,6 @@ T cmp r7, #0
|
||||
vld1.8 {d21}, [lr,:64], r2
|
||||
vrhadd.u8 q8, q8, q10
|
||||
.endif
|
||||
vext.8 d7, d6, d7, #1
|
||||
vst1.8 {d16}, [r0,:64], r2
|
||||
vst1.8 {d17}, [r0,:64], r2
|
||||
bgt 1b
|
||||
@ -106,18 +100,15 @@ T cmp r7, #0
|
||||
|
||||
beq 4f
|
||||
|
||||
add r5, r1, r2
|
||||
lsl r4, r2, #1
|
||||
vld1.8 {d4}, [r1], r4
|
||||
vld1.8 {d6}, [r5], r4
|
||||
vld1.8 {d4}, [r1], r2
|
||||
|
||||
3: pld [r5]
|
||||
3: vld1.8 {d6}, [r1], r2
|
||||
vmull.u8 q8, d4, d0
|
||||
vmlal.u8 q8, d6, d1
|
||||
vld1.8 {d4}, [r1], r4
|
||||
vld1.8 {d4}, [r1], r2
|
||||
vmull.u8 q9, d6, d0
|
||||
vmlal.u8 q9, d4, d1
|
||||
vld1.8 {d6}, [r5], r4
|
||||
pld [r1]
|
||||
.ifc \codec,h264
|
||||
vrshrn.u16 d16, q8, #6
|
||||
vrshrn.u16 d17, q9, #6
|
||||
@ -127,13 +118,13 @@ T cmp r7, #0
|
||||
vshrn.u16 d16, q8, #6
|
||||
vshrn.u16 d17, q9, #6
|
||||
.endif
|
||||
pld [r1, r2]
|
||||
.ifc \type,avg
|
||||
vld1.8 {d20}, [lr,:64], r2
|
||||
vld1.8 {d21}, [lr,:64], r2
|
||||
vrhadd.u8 q8, q8, q10
|
||||
.endif
|
||||
subs r3, r3, #2
|
||||
pld [r1]
|
||||
vst1.8 {d16}, [r0,:64], r2
|
||||
vst1.8 {d17}, [r0,:64], r2
|
||||
bgt 3b
|
||||
@ -144,16 +135,13 @@ T cmp r7, #0
|
||||
vld1.8 {d6, d7}, [r1], r2
|
||||
vext.8 d5, d4, d5, #1
|
||||
vext.8 d7, d6, d7, #1
|
||||
|
||||
5: pld [r1]
|
||||
pld [r1]
|
||||
subs r3, r3, #2
|
||||
vmull.u8 q8, d4, d0
|
||||
vmlal.u8 q8, d5, d1
|
||||
vld1.8 {d4, d5}, [r1], r2
|
||||
vmull.u8 q9, d6, d0
|
||||
vmlal.u8 q9, d7, d1
|
||||
pld [r1]
|
||||
vext.8 d5, d4, d5, #1
|
||||
pld [r1, r2]
|
||||
.ifc \codec,h264
|
||||
vrshrn.u16 d16, q8, #6
|
||||
vrshrn.u16 d17, q9, #6
|
||||
@ -168,11 +156,9 @@ T cmp r7, #0
|
||||
vld1.8 {d21}, [lr,:64], r2
|
||||
vrhadd.u8 q8, q8, q10
|
||||
.endif
|
||||
vld1.8 {d6, d7}, [r1], r2
|
||||
vext.8 d7, d6, d7, #1
|
||||
vst1.8 {d16}, [r0,:64], r2
|
||||
vst1.8 {d17}, [r0,:64], r2
|
||||
bgt 5b
|
||||
bgt 4b
|
||||
|
||||
pop {r4-r7, pc}
|
||||
endfunc
|
||||
@ -209,33 +195,29 @@ T cmp r7, #0
|
||||
|
||||
beq 2f
|
||||
|
||||
add r5, r1, r2
|
||||
|
||||
vdup.8 d0, r4
|
||||
lsl r4, r2, #1
|
||||
vdup.8 d1, r12
|
||||
vld1.8 {d4}, [r1], r4
|
||||
vld1.8 {d4}, [r1], r2
|
||||
vdup.8 d2, r6
|
||||
vld1.8 {d6}, [r5], r4
|
||||
vdup.8 d3, r7
|
||||
|
||||
vext.8 d5, d4, d5, #1
|
||||
vext.8 d7, d6, d7, #1
|
||||
vtrn.32 d4, d5
|
||||
vtrn.32 d6, d7
|
||||
|
||||
vtrn.32 d0, d1
|
||||
vtrn.32 d2, d3
|
||||
|
||||
1: pld [r5]
|
||||
1: vld1.8 {d6}, [r1], r2
|
||||
vext.8 d7, d6, d7, #1
|
||||
vtrn.32 d6, d7
|
||||
vmull.u8 q8, d4, d0
|
||||
vmlal.u8 q8, d6, d2
|
||||
vld1.8 {d4}, [r1], r4
|
||||
vld1.8 {d4}, [r1], r2
|
||||
vext.8 d5, d4, d5, #1
|
||||
vtrn.32 d4, d5
|
||||
pld [r1]
|
||||
vmull.u8 q9, d6, d0
|
||||
vmlal.u8 q9, d4, d2
|
||||
vld1.8 {d6}, [r5], r4
|
||||
vadd.i16 d16, d16, d17
|
||||
vadd.i16 d17, d18, d19
|
||||
.ifc \codec,h264
|
||||
@ -245,14 +227,12 @@ T cmp r7, #0
|
||||
vshrn.u16 d16, q8, #6
|
||||
.endif
|
||||
subs r3, r3, #2
|
||||
pld [r1]
|
||||
pld [r1, r2]
|
||||
.ifc \type,avg
|
||||
vld1.32 {d20[0]}, [lr,:32], r2
|
||||
vld1.32 {d20[1]}, [lr,:32], r2
|
||||
vrhadd.u8 d16, d16, d20
|
||||
.endif
|
||||
vext.8 d7, d6, d7, #1
|
||||
vtrn.32 d6, d7
|
||||
vst1.32 {d16[0]}, [r0,:32], r2
|
||||
vst1.32 {d16[1]}, [r0,:32], r2
|
||||
bgt 1b
|
||||
@ -268,18 +248,15 @@ T cmp r7, #0
|
||||
beq 4f
|
||||
|
||||
vext.32 d1, d0, d1, #1
|
||||
add r5, r1, r2
|
||||
lsl r4, r2, #1
|
||||
vld1.32 {d4[0]}, [r1], r4
|
||||
vld1.32 {d4[1]}, [r5], r4
|
||||
vld1.32 {d4[0]}, [r1], r2
|
||||
|
||||
3: pld [r5]
|
||||
3: vld1.32 {d4[1]}, [r1], r2
|
||||
vmull.u8 q8, d4, d0
|
||||
vld1.32 {d4[0]}, [r1], r4
|
||||
vld1.32 {d4[0]}, [r1], r2
|
||||
vmull.u8 q9, d4, d1
|
||||
vld1.32 {d4[1]}, [r5], r4
|
||||
vadd.i16 d16, d16, d17
|
||||
vadd.i16 d17, d18, d19
|
||||
pld [r1]
|
||||
.ifc \codec,h264
|
||||
vrshrn.u16 d16, q8, #6
|
||||
.else
|
||||
@ -292,7 +269,7 @@ T cmp r7, #0
|
||||
vrhadd.u8 d16, d16, d20
|
||||
.endif
|
||||
subs r3, r3, #2
|
||||
pld [r1]
|
||||
pld [r1, r2]
|
||||
vst1.32 {d16[0]}, [r0,:32], r2
|
||||
vst1.32 {d16[1]}, [r0,:32], r2
|
||||
bgt 3b
|
||||
@ -305,13 +282,9 @@ T cmp r7, #0
|
||||
vext.8 d7, d6, d7, #1
|
||||
vtrn.32 d4, d5
|
||||
vtrn.32 d6, d7
|
||||
|
||||
5: vmull.u8 q8, d4, d0
|
||||
vmull.u8 q8, d4, d0
|
||||
vmull.u8 q9, d6, d0
|
||||
subs r3, r3, #2
|
||||
vld1.8 {d4}, [r1], r2
|
||||
vext.8 d5, d4, d5, #1
|
||||
vtrn.32 d4, d5
|
||||
vadd.i16 d16, d16, d17
|
||||
vadd.i16 d17, d18, d19
|
||||
pld [r1]
|
||||
@ -326,13 +299,10 @@ T cmp r7, #0
|
||||
vld1.32 {d20[1]}, [lr,:32], r2
|
||||
vrhadd.u8 d16, d16, d20
|
||||
.endif
|
||||
vld1.8 {d6}, [r1], r2
|
||||
vext.8 d7, d6, d7, #1
|
||||
vtrn.32 d6, d7
|
||||
pld [r1]
|
||||
vst1.32 {d16[0]}, [r0,:32], r2
|
||||
vst1.32 {d16[1]}, [r0,:32], r2
|
||||
bgt 5b
|
||||
bgt 4b
|
||||
|
||||
pop {r4-r7, pc}
|
||||
endfunc
|
||||
|
||||
@ -2343,7 +2343,8 @@ int ff_MPV_lowest_referenced_row(MpegEncContext *s, int dir)
|
||||
int my_max = INT_MIN, my_min = INT_MAX, qpel_shift = !s->quarter_sample;
|
||||
int my, off, i, mvs;
|
||||
|
||||
if (s->picture_structure != PICT_FRAME || s->mcsel) goto unhandled;
|
||||
if (s->picture_structure != PICT_FRAME || s->mcsel)
|
||||
goto unhandled;
|
||||
|
||||
switch (s->mv_type) {
|
||||
case MV_TYPE_16X16:
|
||||
|
||||
@ -1805,7 +1805,7 @@ int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
ret = rt->recvbuf_pos < rt->recvbuf_len;
|
||||
}
|
||||
} else
|
||||
av_assert0(0);
|
||||
ret = -1;
|
||||
if (ret == 0) {
|
||||
rt->cur_transport_priv = NULL;
|
||||
return 0;
|
||||
|
||||
@ -19,11 +19,10 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "avutil.h"
|
||||
#include "common.h"
|
||||
/// Avoid e.g. MPlayers fast_memcpy, it slows things down here.
|
||||
#undef memcpy
|
||||
#include <string.h>
|
||||
#include "lzo.h"
|
||||
|
||||
/// Define if we may write up to 12 bytes beyond the output buffer.
|
||||
|
||||
@ -24,26 +24,26 @@ fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -idct 19 -i $(SAMPLES)/wmv8/w
|
||||
FATE_MICROSOFT-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV8_DRM)
|
||||
fate-wmv8_drm: $(FATE_WMV8_DRM)
|
||||
|
||||
FATE_VC1 += fate-vc1_sa00040
|
||||
FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00040
|
||||
fate-vc1_sa00040: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1
|
||||
|
||||
FATE_VC1 += fate-vc1_sa00050
|
||||
FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00050
|
||||
fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1
|
||||
|
||||
FATE_VC1 += fate-vc1_sa10091
|
||||
FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10091
|
||||
fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1
|
||||
|
||||
FATE_VC1 += fate-vc1_sa20021
|
||||
FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa20021
|
||||
fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1
|
||||
|
||||
FATE_VC1 += fate-vc1_sa10143
|
||||
FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10143
|
||||
fate-vc1_sa10143: CMD = framecrc -i $(SAMPLES)/vc1/SA10143.vc1
|
||||
|
||||
FATE_VC1 += fate-vc1-ism
|
||||
FATE_VC1-$(CONFIG_MOV_DEMUXER) += fate-vc1-ism
|
||||
fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an
|
||||
|
||||
FATE_MICROSOFT += $(FATE_VC1)
|
||||
fate-vc1: $(FATE_VC1)
|
||||
FATE_MICROSOFT-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes)
|
||||
fate-vc1: $(FATE_VC1-yes)
|
||||
|
||||
FATE_MICROSOFT += $(FATE_MICROSOFT-yes)
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ fate-sub-realtext: CMD = md5 -i $(SAMPLES)/sub/RealText_capability_tester.rt -f
|
||||
FATE_SUBTITLES += fate-sub-sami
|
||||
fate-sub-sami: CMD = md5 -i $(SAMPLES)/sub/SAMI_capability_tester.smi -f ass
|
||||
|
||||
FATE_SUBTITLES += fate-sub-srt
|
||||
FATE_SUBTITLES-$(call DEMDEC, SRT, SRT) += fate-sub-srt
|
||||
fate-sub-srt: CMD = md5 -i $(SAMPLES)/sub/SubRip_capability_tester.srt -f ass
|
||||
|
||||
FATE_SUBTITLES += fate-sub-subripenc
|
||||
@ -28,5 +28,7 @@ fate-sub-subviewer: CMD = md5 -i $(SAMPLES)/sub/SubViewer_capability_tester.sub
|
||||
FATE_SUBTITLES += fate-sub-webvtt
|
||||
fate-sub-webvtt: CMD = md5 -i $(SAMPLES)/sub/WebVTT_capability_tester.vtt -f ass
|
||||
|
||||
FATE_SUBTITLES += $(FATE_SUBTITLES-yes)
|
||||
|
||||
FATE_SAMPLES_FFMPEG += $(FATE_SUBTITLES)
|
||||
fate-subtitles: $(FATE_SUBTITLES)
|
||||
|
||||
@ -4,79 +4,79 @@ fate-4xm-1: CMD = framecrc -i $(SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 -an
|
||||
FATE_4XM += fate-4xm-2
|
||||
fate-4xm-2: CMD = framecrc -i $(SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += $(FATE_4XM)
|
||||
FATE_VIDEO-$(call DEMDEC, FOURXM, FOURXM) += $(FATE_4XM)
|
||||
fate-4xm: $(FATE_4XM)
|
||||
|
||||
FATE_VIDEO += fate-aasc
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, AASC) += fate-aasc
|
||||
fate-aasc: CMD = framecrc -i $(SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-alg-mm
|
||||
FATE_VIDEO-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm
|
||||
fate-alg-mm: CMD = framecrc -i $(SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-amv
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, AMV) += fate-amv
|
||||
fate-amv: CMD = framecrc -idct simple -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an
|
||||
|
||||
FATE_VIDEO += fate-ansi
|
||||
FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi
|
||||
fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-ansi256
|
||||
fate-ansi256: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/ansi256.ans -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-armovie-escape124
|
||||
FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124
|
||||
fate-armovie-escape124: CMD = framecrc -i $(SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-auravision-v1
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, AURA) += fate-auravision-v1
|
||||
fate-auravision-v1: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an
|
||||
|
||||
FATE_VIDEO += fate-auravision-v2
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2
|
||||
fate-auravision-v2: CMD = framecrc -i $(SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an
|
||||
|
||||
FATE_VIDEO += fate-bethsoft-vid
|
||||
FATE_VIDEO-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid
|
||||
fate-bethsoft-vid: CMD = framecrc -i $(SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-bfi
|
||||
FATE_VIDEO-$(call DEMDEC, BFI, BFI) += fate-bfi
|
||||
fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-bink-video
|
||||
FATE_VIDEO-$(call DEMDEC, BINK, BINK) += fate-bink-video
|
||||
fate-bink-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik
|
||||
|
||||
FATE_VIDEO += fate-bmv-video
|
||||
FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video
|
||||
fate-bmv-video: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += fate-cdgraphics
|
||||
FATE_VIDEO-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics
|
||||
fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1
|
||||
|
||||
FATE_VIDEO += fate-cljr
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, CLJR) += fate-cljr
|
||||
fate-cljr: CMD = framecrc -i $(SAMPLES)/cljr/testcljr-partial.avi
|
||||
|
||||
FATE_VIDEO-$(CONFIG_ZLIB) += fate-corepng
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-corepng
|
||||
fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi
|
||||
|
||||
FATE_VIDEO += fate-creatureshock-avs
|
||||
FATE_VIDEO-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs
|
||||
fate-creatureshock-avs: CMD = framecrc -i $(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24
|
||||
|
||||
FATE_CVID += fate-cvid-partial
|
||||
FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-partial
|
||||
fate-cvid-partial: CMD = framecrc -i $(SAMPLES)/cvid/laracroft-cinepak-partial.avi -an
|
||||
|
||||
FATE_CVID += fate-cvid-palette
|
||||
FATE_CVID-$(CONFIG_MOV_DEMUXER) += fate-cvid-palette
|
||||
fate-cvid-palette: CMD = framecrc -i $(SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an
|
||||
|
||||
FATE_CVID += fate-cvid-grayscale
|
||||
FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-grayscale
|
||||
fate-cvid-grayscale: CMD = framecrc -i $(SAMPLES)/cvid/pcitva15.avi -an
|
||||
|
||||
FATE_VIDEO += $(FATE_CVID)
|
||||
fate-cvid: $(FATE_CVID)
|
||||
FATE_VIDEO-$(CONFIG_CINEPAK_DECODER) += $(FATE_CVID-yes)
|
||||
fate-cvid: $(FATE_CVID-yes)
|
||||
|
||||
FATE_VIDEO += fate-cyberia-c93
|
||||
FATE_VIDEO-$(call DEMDEC, C93, C93) += fate-cyberia-c93
|
||||
fate-cyberia-c93: CMD = framecrc -i $(SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-cyuv
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, CYUV) += fate-cyuv
|
||||
fate-cyuv: CMD = framecrc -i $(SAMPLES)/cyuv/cyuv.avi
|
||||
|
||||
FATE_VIDEO += fate-delphine-cin-video
|
||||
FATE_VIDEO-$(call DEMDEC, DSICIN, DSICINVIDEO) += fate-delphine-cin-video
|
||||
fate-delphine-cin-video: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += fate-deluxepaint-anm
|
||||
FATE_VIDEO-$(call DEMDEC, ANM, ANM) += fate-deluxepaint-anm
|
||||
fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24
|
||||
|
||||
FATE_TRUEMOTION1 += fate-truemotion1-15
|
||||
@ -85,10 +85,10 @@ fate-truemotion1-15: CMD = framecrc -i $(SAMPLES)/duck/phant2-940.duk -pix_fmt r
|
||||
FATE_TRUEMOTION1 += fate-truemotion1-24
|
||||
fate-truemotion1-24: CMD = framecrc -i $(SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += $(FATE_TRUEMOTION1)
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, TRUEMOTION1) += $(FATE_TRUEMOTION1)
|
||||
fate-truemotion1: $(FATE_TRUEMOTION1)
|
||||
|
||||
FATE_VIDEO += fate-truemotion2
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, TRUEMOTION2) += fate-truemotion2
|
||||
fate-truemotion2: CMD = framecrc -i $(SAMPLES)/duck/tm20.avi
|
||||
|
||||
FATE_DXA += fate-dxa-feeble
|
||||
@ -97,10 +97,10 @@ fate-dxa-feeble: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rg
|
||||
FATE_DXA += fate-dxa-scummvm
|
||||
fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO-$(CONFIG_ZLIB) += $(FATE_DXA)
|
||||
FATE_VIDEO-$(call DEMDEC, DXA, DXA) += $(FATE_DXA)
|
||||
fate-dxa: $(FATE_DXA)
|
||||
|
||||
FATE_SAMPLES_PCM += fate-film-cvid
|
||||
FATE_VIDEO-$(call DEMDEC, SEGAFILM, CINEPAK) += fate-film-cvid
|
||||
fate-film-cvid: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk -an
|
||||
|
||||
FATE_FLIC += fate-flic-af11-palette-change
|
||||
@ -112,61 +112,61 @@ fate-flic-af12: CMD = framecrc -i $(SAMPLES)/fli/jj00c2.fli -pix_fmt rgb24
|
||||
FATE_FLIC += fate-flic-magiccarpet
|
||||
fate-flic-magiccarpet: CMD = framecrc -i $(SAMPLES)/fli/intel.dat -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += $(FATE_FLIC)
|
||||
FATE_VIDEO-$(call DEMDEC, FLIC, FLIC) += $(FATE_FLIC)
|
||||
fate-flic: $(FATE_FLIC)
|
||||
|
||||
FATE_VIDEO += fate-frwu
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, FRWU) += fate-frwu
|
||||
fate-frwu: CMD = framecrc -i $(SAMPLES)/frwu/frwu.avi
|
||||
|
||||
FATE_VIDEO += fate-id-cin-video
|
||||
FATE_VIDEO-$(call DEMDEC, IDCIN, IDCIN) += fate-id-cin-video
|
||||
fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO-$(CONFIG_AVFILTER) += fate-idroq-video-encode
|
||||
FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode
|
||||
fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2
|
||||
|
||||
FATE_IFF += fate-iff-byterun1
|
||||
FATE_IFF-$(CONFIG_IFF_BYTERUN1_DECODER) += fate-iff-byterun1
|
||||
fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24
|
||||
|
||||
FATE_IFF += fate-iff-fibonacci
|
||||
FATE_IFF-$(CONFIG_EIGHTSVX_FIB_DECODER) += fate-iff-fibonacci
|
||||
fate-iff-fibonacci: CMD = md5 -i $(SAMPLES)/iff/dasboot-in-compressed -f s16le
|
||||
|
||||
FATE_IFF += fate-iff-ilbm
|
||||
FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-ilbm
|
||||
fate-iff-ilbm: CMD = framecrc -i $(SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += $(FATE_IFF)
|
||||
fate-iff: $(FATE_IFF)
|
||||
FATE_VIDEO-$(CONFIG_IFF_DEMUXER) += $(FATE_IFF-yes)
|
||||
fate-iff: $(FATE_IFF-yes)
|
||||
|
||||
FATE_VIDEO += fate-interplay-mve-8bit
|
||||
FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit
|
||||
fate-interplay-mve-8bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += fate-interplay-mve-16bit
|
||||
FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit
|
||||
fate-interplay-mve-16bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += fate-jv
|
||||
fate-jv: CMD = framecrc -i $(SAMPLES)/jv/intro.jv -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += fate-kgv1
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1
|
||||
fate-kgv1: CMD = framecrc -i $(SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an
|
||||
|
||||
FATE_VIDEO += fate-kmvc
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, KMVC) += fate-kmvc
|
||||
fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-mdec
|
||||
FATE_VIDEO-$(call DEMDEC, EA, MDEC) += fate-mdec
|
||||
fate-mdec: CMD = framecrc -idct simple -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an
|
||||
|
||||
FATE_VIDEO += fate-mdec-v3
|
||||
FATE_VIDEO-$(call DEMDEC, STR, MDEC) += fate-mdec-v3
|
||||
fate-mdec-v3: CMD = framecrc -idct simple -i $(SAMPLES)/psx-str/abc000_cut.str -an
|
||||
|
||||
FATE_VIDEO += fate-mimic
|
||||
FATE_VIDEO-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic
|
||||
fate-mimic: CMD = framecrc -idct simple -i $(SAMPLES)/mimic/mimic2-womanloveffmpeg.cam
|
||||
|
||||
FATE_VIDEO += fate-mjpegb
|
||||
FATE_VIDEO-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb
|
||||
fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mjpegb/mjpegb_part.mov -an
|
||||
|
||||
FATE_VIDEO += fate-motionpixels
|
||||
FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels
|
||||
fate-motionpixels: CMD = framecrc -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111
|
||||
|
||||
FATE_VIDEO += fate-mpeg2-field-enc
|
||||
FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc
|
||||
fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an
|
||||
|
||||
# FIXME dropped frames in this test because of coarse timebase
|
||||
@ -176,46 +176,46 @@ fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an
|
||||
FATE_NUV += fate-nuv-rtjpeg-fh
|
||||
fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/rtjpeg_frameheader.nuv -an
|
||||
|
||||
FATE_VIDEO += $(FATE_NUV)
|
||||
FATE_VIDEO-$(call DEMDEC, NUV, NUV) += $(FATE_NUV)
|
||||
fate-nuv: $(FATE_NUV)
|
||||
|
||||
FATE_VIDEO += fate-paf-video
|
||||
fate-paf-video: CMD = framecrc -i $(SAMPLES)/paf/hod1-partial.paf -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += fate-qpeg
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, QPEG) += fate-qpeg
|
||||
fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-r210
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, R210) += fate-r210
|
||||
fate-r210: CMD = framecrc -i $(SAMPLES)/r210/r210.avi -pix_fmt rgb48le
|
||||
|
||||
FATE_VIDEO += fate-rl2
|
||||
FATE_VIDEO-$(call DEMDEC, RL2, RL2) += fate-rl2
|
||||
fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += fate-roqvideo
|
||||
FATE_VIDEO-$(call DEMDEC, ROQ, ROQ) += fate-roqvideo
|
||||
fate-roqvideo: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -an
|
||||
|
||||
FATE_VIDEO += fate-sanm
|
||||
fate-sanm: CMD = framecrc -i $(SAMPLES)/smush/ronin_part.znm -an -pix_fmt rgb24
|
||||
|
||||
FATA_VIDEO += fate-sierra-vmd-video
|
||||
FATE_VIDEO-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video
|
||||
fate-sierra-vmd-video: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an
|
||||
|
||||
FATA_VIDEO += fate-smacker-video
|
||||
FATE_VIDEO-$(call DEMDEC, SMACKER, SMACKER) += fate-smacker-video
|
||||
fate-smacker-video: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += fate-smc
|
||||
FATE_VIDEO-$(call DEMDEC, MOV, SMC) += fate-smc
|
||||
fate-smc: CMD = framecrc -i $(SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-sp5x
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, SP5X) += fate-sp5x
|
||||
fate-sp5x: CMD = framecrc -idct simple -i $(SAMPLES)/sp5x/sp5x_problem.avi
|
||||
|
||||
FATE_VIDEO += fate-thp
|
||||
FATE_VIDEO-$(call DEMDEC, THP, THP) += fate-thp
|
||||
fate-thp: CMD = framecrc -idct simple -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp -an
|
||||
|
||||
FATE_VIDEO += fate-tiertex-seq
|
||||
FATE_VIDEO-$(call DEMDEC, TIERTEXSEQ, TIERTEXSEQVIDEO) += fate-tiertex-seq
|
||||
fate-tiertex-seq: CMD = framecrc -i $(SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-tmv
|
||||
FATE_VIDEO-$(call DEMDEC, TMV, TMV) += fate-tmv
|
||||
fate-tmv: CMD = framecrc -i $(SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24
|
||||
|
||||
FATE_TXD += fate-txd-16bpp
|
||||
@ -224,41 +224,41 @@ fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -an
|
||||
FATE_TXD += fate-txd-pal8
|
||||
fate-txd-pal8: CMD = framecrc -i $(SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += $(FATE_TXD)
|
||||
FATE_VIDEO-$(call DEMDEC, TXD, TXD) += $(FATE_TXD)
|
||||
fate-txd: $(FATE_TXD)
|
||||
|
||||
FATE_VIDEO += fate-ulti
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, ULTI) += fate-ulti
|
||||
fate-ulti: CMD = framecrc -i $(SAMPLES)/ulti/hit12w.avi -an
|
||||
|
||||
FATE_VIDEO += fate-v210
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, V210) += fate-v210
|
||||
fate-v210: CMD = framecrc -i $(SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an
|
||||
|
||||
FATE_VIDEO += fate-v410dec
|
||||
FATE_VIDEO-$(call DEMDEC, MOV, V410) += fate-v410dec
|
||||
fate-v410dec: CMD = framecrc -i $(SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le
|
||||
|
||||
FATE_VIDEO += fate-v410enc
|
||||
FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc
|
||||
fate-v410enc: tests/vsynth1/00.pgm
|
||||
fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -flags +bitexact -vcodec v410 -f avi
|
||||
|
||||
FATE_VIDEO += fate-vcr1
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, VCR1) += fate-vcr1
|
||||
fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an
|
||||
|
||||
FATE_VIDEO += fate-videoxl
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, XL) += fate-videoxl
|
||||
fate-videoxl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi
|
||||
|
||||
FATE_VIDEO += fate-vqa-cc
|
||||
FATE_VIDEO-$(call DEMDEC, WSVQA, VQA) += fate-vqa-cc
|
||||
fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += fate-wc3movie-xan
|
||||
FATE_VIDEO-$(call DEMDEC, WC3, XAN_WC3) += fate-wc3movie-xan
|
||||
fate-wc3movie-xan: CMD = framecrc -i $(SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24
|
||||
|
||||
FATE_VIDEO += fate-wnv1
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, WNV1) += fate-wnv1
|
||||
fate-wnv1: CMD = framecrc -i $(SAMPLES)/wnv1/wnv1-codec.avi -an
|
||||
|
||||
FATE_VIDEO += fate-yop
|
||||
FATE_VIDEO-$(call DEMDEC, YOP, YOP) += fate-yop
|
||||
fate-yop: CMD = framecrc -i $(SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an
|
||||
|
||||
FATE_VIDEO += fate-xxan-wc4
|
||||
FATE_VIDEO-$(call DEMDEC, AVI, XAN_WC4) += fate-xxan-wc4
|
||||
fate-xxan-wc4: CMD = framecrc -i $(SAMPLES)/wc4-xan/wc4trailer-partial.avi -an
|
||||
|
||||
FATE_VIDEO += $(FATE_VIDEO-yes)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user