From patchwork Thu Sep 15 19:23:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37938 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp518643pzh; Thu, 15 Sep 2022 12:23:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM78gFYUlk9eJtumGYZYdwL4qsg0IsILCuvnDUkkQGNe6NFLliy2AwJP2GOWi3IZGywYZiM1 X-Received: by 2002:a17:907:1dcc:b0:77a:c5f3:708b with SMTP id og12-20020a1709071dcc00b0077ac5f3708bmr993716ejc.331.1663269829937; Thu, 15 Sep 2022 12:23:49 -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 sa36-20020a1709076d2400b007802725907asi5706956ejc.647.2022.09.15.12.23.31; Thu, 15 Sep 2022 12:23:49 -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=MIe9I8Rw; 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 9EB3668BBC5; Thu, 15 Sep 2022 22:23:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069062.outbound.protection.outlook.com [40.92.69.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 537F868B9B2 for ; Thu, 15 Sep 2022 22:23:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y2I5NgmTh4O2pLheToM5u3YJsna48HwvjvL0gQTww6CZ6FCjEpntVwCznJQ30t2ZXiAi0WHZ7XllL8sBLR7FDiCvYKvOwNFtEpvkyU5pRzXbQ/YQXqNQL3fp3WUJV042Nae1Ya0qSWfjp4fZsNY1V3XHBHdDK9nmXOD7LGzTZ+WFdack+3fpjXqnNqm6AQbZF7/g84Fd+keDh5RL1NfWPow+H07jjRjESeYlM2S681TDT/dfhyDlL6BKwHVW0zSV+nk4P2c2moEd31xNHu/BJyTBnehoD13/Vc7tPveHzCj4TZnVNg7aAdVsskLDXrxE2f0n6Ask/G0pcdKiGHUV5g== 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=GswkTW3gtGY5o5Sg4YNUFSRDOFCVarb+MOYn8ssDVqI=; b=MTUxorI+xAzOyZfN7r3gshBU6dd8wDkU6TlqVM6Iq7RGd4IsE7MSKrrT13Rirniia/u10Ebtm29CHdiGtsG1VZ8e2+hOtJvZRcv2Q6vqLl6vo51Ez5mp6jUrnjnVYBfAC/pmxDzf0JM5n2+g+XACuDWEORRPhJeLWMpTKd5sK0eAlT9l202R74Iwt0VneT1G7hzMVGH6jolRiIu9xqytUlE/EZ/8vkDP54+/Jptf4G4QDiR3+UTWzlSoPtCgTc8D35zBJyam4HyqXksm/vCSoW8E1SD73oFWBp9LyDx7c7m/aSlSE604q1obMZOkcJntVDrCtEgANzuy71SozVNUXw== 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=GswkTW3gtGY5o5Sg4YNUFSRDOFCVarb+MOYn8ssDVqI=; b=MIe9I8RwktuAiRleZJHH1WVjFg5AS8HYaIqZxBYFnzTis0qOfHvKPoduR8LjllfCDzpe97eDMrUH548F4+mVV97P8sh+dziAt5kpWFRZ7fjv44q0aqzh3JsDIsJ/1s4Pmsm4w7kR8yQ+83bXrpuV6aFKUMTjtGsRBBzQGXhELMCF598cR/8AJrdAD1djzuYC6Qc1norD4yapJBB/mn6vPQlt/Qy3IxfX9cU4X3ibGY4FdWVaJGtVnPP2tHbwDorjSGMk+/agdl7PmJB314CbSZKfB0oZmvv/QpjOV9iyjkFavVyXhkPWS/8LO3DxPreHituMmZLDs/hDhjsJZf2P8A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.15; Thu, 15 Sep 2022 19:23:21 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Thu, 15 Sep 2022 19:23:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Sep 2022 21:23:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [dWnGoT4LugUCwKEh7WORyf4awHzDlQCKTvvUaVh2ZXw=] X-ClientProxiedBy: ZR0P278CA0037.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220915192318.2761116-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0014:EE_ X-MS-Office365-Filtering-Correlation-Id: fc189cf7-0502-4229-ac9c-08da974fc03b X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nhHBm6ef2k4kg+632kkxCLikG7pkRLaJrjRrnq4mGVW50ZMuX6OUPyNlUP5vjPzCpz4jNw5lsEKo7GZjAqdNpPZHBJY9B6R2nltXNZqjHngc4FFXf3NGCSiQTf/WTbWNUHPjVeud9y7rqspaDWNRoJ9wsie6RQ+lQM6imsA66RFp1YAmMk7SxCOZ6GI+yzggLsv2faq3DFYowgZpcLEiKDSNMmn4lGyU07aVZagCZErD4O+/H5QlOuY/ldjABMMLxMfsGHuM/0ImPgWh+h+puC4CzBkVJMDavVFcZOViaRc9lWYYciD0yfH/gqMvh0pC+R48aJTGXtFzHZro/QjiBxsWCbkZMDjI5QImkFO+6x/azT75GKZnzPca/hZOPs9kw9Helcx32SnlZZJOpML2jw8C9y8+zt9hMTyGeF1/CxB7AwPtC5a7qzpkL809vBBCGVz4ahxJH2E9qZpLAQ6NT6GpMKHWcVkNDIhgFMCI1MyoRdosvwzRS6wM5/IR/XwgnwAzlUQ9Ty6runT8IkiODAwl9UM+G1ppZvlOdDMzQ1xxLVM86rI3/IBA1Ih3YEkS+Z7jmdTcRKhGIearK79qG2Ci25Wc+gBJyQQUHrn4HDyCcdyUVXxBBUhA1JgtyMI9A3lNPP392NqByTGTaE2gYD20U2ZdJ/zEUBDCVDiEUy6IvAVMDS/Mub0GQEJwpXZ7gC6n3IAkwMX0y+xldpT/QFF8B3LEv401gJc6DZuc8alO60iJRHFlAxlZzXirvFH0jGW7su21xiyo5pTtwtBFTU X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UOGVK9LbrploRhRMF45J/0lGOqP1mYWItwA6DJXwAfZSOAsrP2R4Pcxsuxc2LUdXa8//e8NJYBXREejB5KXPtHv/qVJ32JZAkNpS0xo7KniNUWbwvsPAaLU1vylW2bR9cRoQYiL6G4uBJbRgYp8kt8Ncd5TiJFK8zlX8HSp4XK3YL5CLhop8dPxAz+YcE8tbwe7xY/BGdnwPYPKNueO84mQ6TMYoW6HD5Qvb30K05Jcb1pBPYqEYugaKHM+OZf77/UBb7eFlo22b8QryVXfCSP8l/81wDdvGvhDiyRmvXe/fTkTx5uyuZ7mW/0uYDISNx5KHxLFsfPlaBtcyp7n0YJDixbnJUNm/nofJ7QzOh3ZBVKm+/q92fFh/RZHtS7KdTpFfIiXXcZDV8JOqD4NiWPUvtmd57Ul8u9+/mUUl3S45IBzUCJO3L8DL4A/mu4kjkNgdrImgnREJhdceQiHnFRHyrj/yx1ZAG/X/arFtsXgG9eE3GvqJAZI9HIhCCoKskzCAJ8rEMfyCfnlgOaLVJH9q88AGyIARUVX35xpi7/Vh4sG9h+XDtnHiuVY7VXu7LKAvHMenQFj42ADaZYZF9L7Zl+xWwT10k8vy+UHb7CBdkXSz/JeKr+OrQDyGXSG4AR8M9axBfIzjcBCE/ODoDg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lYSfNdgdnqcQmUlc9c3NSLUm+B1RaYSl0aMaqK8VfORmPW6brNgciLw/TOk5akc0eL+c/EdqmL8BlrEcgVBO3oez4vxziiSaWxVcUsSNCZDRlwj8ots880i6ZPjvOBDpB7bIcDiHFW+8geIN5m3jMMBWOZ6WkIrojFanziKWqAlcy3JWtYhxqc1M+zw+TPqT7XtHAU0hvVjkifKp+1ebWKtWRv5Iy5xM0W9VWLdHDRo7YaCL96AaOP2asFGq9rvxFTsNYu6R89z4ZFaMSvUW3c9fApdfnQDcIRkRTz8clYkvxXPasQDx79gCoLZSvCbzMvJpVILqhWAOAigoutM31Y8z268sU5HjsAhAv4LvqTusXeUTFWsQz2iSd4kUKNdk5eT4+QUkEUtKyw++xjcY+H+0nMeAWuKGWnj3pyYhR/ClBLKdjA00tvQEsb6yZuteNKtSmmbtaeRD+JrpAYvKaz3N1mKEmpnCKixrX7zeV4xNIOB2Jwa+APYF5aNvJkMvtBNyKAbMO55FvVkxQS5guGOQDaC2QkQinjRUhOEICEwEWKruZuEv9fzvCIckIMX4EJbyopjogO+tEY/zx7vXVtrE9xm8VZC+0eCiYbzpH+cDRljZ8EugAbUBxCNyJta+UhCY1zWqO4kgfv+6QcW/oPIIZNruGfRpb0TGoBnNAc9rbIDw6PI7fXs+MCp3sXmK/5f0303ABMiFmalwt/dmhG5PDaY0Y3s0PxuQLkSIzbLaRVtZgPDcV35J+GdQ+4Eubd4gP+btsNuwMA8mgGxSeaI9hTn9SZJD4rZ6tZxhXcbZ48cSInSGJY6V7gXrNiBa3JBakaQ6gfQa1XmfoEn4qrGQo+YabnLGQKualOcKnYWR9jsmXGQ/s2OuwzU+5s2Sfbhw0AQizf+7Ujxi1o8R2sOSJ4py0OAPbJ1qcoZrLBdQUIyyRAXA1StXSW4c3hDI+pn+V7EsQmnDatTT5uHHbEDrsFXmU8geTt942Nm9D74Iv89wOsX78u3usIfRfQaxro7sUFacWjof7mYOhe3hcE6ScPSjl1kP3FOw8D0GRDijh2cy7dfB9+4twhwnSYGEAZnX5lVzdVmrS1wq3EABBxs38SwAAFNFDllHwlNIG9iZQbBsXXIlU9QkuDBhKbCkapyZ1YMMNL6UA7X/4u6VjesrQSWv2opl9NvCY6VVXbem67enOFe0JlkZn/GfUXb/oY3QIqtbBVNY1QaNCG2tG+XUvD3VFpp5T1QOBLDYJUvORG8vU2lfq+mqyvt5NWi7BJO4IYJy8SfE1WnX0MmLrkT9zFIHdokgigTE+Nl8qkH3NBGZde+O8tEYedXiNlKA X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc189cf7-0502-4229-ac9c-08da974fc03b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2022 19:23:21.1412 (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: DU2P250MB0014 Subject: [FFmpeg-devel] [PATCH 1/9] 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: Yj0S328RnM1a 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. (Thanks to Andriy Gelman for finding an issue in an earlier version that used a 192kHz input sample which does not work reliably accross platforms.) Signed-off-by: Andreas Rheinhardt --- tests/fate/audio.mak | 7 +++++++ tests/ref/fate/aptx | 18 ++++++++++++++++++ tests/ref/fate/aptx-hd | 15 +++++++++++++++ 3 files changed, 40 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..9d39eeace3 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -1,3 +1,10 @@ +FATE_SAMPLES_AUDIO-$(call TRANSCODE, APTX, APTX, WAV_DEMUXER PCM_S16LE_DECODER ARESAMPLE_FILTER) += fate-aptx +fate-aptx: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav aptx "-af aresample -c aptx" "-af aresample -c:a pcm_s16le -t 0.25" "" "" "-f aptx -sample_rate 44100" + +FATE_SAMPLES_AUDIO-$(call TRANSCODE, APTX_HD, APTX_HD, WAV_DEMUXER PCM_S16LE_DECODER \ + ARESAMPLE_FILTER PCM_S32LE_ENCODER) += fate-aptx-hd +fate-aptx-hd: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav aptx_hd "-af aresample -c aptx_hd" "-af aresample -c:a pcm_s32le -t 0.25" "" "" "-f aptx_hd -sample_rate 44100" + 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..4d20b7df9a --- /dev/null +++ b/tests/ref/fate/aptx @@ -0,0 +1,18 @@ +b5d8a297c0e8d9854f19d9d3e8b82859 *tests/data/fate/aptx.aptx +418950 tests/data/fate/aptx.aptx +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout_name 0: 2 channels +0, 0, 0, 1024, 4096, 0xcbb4ceff +0, 1024, 1024, 1024, 4096, 0xa66533e7 +0, 2048, 2048, 1024, 4096, 0x4f22ec39 +0, 3072, 3072, 1024, 4096, 0x45f117f9 +0, 4096, 4096, 1024, 4096, 0xad6c0b7a +0, 5120, 5120, 1024, 4096, 0x611618fd +0, 6144, 6144, 1024, 4096, 0x0ec02f2b +0, 7168, 7168, 1024, 4096, 0x2cf9ae5c +0, 8192, 8192, 1024, 4096, 0xfb008ac0 +0, 9216, 9216, 1024, 4096, 0x25068495 +0, 10240, 10240, 785, 3140, 0x5a260589 diff --git a/tests/ref/fate/aptx-hd b/tests/ref/fate/aptx-hd new file mode 100644 index 0000000000..0691f33c86 --- /dev/null +++ b/tests/ref/fate/aptx-hd @@ -0,0 +1,15 @@ +48ecaa81ee5adaaa62ed3ff6574b6666 *tests/data/fate/aptx-hd.aptx_hd +628425 tests/data/fate/aptx-hd.aptx_hd +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s32le +#sample_rate 0: 44100 +#channel_layout_name 0: 2 channels +0, 0, 0, 1024, 8192, 0xa99888c6 +0, 1536, 1536, 1024, 8192, 0xc3e03a3c +0, 3072, 3072, 1024, 8192, 0x3f06e090 +0, 4608, 4608, 1024, 8192, 0x92fb18f3 +0, 6144, 6144, 1024, 8192, 0x3d5603a2 +0, 7680, 7680, 1024, 8192, 0xcc3d3101 +0, 9216, 9216, 1024, 8192, 0xbcc022ef +0, 10752, 10752, 273, 2184, 0x9873af57