[FFmpeg-cvslog] Merge commit '18019f8cb9663dd1032c65aa453eaec18d641905'
Derek Buitenhuis
git at videolan.org
Wed May 11 20:39:27 CEST 2016
ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed May 11 19:28:12 2016 +0100| [bc3d2f25783a4f61b7018800a12182dc46ff8325] | committer: Derek Buitenhuis
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 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc3d2f25783a4f61b7018800a12182dc46ff8325
---
tests/fate/h264.mak | 10 ++++++++++
tests/ref/fate/h264-invalid-ref-mod | 15 +++++++++++++++
tests/ref/fate/h264-unescaped-extradata | 15 +++++++++++++++
3 files changed, 40 insertions(+)
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index 7f3fe69..c1bb69b 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 0000000..09271fe
--- /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 0000000..5e44bc2
--- /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
======================================================================
diff --cc tests/fate/h264.mak
index 7f3fe69,516aeef..c1bb69b
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@@ -196,20 -185,22 +196,28 @@@ FATE_H264 := $(FATE_H264:%=fate-h264-c
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
+FATE_H264_FFPROBE-$(call DEMDEC, MATROSKA, H264) += fate-h264-dts_5frames
FATE_SAMPLES_AVCONV += $(FATE_H264-yes)
-fate-h264: $(FATE_H264-yes)
+FATE_SAMPLES_FFPROBE += $(FATE_H264_FFPROBE-yes)
+fate-h264: $(FATE_H264-yes) $(FATE_H264_FFPROBE-yes)
+
+fate-h264-conformance-aud_mw_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264
+
+#force framerate so that the option is tested, theres no other case that tests it, its not needed at all otherwise here
+fate-h264-conformance-ba1_ft_c: CMD = framecrc -framerate 19 -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264
-fate-h264-conformance-aud_mw_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264
-fate-h264-conformance-ba1_ft_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264
fate-h264-conformance-ba1_sony_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv
fate-h264-conformance-ba2_sony_f: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA2_Sony_F.jsv
fate-h264-conformance-ba3_sva_c: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA3_SVA_C.264
@@@ -399,8 -379,7 +407,10 @@@ fate-h264-extreme-plane-pred
fate-h264-interlace-crop: CMD = framecrc -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vframes 3
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
+
+fate-h264-dts_5frames: CMD = probeframes $(TARGET_SAMPLES)/h264/dts_5frames.mkv
diff --cc tests/ref/fate/h264-invalid-ref-mod
index 0000000,75bd229..09271fe
mode 000000,100644..100644
--- a/tests/ref/fate/h264-invalid-ref-mod
+++ b/tests/ref/fate/h264-invalid-ref-mod
@@@ -1,0 -1,11 +1,15 @@@
-#tb 0: 1/24000
-0, 519, 519, 0, 6220800, 0x89daa15e
-0, 1520, 1520, 0, 6220800, 0xcf52e254
-0, 2521, 2521, 0, 6220800, 0x91132c13
-0, 3522, 3522, 0, 6220800, 0x37b8be91
-0, 4523, 4523, 0, 6220800, 0x2b09bafa
-0, 5524, 5524, 0, 6220800, 0x06d79d8d
-0, 6525, 6525, 0, 6220800, 0x8e793c1d
-0, 7526, 7526, 0, 6220800, 0xea0fd885
-0, 8527, 8527, 0, 6220800, 0x7786a2ad
-0, 9528, 9528, 0, 6220800, 0xed4f9dd9
++#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 --cc tests/ref/fate/h264-unescaped-extradata
index 0000000,a131b6c..5e44bc2
mode 000000,100644..100644
--- a/tests/ref/fate/h264-unescaped-extradata
+++ b/tests/ref/fate/h264-unescaped-extradata
@@@ -1,0 -1,11 +1,15 @@@
-#tb 0: 1/44100
-0, 0, 0, 0, 84480, 0x0699eb38
-0, 1764, 1764, 0, 84480, 0xce902c32
-0, 3528, 3528, 0, 84480, 0xb6d125f7
-0, 5292, 5292, 0, 84480, 0x2555e93b
-0, 7056, 7056, 0, 84480, 0xaea5c08c
-0, 8820, 8820, 0, 84480, 0x848eb3da
-0, 10584, 10584, 0, 84480, 0x6cfabe90
-0, 12348, 12348, 0, 84480, 0xed16cc5e
-0, 14112, 14112, 0, 84480, 0xda8df8f8
-0, 15876, 15876, 0, 84480, 0x83fa054b
++#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
More information about the ffmpeg-cvslog
mailing list