From patchwork Wed Mar 20 02:12:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47251 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8ba5:b0:1a3:31a3:7958 with SMTP id m37csp121072pzh; Tue, 19 Mar 2024 19:14:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVm5XVN80U8Dz2lZqo/hjX4S0vjtKCfhXlCXnY4BoGdNldfqAp8N0DUixN+moAgt7rGhhua2qN5sX7jdB5Vo7YrE+NWzx01ZCGEdg== X-Google-Smtp-Source: AGHT+IHG7dvESODnVxbpHkC9kG4Z5tjzm2Ax3etlDH5SZF/a/ib2dfUBPH7VOfKRV+uPlV/xGRmu X-Received: by 2002:a17:906:748:b0:a46:c11d:dd0a with SMTP id z8-20020a170906074800b00a46c11ddd0amr1017006ejb.31.1710900843675; Tue, 19 Mar 2024 19:14:03 -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 he32-20020a1709073da000b00a46be2cec95si2725647ejc.992.2024.03.19.19.14.03; Tue, 19 Mar 2024 19:14:03 -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=U0CoP52T; 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 7E14B68D459; Wed, 20 Mar 2024 04:13:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2030.outbound.protection.outlook.com [40.92.59.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D597568D47D for ; Wed, 20 Mar 2024 04:13:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V3hrftTPi6uVYAaf0ZcZPwOkQjdICSd2oaS/zjfTBVla9HOrZXYjYkq/t5SFI82stiwejxoyB/BRXPwNBFv1sEgrC91ahgHbt2aoRpDmiF8THsFuHP+tXWX+d0GO3oXdQgJH3b+fcPjL9FSRbAfMja60VPeGyGL8dwjrmy3NFT3iyx82/t66/VddwptfeFuxlrAqvK9IVggvGOKqO3alW+e3Eq0mSByjkJ2s59VzRP3MwU1ztN23Lm3nIL2HrjeJ3wNfx7jLnOA+qwaeyV4wv8irpKheq2Uu2gyj5eMoagM+gHrxsVydZG+UA/w0rR7lAtgyGk5BqPUu9c4oDX/2fQ== 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=YiPhB2O9OUXxkhy3VoYv3P22Ir0itPo6tTSm1G0Jx8s=; b=k/Ft+LiDvcLlwpFtnA2ewkPgrGu4l6+Nv7muKfT4tQc/cuKmegI4RrrmKPQ3kmE8WErO+kDIpDepLCl+UTvHRkgbLPZZHbx8jXOMaUJ1omRPidE7ai+wAjJmV3yW1E0qurHgPszYVMWjyNX3E9EZ5XxPxoxxAeocL/2GRb7lNOhlaEdnwspa6GImoOCK+KSAPGNIYJAxbg4Nj342J2s7aSnyO1Q6WsCSXg8j5bomKZA4eYHBLG9mg9HU1vj+SO+Coe9pkjtVGTz9xpUERtNv0sm+9l5BQ6pvHbaKtkfSe9O1Wmsn7VI7HpFi8I8VP3Ya6QE02rVuAp7unpoTOAQV9g== 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=YiPhB2O9OUXxkhy3VoYv3P22Ir0itPo6tTSm1G0Jx8s=; b=U0CoP52TLbez1EmqyNw0nqEu1stIEMP69iVbYM8haRflwCmDr4hNYzrdHjekM928iUCVICVtMnh4gZcvCTUyPI63pJnmTx63i0RAz7UG9u+305jqezhNQMWeMQovHbVGHWlLdcN/B3kiYq59tQhJd/GpCNhULVTpISKmYhZTEym1sSTiEl+6UANb77tQC/YzmhP07KY34/NnROMIDXFoMUrRSuQh/X5O8PlcxnrU0IhBMmEXp+DGujaAlRutE8OVHkrb/SvkfUSvzJWQjT/ULw81oxmu2gwupNTFlPwaVD5CtyP4IZ1xE0e6dsDGaHNaylJNWOMAV7jMhRD6rbOdeA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PAXP250MB0543.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:28c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.28; Wed, 20 Mar 2024 02:13:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Wed, 20 Mar 2024 02:13:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Mar 2024 03:12:50 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [1P8S6A6N3yp/BRBA7eegQeIcMH3YECpknqbdZycdlH8=] X-ClientProxiedBy: ZR0P278CA0062.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240320021256.107338-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PAXP250MB0543:EE_ X-MS-Office365-Filtering-Correlation-Id: 9fcc1b24-6e76-416d-6a64-08dc48836278 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnpHlru1h1vRfamsRCbuNA5U7PTDoP4XPWUfREE4PdWNILUXOAaDB25nXKEZwyJq354jE92WXy6cSBeJsGEai6CCds56YNvQCy4qXZhpN9TwtuI5+ZLgpWIzsCaVv2tFlDZSi25pGYuERPQej/S3Yvg76QzhQ1uk6YRVEKf+HnX9Hw7De7Hw22Itk+gmBgiaz8oZSoOJ4n11aew+cVU4YP/mbXkk+ZvuVO2l6QTPb8YJui8hkGjH/WI3O4SuRb8KlRV2KE65xNXWk8kZ+mACkhSnid/XH0UotnfoaJCmRkYlCG02nrAsG4kloPVVaPozic3DgC6XJj9iPqQRhNvbyPukBJKow360dPAqMiVFwBV5HT8Tc5ZfBP7Dzq1ZFWV9FwF80NFFJtf/nVeHakG/6oHDzuxkL2ecUOT4GL1hs6XJvWpj+KEkLpMLh1qSvF1jaRpRJoS1RnYSL5gxO5Cv+4nzwjZ8AkUxXHi5djRENHquS+/QYOUBiuC/j0DeDkfJqy1LHseM+ns7KxOdZFVW2yGEwmS5Znf3LDtVM2oGrAS0JYEPIwUyLOewjqDOFdW4w3/ZX+pvQK66hq+aaQRlsGXAMIVjmDnCoBAKdIKeW5vG13xTE2CKKPfycyWHhXymZG0Q96paueks5X+TOnW4MJuKy9vBVeZDWjBmImR/0FDdeXbSa/WUkvEmTwgXXA3fPabSLXWW4oxJrtmQSw1+uiKBR2KxgCDJya8Th3c/BPHlQIEUhjgGi+K9jEQqFBf02k0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w7MFRsfZQx9n3FG1Fgp4P/o6obD6dcATXZiut3pUeqxsN49ovCELyAqv98Cn9Ygxwi83jri1NQk+dBTUMQJhkhEQYPLK041gJRENZq5Uj1eacPrmQff98o0+mxQaSBe6E9w9Bf42ub4aJEZKXlkbKom/ctPDywq3j7x7xwHEmCkBh7Iug7trKiEjQo0MrVAqpfAquCfdUpCaDhydDxs4P6+C3GVJJChTOaB3navjk1+ljVP5kKpYtqbxHH98zPCrtCgcU8Dr3Cr9f1j8TPi2tOKrOebXgRnjwU+7dDPznDU7hBcYAKET1fD8G/x3md+pl85KStKOxB2j16fsMQ4AtyrU13X7Sl3mLxj+Zd+wkY7zfMU/McbOSS5g3Yso9bwoJm2rsx0tMfjK4EBRNyHSJuJHbBGi7D8soyVTlIp4leLOFKzNfhfSxeO5MCO0CP0F1wWar27HftkswryB4SRHOOXazMTAQceFdMrr2TiTGYFJpmFfwJw7Yf0GRRAD5mEQsoCHhpB+m+MO9P4FPW/W9J7UsO72pWPVv1wP6Tqo6ZUakIBCfX7wUbGHI81XzLDCnUwWsd3LafWI2i0g/Cpij1FNkqwl5qo2Uvos4CV0ndM2WKh5J3g1KRWWGQ3QDQV2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oeWhQ6Qi9UchSlCmCir+o78n5SlM4MhpMANtJl4Hs80FX3I+EHejd2o6aQ7Witc+k6DGlgSeUMexGRis8u4B2JzTHn7g+FGENRIc3a+ITm8GX1uQChQOc3wlAo8VBcaVS4KHGcZRXlgHPovXWvs5QOsndhaYHQZZsXHQALZza9T+9XzyjheS2CK1EsUxvi6fpnyKCRME3yOP7PJacTky5Zr54TGP6CdPwEUGslsZq2DgUumdlmx8kaQEjwWeHkLrvadTQAea30WYQakdFz0fLwiC0Dne1KBw8+bhsChBgefkxhNpDJOOxk69cg0qzDMG66G5DjNCp4wuhnGMfIooFWOE6K2b48Y38S4ZsCzH1Q0MnL8m6StqHiHcg6xTudtMtc6fzij7pdjtEsO9+mZQE+RU2JMCu/61otk6GSWMcMzyGkPIJyI3vHF1RdDcY9Tci+K5c4+jV1NsCsr0u0IVhljkbuMOi/Wfi32IcAIDujuW9Jcp1fXvl/wovPbAnIF41tL41l+sv+iZs6jFbnZ1meX8cSw8Vl7xjz1W9cFfXsUjYjXpW/+U2MoYGRi3tDfTkQJQ+XPiETFaPoPuXGrginXAeHHx2jfSzPRoFGNSn9bJJufBysAcvD1Tb1ef26seheTrClDran2dB2N/J95Eb3xxvFfBT8OLOeZPmcX3ZFgy3l35ADg8Vn4p6fbKEQxBKKolOvHl0rFD3Gj5S5IGfNgDXQd0Fc0kOrpdyOI8mTtrBJbfgp8DPoW28WHgIWb3o80lsHmJH6LMZlMqniHU4hcyLc/suFrxQuCeLRkbGD/2BhFEcagHL6Mar336+yhZh7v5sANMJV6JwRQjCO0N9iAOFCaATMhBACf6IFG56RZQr3R38Vj13GYuFmvDdRYqYOSLcQZxD8giyvwVSAF/exTwjoAlam1KV6i3GD3BW3o5NtOfRVpWIcSP2R2gxWu83fWzf0yfSaJmMZuFNG6jSrzv1Vz4aRVPYmIQaCNDZ3Iil5nHw5VCYfyTJt61cfXiWCJh0D8eiS+06aReJDk3wjyl9iiiX4wGqxsJtpedBEih8+ZXiy5Mz4hvvthzQZlCV4c8BQlzrNDKmoUE+aKgacPDOuFS0lon+GoKwf6rHHrXe6uzIEYLr20ki5Z4HrbEg3IjcMzlnG95u+rTsgNgDY6zJqu86QNm7nEUePac853ofkFZXn3nam4fB2ATb+nN+YswshiieagnY6EwvTSJn+9lR0ljnSjfS1osbtYunkKKMY9CPciFjNnxPPspHwpCgl67G3Rt4aCvHTxwooTlUw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fcc1b24-6e76-416d-6a64-08dc48836278 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2024 02:13:51.1494 (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: PAXP250MB0543 Subject: [FFmpeg-devel] [PATCH 07/13] fate/filter-audio: Don't use pcm output for channelsplit 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mLpSQxzigpn2 This test muxes two streams into a single pcm file, although the two streams are of course not recoverable from the output (unless one has extra information). So use the streamhash muxer instead (which also provides coverage for it; it was surprisingly unused in FATE so far). This is in preparation for actually enforcing a limit of one stream for the PCM muxers. Signed-off-by: Andreas Rheinhardt --- tests/fate/filter-audio.mak | 6 ++---- tests/ref/fate/filter-channelsplit | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 tests/ref/fate/filter-channelsplit diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 308969c4ac..8d05e6bd77 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -306,12 +306,10 @@ fate-filter-channelmap-one-str: REF = 0ea3052e482c95d5d3bd9da6dac1b5fa FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP ARESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_FILTER_CHANNELMAP) -FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELSPLIT ASETNSAMPLES ARESAMPLE, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-channelsplit +FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELSPLIT ASETNSAMPLES ARESAMPLE, WAV, PCM_S16LE, PCM_S16LE, STREAMHASH) += fate-filter-channelsplit fate-filter-channelsplit: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-filter-channelsplit: tests/data/asynth-44100-2.wav -fate-filter-channelsplit: CMD = md5 -auto_conversion_filters -i $(SRC) -filter_complex asetnsamples=n=1024:p=0,channelsplit -f s16le -fate-filter-channelsplit: CMP = oneline -fate-filter-channelsplit: REF = d92988d0fe2dd92236763f47b07ab597 +fate-filter-channelsplit: CMD = fmtstdout streamhash -auto_conversion_filters -i $(SRC) -filter_complex asetnsamples=n=1024:p=0,channelsplit FATE_AFILTER-$(call FILTERDEMDECENCMUX, JOIN ARESAMPLE, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-join fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav diff --git a/tests/ref/fate/filter-channelsplit b/tests/ref/fate/filter-channelsplit new file mode 100644 index 0000000000..892801d94d --- /dev/null +++ b/tests/ref/fate/filter-channelsplit @@ -0,0 +1,2 @@ +0,a,SHA256=a4f03d92f82d074d20bcc49ffcbb28911ae85b097142249a890af59422eb0da8 +1,a,SHA256=c2f021f2b2faa1629674e6126ce5f997ef2034ecd3a15df595a98aefa40614e9