This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 5b614efc7e6134274fa5d05e240736be2dc203cc Author: James Almer <[email protected]> AuthorDate: Tue Sep 8 22:10:18 2026 -0300 Commit: James Almer <[email protected]> CommitDate: Thu Sep 10 22:38:20 2026 -0300 tests/fate/mov: add more CENC tests This covers h264 and hevc for both Annex B and ISOBMFF input codepaths. Signed-off-by: James Almer <[email protected]> --- tests/fate/mov.mak | 12 ++++++++++-- tests/ref/fate/mov-h264-cenc | 25 +++++++++++++++++++++++++ tests/ref/fate/mov-h264_iso-cenc | 13 +++++++++++++ tests/ref/fate/mov-hevc-cenc | 9 +++++++++ tests/ref/fate/mov-hevc_iso-cenc | 10 ++++++++++ 5 files changed, 67 insertions(+), 2 deletions(-) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index ffe555bf74..48a423713e 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -208,10 +208,18 @@ fate-mov-mp4-fragmented-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/Sub "-f lavfi -i smptehdbars=duration=24.5245:size=320x180:rate=24000/1001,format=yuv420p" \ "" "" "data" -FATE_MOV_FFMPEG_SAMPLES-$(call REMUX, MP4 IVF, MOV_DEMUXER AV1_PARSER EXTRACT_EXTRADATA_BSF) += fate-mov-av1-cenc -fate-mov-av1-cenc: CMD = transcode ivf $(TARGET_SAMPLES)/av1/non_uniform_tiling.ivf mp4 \ +define FATE_MOV_CENC_TEST +FATE_MOV_FFMPEG_SAMPLES-$(call REMUX, MP4 $(4), MOV_DEMUXER $(2)_PARSER EXTRACT_EXTRADATA_BSF) += fate-mov-$(1)-cenc +fate-mov-$(1)-cenc: CMD = transcode $(3) $(TARGET_SAMPLES)/$(5) mp4 \ "-c:v copy -encryption_scheme cenc-aes-ctr -encryption_key 00112233445566778899aabbccddeeff -encryption_kid 00112233445566778899aabbccddeeff" \ "-c:v copy" "" "" "-decryption_key 00112233445566778899aabbccddeeff" +endef + +$(eval $(call FATE_MOV_CENC_TEST,av1,AV1,ivf,IVF,av1/non_uniform_tiling.ivf)) +$(eval $(call FATE_MOV_CENC_TEST,h264,H264,h264,H264,h264-conformance/CAMACI3_Sony_C.jsv)) +$(eval $(call FATE_MOV_CENC_TEST,h264_iso,H264,matroska,MATROSKA,h264/dts_5frames.mkv)) +$(eval $(call FATE_MOV_CENC_TEST,hevc,HEVC,hevc,HEVC,hevc-conformance/ipcm_A_NEC_3.bit)) +$(eval $(call FATE_MOV_CENC_TEST,hevc_iso,HEVC,mov,MOV,hevc/extradata-reload-multi-stsd.mov)) # avif demuxing - still image with 1 item. FATE_MOV_FFMPEG_SAMPLES-$(call FRAMECRC, MOV, AV1, AV1_PARSER) \ diff --git a/tests/ref/fate/mov-h264-cenc b/tests/ref/fate/mov-h264-cenc new file mode 100644 index 0000000000..75c15e7238 --- /dev/null +++ b/tests/ref/fate/mov-h264-cenc @@ -0,0 +1,25 @@ +59561bc01461cbcb947281c091cac9ee *tests/data/fate/mov-h264-cenc.mp4 +72996 tests/data/fate/mov-h264-cenc.mp4 +#extradata 0: 25, 0x5c9d073a +#tb 0: 1/1200000 +#media_type 0: video +#codec_id 0: h264 +#dimensions 0: 192x128 +#sar 0: 0/1 +0, -96000, -96000, 48000, 5183, 0x9bc6204f, F=0x5 +0, -48000, -48000, 48000, 4528, 0x9e28ce6e, F=0x4 +0, 0, 0, 48000, 4660, 0x1ff41c2a, F=0x0 +0, 48000, 48000, 48000, 3740, 0x8cec5062, F=0x0 +0, 96000, 96000, 48000, 3492, 0x8471c705, F=0x0 +0, 144000, 144000, 48000, 4793, 0xab1b7855, F=0x0 +0, 192000, 192000, 48000, 3351, 0xad2783f0, F=0x0 +0, 240000, 240000, 48000, 3396, 0xe0908da6, F=0x0 +0, 288000, 288000, 48000, 4846, 0x03a36085, F=0x0 +0, 336000, 336000, 48000, 3870, 0xdd6fa409, F=0x0 +0, 384000, 384000, 48000, 4022, 0x2a85ee8e, F=0x0 +0, 432000, 432000, 48000, 5641, 0x60cfe0ca, F=0x0 +0, 480000, 480000, 48000, 4221, 0x97733c38, F=0x0 +0, 528000, 528000, 48000, 4068, 0xfc65fe01, F=0x0 +0, 576000, 576000, 48000, 3971, 0x1b7aa573, F=0x0 +0, 624000, 624000, 48000, 3964, 0x4abab2ed, F=0x0 +0, 672000, 672000, 48000, 3867, 0xf12f9612, F=0x0 diff --git a/tests/ref/fate/mov-h264_iso-cenc b/tests/ref/fate/mov-h264_iso-cenc new file mode 100644 index 0000000000..96a6e9a723 --- /dev/null +++ b/tests/ref/fate/mov-h264_iso-cenc @@ -0,0 +1,13 @@ +03e458edc426f90f52b560e175ad32d2 *tests/data/fate/mov-h264_iso-cenc.mp4 +15542 tests/data/fate/mov-h264_iso-cenc.mp4 +#extradata 0: 40, 0xcd870951 +#tb 0: 1/16000 +#media_type 0: video +#codec_id 0: h264 +#dimensions 0: 512x256 +#sar 0: 1/1 +0, 0, 0, 2672, 14428, 0x1c626b86 +0, 2672, 2672, 2656, 11, 0x08f901f1, F=0x0 +0, 5328, 5328, 2672, 11, 0x09990211, F=0x0 +0, 8000, 8000, 2672, 11, 0x0a390231, F=0x0 +0, 10672, 10672, 2672, 11, 0x0ad90251, F=0x0 diff --git a/tests/ref/fate/mov-hevc-cenc b/tests/ref/fate/mov-hevc-cenc new file mode 100644 index 0000000000..c823b24ed5 --- /dev/null +++ b/tests/ref/fate/mov-hevc-cenc @@ -0,0 +1,9 @@ +67d984d1166e68b085e85dabac1d69fb *tests/data/fate/mov-hevc-cenc.mp4 +6166 tests/data/fate/mov-hevc-cenc.mp4 +#extradata 0: 101, 0x8d351483 +#tb 0: 1/1200000 +#media_type 0: video +#codec_id 0: hevc +#dimensions 0: 416x240 +#sar 0: 0/1 +0, 0, 0, 48000, 5155, 0x18ffdb5c diff --git a/tests/ref/fate/mov-hevc_iso-cenc b/tests/ref/fate/mov-hevc_iso-cenc new file mode 100644 index 0000000000..2a1a3dcc19 --- /dev/null +++ b/tests/ref/fate/mov-hevc_iso-cenc @@ -0,0 +1,10 @@ +3b47c19a63210cf0bc2be5bf51fa36ad *tests/data/fate/mov-hevc_iso-cenc.mp4 +5548 tests/data/fate/mov-hevc_iso-cenc.mp4 +#extradata 0: 110, 0xb3a41478 +#tb 0: 1/12800 +#media_type 0: video +#codec_id 0: hevc +#dimensions 0: 128x128 +#sar 0: 1/1 +0, 0, 0, 512, 2108, 0x57c38f64 +0, 512, 512, 512, 31, 0xabe10d25, F=0x0 -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
