From patchwork Thu Sep 23 15:28:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30504 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp568907iob; Thu, 23 Sep 2021 08:33:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOlxktCzrG6EoE+LKQ9hRevsWHJUivlmmv+BKboaQ5H2WJIO+8SPm3McLE3w0DUDYENU7/ X-Received: by 2002:a17:906:369a:: with SMTP id a26mr5580238ejc.539.1632411182189; Thu, 23 Sep 2021 08:33:02 -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 y5si44387eda.365.2021.09.23.08.33.01; Thu, 23 Sep 2021 08:33:02 -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=BaVFJ1Sl; 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 D865568A8EE; Thu, 23 Sep 2021 18:30:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074100.outbound.protection.outlook.com [40.92.74.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E57B68AE7A for ; Thu, 23 Sep 2021 18:30:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tf17FV2A6qwc7/E39pEd8n0jKdUWSRS85psETksuNZFv7Cl8l28sq/jg9ykIbJfGNJm/dpt0R27zLFHPi/aCnkJ6vjA+AowbtgIgoZbgaU63ZhWxQlIGfLDLVCy/2fis/JL7kI2ZJZ7mSOQAQdXXO7Gu0lgRv1PzFyFg2kw5UKYu8/eaT5NOL+oTfsu7V1BIhdkenoNkcEcXMps7ipt1gBPkJJnX+9fHuG4bvKtZjmwd1/wVmx1aEowYnQabkukx+po6CoCGF9Ey3F+DFBVuPJLngkrEZ4N9ArZ+BmjrFlB32enQ+BUfUhMp1xOhA1RKeW1nqYndQqU2lf8ouCwXvg== 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; bh=tfCA4/HXqJ6Bbluc9/Pyh8xDm9ezUejG72ERC2fO38o=; b=DsW3I+rqWPbgPrcHDptS9iur90ubx0loUxrgeexPwmYAoiRnTXS0hqvUxCR8+2udi3cYDqvqHxJG1tkJxVBYLDN4o48VjPTJsLafCTdKDivlGCEs/MTYePQEP0WTQn8lf9YKHah9WxTgvMS+m3eygqI8GFaiVDYXvNFG4KINWwEq0/qDMYZ8b1a/iIdKDbSHzNE3gXMinoBU8WXJmiAM03soOtzvjbukiMxfZyDC/fHSKA+FpZwjy8BYKkn7n0ukPTxTK7xsEUx322RSAnOxGtKKc/fRKU58lGKGSPY45Q7Obc+4JOl/vbbn/mKKfCe0Gr6LIZnynTUmPS6MPizPhQ== 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=tfCA4/HXqJ6Bbluc9/Pyh8xDm9ezUejG72ERC2fO38o=; b=BaVFJ1Slmat5ECQ3d3kk3mdnPeBcbEvl9B4xH3/Q9XNkfqbqR5rR5aur4pMOJOg+f1my3deQ6DlTakGLClkSsDbz3lkwGwpdBd+Q5bFyVx9GboTrklix/2bMWTLCwtb1ekSe8JjK68n07bcd0RyLwJGkA6HiTqqANYRSmEzIQz0vTU0/anqrZ1BM6f11osZVrC7lLk3ykOFOavI7PZJZEXgxsfX9Kp1eLfhKACEBELL0goJmkOYGnMAGuUMhU1DWfReunjc4SJ82WFG4enYl3aczw2VuEuk8NtF5XF83ElDgfrL8aFfFUTMSGsMmJDgp/LnlcjkB7xRaOXXnSgeFUw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5172.eurprd03.prod.outlook.com (2603:10a6:20b:c1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 23 Sep 2021 15:29:58 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.021; Thu, 23 Sep 2021 15:29:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:57 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [kbohyZ9iarcRqJORSYzMeoKd0J6XijxA] X-ClientProxiedBy: AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210923152902.42865-21-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 15:29:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a483b81d-b7cb-4ef4-0f7d-08d97ea700c5 X-MS-Exchange-SLBlob-MailProps: sTyj/kSftouSyK8Ur8NVjbpNS/aEd/pXHVnuSzT6Cd+JcLs7f3angM9rhplilWieGt4m8780m7xR1GPVtbBYw4cOnOrBGow1LyBlMfQjUJpXOc6f7ezi5r51czk5eOTzWTnHFXuXpZlW9Ko1r3LcnA6Xd1QZewDPZ5BCaeAs5Pz69Kr7l8AdwyfzumDqH09hX4lgIClAeFimPT/hQDV5Uog23STQ8GA5mY2Qf6K68TcYVRcDYMp065pC46QIig/mGzffb+DEcGNvzrs7x5I1xFYNtIggj5vVOTczHSMKb4Z4gNpLNNjgFbXRpAwT4gomLvXSICy7aZ8m2asrCDVxIz8sM9uIqYPp23PalW2lswcdBJCTot9cM7p7pqTsl2Tp6tSKKBXl8yLGIY/JRAonDi1w1ET5LPLv4dbzf8idz4Oou4E1dNhpBcneQO1XfDcwY38G02c9U8ypnwR1OdbAFMKjSZ52syQPr6ieG/N3OpPteDR7/06rJGdEofPGc6c0C9w1KA7reGVFOD/+6SSAq/UZByQj3XYitButCegq4t6S49f7z/H8jkC8UAHGodov17ViDGzKpSnrEBOsDsq9HPlHSBYawLGTxMNN/NR7ECr0pk63T+YPl0u2k1v2hvHBx/rfyBcxmatm1Ma8r7LaCr3godkZg0mqCsGw20sHOTbOFNcSfCmuOIWVcVIIVA4JrTKiP4EVmVE5ah9Nm9Hcq9aqrgc3ADadj5GYvNMD575IutVJEqN+fcVi0+FeE29Txf4e3VOUDegVdD/t7iwC20oI8Z48NWJCP0IJg9rAWbZYQPIHk4CKIxX5Ui57coO70KJvIDowoDmoh7rYy6VMQw== X-MS-TrafficTypeDiagnostic: AM6PR03MB5172: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G6n5pQ2A8c8y5t22S7sY5hBQwVd/FSKKvzCba6WmZcMXvxiG5w1SK7j6w7dma961SXwzqby45+UR1f5NI0Gm5fAf3Kkr0FdFiaUHOUppoHaDp3I07eUP/NMiA6ZEHyZFJGkysVsJCDhb1vpYK2wmT0KZoWxl+mgJZQOaZEGIQk4B49Yo68IGyAAC7A+tAXNvMVw8vZsV75AiRuMi77bgxmTkZdrV+NmxkoCcW0IGsUOeXKoIp3CjXWbHjEvKk2Ku/Di2yWEcD96mIsQp+e0oBo15BlF6PGkOLMwOcekJlxNHtLwta+fCbb/e//uCl6HBZL/VuqQJipqMgCC8Lv/YClmNcjMP6Eqpo5uPmQNr6icJEk88ulONOgwpByuQ9UeJYVLnzzoSG1ZdPKJRYyItactdmMdzX91XNE0svAdRCBU6aPp177WluWVb7kW5//qe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tx1Cy2u19g22tHupCvgytbjDWrHGTTT9Qcmse7zIXGxWVQf8Z4nc/f3aGocnv17UakWjPT2R9adG+i6q7dMCJ0Bloqpqh8/0+U1tykHdshFphCOVFdURxZ2/lYfcbpTKF18kX/jiRnKkYXO9FOBQ9g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a483b81d-b7cb-4ef4-0f7d-08d97ea700c5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 15:29:58.9020 (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: AM6PR03MB5172 Subject: [FFmpeg-devel] [PATCH 22/27] fate/oma: Add remux tests for ATRAC3 and ATRAC3P 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: 3XNnZf42RT2O They already uncovered an uninitialized-value bug in the ATRAC3 code in the demuxer; and provide coverage for ID3v2.3. Signed-off-by: Andreas Rheinhardt --- tests/fate/oma.mak | 18 +++++++++++++++++- tests/ref/fate/oma-atrac3-remux | 14 ++++++++++++++ tests/ref/fate/oma-atrac3p-remux | 18 ++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 tests/ref/fate/oma-atrac3-remux create mode 100644 tests/ref/fate/oma-atrac3p-remux diff --git a/tests/fate/oma.mak b/tests/fate/oma.mak index 977dbd5c32..a088feff21 100644 --- a/tests/fate/oma.mak +++ b/tests/fate/oma.mak @@ -1,5 +1,21 @@ FATE_OMA_FFMPEG-$(call ALLYES, OMA_DEMUXER CRC_MUXER) += fate-oma-demux fate-oma-demux: CMD = crc -i $(TARGET_SAMPLES)/oma/01-Untitled-partial.oma -c:a copy +# Also tests splitting and joining the date into TYER and TDAT id3v2.3 tags. +FATE_OMA_REMUX_FFPROBE-yes += fate-oma-atrac3p-remux +fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sample1.oma oma "-c copy -metadata date=2021-09-23 -metadata time=16:00 -metadata title=noise -metadata id3v2_priv.foo=hex\xB3 -metadata_header_padding 500" "-c copy -t 0.2" "" "-show_entries format_tags" + +FATE_OMA_REMUX-$(CONFIG_WAV_DEMUXER) += fate-oma-atrac3-remux +fate-oma-atrac3-remux: CMD = transcode wav $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav oma "-c copy" "-c copy -t 0.1" + +FATE_OMA_FFMPEG-$(call ALLYES, FILE_PROTOCOL OMA_MUXER \ + OMA_DEMUXER FRAMECRC_MUXER \ + PIPE_PROTOCOL) \ + += $(FATE_OMA_REMUX-yes) +FATE_OMA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL OMA_MUXER \ + OMA_DEMUXER FRAMECRC_MUXER \ + PIPE_PROTOCOL) \ + += $(FATE_OMA_REMUX_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_OMA_FFMPEG-yes) -fate-oma: $(FATE_OMA_FFMPEG-yes) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_OMA_FFMPEG_FFPROBE-yes) +fate-oma: $(FATE_OMA_FFMPEG-yes) $(FATE_OMA_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/oma-atrac3-remux b/tests/ref/fate/oma-atrac3-remux new file mode 100644 index 0000000000..fb402c43c6 --- /dev/null +++ b/tests/ref/fate/oma-atrac3-remux @@ -0,0 +1,14 @@ +9f1825375316cb8d6109747def944856 *tests/data/fate/oma-atrac3-remux.oma +50056 tests/data/fate/oma-atrac3-remux.oma +#extradata 0: 14, 0x0aa600f2 +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: atrac3 +#sample_rate 0: 44100 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +0, 0, 0, 1024, 384, 0xdfded1b5 +0, 1024, 1024, 1024, 384, 0xd8e3badd +0, 2048, 2048, 1024, 384, 0xa316bdbb +0, 3072, 3072, 1024, 384, 0xcea0ad2b +0, 4096, 4096, 1024, 384, 0x88d7a98a diff --git a/tests/ref/fate/oma-atrac3p-remux b/tests/ref/fate/oma-atrac3p-remux new file mode 100644 index 0000000000..d909fdaee9 --- /dev/null +++ b/tests/ref/fate/oma-atrac3p-remux @@ -0,0 +1,18 @@ +0053481795d07598bf2e7d931dfc4fa3 *tests/data/fate/oma-atrac3p-remux.oma +671783 tests/data/fate/oma-atrac3p-remux.oma +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: atrac3p +#sample_rate 0: 44100 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +0, 0, 0, 2048, 1488, 0x69b7fad9 +0, 2048, 2048, 2048, 1488, 0x3c43fdb8 +0, 4096, 4096, 2048, 1488, 0xdcd2dbcc +0, 6144, 6144, 2048, 1488, 0x5708e4bd +0, 8192, 8192, 2048, 1488, 0xdc7bf8a7 +[FORMAT] +TAG:title=noise +TAG:time=16:00 +TAG:date=2021-09-23 +[/FORMAT]