aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-11-18 11:32:10 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-11-18 11:32:10 +0100
commit127cc6dd3d0b8ce8875aecacc5c2aaf45bf52243 (patch)
tree6a18af8f3a07ae53909e6b4fd2a613e079b18f04
parent5e78126bbdd58ae4dd97e2b604cbbec336f8bc32 (diff)
parent8d07e941b04d63fc4443dd986e3dc7b69cdcca43 (diff)
downloadffmpeg-127cc6dd3d0b8ce8875aecacc5c2aaf45bf52243.tar.gz
Merge commit '8d07e941b04d63fc4443dd986e3dc7b69cdcca43'
* commit '8d07e941b04d63fc4443dd986e3dc7b69cdcca43': FATE: add a test of H.264 SEI recovery in an intra refresh stream Our H264 decoder drops 3 frames from the beginning of the stream, but all frames after those match, hence the difference in the fate test. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r--tests/fate/h264.mak2
-rw-r--r--tests/ref/fate/h264-intra-refresh-recovery15
2 files changed, 17 insertions, 0 deletions
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index c366d869cd..718a3a862a 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -191,6 +191,7 @@ FATE_H264_REINIT_TESTS := large_420_8-to-small_420_8 \
FATE_H264 := $(FATE_H264:%=fate-h264-conformance-%) \
$(FATE_H264_REINIT_TESTS:%=fate-h264-reinit-%) \
fate-h264-extreme-plane-pred \
+ fate-h264-intra-refresh-recovery \
fate-h264-lossless \
fate-h264-3386 \
@@ -425,6 +426,7 @@ fate-h264-xavc-4389: CMD = framecrc -i $(TARGET_SAM
fate-h264-attachment-631: CMD = framecrc -i $(TARGET_SAMPLES)/h264/attachment631-small.mp4 -an -max_error_rate 0.95
fate-h264-skip-nokey: CMD = framecrc -skip_frame nokey -i $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts
fate-h264-skip-nointra: CMD = framecrc -skip_frame nointra -i $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts
+fate-h264-intra-refresh-recovery: CMD = framecrc -i $(TARGET_SAMPLES)/h264/intra_refresh.h264 -frames:v 10
fate-h264-invalid-ref-mod: CMD = framecrc -i $(TARGET_SAMPLES)/h264/h264refframeregression.mp4 -an -frames 10 -pix_fmt yuv420p10le
fate-h264-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/h264/lossless.h264
fate-h264-mixed-nal-coding: CMD = framecrc -i $(TARGET_SAMPLES)/h264/mixed-nal-coding.mp4
diff --git a/tests/ref/fate/h264-intra-refresh-recovery b/tests/ref/fate/h264-intra-refresh-recovery
new file mode 100644
index 0000000000..e85fe7bae8
--- /dev/null
+++ b/tests/ref/fate/h264-intra-refresh-recovery
@@ -0,0 +1,15 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0, 57, 57, 1, 115200, 0x4a17d50b
+0, 58, 58, 1, 115200, 0x1283d05b
+0, 59, 59, 1, 115200, 0x2747c650
+0, 60, 60, 1, 115200, 0xba23c933
+0, 61, 61, 1, 115200, 0x8a96c54b
+0, 62, 62, 1, 115200, 0x748ac6d3
+0, 63, 63, 1, 115200, 0x719ca491
+0, 64, 64, 1, 115200, 0x3d259d4d
+0, 65, 65, 1, 115200, 0xe3599aa8
+0, 66, 66, 1, 115200, 0x6fd4affe