From patchwork Thu Sep 7 01:02:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43610 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp295223pzh; Wed, 6 Sep 2023 18:01:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGWklJ0YnEtA5wtakJvzme0wA1OAyvsQV4wYFVWMlemcqonb1JZeamipFgzPV9VL2FwOhDr X-Received: by 2002:adf:f20e:0:b0:317:573c:1314 with SMTP id p14-20020adff20e000000b00317573c1314mr3456813wro.58.1694048505592; Wed, 06 Sep 2023 18:01:45 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f3-20020aa7d843000000b005255db6966bsi9541344eds.621.2023.09.06.18.01.25; Wed, 06 Sep 2023 18:01:45 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Mpy4ysnu; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A4E668C7B0; Thu, 7 Sep 2023 04:01:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2023.outbound.protection.outlook.com [40.92.59.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD9DF68C683 for ; Thu, 7 Sep 2023 04:01:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Be7ITCC/3UnD5+H/TP3IE39ANQ/6hYpfJvbHc/sG74IZaYu2xZ6g4hqjfJEnFF/JTZLHnXWyPwQN7uVgassXoCp2ikUn7IABjVmua9WNqPpBSCkA+Oq7VQmu94W1q48ka3d58iHCmhp7zjuqCfgULNrPI7Ksx4l7f66TkLjCK8kEDAa96AAgXtJWA7kMzj9eFsQklYJ0CFjquY76HHLYHm7E9hSm1ItOkhHwLM5UaXYvT8NN8s+KHqY684Pm27eFkjFdZiJ8NWBcEbVENh/sy/XTt7WN+7uz6yCU8rAgAJrqhLSaVgePP8OOSqFe7r/mxXgMKWRc9PGxdOfXwQl1Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e+g7pNs8bqJCN+0tWbaLOHi9Tim88EwrC7d3hwCvka4=; b=Qbqn5rvENJSrRMt08M6/sW+9FVPAxo9kizqsqE3/XzSMq8LtKYyhqkKn6g3J1ElcgnwBcL+0WTMbhT02bMBH+vb3w4IEy95Jjar9NpFYNXg8GzxuH7GZPsxnNoRlKxPooCtbwxN8tK4HdJVY2zf9yUrF2jx+g+Ba4OGSnnKsbvnWsBlPxtubl24T9z2CczfichWjSoW9QAkfegp4IZaXr9YtYx+mobDju1VNiLNbGHV3HLxhxvzfzgOoMJXbVv7KvMECfIQ7lhFUM4wXoCvl3X4yhFl69XdL9KAHEcG5sr2WhxvmftBHzoSkZj6PUe/WuiSZCyno4L+3G3DbkaHPyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e+g7pNs8bqJCN+0tWbaLOHi9Tim88EwrC7d3hwCvka4=; b=Mpy4ysnuuV9Y5h2OHsFi9zoPp4rgRkK9oWZH/P3ud9MtRp9g+T+MJlCtiUogl2ILKNrYZhbb1hexKYt/pME1AQoBtZ68Mcdj+e4J6xYlOtj/gd4fup+XMtDfpYqI74QeGWarU0Q2+/o60s9YJ4nR//FfsZwZT78OSc6tD8oZN1yd9B0pyoZ3x73QwWA7EM9ImNuBbn/LgnwXTF4ReucM0vQcJNDz2Hy8OJqRXffueTjJSkNxlaGsa8PPjSRSjR5dFw5dE5PF+8jWY5hvaMLDRJbi9E1nOVGdAGaBIVrKOAXrMwqXVOM8isIgywhqbMmf9FHYTd3X6fJCI06BH3yLng== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0025.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Thu, 7 Sep 2023 01:01:12 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.034; Thu, 7 Sep 2023 01:01:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2023 03:02:01 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [gMt0nYS7uDoxh75knBYjOH6u8kxUuEtX] X-ClientProxiedBy: FR0P281CA0053.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230907010222.454612-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0025:EE_ X-MS-Office365-Filtering-Correlation-Id: d9a7f5c6-1b7f-4711-1805-08dbaf3dedf7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D5gitH3zci2eOXDK3h09NmIAM5E9dKKbjNJVqe4MxEWN5X3Wr4p5N7F8c/CWqYPoNBS+3YMomoScG9o7nsiDt+f/VbebgjzL8zogcm0XDNf/7ZC/5sc+rVGVrgCHAB3wQb4qWSikJH3oeztgHYRjn1XGSjtX5pn1CVxxNnFwqBqoipRSaqRBFDAhhqcwjM0f4H8/eCSya3qEFDxgdHNUh/G9yGDocf54Gh/OYxl6nZYYKjdsb0ioC+w+J366C01i4DiL4veZEd0TXZSUGTpkYl0eqJIlrQAxdVNNMSlDPD1N2AxrJUD6i8JeuAY5iGC31uLK06fHISyrWbthqeoYO7qfqSprlVGwnjxz5goW/BuBLkcMkn0bcmBRTT+Wnd13AOoNCY+VhHhoHZn409X2PbiCmrN9SnWiV+juQX5+/ipQ3XrUi/N1hMbK3y1LM0QHtJbUbibKzrF7DlK4H8kUJG+4oWkTnIE7MNtqb+Z2Y7aO4q+7HjWDB6Ttmp/sMlfp9XG30dUpyAi8ldG+OPZ7KNFyeDfC1HO003j7cwXGkSFH5pTr1bNjCNnE1OvnD6pS8CnNFEZ8skXQ9irTS69kIjkt1mwMyPPbHTFZI8SEiOU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /dgGHcLNaTIRRrZo/2BTmwFWgeuybR34Iagl4rjGISmDbtxy1CjtfX6nbcjtvVN/3jA7vk2j1Sj5sbJKyDSDm6chna37jGhqTSFOvSuzKFMaj9Q699QeemtrBkE5Au0L1X84Fa1gCqhxH2sgpDzha5DlgQ8B38SoLD2VkniQdUnh5QOspENvd2UxolItot8wMX7Yy1b+WWFRpPWpRQnHeTU6fZDoHTR0OKigS+ISEJ2/xpmpWFE83AYhUdmefONP8s03ItYOJf2IbD+Msv8nSdUaci2gARP2VqnJbaakIotLGFvtNy6z1IyaZLDLOBcxCblm3Bv0GuWBksarlidy2RimaEhPhWdGH7eOriEHjpsb/pSv67CnXuMvEZpH6cz8RZxMKHsv19jQJcG56NEVliVM+E3t2rAn3wI3iSL/e+jOZ55qeREXuHpnXlSocxszgbp09LWoBpeN/vE4Jn8/ij3LklG+O0TNurMlnnXI3s5yjpcnh/HNCABifj7D0oZuxN9WT3rixnKJzNhSx8+gLviiJcXuHrREKkFQyzbsY2er3kA67W/jmkOpJk1F6dIelAC6dCOZ42CJwjb1afxcKbqd9nFi9Da4VNyWvDUxgz7UfFKMX2aQp0QSjwP1gP3knysfdlct4uC6ZNSL6UPHipRBJFdb0DdAcW80hdNaKIrpQsyRESFdr2ivEUlW1CBZpGVABIKuLAHRqaKNL/Y5FTdr0dHFjRQDEFlIwhtzKVm6MrWIpFc68H/nSs1B5sl1Ic9zqnkFidMzWsC7IJeOM9qNvrm29oxp8LTqCSv2bBbAIspOBdIuAFvWXJWq8kEsif665zBX0+G/hMc+um/I84BGrZ9zizar52Njmg50iVx76PycfGedstvMXBNX/+zptWIvxxQlY7wpdSkiJe5Hl2Kh2YAKVNZ3wlNoCy9HpE7FEldK29hq9db2YxAmxmJUDwAWIwQr0lth2XVQjSCGJrRtwgcbY2GVSda/KoBUxy4krc7XYKIi5RfYSv+OKRWDdCo54+zo/GZ/9DqOo1xcqVl5n/iUJu5TmG/i3gHq1XymU+EFk7Und7jHdfgQ9nWxX+uPPA9PoLmRIlbh1NiWYr65wpKEpZtw9iDd94zHrfL1kx3A8psLP2eAfzAXOuNGbwMlXV68KjCuDAJatWwqcKlh8f2fiH6YJUIAzNZ1B6BJHU4wYlGS+4Y01sGPhh8/uJ62pgCKNH06ROF9MbcDMUCeRCl+7SgB5FcvjYgP4PX/gvOpj5xfy4oAoI4rDKuK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9a7f5c6-1b7f-4711-1805-08dbaf3dedf7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2023 01:01:12.5882 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P250MB0025 Subject: [FFmpeg-devel] [PATCH v2 01/22] fate/demux, lavf-container: Workaround for AV1-aspect ratio issue 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2S7JjV54eCT+ This is a workaround for an issue introduced in commit 1652f2492f88434010053289d946dab6a57e4d58. It is not meant to be applied to the tree. Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 2 +- tests/fate/demux.mak | 2 +- tests/fate/lavf-container.mak | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 5a71ac001e..276f97489d 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -383,7 +383,7 @@ lavf_container_fate() file=${outdir}/lavf.$t cleanfiles="$cleanfiles $file" input="${target_samples}/$1" - do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" "$ENC_OPTS -metadata title=lavftest" -vcodec copy -acodec copy + do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" "$ENC_OPTS -metadata title=lavftest" $4 -vcodec copy -acodec copy do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $3 } diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index ace8fa0b52..7a091de851 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -14,7 +14,7 @@ FATE_SAMPLES_DEMUX-$(CONFIG_AEA_DEMUXER) += fate-aea-demux fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -c:a copy FATE_SAMPLES_DEMUX-$(call DEMDEC, AV1, AV1) += fate-av1-annexb-demux -fate-av1-annexb-demux: CMD = framecrc -c:v av1 -i $(TARGET_SAMPLES)/av1/annexb.obu -c:v copy +fate-av1-annexb-demux: CMD = framecrc -c:v av1 -i $(TARGET_SAMPLES)/av1/annexb.obu -c:v copy -sar 1:1 FATE_SAMPLES_DEMUX-$(CONFIG_AST_DEMUXER) += fate-ast fate-ast: CMD = crc -i $(TARGET_SAMPLES)/ast/demo11_02_partial.ast -c copy diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 0d4a224601..047dd1d7f4 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -86,8 +86,8 @@ FATE_LAVF_CONTAINER_FATE = $(FATE_LAVF_CONTAINER_FATE-yes:%=fate-lavf-fate-%) $(FATE_LAVF_CONTAINER_FATE): REF = $(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf-fate-%=%) $(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF) -fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" -fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" +fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" "-sar 1:1" +fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" "-sar 1:1" fate-lavf-fate-evc.mp4: CMD = lavf_container_fate "evc/akiyo_cif.evc" "" "-c:v copy" fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264" "" "-c:v copy" fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto"