diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:33:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:47:32 +0200 |
| commit | 55219a78c7d04d1937384366ba911c5d75c5c1e4 (patch) | |
| tree | 85efaa581ea0a51328bb8dda18727b84021b4c80 /tests | |
| parent | 4df3cf90bf7a54793e90304bd1b6c7599673f36a (diff) | |
| parent | 7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7 (diff) | |
| download | ffmpeg-55219a78c7d04d1937384366ba911c5d75c5c1e4.tar.gz | |
Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
Hap decoder and encoder
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/video.mak | 12 | ||||
| -rw-r--r-- | tests/ref/fate/hap1 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/hap5 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/hapy | 2 |
4 files changed, 18 insertions, 0 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 314f16889a..aecb0e5a03 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -168,6 +168,18 @@ fate-id-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/idcin/idlog-2MB.cin -pix_ FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -r 30 -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2 +FATE_HAP += fate-hap1 +fate-hap1: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hap1.mov + +FATE_HAP += fate-hap5 +fate-hap5: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hap5.mov + +FATE_HAP += fate-hapy +fate-hapy: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hapy.mov + +FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, HAP) += $(FATE_HAP) +fate-hap: $(FATE_HAP) + FATE_IFF-$(CONFIG_IFF_BYTERUN1_DECODER) += fate-iff-byterun1 fate-iff-byterun1: CMD = framecrc -i $(TARGET_SAMPLES)/iff/ASH.LBM -pix_fmt rgb24 diff --git a/tests/ref/fate/hap1 b/tests/ref/fate/hap1 new file mode 100644 index 0000000000..d3bdeae9fe --- /dev/null +++ b/tests/ref/fate/hap1 @@ -0,0 +1,2 @@ +#tb 0: 62/2997 +0, 0, 0, 1, 1228800, 0x0fa946bc diff --git a/tests/ref/fate/hap5 b/tests/ref/fate/hap5 new file mode 100644 index 0000000000..458981e4d8 --- /dev/null +++ b/tests/ref/fate/hap5 @@ -0,0 +1,2 @@ +#tb 0: 1/30 +0, 0, 0, 1, 1228800, 0xb71ecf93 diff --git a/tests/ref/fate/hapy b/tests/ref/fate/hapy new file mode 100644 index 0000000000..e7d7608395 --- /dev/null +++ b/tests/ref/fate/hapy @@ -0,0 +1,2 @@ +#tb 0: 62/2997 +0, 0, 0, 1, 1228800, 0x5993522d |