diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-26 04:47:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-26 05:11:21 +0100 |
| commit | 305e4b35ea7b643ab3ce8a37fa8cb464e8adeb3f (patch) | |
| tree | 9e3773a72155b936e1ca66d4f089fa1b7eeeb791 /tests | |
| parent | 8e039121335f482234214bc4e0322ac72c1089ef (diff) | |
| parent | 0a9efe4c6eb48bf863e2e630b3ad907a198961c5 (diff) | |
| download | ffmpeg-305e4b35ea7b643ab3ce8a37fa8cb464e8adeb3f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (34 commits)
mlp_parser: fix the channel mask value used for the top surround channel
vorbisenc: check all allocations for failure
roqaudioenc: return AVERROR codes instead of -1
roqaudioenc: set correct bit rate
roqaudioenc: use AVCodecContext.frame_size correctly.
roqaudioenc: remove unneeded sample_fmt check
ra144enc: use int16_t* for input samples rather than void*
ra144enc: set AVCodecContext.coded_frame
ra144enc: remove unneeded sample_fmt check
nellymoserenc: set AVCodecContext.coded_frame
nellymoserenc: improve error checking in encode_init()
nellymoserenc: return AVERROR codes instead of -1
libvorbis: improve error checking in oggvorbis_encode_init()
mpegaudioenc: return AVERROR codes instead of -1
libfaac: improve error checking and handling in Faac_encode_init()
avutil: add AVERROR_UNKNOWN
check for coded_frame allocation failure in several audio encoders
audio encoders: do not set coded_frame->key_frame.
g722enc: check for trellis data allocation error
libspeexenc: export encoder delay through AVCodecContext.delay
...
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/fraps.c
libavcodec/kgv1dec.c
libavcodec/libfaac.c
libavcodec/libgsm.c
libavcodec/libvorbis.c
libavcodec/mlp_parser.c
libavcodec/roqaudioenc.c
libavcodec/vorbisenc.c
libavutil/avutil.h
libavutil/error.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 1 | ||||
| -rw-r--r-- | tests/fate/cdxl.mak | 14 | ||||
| -rw-r--r-- | tests/ref/fate/cdxl-ham6 | 17 | ||||
| -rw-r--r-- | tests/ref/fate/cdxl-ham8 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/cdxl-pal8 | 12 | ||||
| -rw-r--r-- | tests/ref/fate/cdxl-pal8-small | 47 | ||||
| -rw-r--r-- | tests/ref/lavf/xwd | 2 |
7 files changed, 94 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index 3716eb6d82..45ce1308f0 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -46,6 +46,7 @@ include $(SRC_PATH)/tests/fate/amrnb.mak include $(SRC_PATH)/tests/fate/amrwb.mak include $(SRC_PATH)/tests/fate/atrac.mak include $(SRC_PATH)/tests/fate/audio.mak +include $(SRC_PATH)/tests/fate/cdxl.mak include $(SRC_PATH)/tests/fate/dct.mak include $(SRC_PATH)/tests/fate/demux.mak include $(SRC_PATH)/tests/fate/dfa.mak diff --git a/tests/fate/cdxl.mak b/tests/fate/cdxl.mak new file mode 100644 index 0000000000..82ac27e430 --- /dev/null +++ b/tests/fate/cdxl.mak @@ -0,0 +1,14 @@ +FATE_CDXL += fate-cdxl-ham6 +fate-cdxl-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/cat.cdxl -an -frames:v 16 + +FATE_CDXL += fate-cdxl-ham8 +fate-cdxl-ham8: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -an -frames:v 1 + +FATE_CDXL += fate-cdxl-pal8 +fate-cdxl-pal8: CMD = framecrc -i $(SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -frames:v 11 + +FATE_CDXL += fate-cdxl-pal8-small +fate-cdxl-pal8-small: CMD = framecrc -i $(SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46 + +FATE_TESTS += $(FATE_CDXL) +fate-cdxl: $(FATE_CDXL) diff --git a/tests/ref/fate/cdxl-ham6 b/tests/ref/fate/cdxl-ham6 new file mode 100644 index 0000000000..6426d45014 --- /dev/null +++ b/tests/ref/fate/cdxl-ham6 @@ -0,0 +1,17 @@ +#tb 0: 52/525 +0, 0, 0, 1, 57600, 0x87887a7b +0, 1, 1, 1, 57600, 0x10c301d2 +0, 2, 2, 1, 57600, 0xd1a6f910 +0, 3, 3, 1, 57600, 0x20242bb9 +0, 4, 4, 1, 57600, 0xae33cb7f +0, 5, 5, 1, 57600, 0x501b82c8 +0, 6, 6, 1, 57600, 0x84199043 +0, 7, 7, 1, 57600, 0x946a6dbb +0, 8, 8, 1, 57600, 0xeacea671 +0, 9, 9, 1, 57600, 0x77b8723f +0, 10, 10, 1, 57600, 0x371cdb09 +0, 11, 11, 1, 57600, 0xa16ef5ee +0, 12, 12, 1, 57600, 0xcb6abd9e +0, 13, 13, 1, 57600, 0xb73e800f +0, 14, 14, 1, 57600, 0x368bd93e +0, 15, 15, 1, 57600, 0xcde72dc5 diff --git a/tests/ref/fate/cdxl-ham8 b/tests/ref/fate/cdxl-ham8 new file mode 100644 index 0000000000..269f1f30cf --- /dev/null +++ b/tests/ref/fate/cdxl-ham8 @@ -0,0 +1,2 @@ +#tb 0: 3/158 +0, 0, 0, 1, 67584, 0xce0cade5 diff --git a/tests/ref/fate/cdxl-pal8 b/tests/ref/fate/cdxl-pal8 new file mode 100644 index 0000000000..82d4d634c7 --- /dev/null +++ b/tests/ref/fate/cdxl-pal8 @@ -0,0 +1,12 @@ +#tb 0: 12/601 +0, 0, 0, 1, 67584, 0x5eae629b +0, 1, 1, 1, 67584, 0x32591227 +0, 2, 2, 1, 67584, 0x4e4424c7 +0, 3, 3, 1, 67584, 0x70db0134 +0, 4, 4, 1, 67584, 0x3550ed0b +0, 5, 5, 1, 67584, 0x86fe3eef +0, 6, 6, 1, 67584, 0x3414bb33 +0, 7, 7, 1, 67584, 0x667bfb91 +0, 8, 8, 1, 67584, 0x6e1a4ccb +0, 9, 9, 1, 67584, 0xf723f9ae +0, 10, 10, 1, 67584, 0x88481d5d diff --git a/tests/ref/fate/cdxl-pal8-small b/tests/ref/fate/cdxl-pal8-small new file mode 100644 index 0000000000..f7a1a465ab --- /dev/null +++ b/tests/ref/fate/cdxl-pal8-small @@ -0,0 +1,47 @@ +#tb 0: 368/11025 +0, 0, 0, 1, 30720, 0x0d552cfd +0, 1, 1, 1, 30720, 0x3cf93291 +0, 2, 2, 1, 30720, 0xe45b2868 +0, 3, 3, 1, 30720, 0xb5df289b +0, 4, 4, 1, 30720, 0x2562259e +0, 5, 5, 1, 30720, 0xbf171878 +0, 6, 6, 1, 30720, 0x695b1d73 +0, 7, 7, 1, 30720, 0x89ef1614 +0, 8, 8, 1, 30720, 0xe12a1dd9 +0, 9, 9, 1, 30720, 0x49622ffa +0, 10, 10, 1, 30720, 0xd6832703 +0, 11, 11, 1, 30720, 0xec1d0cb7 +0, 12, 12, 1, 30720, 0x8bee0525 +0, 13, 13, 1, 30720, 0x1e0cf0c4 +0, 14, 14, 1, 30720, 0xf83fd9db +0, 15, 15, 1, 30720, 0xffb0d6ab +0, 16, 16, 1, 30720, 0xe37fe239 +0, 17, 17, 1, 30720, 0x74b0f856 +0, 18, 18, 1, 30720, 0x9c88d3e1 +0, 19, 19, 1, 30720, 0x714db368 +0, 20, 20, 1, 30720, 0x6c8e8860 +0, 21, 21, 1, 30720, 0x804968e6 +0, 22, 22, 1, 30720, 0x7ac56ae4 +0, 23, 23, 1, 30720, 0xffd85cbf +0, 24, 24, 1, 30720, 0x1f8455f9 +0, 25, 25, 1, 30720, 0x3ae65296 +0, 26, 26, 1, 30720, 0x9e544ecd +0, 27, 27, 1, 30720, 0x35678e5a +0, 28, 28, 1, 30720, 0x04bae866 +0, 29, 29, 1, 30720, 0xb126ed94 +0, 30, 30, 1, 30720, 0x1720efc5 +0, 31, 31, 1, 30720, 0x4c1b01c2 +0, 32, 32, 1, 30720, 0xd0a1e866 +0, 33, 33, 1, 30720, 0x0d330789 +0, 34, 34, 1, 30720, 0xf5ac08bb +0, 35, 35, 1, 30720, 0x9abe0d83 +0, 36, 36, 1, 30720, 0xa44c02f4 +0, 37, 37, 1, 30720, 0xdc4cc688 +0, 38, 38, 1, 30720, 0x22eef3c1 +0, 39, 39, 1, 30720, 0xcfbc0d1d +0, 40, 40, 1, 30720, 0x7104ea31 +0, 41, 41, 1, 30720, 0x80daecfb +0, 42, 42, 1, 30720, 0xe1bab995 +0, 43, 43, 1, 30720, 0x43f4b896 +0, 44, 44, 1, 30720, 0xa0d2bf5c +0, 45, 45, 1, 30720, 0x3556a114 diff --git a/tests/ref/lavf/xwd b/tests/ref/lavf/xwd index 6ba88cd2fd..41846c76fd 100644 --- a/tests/ref/lavf/xwd +++ b/tests/ref/lavf/xwd @@ -1,3 +1,3 @@ -0ab6cd4fe5fe85a3f3e87508c2eadfa0 *./tests/data/images/xwd/02.xwd +50baa5560b7d1aa3188b19c1162bf7dc *./tests/data/images/xwd/02.xwd ./tests/data/images/xwd/%02d.xwd CRC=0x6da01946 304239 ./tests/data/images/xwd/02.xwd |