diff options
| author | Clément Bœsch <u@pkh.me> | 2017-01-17 15:26:38 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-01-24 16:13:03 +0100 |
| commit | 744801989099df26e90b00062c645969c5347533 (patch) | |
| tree | 776f86b3709a4355e967712065866fb89297be19 /tests | |
| parent | 1033f56b074d0aaf95fe2a0c356cd63cbb7f31aa (diff) | |
| parent | 38efff92f1ef81f3de20ff0460ec7b70c253d714 (diff) | |
| download | ffmpeg-streaming-744801989099df26e90b00062c645969c5347533.zip ffmpeg-streaming-744801989099df26e90b00062c645969c5347533.tar.gz | |
Merge commit '38efff92f1ef81f3de20ff0460ec7b70c253d714'
* commit '38efff92f1ef81f3de20ff0460ec7b70c253d714':
FATE: add a test for H.264 with two fields per packet
h264: fix decoding multiple fields per packet with slice threads
This merge includes two commits because the FATE test was useful in
order to make proper testing.
The merge gets rid of the now unused:
- SLICE_SINGLETHREAD and SLICE_SKIPED macros
- max_contexts
- "again" label in decode_nal_units()
This commit also includes the fix from d3e4d406b.
Thanks to wm4 and Michael Niedermayer for their testing.
Merged-by: Clément Bœsch <u@pkh.me>
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/h264.mak | 4 | ||||
| -rw-r--r-- | tests/ref/fate/h264-twofields-packet | 35 |
2 files changed, 39 insertions, 0 deletions
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 1f6e5f3..52b6a98 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -215,6 +215,9 @@ FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-mixed-nal-coding # this sample has invalid extradata that is not escaped FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-unescaped-extradata +# this sample contains field-coded frames, with both fields in a single packet +FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-twofields-packet + FATE_H264-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF H264_MUXER) += fate-h264-bsf-mp4toannexb FATE_H264-$(call DEMDEC, MATROSKA, H264) += fate-h264-direct-bff FATE_H264-$(call DEMDEC, FLV, H264) += fate-h264-brokensps-2580 @@ -431,6 +434,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-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 diff --git a/tests/ref/fate/h264-twofields-packet b/tests/ref/fate/h264-twofields-packet new file mode 100644 index 0000000..4cff0a1 --- /dev/null +++ b/tests/ref/fate/h264-twofields-packet @@ -0,0 +1,35 @@ +#tb 0: 1001/30000 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1920x1080 +#sar 0: 1/1 +0, 0, 0, 1, 3110400, 0x40d65f69 +0, 1, 1, 1, 3110400, 0xdcbc50bf +0, 2, 2, 1, 3110400, 0x73a2276a +0, 3, 3, 1, 3110400, 0x84a2b3c6 +0, 4, 4, 1, 3110400, 0x7cf3b570 +0, 5, 5, 1, 3110400, 0xa2d1e03a +0, 6, 6, 1, 3110400, 0x03220fb1 +0, 7, 7, 1, 3110400, 0x89cd526a +0, 8, 8, 1, 3110400, 0xbb4b7531 +0, 9, 9, 1, 3110400, 0x0a69f053 +0, 10, 10, 1, 3110400, 0x0187994b +0, 11, 11, 1, 3110400, 0x26ed49fa +0, 12, 12, 1, 3110400, 0xbe8966d4 +0, 13, 13, 1, 3110400, 0x248d203c +0, 14, 14, 1, 3110400, 0x3139c754 +0, 15, 15, 1, 3110400, 0xf22380c4 +0, 16, 16, 1, 3110400, 0x3e00dcc1 +0, 17, 17, 1, 3110400, 0x8cbe2483 +0, 18, 18, 1, 3110400, 0x6951cd63 +0, 19, 19, 1, 3110400, 0x36aca4c5 +0, 20, 20, 1, 3110400, 0x4d4f6fbe +0, 21, 21, 1, 3110400, 0x997247aa +0, 22, 22, 1, 3110400, 0x0fd40e06 +0, 23, 23, 1, 3110400, 0xa10d2d67 +0, 24, 24, 1, 3110400, 0x87c481da +0, 25, 25, 1, 3110400, 0xe3dca3cd +0, 26, 26, 1, 3110400, 0x5f77b078 +0, 27, 27, 1, 3110400, 0xf1ddd098 +0, 28, 28, 1, 3110400, 0xedcd1754 +0, 29, 29, 1, 3110400, 0x14ac7153 |
