From patchwork Wed Sep 7 22:23:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp4178981pzh; Wed, 7 Sep 2022 15:23:40 -0700 (PDT) X-Google-Smtp-Source: AA6agR7Farwt37628uTtpcOy5u88441Pwyvz/TcaezpB8YtTgie5LpuL5ezmjQUSFdSGG6LAOSDQ X-Received: by 2002:a17:907:a06e:b0:734:b5b5:96ed with SMTP id ia14-20020a170907a06e00b00734b5b596edmr3780621ejc.251.1662589419831; Wed, 07 Sep 2022 15:23:39 -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 my32-20020a1709065a6000b0073dc603eceasi386950ejc.847.2022.09.07.15.23.39; Wed, 07 Sep 2022 15:23:39 -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=VdCQMRPA; 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 7412768B979; Thu, 8 Sep 2022 01:23:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075069.outbound.protection.outlook.com [40.92.75.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5467A68B964 for ; Thu, 8 Sep 2022 01:23:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jBW6Y6L5v42Ax5xf8+t81dOq1Kb/6+d5PAQueb47R3fyD/WoGcvxEUTk3JtQSWOrQIBjBjtV9bqTyQxDW2yDVwvrVZF0QdbzbgkK3OvhI1W4LvDZSvdl5IspYPoLJeprOrnqc12yUfy9BHsoQlohe7TVkuG9cfB/HnwlSw4ZurUrxPH2vfjOTKt1EyvgIF3XvfgG01Nu5kONnIKWIJBig7Tix/rksJKQkrXyJgXC6o71nm3cEtGO6ntgmHJg8IRbsdDHx88gDyrrStk0RY8IUKo06iZnz0BBAr+XLfla4ZATPb4/M7iqSgJ420pRRHBIKEkfwU70Q5Qyp0gph+rzIw== 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=oFRMI45KfZGhPQgSnllAuoMowr7zzkXRR8TBI+b+W44=; b=VjUp/QJO83hxw62YnwvEpuisHEx5CMPRZRYjOXEzeS/fLSzRV6y2monqi0+hEMnq4nkgrHXHw7cKjYpmPSELQWkv5599nopzeErcozrINHy4ryhFmcujHeoOkr+eP8Op68A8o4NDmIrokKgxByKhOx235/IrlmTm7Ahcqdk0sgXkMB+ssgR1A6sYbS+Ds3h6juE1B9ObAHzCv24QvohR4z6rpGiLC7ojiBxZHh1+cjy7ZroQVMar7Cqvs8GasvIcd7ghvD8SyzeisFyv9M9tPPpXhLtNpxNrspUk07pukAsn5dyGLyuYh7J7tmF9twpvNRynmO16kLBY4niQkz2iWg== 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=oFRMI45KfZGhPQgSnllAuoMowr7zzkXRR8TBI+b+W44=; b=VdCQMRPAtpdeIX5/ARMjGVyYLnglfJrSDXGTbCfPbnxSyZxJRKYPyK87K8/gsYkw4NdeJ2CAatA9uk9RE0pYaIROvtmP5wKghk4/DuFqRWsq9zDD5OIUvBoEjJlRDsQ2pXM+7AtOIFnKM5wKphcGaIsnQNPk+kyJ6wkRoWBdONuEsOe483ZdGDIn7mgjAVeublqTntJDKZBiItgOOdTnQ6SmijAF7xyhSwKEqe7g9fIl882wrxp3PJnE8Lgi/zrP3xKrKefUtKgPuVyEjk7Qq35kHIuAKOdluwCVKrkB34vdWPgc+9RNCUs8PdKcE0oXIz7TKugu9KEfvArayV2ikA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0080.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:271::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.15; Wed, 7 Sep 2022 22:23:30 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c3af:c609:301f:beab]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c3af:c609:301f:beab%9]) with mapi id 15.20.5588.018; Wed, 7 Sep 2022 22:23:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Sep 2022 00:23:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [udQg+Wry8E2P4Ftj2ep5hylmWYVsrQTtXH0PVJt7yhw=] X-ClientProxiedBy: ZR2P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220907222322.2054149-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d6bfc90-7063-4e6b-e5e2-08da911f9774 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHWbkhKm98zMtZhYpSn/9FWQcTefy60nUGb5Pyirm8J8UQBbgPsL7Fh5a9ooHbB/1UrEL8VdhWTCkINCABz5Plg53tVAeQcr3z1DeoVYbt0jCL5dPY8uWX+oglIHT6cUqI02jWiHsJLIEHToURprJ/yezCRLTv37hJRoL4xHR9Bz8Iyz3C9Qy+lMcSNey+Jnn9oQ+8HzYzU3zAOLKbpVqumR0VVvhn//3RDFc6xkAG+yd+M4rnpaXVzyIBY7j2UY+LqCP5xakX6lC0dY0fHn5wNVpVE0O4OE5vW/OLYlElyWmtb3PDOho2dz6DzBnYDIaDDuMAVbeRrp1eZiAyxqzhVNpXfk9Dru2O80O9x4oDlrw6e9lfUIC/JSNTByJEmbJB74jO+VMKRlEYwYcQqkl53AB0H/duv78Ga4qnRuJ1GRRm5o3qNzoQxxsidCWB27oMC882EAlSnwiJEQcDeWCDiUmrldrCFEyZM18dilWocYtFf/Ti5Bl83th/vpHQEeS0w+EeXSgNzsetI3HFi3wmfWBJ/ZPNHNOs5MiQka5u8s1telegTgK1jhXpvqc+s1SBzW4xJbi6FGX3QirdPV3xM4fcWzMwY2eZJYQAmkIGiFN+0RPda+o4ajEy4vnv6ZPeTDUjmS2QVOZZqeqadWj1IUaEWMIjvY2yy6xfSXHuRmNGsW1JWSp8q2hsoGYOlXW4mtD/UVsdULcA== X-MS-TrafficTypeDiagnostic: DU2P250MB0080:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9uVrORUmhvf6jpepmeoAzVSleiAzC/OZoS5eRGNjN7kC4BYK2Y3hkRrCciN9GiH5/xngymlPra5wM6OCoI7ZKXFQ/fOvDxCgA+ksJgzleJnkb94BLT7P1wpLFPMyarJSLH0CoC1wKtm4Bm3AQxE9cQDR2w04BouBy9PyT3FRjEoLXML5/JA1QpNfXlfxfJ28SGQ5TaG4ft4eCdpjdv8WwyKhTZwcsMwD6wTEtLcCZ9zsZ1XMToUsWYMemXTApZ/OykcL3ozpLAMhQQjciQjciSINZJdneq4pdVliD55fkDaEad/rg8TwZ7jvIkQtWSf/VYVbvfOmIeQGDCT90gcw4Yy2HN1wBUQp1guDINP6vASJm0yyQX0f/aYfMLOP0Nno35QoPZa/c9Ai+hzYveNeqDAQdcovm4QFfN/l5FVea5+xH2BNAPm9wMg/hFmAMByYLOhwOxQ2OMsHsGdFRbzAELvH/+fyx6LygZu6Y46nBc7TqsofjvXqbJemsrpW0NfLUjlkSum+Cfez6WeQIWt49SRFavYJK+c+Q10178KLcPXT2j41oD+WefzqeILWR1luQeP3djQrMtcVq8/WIlCcL2lKzh49nWNG5crTdGfMvoDdvh4Tsm+DDlnQCz9Kc7PO+BUMek9p9dWqq3ooW/KZvA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8FneFYQ4ZqTzAvh2nhQc15hvmsDmYWdtwsHH3tLQxZ6XWiUt7z1OqVslr5gUQo4UGfSNmUn21H/HWSKx7h+hoQ3MybOwUaDaiyluZqYVaLS9Wxf3X+50L3m/Wm+PRS0jwydt2eQrP96aFidzCjLlOwK/ehNM3BVzlG18hUZIs377GDl0TEWQ92OsM/AdsVWtzAzLKJCxyELPrgzazaHew5GMhjH/Ba94LYQdbZATKdd+37CCkBSZQAMFfaSzQ8jYi4Ng9sVZRvxtME05grJ3mjcWp4gB1OFhTQhyWv/xpKlpF8jVY4yNoF4UmhjBV4zT3/dQ5moP7GhTvM4FFy2ehuu1oTAKekSsBw+HbijVv1cCbHYELxeEs30bCZPejUT/6XOjO2q2KeDnNmpVudHwKsHG66fY0VkLjU/Au7NpUP8dk1xELUgzNluvVICUATVvIg6EzOwTXZN5fq0Seubrhha8A6XdLYJz3AEnU+R9lzQ5M6v038gIIx++0wfyb+6QC5THuaoDggqRYvBGaEhQxetGnQjhEO1u54tRmEJQiDaE3f88bYK3eEnmmIxewcHOMh04zd13KcOrjhkZ6L0JlC32bQLRWpOkSjyRmaVxk60zX0UoD8cEcMkwLVnnfLLgdggD8eq5OdBE2bhsHJzRakoUZuj/7yk6a+0E7HGEnN5fB6uP+67mNLoKjuPn6k9DL/if24MabaDRX1E0u/dfjcH88mcYJXyZqV336IGjVNlrlOrkVEjYE//CjBi3q3AV6eOO44RkfVJtjpO3I7seHoKHcTS5EFkNRqszSLAcBhjIgeD5gbuihkiKyRA5gDoNmV1CvCnLhxO3giNB8aiupbr80mvanjlOwdI7ZEjZGkvyVZf7nxaTx6XquWnCk6aQUbwegQCXdzx31jlMQCn1/QPJvzF3iWbnqsWQoNXwbtrONY6D5rjW4ifWUtPxQVAbxywVsfN4r9d6IFi3xxmpJ7PPB9ARcXuU+gK7q/eF8aLQUhbLKudUkMfa3abPVJkgQvcJmeUARsIoJRNZnCt3LZO56D23apJhC0m6MUt5+vjsz/ym047zq4LKhPOpeTGjkkWZR2/0Zk/v5d7+dnBgDpqUQ+ZPgftOfkhLucTEB6lWad5Ego00HUwlhVdImWBB3XAz3/czx3GjDlsLjb3MjZcyph/+Sj9X4/lcMzhIcua6uPhSljkgsuKANBcer9srwsSxjC+ZoKNWasyIDgQ+S7FHhVmdK+gDCF07uf98gj7hjgfZtuaZMGCkWdtp2AnLnj1A6cdIORCIvoUtaxzmkL1I9ev3cuRUGvx5Wy03D429iWqCEYdKW71+bGlbgZvo X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d6bfc90-7063-4e6b-e5e2-08da911f9774 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2022 22:23:29.9255 (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: DU2P250MB0080 Subject: [FFmpeg-devel] [PATCH 2/2] fate/matroska: Add test for updating AV1 extradata 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: Z1YvAuHQKsVt Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 6 +++++ tests/ref/fate/webm-av1-extradata-update | 32 ++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 tests/ref/fate/webm-av1-extradata-update diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 63e81f121b..39137ad4be 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -49,6 +49,12 @@ FATE_MATROSKA-$(call ALLYES, FLAC_DECODER FLAC_ENCODER FLAC_PARSER \ fate-matroska-flac-extradata-update: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/flac_channel_layouts.mka \ matroska "-map 0 -map 0:0 -c flac -frames:a:2 8" "-map 0 -c copy" +# This tests that the Matroska/WebM muxer writes the AV1 CodecPrivate +# via extradata obtained from packet side data. It also tests that +# the aspect ratio is only written with pixels as DisplayUnit for WebM. +FATE_MATROSKA-$(call REMUX, WEBM MATROSKA, IVF_DEMUXER AV1_PARSER EXTRACT_EXTRADATA_BSF) += fate-webm-av1-extradata-update +fate-webm-av1-extradata-update: CMD = transcode ivf $(TARGET_SAMPLES)/av1/decode_model.ivf webm "-c copy -bsf extract_extradata -sar 3:1" "-c copy" "" "" "-nofind_stream_info" "-nofind_stream_info" + # This test tests demuxing Vorbis and chapters from ogg and muxing it in and # demuxing it from Matroska/WebM. It furthermore tests the WebM muxer, in # particular its DASH mode. Finally, it tests writing the Cues at the front. diff --git a/tests/ref/fate/webm-av1-extradata-update b/tests/ref/fate/webm-av1-extradata-update new file mode 100644 index 0000000000..9dd2056e0e --- /dev/null +++ b/tests/ref/fate/webm-av1-extradata-update @@ -0,0 +1,32 @@ +fbf3091fdf05b2856c578e7c948d68c3 *tests/data/fate/webm-av1-extradata-update.webm +23048 tests/data/fate/webm-av1-extradata-update.webm +#extradata 0: 35, 0x527207cd +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: av1 +#dimensions 0: 240x100 +#sar 0: 3/1 +0, 0, 0, 0, 8168, 0x1851ab62 +0, 42, 42, 0, 7040, 0x967788f9, F=0x0 +0, 83, 83, 0, 4, 0x01f400e2, F=0x0 +0, 125, 125, 0, 48, 0x49ad107e, F=0x0 +0, 167, 167, 0, 4, 0x021c00fa, F=0x0 +0, 208, 208, 0, 279, 0x69728439, F=0x0 +0, 250, 250, 0, 4, 0x01c400d2, F=0x0 +0, 292, 292, 0, 63, 0x9bbf1836, F=0x0 +0, 333, 333, 0, 4, 0x026c012a, F=0x0 +0, 375, 375, 0, 1065, 0xce2003ac, F=0x0 +0, 417, 417, 0, 4, 0x019400c2, F=0x0 +0, 458, 458, 0, 52, 0x7a0112f1, F=0x0 +0, 500, 500, 0, 4, 0x021c010a, F=0x0 +0, 542, 542, 0, 689, 0x1e8b49e7, F=0x0 +0, 583, 583, 0, 4, 0x01e400f2, F=0x0 +0, 625, 625, 0, 209, 0x124c6790, F=0x0 +0, 667, 667, 0, 42, 0xea690e31, F=0x0 +0, 708, 708, 0, 3521, 0xd76ee284, F=0x0 +0, 750, 750, 0, 63, 0x4572188f, F=0x0 +0, 792, 792, 0, 386, 0xb078c259, F=0x0 +0, 833, 833, 0, 178, 0x1ebb5121, F=0x0 +0, 875, 875, 0, 60, 0x729317f7, F=0x0 +0, 917, 917, 0, 40, 0xad970a66, F=0x0 +0, 958, 958, 0, 61, 0xcc0d1a20, F=0x0