[FFmpeg-cvslog] Merge commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d'

James Almer git at videolan.org
Sun Nov 12 01:05:15 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 18:09:11 2017 -0300| [b125822d1d07e305c0012ef67b8be0cb9261ee9f] | committer: James Almer

Merge commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d'

* commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d':
  FATE: add a test for the H.264 sample fixed by 7c4f6f6

Merged-by: James Almer <jamrial at gmail.com>

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

 tests/fate/h264.mak                      |  2 ++
 tests/ref/fate/h264-ref-pic-mod-overflow | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index 043e1f2d19..1839b9b44e 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -195,6 +195,7 @@ FATE_H264  := $(FATE_H264:%=fate-h264-conformance-%)                    \
               fate-h264-lossless                                        \
               fate-h264-3386                                            \
               fate-h264-missing-frame                                   \
+              fate-h264-ref-pic-mod-overflow                            \
 
 FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264)
 FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-crop-to-container
@@ -434,6 +435,7 @@ fate-h264-intra-refresh-recovery:                 CMD = framecrc -i $(TARGET_SAM
 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
+fate-h264-ref-pic-mod-overflow:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/ref-pic-mod-overflow.h264
 fate-h264-twofields-packet:                       CMD = framecrc -i $(TARGET_SAMPLES)/h264/twofields_packet.mp4 -an -frames 30
 fate-h264-unescaped-extradata:                    CMD = framecrc -i $(TARGET_SAMPLES)/h264/unescaped_extradata.mp4 -an -frames 10
 fate-h264-3386:                                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/bbc2.sample.h264
diff --git a/tests/ref/fate/h264-ref-pic-mod-overflow b/tests/ref/fate/h264-ref-pic-mod-overflow
new file mode 100644
index 0000000000..d4386c0264
--- /dev/null
+++ b/tests/ref/fate/h264-ref-pic-mod-overflow
@@ -0,0 +1,25 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+0,          0,          0,        1,  3110400, 0x5cd0bee9
+0,          1,          1,        1,  3110400, 0x19d0155c
+0,          2,          2,        1,  3110400, 0x3519be4b
+0,          3,          3,        1,  3110400, 0x87dc6708
+0,          4,          4,        1,  3110400, 0xef3c1056
+0,          5,          5,        1,  3110400, 0x5064aad2
+0,          6,          6,        1,  3110400, 0xbfb35057
+0,          7,          7,        1,  3110400, 0x6089eb95
+0,          8,          8,        1,  3110400, 0x85de8dea
+0,          9,          9,        1,  3110400, 0x216b1e5a
+0,         10,         10,        1,  3110400, 0xba73bdc4
+0,         11,         11,        1,  3110400, 0x536e437a
+0,         12,         12,        1,  3110400, 0x4be0cdbd
+0,         13,         13,        1,  3110400, 0x7316462d
+0,         14,         14,        1,  3110400, 0x80eb8622
+0,         15,         15,        1,  3110400, 0xa612a70b
+0,         16,         16,        1,  3110400, 0x9ff65345
+0,         17,         17,        1,  3110400, 0x57003dfa
+0,         18,         18,        1,  3110400, 0xf29e036e
+0,         19,         19,        1,  3110400, 0x70285363


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

diff --cc tests/fate/h264.mak
index 043e1f2d19,7676fb8e27..1839b9b44e
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@@ -193,8 -182,8 +193,9 @@@ FATE_H264  := $(FATE_H264:%=fate-h264-c
                fate-h264-extreme-plane-pred                              \
                fate-h264-intra-refresh-recovery                          \
                fate-h264-lossless                                        \
 +              fate-h264-3386                                            \
                fate-h264-missing-frame                                   \
+               fate-h264-ref-pic-mod-overflow                            \
  
  FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264)
  FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-crop-to-container
@@@ -434,9 -397,9 +435,10 @@@ fate-h264-intra-refresh-recovery
  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
+ fate-h264-ref-pic-mod-overflow:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/ref-pic-mod-overflow.h264
  fate-h264-twofields-packet:                       CMD = framecrc -i $(TARGET_SAMPLES)/h264/twofields_packet.mp4 -an -frames 30
  fate-h264-unescaped-extradata:                    CMD = framecrc -i $(TARGET_SAMPLES)/h264/unescaped_extradata.mp4 -an -frames 10
 +fate-h264-3386:                                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/bbc2.sample.h264
  fate-h264-missing-frame:                          CMD = framecrc -i $(TARGET_SAMPLES)/h264/nondeterministic_cut.h264
  
  fate-h264-reinit-%:                               CMD = framecrc -i $(TARGET_SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10le,scale=w=352:h=288
diff --cc tests/ref/fate/h264-ref-pic-mod-overflow
index 0000000000,b84ef5a900..d4386c0264
mode 000000,100644..100644
--- a/tests/ref/fate/h264-ref-pic-mod-overflow
+++ b/tests/ref/fate/h264-ref-pic-mod-overflow
@@@ -1,0 -1,21 +1,25 @@@
+ #tb 0: 1/25
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 1920x1080
++#sar 0: 1/1
+ 0,          0,          0,        1,  3110400, 0x5cd0bee9
+ 0,          1,          1,        1,  3110400, 0x19d0155c
+ 0,          2,          2,        1,  3110400, 0x3519be4b
+ 0,          3,          3,        1,  3110400, 0x87dc6708
+ 0,          4,          4,        1,  3110400, 0xef3c1056
+ 0,          5,          5,        1,  3110400, 0x5064aad2
+ 0,          6,          6,        1,  3110400, 0xbfb35057
+ 0,          7,          7,        1,  3110400, 0x6089eb95
+ 0,          8,          8,        1,  3110400, 0x85de8dea
+ 0,          9,          9,        1,  3110400, 0x216b1e5a
+ 0,         10,         10,        1,  3110400, 0xba73bdc4
+ 0,         11,         11,        1,  3110400, 0x536e437a
+ 0,         12,         12,        1,  3110400, 0x4be0cdbd
+ 0,         13,         13,        1,  3110400, 0x7316462d
+ 0,         14,         14,        1,  3110400, 0x80eb8622
+ 0,         15,         15,        1,  3110400, 0xa612a70b
+ 0,         16,         16,        1,  3110400, 0x9ff65345
+ 0,         17,         17,        1,  3110400, 0x57003dfa
+ 0,         18,         18,        1,  3110400, 0xf29e036e
+ 0,         19,         19,        1,  3110400, 0x70285363



More information about the ffmpeg-cvslog mailing list