diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 11:56:15 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 11:56:29 +0100 |
commit | 6c8ac2d78230990f3a01be28d3ef68fb281d6609 (patch) | |
tree | 9844728ecb492e32ff03026b64501b42213c0559 /tests/fate/h264.mak | |
parent | 82f95d7fd7c0e99a59163e6d14c35cc11bb7f9d7 (diff) | |
parent | 1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5 (diff) | |
download | ffmpeg-streaming-6c8ac2d78230990f3a01be28d3ef68fb281d6609.zip ffmpeg-streaming-6c8ac2d78230990f3a01be28d3ef68fb281d6609.tar.gz |
Merge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5'
* commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5':
fate: add tests for h264 decoder reinit
h264: fix bit depth changes with frame threading
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/h264.mak')
-rw-r--r-- | tests/fate/h264.mak | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index ca87b7d..31ee5bf 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -182,7 +182,13 @@ FATE_H264 = aud_mw_e \ sva_nl1_b \ sva_nl2_e \ +FATE_H264_REINIT_TESTS := large_420_8-to-small_420_8 \ + small_420_8-to-large_444_10 \ + small_420_9-to-small_420_8 \ + small_422_9-to-small_420_9 \ + FATE_H264 := $(FATE_H264:%=fate-h264-conformance-%) \ + $(FATE_H264_REINIT_TESTS:%=fate-h264-reinit-%) \ fate-h264-extreme-plane-pred \ fate-h264-lossless \ @@ -381,3 +387,5 @@ fate-h264-bsf-mp4toannexb: CMD = md5 -i $(SAMPLES)/h264/i fate-h264-extreme-plane-pred: CMD = framemd5 -i $(SAMPLES)/h264/extreme-plane-pred.h264 fate-h264-interlace-crop: CMD = framecrc -i $(SAMPLES)/h264/interlaced_crop.mp4 -vframes 3 fate-h264-lossless: CMD = framecrc -i $(SAMPLES)/h264/lossless.h264 + +fate-h264-reinit-%: CMD = framecrc -i $(SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10,scale=352:288 |