diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-11 19:28:12 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-11 19:39:09 +0100 |
| commit | bc3d2f25783a4f61b7018800a12182dc46ff8325 (patch) | |
| tree | 206e110eca1f55411efd66f4886b936cba45b473 | |
| parent | 75a1fc0376cc89410ff4379e03d94c03fe68a5b8 (diff) | |
| parent | 18019f8cb9663dd1032c65aa453eaec18d641905 (diff) | |
| download | ffmpeg-bc3d2f25783a4f61b7018800a12182dc46ff8325.tar.gz | |
Merge commit '18019f8cb9663dd1032c65aa453eaec18d641905'
* commit '18019f8cb9663dd1032c65aa453eaec18d641905':
FATE: add an H.264 test with unescaped extradata
FATE: add an H.264 test with invalid reference lists
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | tests/fate/h264.mak | 10 | ||||
| -rw-r--r-- | tests/ref/fate/h264-invalid-ref-mod | 15 | ||||
| -rw-r--r-- | tests/ref/fate/h264-unescaped-extradata | 15 |
3 files changed, 40 insertions, 0 deletions
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 7f3fe69946..c1bb69ba26 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -196,6 +196,14 @@ FATE_H264 := $(FATE_H264:%=fate-h264-conformance-%) \ FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264) FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-crop-to-container FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-interlace-crop + +# this sample has invalid reference list modification, but decodes fine +# by using a previous ref frame instead of a missing one +FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-invalid-ref-mod + +# this sample has invalid extradata that is not escaped +FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-unescaped-extradata + FATE_H264-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb FATE_H264-$(call DEMDEC, MATROSKA, H264) += fate-h264-direct-bff FATE_H264-$(call DEMDEC, FLV, H264) += fate-h264-brokensps-2580 @@ -400,6 +408,8 @@ fate-h264-interlace-crop: CMD = framecrc -i $(TARGET_SAM fate-h264-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/h264/lossless.h264 fate-h264-direct-bff: CMD = framecrc -i $(TARGET_SAMPLES)/h264/direct-bff.mkv fate-h264-brokensps-2580: CMD = framecrc -i $(TARGET_SAMPLES)/h264/brokensps.flv -vf format=yuv420p,scale=w=192:h=144 -sws_flags bitexact+bilinear +fate-h264-invalid-ref-mod: CMD = framecrc -i $(TARGET_SAMPLES)/h264/h264refframeregression.mp4 -an -frames 10 -pix_fmt yuv420p10le +fate-h264-unescaped-extradata: CMD = framecrc -i $(TARGET_SAMPLES)/h264/unescaped_extradata.mp4 -an -frames 10 fate-h264-reinit-%: CMD = framecrc -i $(TARGET_SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10le,scale=w=352:h=288 diff --git a/tests/ref/fate/h264-invalid-ref-mod b/tests/ref/fate/h264-invalid-ref-mod new file mode 100644 index 0000000000..09271fe134 --- /dev/null +++ b/tests/ref/fate/h264-invalid-ref-mod @@ -0,0 +1,15 @@ +#tb 0: 1001/24000 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1920x1080 +#sar 0: 1/1 +0, 1, 1, 1, 6220800, 0x89daa15e +0, 2, 2, 1, 6220800, 0xcf52e254 +0, 3, 3, 1, 6220800, 0x91132c13 +0, 4, 4, 1, 6220800, 0x37b8be91 +0, 5, 5, 1, 6220800, 0x2b09bafa +0, 6, 6, 1, 6220800, 0x06d79d8d +0, 7, 7, 1, 6220800, 0x8e793c1d +0, 8, 8, 1, 6220800, 0xea0fd885 +0, 9, 9, 1, 6220800, 0x7786a2ad +0, 10, 10, 1, 6220800, 0xed4f9dd9 diff --git a/tests/ref/fate/h264-unescaped-extradata b/tests/ref/fate/h264-unescaped-extradata new file mode 100644 index 0000000000..5e44bc255d --- /dev/null +++ b/tests/ref/fate/h264-unescaped-extradata @@ -0,0 +1,15 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x176 +#sar 0: 0/1 +0, 0, 0, 1, 84480, 0x0699eb38 +0, 1, 1, 1, 84480, 0xce902c32 +0, 2, 2, 1, 84480, 0xb6d125f7 +0, 3, 3, 1, 84480, 0x2555e93b +0, 4, 4, 1, 84480, 0xaea5c08c +0, 5, 5, 1, 84480, 0x848eb3da +0, 6, 6, 1, 84480, 0x6cfabe90 +0, 7, 7, 1, 84480, 0xed16cc5e +0, 8, 8, 1, 84480, 0xda8df8f8 +0, 9, 9, 1, 84480, 0x83fa054b |