[FFmpeg-cvslog] Merge commit '481ff3cf018811ba3235f1c236e970f32a6300b9'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  1 12:06:21 2017 +0200| [e83a1c5b7ce0d978d69e677bead6cdcf07ec7d38] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e83a1c5b7ce0d978d69e677bead6cdcf07ec7d38
---

 tests/fate/hevc.mak                  |  5 +++++
 tests/ref/fate/hevc-extradata-reload | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index bb68328..d1611c1 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 0000000..e04d6dc
--- /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


======================================================================

diff --cc tests/fate/hevc.mak
index bb68328,5446969..d1611c1
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@@ -217,27 -154,17 +217,32 @@@ ende
  
  $(foreach N,$(HEVC_SAMPLES),$(eval $(call FATE_HEVC_TEST,$(N))))
  $(foreach N,$(HEVC_SAMPLES_10BIT),$(eval $(call FATE_HEVC_TEST_10BIT,$(N))))
 +$(foreach N,$(HEVC_SAMPLES_422_10BIT),$(eval $(call FATE_HEVC_TEST_422_10BIT,$(N))))
 +$(foreach N,$(HEVC_SAMPLES_422_10BIN),$(eval $(call FATE_HEVC_TEST_422_10BIN,$(N))))
 +$(foreach N,$(HEVC_SAMPLES_444_8BIT),$(eval $(call FATE_HEVC_TEST_444_8BIT,$(N))))
 +$(foreach N,$(HEVC_SAMPLES_444_12BIT),$(eval $(call FATE_HEVC_TEST_444_12BIT,$(N))))
  
 -fate-hevc-paramchange-yuv420p-yuv420p10: CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc/paramchange_yuv420p_yuv420p10.hevc
 +fate-hevc-paramchange-yuv420p-yuv420p10: CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc/paramchange_yuv420p_yuv420p10.hevc -sws_flags area+accurate_rnd+bitexact
  FATE_HEVC += fate-hevc-paramchange-yuv420p-yuv420p10
  
 +tests/data/hevc-mp4.mov: TAG = GEN
 +tests/data/hevc-mp4.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
 +	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
 +	-i $(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit -c copy -flags +bitexact $(TARGET_PATH)/$@ -y 2>/dev/null
 +
 +FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_MP4TOANNEXB_BSF MOV_MUXER HEVC_MUXER) += fate-hevc-bsf-mp4toannexb
 +fate-hevc-bsf-mp4toannexb: tests/data/hevc-mp4.mov
 +fate-hevc-bsf-mp4toannexb: CMD = md5 -i $(TARGET_PATH)/tests/data/hevc-mp4.mov -vcodec copy -fflags +bitexact -f hevc
 +fate-hevc-bsf-mp4toannexb: CMP = oneline
 +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 --cc tests/ref/fate/hevc-extradata-reload
index 0000000,9fcab71..e04d6dc
mode 000000,100644..100644
--- a/tests/ref/fate/hevc-extradata-reload
+++ b/tests/ref/fate/hevc-extradata-reload
@@@ -1,0 -1,5 +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, 39a8714d763c623ae7f6faae34e107d1
 -0,          3,          3,        1,    24576, 5db2600aa268b4fd28b64ab28a096f32
++0,          2,          2,        1,    24576, aea8b931d694e38ffa54ea4c88e04491
++0,          3,          3,        1,    24576, 9d8f6a78c1bae37eabcab29295fd02a8