virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  FATE: add a bink version 'b' test
  FATE: add a bink version 'i' test
  libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-17 13:06:12 +01:00
commit 130dc95187
5 changed files with 73 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libswscale/swscale.h
View File

@ -85,9 +85,7 @@ const char *swscale_license(void);
*/ */
#define SWS_CPU_CAPS_MMX 0x80000000 #define SWS_CPU_CAPS_MMX 0x80000000
#define SWS_CPU_CAPS_MMXEXT 0x20000000 #define SWS_CPU_CAPS_MMXEXT 0x20000000
#if LIBSWSCALE_VERSION_MAJOR < 3
#define SWS_CPU_CAPS_MMX2 0x20000000 #define SWS_CPU_CAPS_MMX2 0x20000000
#endif
#define SWS_CPU_CAPS_3DNOW 0x40000000 #define SWS_CPU_CAPS_3DNOW 0x40000000
#define SWS_CPU_CAPS_ALTIVEC 0x10000000 #define SWS_CPU_CAPS_ALTIVEC 0x10000000
#define SWS_CPU_CAPS_BFIN 0x01000000 #define SWS_CPU_CAPS_BFIN 0x01000000

12
tests/fate/video.mak
View File

@ -37,8 +37,16 @@ fate-bethsoft-vid: CMD = framecrc -i $(SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -
FATE_VIDEO-$(call DEMDEC, BFI, BFI) += fate-bfi FATE_VIDEO-$(call DEMDEC, BFI, BFI) += fate-bfi
fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24 fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24
FATE_VIDEO-$(call DEMDEC, BINK, BINK) += fate-bink-video FATE_BINK_VIDEO += fate-bink-video-b
fate-bink-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik fate-bink-video-b: CMD = framecrc -i $(SAMPLES)/bink/RISE.BIK -frames 30
FATE_BINK_VIDEO += fate-bink-video-f
fate-bink-video-f: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik
FATE_BINK_VIDEO += fate-bink-video-i
fate-bink-video-i: CMD = framecrc -i $(SAMPLES)/bink/RazOnBull.bik -an
FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO)
FATE_VIDEO-$(call DEMDEC, BMV, BMV_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-bmv-video: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an

31
tests/ref/fate/bink-video-b Normal file
View File

@ -0,0 +1,31 @@
#tb 0: 1/15
0, 0, 0, 1, 34800, 0x4fd0a8e4
0, 1, 1, 1, 34800, 0xd381a7b7
0, 2, 2, 1, 34800, 0x688ca315
0, 3, 3, 1, 34800, 0xaae39c3f
0, 4, 4, 1, 34800, 0xdcb19759
0, 5, 5, 1, 34800, 0xd458970a
0, 6, 6, 1, 34800, 0x99269865
0, 7, 7, 1, 34800, 0x6d459bbc
0, 8, 8, 1, 34800, 0x6c759cd2
0, 9, 9, 1, 34800, 0x47459ad5
0, 10, 10, 1, 34800, 0xe6e897b9
0, 11, 11, 1, 34800, 0x63599374
0, 12, 12, 1, 34800, 0x666191e2
0, 13, 13, 1, 34800, 0x4ca8933e
0, 14, 14, 1, 34800, 0xbea594f4
0, 15, 15, 1, 34800, 0xa5609473
0, 16, 16, 1, 34800, 0xe5d79234
0, 17, 17, 1, 34800, 0xf7738e58
0, 18, 18, 1, 34800, 0x9d0c8b24
0, 19, 19, 1, 34800, 0x0b2d8a66
0, 20, 20, 1, 34800, 0xf4698b72
0, 21, 21, 1, 34800, 0xdf808d44
0, 22, 22, 1, 34800, 0xae6b895e
0, 23, 23, 1, 34800, 0xa67b8144
0, 24, 24, 1, 34800, 0xc54d79c4
0, 25, 25, 1, 34800, 0x75ca72e2
0, 26, 26, 1, 34800, 0xc6a56f65
0, 27, 27, 1, 34800, 0x406e740d
0, 28, 28, 1, 34800, 0xd29478de
0, 29, 29, 1, 34800, 0x22cf7dc2

0
tests/ref/fate/bink-video → tests/ref/fate/bink-video-f
View File

32
tests/ref/fate/bink-video-i Normal file
View File

@ -0,0 +1,32 @@
#tb 0: 1/30
0, 0, 0, 1, 460800, 0xaef133d9
0, 1, 1, 1, 460800, 0x2da1248b
0, 2, 2, 1, 460800, 0x3d7945b4
0, 3, 3, 1, 460800, 0x44554f62
0, 4, 4, 1, 460800, 0x1bc0007e
0, 5, 5, 1, 460800, 0xe9b5c4fa
0, 6, 6, 1, 460800, 0x41b17af0
0, 7, 7, 1, 460800, 0x88f5d31c
0, 8, 8, 1, 460800, 0xdedb6e2d
0, 9, 9, 1, 460800, 0xd36f0a5e
0, 10, 10, 1, 460800, 0xb564921c
0, 11, 11, 1, 460800, 0xd72b1208
0, 12, 12, 1, 460800, 0x5c87760e
0, 13, 13, 1, 460800, 0xecb75843
0, 14, 14, 1, 460800, 0x58deee70
0, 15, 15, 1, 460800, 0x64b5ae3e
0, 16, 16, 1, 460800, 0x9269e9e6
0, 17, 17, 1, 460800, 0x47064d62
0, 18, 18, 1, 460800, 0x88858604
0, 19, 19, 1, 460800, 0x129d8834
0, 20, 20, 1, 460800, 0x046ecae5
0, 21, 21, 1, 460800, 0x6c74c134
0, 22, 22, 1, 460800, 0x37d56c01
0, 23, 23, 1, 460800, 0x4c0a4f15
0, 24, 24, 1, 460800, 0xe28ef96b
0, 25, 25, 1, 460800, 0x66c72383
0, 26, 26, 1, 460800, 0x9487175b
0, 27, 27, 1, 460800, 0x71034965
0, 28, 28, 1, 460800, 0x0f99ca96
0, 29, 29, 1, 460800, 0x8a8c79b2
0, 30, 30, 1, 460800, 0x34d4926e