From patchwork Sun Aug 29 21:27:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29859 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3402322iov; Sun, 29 Aug 2021 14:28:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjoGD62+vRttWkOMlKbO7YLhY9RNLTHdUXmZ7aS3sDvGoEDpUUS60SXcv638Ey336hg5UA X-Received: by 2002:a17:906:ce24:: with SMTP id sd4mr21539647ejb.329.1630272508175; Sun, 29 Aug 2021 14:28:28 -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 i5si12257236ejd.224.2021.08.29.14.28.27; Sun, 29 Aug 2021 14:28:28 -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=TDaWEl6q; 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 6B93E68A2B9; Mon, 30 Aug 2021 00:28:15 +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-oln040092075055.outbound.protection.outlook.com [40.92.75.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0217A687F49 for ; Mon, 30 Aug 2021 00:28:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NBpk25CWxKIkHF/G+p+oqlqXSdpk4a4SOBVa3qcMhTiufuQEyExNohJSG9w42LYnkii1YJfCXKcSDydqS3kyQ3kw2O7YOXvR6tXK6BwvbppFvDCeN2Lb02zKvPHAgTqpNg3rQnWEA257gv3mcJxCZiczo4n/UvME1hhjOL3ZPm5N7BVPpTddJiWlZiL5oQvQiEKilPle7FhnKL+STaidMRBzRGGoErCJjenoUurV+H6cmpmM3leyaCg1wpmM96o6RZuHGulSoZbQORIGS/4KgPiJSDxK0o3twbz3Kh70VBin1uepU4A0z5UVbt5cIGEecFAPsu3HmfRBBuXVnte3iQ== 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-SenderADCheck; bh=zSgfVMzptj7kuIDMt0GNaoQ4ez0ZGJ5qCBfBImZcaBc=; b=EPEDfLih3iegzchh3HwM0lD2g4uny4Awlkc7ovYAV+KjQqpjltxiTOoxarON0qEVttiMSMLRAmSGkh4fTInpAJOo3rPphEH0r1cnlHQX4k8qLglglm1WOScKyFCOjxuU1JWGG/iFvfrwUzMF8B2MAIqZ8DzVbgO0BRfbVtG536dkWKM8yO5RLD4v9xn5hEK59+wJodCHYqJ0VrHejJzn6B6NKx/5u32J3VWcGGYhaWRSwWwMdd8euO8sXYgD7LbW/q3HmK46gRTdBcVKz9gRmHuaZJD/NJYnAYQgHdA3LHyVAM7cKNRh4+Fnw6Tr+xDedVMQdq4CPwjeg/gbecDMpg== 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=zSgfVMzptj7kuIDMt0GNaoQ4ez0ZGJ5qCBfBImZcaBc=; b=TDaWEl6qxzS+GTkV717IRmz7vZQJSeX6sX6o35uieIFC1peJzntLUb4ecdt4nx00mbuRmQZPFxWtn+3rmhuE1ad9ftvvDoCY6oTTbY3JvIDrtcSBGtpJyFJMzUzT92+4LPv5HLk00g8KQu5vynRvvoSi9o9hKYkzz4aKvT89Zkypf0eVT/mTQ/Vslx13x97cBKJmfV3SZEzrxrHXtYBhSpOz/yx8dauSoWrB3Z9M2V0o6c6+ogblYnh+k5pdTlJwIFo0zacfasyShLGJmKeeVMwVTAvUkhAhLfRGGYc4aKwZ5AE1hsmCEBN3w/hYvFtwLGkXADRDZ8dRgfI+OF8bHQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5927.eurprd03.prod.outlook.com (2603:10a6:20b:e3::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Sun, 29 Aug 2021 21:28:06 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5%7]) with mapi id 15.20.4457.024; Sun, 29 Aug 2021 21:28:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Aug 2021 23:27:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [hxGV8/pu/Oi87nZyjUOW8XXVCa03QR31] X-ClientProxiedBy: PR0P264CA0178.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210829212744.1505779-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0178.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.19 via Frontend Transport; Sun, 29 Aug 2021 21:28:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 021eb701-a1b5-4c78-d628-08d96b33e3d4 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXOVIHST31EzKLNwg5cTLbyrNM8d22MphDes3FX3Hzm84rsZMQepvC8F4oCdcyYe7c7RpkSROtjWDhU7UoRzxUNaFD9dohVso6Jp6ukA39+Hw9ilajXIKJlFB5mh1EVHFwd7FvZeVWp9xlRS3aADn4Hf7vnQZg4zrsTmHQiGtSd8aQP6uA10FCAbQmVLX1w6oteFXppcNGEp77HdleZ+UfUWqSvQOGvqhSCqNnohmVD6ukfGdVeUwr+YT/dFCyAiQrjx/1vFvMabS4Z4FxHbtNGMUypf3KvXMJKmTRE5ypLV0QHQ987hFH4UhGz7t9rHaN5DzegP1quAQ1ZTJQlJvY84zB2PJYS6mQdEv+OGWyg/RmJu/8fJDoPOZ0WV6WE4CDMaZKDR7whtmFmC9sVu73R6sTgmEaWDVpIi8I1Trug+21C0GIxvIru/4mmpQiYFWEIEWMjzbdniy2pLHrlvxMr1/4EPiAmVtXLMfz8g08NCrIqqavykuFYJYp5Z76W/vkc8bVlWa7AU5BMm0A7d2vsnSnGA8UcWs+wvDKDzbUbG8mMBxBu95Uw6S8d1QyhPT2hylVfBW/Zq/y3eWpWFtu5tYr4nLt/66TGb4Uq4tUJvzJG1kGiwXIK3hbWkRixRezZv9IQTIKWg7EDWzDj6S+YJkWhYp7SrH+AA/l6UWm7M6y4RFcAnWZ58h2m1R2X2MuTYASQ47ItUIX71qp0PhrShmQmE+AfamU= X-MS-TrafficTypeDiagnostic: AM6PR03MB5927: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 74yqW0jR2U2BLEJEItt+prYqrfyyCZZU0Vi5nX77QYwPqvDn6vrMfXHmxsmOX2xiVBpRBFWP3tFa26/Sd5n0q/O/mws6ORs5YeHb5qksu9Tp8gmYoK15LlCosY9Jdc58iJS3ZEzro4BZ2Q4X/PapvPual5COqS23eFsQCoIq1kYYuA7BjJrFXUE5RD1jjHMj2+4Flg1OmrtFsckisGIaUkr7lYMQgdnhIK5IbxENxA9TmyJtikH3w1GzGHPoknraC8gkKj8aqp8jYJrgez/i7U3Xkp8dXa+surEvU28FM+z2E+hvBfoidmA+k4vMnVnN4wWLepdoFBHh65YxCAlcTmOoeeFY6dll2W+jq1oF72UhbeMMLz0UdcvhfvIyinFUUJtxivsaYsr0hImVzWukn6EwwSoXdnmBKyH0bvXFbU3sUpd2t9wQCCMu1JLsQRFp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K3TYxqbuOjhJd34ap3LzYFOvr+C18oOTMRI4jzxbJwavoT3a1hm5u9Tl+QGiu3CY3HARYUdDJJimk4LQk5EVBGWGaaE8SBvELjdLMMttYYo2bsJfACc9zNnT9Wfv1Y6ydABpnSfPgJLDNxf2fVdgfg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 021eb701-a1b5-4c78-d628-08d96b33e3d4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2021 21:28:06.1388 (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: AM6PR03MB5927 Subject: [FFmpeg-devel] [PATCH 05/11] fate/audio: Add tests for APTX (HD) 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: /ApoIAN3JXTF We have de- and encoders for APTX and APTX HD, yet not FATE tests. This commit therefore adds a transcoding test to utilize them. Furthermore, during creating these tests it turned out that the duration is set incorrectly for APTX HD. This will be fixed in a future commit. Signed-off-by: Andreas Rheinhardt --- tests/fate/audio.mak | 14 ++++++++++++++ tests/ref/fate/aptx | 20 ++++++++++++++++++++ tests/ref/fate/aptx-hd | 16 ++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 tests/ref/fate/aptx create mode 100644 tests/ref/fate/aptx-hd diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index fd9905ca0a..dfa72288ae 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -1,3 +1,17 @@ +FATE_SAMPLES_AUDIO-$(call ALLYES, FILE_PROTOCOL WAV_DEMUXER PCM_S24LE_DECODER \ + ARESAMPLE_FILTER APTX_ENCODER APTX_MUXER \ + APTX_DEMUXER APTX_DECODER PCM_S16LE_ENCODER \ + FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-aptx +fate-aptx: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav aptx "-af aresample -c aptx" "-af aresample -c:a pcm_s16le -t 0.25" + +FATE_SAMPLES_AUDIO-$(call ALLYES, FILE_PROTOCOL WAV_DEMUXER PCM_S24LE_DECODER \ + ARESAMPLE_FILTER APTX_HD_ENCODER \ + APTX_HD_MUXER APTX_HD_DEMUXER APTX_HD_DECODER \ + PCM_S32LE_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-aptx-hd +fate-aptx-hd: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav aptx_hd "-af aresample -c aptx_hd" "-af aresample -c:a pcm_s32le -t 0.25" "" "" "" "aptx_hd" + FATE_BINKAUDIO-$(call DEMDEC, BINK, BINKAUDIO_DCT) += fate-binkaudio-dct fate-binkaudio-dct: CMD = pcm -i $(TARGET_SAMPLES)/bink/binkaudio_dct.bik fate-binkaudio-dct: REF = $(SAMPLES)/bink/binkaudio_dct.pcm diff --git a/tests/ref/fate/aptx b/tests/ref/fate/aptx new file mode 100644 index 0000000000..ff890f6943 --- /dev/null +++ b/tests/ref/fate/aptx @@ -0,0 +1,20 @@ +e36494e4eaa69dceb9746e784f928198 *tests/data/fate/aptx.aptx +480000 tests/data/fate/aptx.aptx +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 48000 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +0, 0, 0, 1024, 4096, 0x42e145b7 +0, 1024, 1024, 1024, 4096, 0xfe24da5f +0, 2048, 2048, 1024, 4096, 0x5c9d2323 +0, 3072, 3072, 1024, 4096, 0xc7e155cf +0, 4096, 4096, 1024, 4096, 0xff114281 +0, 5120, 5120, 1024, 4096, 0xd60bb6b0 +0, 6144, 6144, 1024, 4096, 0x2beaa892 +0, 7168, 7168, 1024, 4096, 0xc74c71ca +0, 8192, 8192, 1024, 4096, 0xf49880cc +0, 9216, 9216, 1024, 4096, 0x9eae2532 +0, 10240, 10240, 1024, 4096, 0x096863b2 +0, 11264, 11264, 736, 2944, 0x533118a3 diff --git a/tests/ref/fate/aptx-hd b/tests/ref/fate/aptx-hd new file mode 100644 index 0000000000..825d0439b1 --- /dev/null +++ b/tests/ref/fate/aptx-hd @@ -0,0 +1,16 @@ +5cfb39f6d059dd0a906feabc12b3ac24 *tests/data/fate/aptx-hd.aptx_hd +720000 tests/data/fate/aptx-hd.aptx_hd +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s32le +#sample_rate 0: 48000 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +0, 0, 0, 1024, 8192, 0x85791bdb +0, 1536, 1536, 1024, 8192, 0x8db6dfa9 +0, 3072, 3072, 1024, 8192, 0x617b2190 +0, 4608, 4608, 1024, 8192, 0x733c4d71 +0, 6144, 6144, 1024, 8192, 0xb254420c +0, 7680, 7680, 1024, 8192, 0xc166b305 +0, 9216, 9216, 1024, 8192, 0x93e8a20e +0, 10752, 10752, 1024, 8192, 0xd91c6790