From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 533AF49C06 for ; Tue, 5 Mar 2024 00:02:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D3BCA68D4EA; Tue, 5 Mar 2024 02:01:00 +0200 (EET) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C84C68D4EA for ; Tue, 5 Mar 2024 02:00:54 +0200 (EET) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-299e4b352cdso3389572a91.0 for ; Mon, 04 Mar 2024 16:00:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709596852; x=1710201652; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SFTBAp2L4K56iwCVK6vvIdmOdsGimyi5A30Eay2gdY0=; b=EPQHqWBA7+AL1J1HCLYOkeZtKFo/Af2OkFIaz+ZkFRTC3SFWQpOYF3eqD3nqB12i9d OcneTBymbVwcU5XmPEBl7pSeTn8jyTgtOi8ZZgCcIK9+mshSctdNkWRbiLSRZA3hdnQo DyTLHjOYYlZCvCQyJy0960EWp9gzVE7oc+78VtSCBAsZtJ0IkNOEtTEpBEY3+E/cWrhq OFC3rIB5HCOpU0NuPTlNKhYCjav2Q1JjpUkgRyMLHBsbSZScrmstczmFrxLJqhqLjWHB tR5wVxm/T5BpXJb7lAI2ZHogd22L/muBw4r0uo4MgC7/+Q5IcTeEcSqm8i52j8jJVOBY UBlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709596852; x=1710201652; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SFTBAp2L4K56iwCVK6vvIdmOdsGimyi5A30Eay2gdY0=; b=dDRKrmPf2Uz9C2jEPkHkHiFkJhPCVhGe1GS8FK6g60gQNAzaIoWPD0LM4ZPTtFjLbw xW8GMY8HnwzvbfBKxcGeRDxQtuGZ2+zBK9oW+bVAuj2NgepIdVZ3LGd3/56v/+niEu1o jXMOZpvB8BLgRvM5QiWWzSDl0iXo4KT81Uxf3xrO/hqbhFM+it5EZgN4huUR8KBQHdkx tdv1koYWmoUTJkfUybk8O/oG1CJ0VoGKzv8AnssEXUADLBHcwEWUIhd02UZ3vI5pQX3e lXUcCGg1Gy+xW8FBwXc2/kQFZ0+8uead5HcXWpwfIJ0BSxZb5+jSTyxIzqjxCeA1OdZJ 6CCw== X-Gm-Message-State: AOJu0YyEptmiLzPv6ma1VtS3Y8XOgDUqOzJwmsvEmpYL7ngSA6ompKef yxZpKlQdUE5hr4hDptdeuGqQS+wME37I2nOeANFFpr4UZLAnFOtFi6vv9kst X-Google-Smtp-Source: AGHT+IE7n+0nT9u5Q9mGGtqNxXr5QWAcTzlUe4L1AWYWtcNI00yr7HXX9gBfCE3K35ZvpHZsw+wLLg== X-Received: by 2002:a17:90a:ce94:b0:29a:8829:f687 with SMTP id g20-20020a17090ace9400b0029a8829f687mr7805629pju.27.1709596851604; Mon, 04 Mar 2024 16:00:51 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id gb2-20020a17090b060200b0029acce2420asm8288663pjb.10.2024.03.04.16.00.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 16:00:50 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 21:00:27 -0300 Message-ID: <20240305000033.10379-7-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240305000033.10379-1-jamrial@gmail.com> References: <20240305000033.10379-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/9 v3] fate/mov: print stream group information for avif/heic tests X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- tests/fate-run.sh | 13 ++ tests/fate/mov.mak | 12 +- .../ref/fate/mov-heic-demux-still-image-grid | 162 ++++++++++++++++-- .../ref/fate/mov-heic-demux-still-image-iovl | 100 ++++++++++- 4 files changed, 263 insertions(+), 24 deletions(-) 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..91b71d68b1 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_components: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_components: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..5c4092bb09 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,149 @@ #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 +[COMPONENT] +nb_tiles=4 +coded_width=2560 +coded_height=1440 +horizontal_offset=0 +vertical_offset=0 +width=2560 +height=1440 +[PIECE] +stream_index=0 +tile_horizontal_offset=0 +tile_vertical_offset=0 +[/PIECE] +[PIECE] +stream_index=1 +tile_horizontal_offset=1280 +tile_vertical_offset=0 +[/PIECE] +[PIECE] +stream_index=2 +tile_horizontal_offset=0 +tile_vertical_offset=720 +[/PIECE] +[PIECE] +stream_index=3 +tile_horizontal_offset=1280 +tile_vertical_offset=720 +[/PIECE] +[/COMPONENT] +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..67394c2893 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,93 @@ #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 +[COMPONENT] +nb_tiles=2 +coded_width=1440 +coded_height=960 +horizontal_offset=0 +vertical_offset=0 +width=1440 +height=960 +[PIECE] +stream_index=0 +tile_horizontal_offset=0 +tile_vertical_offset=0 +[/PIECE] +[PIECE] +stream_index=1 +tile_horizontal_offset=160 +tile_vertical_offset=240 +[/PIECE] +[/COMPONENT] +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] -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".