From patchwork Tue Jan 10 22:26:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 39959 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp4303635pzb; Tue, 10 Jan 2023 14:26:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXsYAJkqh/oETIiQcWIpzoWRjohkXEYt/WdwIBqy3jAyoJ9QYX/IrtVEdpDO3Zufoyx0idgJ X-Received: by 2002:a50:eacc:0:b0:46b:fb39:1136 with SMTP id u12-20020a50eacc000000b0046bfb391136mr64129892edp.19.1673389597529; Tue, 10 Jan 2023 14:26:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673389597; cv=none; d=google.com; s=arc-20160816; b=nJeLc8HXgUXai4gfQFt+CvLQj2bFkgt4jPAP2Loka2DL6DbZuRwfVH1Vf0dUHsC9Ex mUzhcDDxcCyVpLbZcQ6+ki3XKnsNrgjd4pmgfqFNLqMwagF9PxhOS2x8dNACx/r7imfA V3HMVQXwNZ6E2PpOnZH7JqW60WvgfnKA5n1pXJARVSsBB6h6WuROm3JAH7NUhSCGuxVP yU53P4JV2VkEVHp3MESWNNvIkKS2hqSBuP1YDJuKw0zLSlw/wWsjk5CJLxcj6WHebXiu e6b3L+GVOUvWiSH/ZoCk4Hxtf6/KYKD/7JxrkkwH3LM5yPcN88cB1PgGw6M1YxB5hgZJ e+og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=X9V3fQzHXKbjJooblmVOQPf+amYxfwGNgoYZjnH3MV4=; b=tfRnXmwzRiTs2NapUggJEjZ4F+10MPvdjt34/4n9TQaEygS9/YpC/U1pQ90Lv5pYlF u63BligYb11eitg2ZVSyV4YR4nHW+//T8RQh8NIylUD5/Uz17doSZh8EWk34TaruxJzq tBdI0ZKiurrTCY7VKkfYVEkbkYcDqDzu9jld4LabsV0RvoxLJfZWfxkqGbE0fvgUu1Ie wQQad62FpzUjSwSOkYWPj8b/4PhkwM8Vm478z8dX3LKKHjdbqBRNvBawJFbbygPb3AH8 Do3CfuX8N0IbJnLPPNQq0AHrbwITHPjrET7L38OBpTdaIFzfhKvt3mpoNkVefj721jyh pobg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j12-20020aa7c0cc000000b0048fac1755bbsi12729256edp.168.2023.01.10.14.26.34; Tue, 10 Jan 2023 14:26:37 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D694868BCC0; Wed, 11 Jan 2023 00:26:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 068CA689C7E for ; Wed, 11 Jan 2023 00:26:24 +0200 (EET) Received: by mail-pj1-f49.google.com with SMTP id c8-20020a17090a4d0800b00225c3614161so17987971pjg.5 for ; Tue, 10 Jan 2023 14:26:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=P2q2vvfIuybZCA2RcECuNJRLV3Uu7aPqQRLDKr3QD34=; b=0vMkXH23oRzS0Bwg3zfxi9oTyzh3DEQUlU6/5uk9dK85kR9vP9O1c7SFixzcx6goCk LMMxY/t+yXFt+JC/MCxDZQuzYGFYgH+kSeguCVUu2KwvJCMdvcYF5QhBcKY8ob6ROLCP bPfKwWln8CQxS9Q67PXtR+tgslnC1oVq0YROcMWu/B/acbnF2GGgUKJ/zuNTlR+3Skna PP0dpgu0CAq1UyJ2tjZac+ojxwxxDTT1VIkwnXwnXVCnpxeNTCiJ4N42UD57TpSJr6RN 1Jyep4V4ypq8dtKiGAsbL8T/VGI2LHiPSYqnMWLYpyI1GtRe6A6bqfFDe9IbUB+E8vXi Wokw== X-Gm-Message-State: AFqh2kon48m8epmjNTvnVZOK7kgy0mo4NW1awsLLDp6WaOHn/lhfQtz9 Yykuxma8qZdRSeMYNOvrH68bMjAHR3Q= X-Received: by 2002:a17:902:b60b:b0:192:b6af:415 with SMTP id b11-20020a170902b60b00b00192b6af0415mr457797pls.14.1673389581393; Tue, 10 Jan 2023 14:26:21 -0800 (PST) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id h6-20020a170902eec600b001811a197797sm7442444plb.194.2023.01.10.14.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:26:20 -0800 (PST) Received: by localhost (sSMTP sendmail emulation); Tue, 10 Jan 2023 14:26:17 -0800 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Jan 2023 14:26:16 -0800 Message-Id: <20230110222616.1760-1-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] fate/imfdec: add audio test 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SxGMoUqzIY2K From: Pierre-Anthony Lemieux Improves the test material by using audio and video resources whose respective temporal boundaries do not line up. https://www.sandflow.com/public/countdown-audio-2023-01-10-2.zip --- tests/fate/imf.mak | 3 + tests/ref/fate/imf-cpl-with-audio | 207 ++++++++++++++++++++++++++++++ 2 files changed, 210 insertions(+) create mode 100644 tests/ref/fate/imf-cpl-with-audio diff --git a/tests/fate/imf.mak b/tests/fate/imf.mak index feb54d1361..49ab35e7d9 100644 --- a/tests/fate/imf.mak +++ b/tests/fate/imf.mak @@ -1,6 +1,9 @@ FATE_IMF += fate-imf-cpl-with-repeat fate-imf-cpl-with-repeat: CMD = framecrc -f imf -i $(TARGET_SAMPLES)/imf/countdown/CPL_bb2ce11c-1bb6-4781-8e69-967183d02b9b.xml -c:v copy +FATE_IMF += fate-imf-cpl-with-audio +fate-imf-cpl-with-audio: CMD = framecrc -f imf -i $(TARGET_SAMPLES)/imf/countdown-audio/CPL_688f4f63-a317-4271-99bf-51444ff39c5b.xml -c:a copy + FATE_SAMPLES_FFMPEG-$(CONFIG_IMF_DEMUXER) += $(FATE_IMF) fate-imfdec: $(FATE_IMF) diff --git a/tests/ref/fate/imf-cpl-with-audio b/tests/ref/fate/imf-cpl-with-audio new file mode 100644 index 0000000000..b8d70ca5d8 --- /dev/null +++ b/tests/ref/fate/imf-cpl-with-audio @@ -0,0 +1,207 @@ +#tb 0: 1/24 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 640x360 +#sar 0: 0/1 +#tb 1: 1/48000 +#media_type 1: audio +#codec_id 1: pcm_s24le +#sample_rate 1: 48000 +#channel_layout_name 1: stereo +0, 0, 0, 1, 1382400, 0x6a2c410c +1, 0, 0, 1920, 11520, 0x974f4bab +1, 1920, 1920, 1920, 11520, 0xdf793f69 +0, 1, 1, 1, 1382400, 0x5f0c67d2 +1, 3840, 3840, 1920, 11520, 0xfd69559a +0, 2, 2, 1, 1382400, 0x408e1262 +1, 5760, 5760, 1920, 11520, 0x28fa469b +0, 3, 3, 1, 1382400, 0x3567d455 +1, 7680, 7680, 1920, 11520, 0xe49161cf +0, 4, 4, 1, 1382400, 0x2312e68b +1, 9600, 9600, 1920, 11520, 0xb92c49ae +0, 5, 5, 1, 1382400, 0xe3d84ec2 +1, 11520, 11520, 1920, 11520, 0xd2b75d46 +0, 6, 6, 1, 1382400, 0xdbb3ab8c +1, 13440, 13440, 1920, 11520, 0xa13b5a9b +0, 7, 7, 1, 1382400, 0xeb250513 +1, 15360, 15360, 1920, 11520, 0xfe804299 +0, 8, 8, 1, 1382400, 0x26c3c8c0 +1, 17280, 17280, 1920, 11520, 0x7a8654d4 +0, 9, 9, 1, 1382400, 0xbc41a23e +1, 19200, 19200, 1920, 11520, 0x1a2e48a4 +0, 10, 10, 1, 1382400, 0x49d6a8de +1, 21120, 21120, 1920, 11520, 0x20504669 +0, 11, 11, 1, 1382400, 0x5e05cfa4 +1, 23040, 23040, 960, 5760, 0x74bf38f6 +0, 12, 12, 1, 1382400, 0x01327a34 +1, 24000, 24000, 1920, 11520, 0x974f4bab +1, 25920, 25920, 1920, 11520, 0xdf793f69 +0, 13, 13, 1, 1382400, 0x06ce3c36 +1, 27840, 27840, 1920, 11520, 0xfd69559a +0, 14, 14, 1, 1382400, 0x6aa24e6c +1, 29760, 29760, 1920, 11520, 0x28fa469b +0, 15, 15, 1, 1382400, 0x55d8b694 +1, 31680, 31680, 1920, 11520, 0xe49161cf +0, 16, 16, 1, 1382400, 0xcc6f136d +1, 33600, 33600, 1920, 11520, 0xb92c49ae +0, 17, 17, 1, 1382400, 0xe92b6ce5 +1, 35520, 35520, 1920, 11520, 0xd2b75d46 +0, 18, 18, 1, 1382400, 0x664d30a1 +1, 37440, 37440, 1920, 11520, 0xa13b5a9b +0, 19, 19, 1, 1382400, 0x09d80a1f +1, 39360, 39360, 1920, 11520, 0xfe804299 +0, 20, 20, 1, 1382400, 0x2b58536e +1, 41280, 41280, 1920, 11520, 0x7a8654d4 +0, 21, 21, 1, 1382400, 0xf24b7a34 +1, 43200, 43200, 1920, 11520, 0x1a2e48a4 +0, 22, 22, 1, 1382400, 0xe2a524c4 +1, 45120, 45120, 1920, 11520, 0x20504669 +0, 23, 23, 1, 1382400, 0xe841e6b7 +1, 47040, 47040, 1920, 11520, 0x7ad44ba6 +0, 24, 24, 1, 1382400, 0x6a2c410c +1, 48960, 48960, 1920, 11520, 0xc8934994 +0, 25, 25, 1, 1382400, 0x5f0c67d2 +1, 50880, 50880, 1920, 11520, 0x07ad70bb +0, 26, 26, 1, 1382400, 0x408e1262 +1, 52800, 52800, 1920, 11520, 0x1ba75d9a +0, 27, 27, 1, 1382400, 0x3567d455 +1, 54720, 54720, 1920, 11520, 0x0d4a435f +0, 28, 28, 1, 1382400, 0x2312e68b +1, 56640, 56640, 1920, 11520, 0x288b6c85 +0, 29, 29, 1, 1382400, 0xe3d84ec2 +1, 58560, 58560, 1920, 11520, 0x85da5f6e +0, 30, 30, 1, 1382400, 0xdbb3ab8c +1, 60480, 60480, 1920, 11520, 0x317a6ac0 +0, 31, 31, 1, 1382400, 0xeb250513 +1, 62400, 62400, 1920, 11520, 0xeea55aa3 +0, 32, 32, 1, 1382400, 0x26c3c8c0 +1, 64320, 64320, 1920, 11520, 0x598b604c +0, 33, 33, 1, 1382400, 0xbc41a23e +1, 66240, 66240, 1920, 11520, 0xbf6f4b95 +0, 34, 34, 1, 1382400, 0x49d6a8de +1, 68160, 68160, 1920, 11520, 0x52e66e81 +0, 35, 35, 1, 1382400, 0x5e05cfa4 +1, 70080, 70080, 1920, 11520, 0xca9b57c9 +0, 36, 36, 1, 1382400, 0x01327a34 +1, 72000, 72000, 1920, 11520, 0x974f4bab +1, 73920, 73920, 1920, 11520, 0xdf793f69 +0, 37, 37, 1, 1382400, 0x06ce3c36 +1, 75840, 75840, 1920, 11520, 0xfd69559a +0, 38, 38, 1, 1382400, 0x6aa24e6c +1, 77760, 77760, 1920, 11520, 0x28fa469b +0, 39, 39, 1, 1382400, 0x55d8b694 +1, 79680, 79680, 1920, 11520, 0xe49161cf +0, 40, 40, 1, 1382400, 0xcc6f136d +1, 81600, 81600, 1920, 11520, 0xb92c49ae +0, 41, 41, 1, 1382400, 0xe92b6ce5 +1, 83520, 83520, 1920, 11520, 0xd2b75d46 +0, 42, 42, 1, 1382400, 0x664d30a1 +1, 85440, 85440, 1920, 11520, 0xa13b5a9b +0, 43, 43, 1, 1382400, 0x09d80a1f +1, 87360, 87360, 1920, 11520, 0xfe804299 +0, 44, 44, 1, 1382400, 0x2b58536e +1, 89280, 89280, 1920, 11520, 0x7a8654d4 +0, 45, 45, 1, 1382400, 0xf24b7a34 +1, 91200, 91200, 1920, 11520, 0x1a2e48a4 +0, 46, 46, 1, 1382400, 0xe2a524c4 +1, 93120, 93120, 1920, 11520, 0x20504669 +0, 47, 47, 1, 1382400, 0xe841e6b7 +1, 95040, 95040, 1920, 11520, 0x7ad44ba6 +0, 48, 48, 1, 1382400, 0x6a2c410c +1, 96960, 96960, 1920, 11520, 0xc8934994 +0, 49, 49, 1, 1382400, 0x5f0c67d2 +1, 98880, 98880, 1920, 11520, 0x07ad70bb +0, 50, 50, 1, 1382400, 0x408e1262 +1, 100800, 100800, 1920, 11520, 0x1ba75d9a +0, 51, 51, 1, 1382400, 0x3567d455 +1, 102720, 102720, 1920, 11520, 0x0d4a435f +0, 52, 52, 1, 1382400, 0x2312e68b +1, 104640, 104640, 1920, 11520, 0x288b6c85 +0, 53, 53, 1, 1382400, 0xe3d84ec2 +1, 106560, 106560, 1920, 11520, 0x85da5f6e +0, 54, 54, 1, 1382400, 0xdbb3ab8c +1, 108480, 108480, 1920, 11520, 0x317a6ac0 +0, 55, 55, 1, 1382400, 0xeb250513 +1, 110400, 110400, 1920, 11520, 0xeea55aa3 +0, 56, 56, 1, 1382400, 0x26c3c8c0 +1, 112320, 112320, 1920, 11520, 0x598b604c +0, 57, 57, 1, 1382400, 0xbc41a23e +1, 114240, 114240, 1770, 10620, 0xabdba053 +0, 58, 58, 1, 1382400, 0x49d6a8de +1, 116010, 116010, 1920, 11520, 0x38de5240 +1, 117930, 117930, 1920, 11520, 0x05c23c05 +0, 59, 59, 1, 1382400, 0x5e05cfa4 +1, 119850, 119850, 1920, 11520, 0x70d7621a +0, 60, 60, 1, 1382400, 0x01327a34 +1, 121770, 121770, 1920, 11520, 0x2fef4788 +0, 61, 61, 1, 1382400, 0x06ce3c36 +1, 123690, 123690, 1920, 11520, 0x95b0542b +0, 62, 62, 1, 1382400, 0x6aa24e6c +1, 125610, 125610, 1920, 11520, 0x38654d48 +0, 63, 63, 1, 1382400, 0x55d8b694 +1, 127530, 127530, 1920, 11520, 0x06ec57ec +0, 64, 64, 1, 1382400, 0xcc6f136d +1, 129450, 129450, 1920, 11520, 0xd0a76908 +0, 65, 65, 1, 1382400, 0xe92b6ce5 +1, 131370, 131370, 1920, 11520, 0xbd7c4296 +0, 66, 66, 1, 1382400, 0x664d30a1 +1, 133290, 133290, 1920, 11520, 0x7fa54533 +0, 67, 67, 1, 1382400, 0x09d80a1f +1, 135210, 135210, 1920, 11520, 0x7e324f34 +0, 68, 68, 1, 1382400, 0x2b58536e +1, 137130, 137130, 1920, 11520, 0x2400410a +0, 69, 69, 1, 1382400, 0xf24b7a34 +1, 139050, 139050, 1920, 11520, 0x52c85b21 +0, 70, 70, 1, 1382400, 0xe2a524c4 +1, 140970, 140970, 1920, 11520, 0xa384487e +0, 71, 71, 1, 1382400, 0xe841e6b7 +1, 142890, 142890, 1920, 11520, 0xddf76717 +0, 72, 72, 1, 1382400, 0x6a2c410c +1, 144810, 144810, 1920, 11520, 0x78165e3a +0, 73, 73, 1, 1382400, 0x5f0c67d2 +1, 146730, 146730, 1920, 11520, 0x037b3e07 +0, 74, 74, 1, 1382400, 0x408e1262 +1, 148650, 148650, 1920, 11520, 0x03d87afa +0, 75, 75, 1, 1382400, 0x3567d455 +1, 150570, 150570, 1920, 11520, 0x17445f5a +0, 76, 76, 1, 1382400, 0x2312e68b +1, 152490, 152490, 1920, 11520, 0xbf48611b +0, 77, 77, 1, 1382400, 0xe3d84ec2 +1, 154410, 154410, 1920, 11520, 0xe5215b3c +0, 78, 78, 1, 1382400, 0xdbb3ab8c +1, 156330, 156330, 1920, 11520, 0x9d345af5 +0, 79, 79, 1, 1382400, 0xeb250513 +1, 158250, 158250, 1920, 11520, 0x3de75a0f +0, 80, 80, 1, 1382400, 0x26c3c8c0 +1, 160170, 160170, 1920, 11520, 0xe3ed6e63 +0, 81, 81, 1, 1382400, 0xbc41a23e +1, 162090, 162090, 1910, 11460, 0x5af73417 +0, 82, 82, 1, 1382400, 0x49d6a8de +1, 164000, 164000, 1920, 11520, 0xee0035c1 +1, 165920, 165920, 1920, 11520, 0x31424265 +0, 83, 83, 1, 1382400, 0x5e05cfa4 +1, 167840, 167840, 1920, 11520, 0x035d4a8d +0, 84, 84, 1, 1382400, 0x01327a34 +1, 169760, 169760, 1920, 11520, 0xa8375593 +0, 85, 85, 1, 1382400, 0x06ce3c36 +1, 171680, 171680, 1920, 11520, 0xbc3e65d3 +0, 86, 86, 1, 1382400, 0x6aa24e6c +1, 173600, 173600, 1920, 11520, 0xa2083bae +0, 87, 87, 1, 1382400, 0x55d8b694 +1, 175520, 175520, 1920, 11520, 0xa220604f +0, 88, 88, 1, 1382400, 0xcc6f136d +1, 177440, 177440, 1920, 11520, 0xd5d3598c +0, 89, 89, 1, 1382400, 0xe92b6ce5 +1, 179360, 179360, 1920, 11520, 0x0e376085 +0, 90, 90, 1, 1382400, 0x664d30a1 +1, 181280, 181280, 1920, 11520, 0x40d973bf +0, 91, 91, 1, 1382400, 0x09d80a1f +1, 183200, 183200, 1920, 11520, 0x05d74496 +0, 92, 92, 1, 1382400, 0x2b58536e +1, 185120, 185120, 1920, 11520, 0xec735e54 +0, 93, 93, 1, 1382400, 0xf24b7a34 +1, 187040, 187040, 1920, 11520, 0x485c5a96 +0, 94, 94, 1, 1382400, 0xe2a524c4 +1, 188960, 188960, 1920, 11520, 0x0ec2705d +0, 95, 95, 1, 1382400, 0xe841e6b7 +1, 190880, 190880, 1120, 6720, 0x81991480