aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-04-01 12:06:21 +0200
committerClément Bœsch <u@pkh.me>2017-04-01 12:07:50 +0200
commite83a1c5b7ce0d978d69e677bead6cdcf07ec7d38 (patch)
tree0dd791959d3a8f82cff2b7f99b089c05518e0b61
parent1ef8da77a5ab71fd6da07da816f38f2e639e5543 (diff)
parent481ff3cf018811ba3235f1c236e970f32a6300b9 (diff)
downloadffmpeg-e83a1c5b7ce0d978d69e677bead6cdcf07ec7d38.tar.gz
Merge commit '481ff3cf018811ba3235f1c236e970f32a6300b9'
* commit '481ff3cf018811ba3235f1c236e970f32a6300b9': fate: Add h264 and hevc extradata reload tests Only the HEVC part is merged, see 00c80798160f930ce680f98f869c23d91a261f06 Merged-by: Clément Bœsch <u@pkh.me>
-rw-r--r--tests/fate/hevc.mak5
-rw-r--r--tests/ref/fate/hevc-extradata-reload13
2 files changed, 18 insertions, 0 deletions
diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index bb68328165..d1611c1dbd 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -238,6 +238,11 @@ fate-hevc-bsf-mp4toannexb: REF = 1873662a3af1848c37e4eb25722c8df9
FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += $(FATE_HEVC)
+# this sample has two stsd entries and needs to reload extradata
+FATE_HEVC-$(call DEMDEC, MOV, HEVC) += fate-hevc-extradata-reload
+
+fate-hevc-extradata-reload: CMD = framemd5 -i $(TARGET_SAMPLES)/hevc/extradata-reload-multi-stsd.mov
+
FATE_SAMPLES_AVCONV += $(FATE_HEVC-yes)
fate-hevc: $(FATE_HEVC-yes)
diff --git a/tests/ref/fate/hevc-extradata-reload b/tests/ref/fate/hevc-extradata-reload
new file mode 100644
index 0000000000..e04d6dcb04
--- /dev/null
+++ b/tests/ref/fate/hevc-extradata-reload
@@ -0,0 +1,13 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+#stream#, dts, pts, duration, size, hash
+0, 0, 0, 1, 24576, 0d01217c5d1ec6799643fc7d75ba2337
+0, 1, 1, 1, 24576, f73d9cca9b4c1765d0ead242c3f0c339
+0, 2, 2, 1, 24576, aea8b931d694e38ffa54ea4c88e04491
+0, 3, 3, 1, 24576, 9d8f6a78c1bae37eabcab29295fd02a8