[FFmpeg-devel,7/8] fate/mov: print stream group information for avif/heic tests

Message ID	20240303180929.56930-7-jamrial@gmail.com
State	Accepted
Commit	1f73b52850b5224a2503e8d5c96100a310585621
Headers	show Delivered-To: ffmpegpatchwork2@gmail.com Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; From: James Almer <jamrial@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 15:09:25 -0300 Message-ID: <20240303180929.56930-7-jamrial@gmail.com> In-Reply-To: <20240303180929.56930-1-jamrial@gmail.com> References: <20240303180929.56930-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8] fate/mov: print stream group information for avif/heic tests Precedence: list Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Series	[FFmpeg-devel,1/8,v2] fftools/ffprobe: add support for Stream Groups \| expand [FFmpeg-devel,1/8,v2] fftools/ffprobe: add support for Stream Groups [FFmpeg-devel,2/8] fftools/ffprobe: print some basic Tile Grid Stream Group parameters [FFmpeg-devel,3/8] fate/iamf: print stream group information [FFmpeg-devel,4/8] avformat/mov: fix setting disposition for the first iamf stream [FFmpeg-devel,5/8] fate/mov: print stream group information for iamf tests [FFmpeg-devel,6/8] avformat/mov: don't mark an item referenced by a grid as dependent if it's the p… [FFmpeg-devel,7/8] fate/mov: print stream group information for avif/heic tests [FFmpeg-devel,8/8] fate/mov: use framecrc for the remaining avif/heic tests

Context	Check	Description
yinshiyou/make_loongarch64	success	Make finished
yinshiyou/make_fate_loongarch64	success	Make fate finished
andriy/make_x86	success	Make finished
andriy/make_fate_x86	success	Make fate finished

diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 7a7344e645..2de560354f 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -272,6 +272,19 @@ transcode(){ run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return } +stream_demux(){ + src_fmt=$1 + srcfile=$2 + src_opts=$3 + enc_opts=$4 + ffprobe_opts=$5 + tsrcfile=$(target_path $srcfile) + ffmpeg $DEC_OPTS -f $src_fmt $src_opts -i $tsrcfile $ENC_OPTS $FLAGS $enc_opts \ + -f framecrc - || return + test -z "$ffprobe_opts" || \ + run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tsrcfile || return +} + stream_remux(){ src_fmt=$1 srcfile=$2 diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index de0e654532..9d0bdd0078 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -161,13 +161,17 @@ FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ += fate-mov-heic-demux-still-image-multiple-items fate-mov-heic-demux-still-image-multiple-items: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C003.heic -c:v copy -map 0 -FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ +# heic demuxing - still image with multiple items in a grid. +FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call DEMMUX, MOV, FRAMECRC, HEVC_DECODER HEVC_PARSER) \ += fate-mov-heic-demux-still-image-grid -fate-mov-heic-demux-still-image-grid: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C007.heic -c:v copy -map 0:g:0 +fate-mov-heic-demux-still-image-grid: CMD = stream_demux mov $(TARGET_SAMPLES)/heif-conformance/C007.heic "" "-c:v copy -map 0:g:0" \ + "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" -FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ +# heic demuxing - still image with multiple items in an overlay canvas. +FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call DEMMUX, MOV, FRAMECRC, HEVC_DECODER HEVC_PARSER) \ += fate-mov-heic-demux-still-image-iovl -fate-mov-heic-demux-still-image-iovl: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C015.heic -c:v copy -map 0:g:0 +fate-mov-heic-demux-still-image-iovl: CMD = stream_demux mov $(TARGET_SAMPLES)/heif-conformance/C015.heic "" "-c:v copy -map 0:g:0" \ + "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" # Resulting remux should have: # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED diff --git a/tests/ref/fate/mov-heic-demux-still-image-grid b/tests/ref/fate/mov-heic-demux-still-image-grid index 6fde8fff28..b15ce91e1a 100644 --- a/tests/ref/fate/mov-heic-demux-still-image-grid +++ b/tests/ref/fate/mov-heic-demux-still-image-grid @@ -1,10 +1,7 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#extradata 0, 100, 5444bf01e03182c73ae957179d560f4d -#extradata 1, 100, 5444bf01e03182c73ae957179d560f4d -#extradata 2, 100, 5444bf01e03182c73ae957179d560f4d -#extradata 3, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 0: 100, 0xee3e15e9 +#extradata 1: 100, 0xee3e15e9 +#extradata 2: 100, 0xee3e15e9 +#extradata 3: 100, 0xee3e15e9 #tb 0: 1/1 #media_type 0: video #codec_id 0: hevc @@ -25,8 +22,120 @@ #codec_id 3: hevc #dimensions 3: 1280x720 #sar 3: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 111554, 03ceabfab39afd2e2e796b9362111f32 -1, 0, 0, 1, 111481, e5db978adbe4de7ee50fe73abc39fcfa -2, 0, 0, 1, 111451, 08700213113cadbb6628ecb8253c1c2a -3, 0, 0, 1, 111353, 5de942e14c848e5e22fad5d88fb13776 +0, 0, 0, 1, 111554, 0xa0679859 +1, 0, 0, 1, 111481, 0xc5386eaf +2, 0, 0, 1, 111451, 0xdbde88de +3, 0, 0, 1, 111353, 0x26435c8c +[STREAM_GROUP] +index=0 +id=0x3f1 +nb_streams=4 +type=Tile Grid +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:title=Derived image +[STREAM] +index=0 +id=0x3ea +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +id=0x3ec +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=2 +id=0x3ee +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=3 +id=0x3f0 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/mov-heic-demux-still-image-iovl b/tests/ref/fate/mov-heic-demux-still-image-iovl index 753cef267a..113b251c00 100644 --- a/tests/ref/fate/mov-heic-demux-still-image-iovl +++ b/tests/ref/fate/mov-heic-demux-still-image-iovl @@ -1,8 +1,5 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#extradata 0, 100, 5444bf01e03182c73ae957179d560f4d -#extradata 1, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 0: 100, 0xee3e15e9 +#extradata 1: 100, 0xee3e15e9 #tb 0: 1/1 #media_type 0: video #codec_id 0: hevc @@ -13,6 +10,74 @@ #codec_id 1: hevc #dimensions 1: 1280x720 #sar 1: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 111554, 03ceabfab39afd2e2e796b9362111f32 -1, 0, 0, 1, 112393, daa001d351c088a5bc328459e2501c95 +0, 0, 0, 1, 111554, 0xa0679859 +1, 0, 0, 1, 112393, 0xdf2b9da0 +[STREAM_GROUP] +index=0 +id=0x3ee +nb_streams=2 +type=Tile Grid +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:title=Derived image +[STREAM] +index=0 +id=0x3ea +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +id=0x3ed +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP]

[FFmpeg-devel,7/8] fate/mov: print stream group information for avif/heic tests

Checks

Commit Message

Patch