From patchwork Sun Apr 24 03:33:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35396 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219480pzh; Sat, 23 Apr 2022 20:34:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0s5L+hOkX5kPHx0l6txLU/U+cBl5eYVPElAmbbhSC86yc6qvFza8TesCsEBvfxN9vbWU8 X-Received: by 2002:a17:907:970e:b0:6ef:ef30:bfa3 with SMTP id jg14-20020a170907970e00b006efef30bfa3mr10824654ejc.54.1650771295647; Sat, 23 Apr 2022 20:34:55 -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 j26-20020a50d01a000000b00420fff231a3si9782422edf.160.2022.04.23.20.34.55; Sat, 23 Apr 2022 20:34:55 -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=ca1okubJ; 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 E9DBF68B2E3; Sun, 24 Apr 2022 06:34:47 +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-oln040092075104.outbound.protection.outlook.com [40.92.75.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09BBF68B29A for ; Sun, 24 Apr 2022 06:34:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ca9OKwQZuX1WvsLr/IaHA+fObr4eEty7XPJLeUb2gbz0ZA9miizkP9kw06a87wm6d96gds/zMExS8jAjQvPJ8Mw1fZ4F2xIo5ezutqL8YBhaC1T7JlrF6WnUuQFxXRFNh/o6XqNBnodCRjILBUbMBZqCDSK5UfEF/Uq9RrfP7teA4IlRK1QAO5/4/ao4c3r8ARYxtjDEfx2CCklRyJHj/Cmg7gr4VwDjO5qjLMiQitLDdyT9ene22lC8AnTqL5BVCCu8JUVtB5h6zPaXK+F14ZioaESzq6t/BnbKjRGF48oghRsnAn1QfxAxtEkJsOIKE/RTTkDLpSLBJbLv7+lu7A== 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=CMWBEF8VFRIsIXKvpIXam+kU1iiW9EoHLVfyIbIwT/Y=; b=E+i0+M0KSJ8f8SsKDtiNC4QSqsvZBnrFwOa+KwBCtuRBJViNPlmOnKwjXwSL+bCz+VRbulsdrUSrD2t4s/BofqdL3+f0JEnzhE82Ol7TYTfSMxJ3kW6DYRWfLI1CB/a5Yd+P95dteFpF7yUH7AFNSycvYl4KRJN9GOTLtJPNE/1jAGoiOIcstX16F1kju4kRQDzcPtnpG1NjiRGSuRB2HbQ18ahfKGYj4cmAP2awIkOg4VO+qwhC/wDigzR6o8uuuLXW3ILGuFawVksNbYKm0daJeRZBmG2axit/LR0YEgTUqxFARKonvqiq0I8eFuQjVC76aFJvXHSndtFXjQdksA== 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=CMWBEF8VFRIsIXKvpIXam+kU1iiW9EoHLVfyIbIwT/Y=; b=ca1okubJTRcVLYXJkXjRPz1tu/amvDaIQeU0TZqo90xSjbEuD5z+DPXdrN5WxKpGWuTk+gWZN3JGopm/NB+0c2iHudlU8mDU+O/8h8mSc3kEhPbQg4fuJUgymSu/Jvyym3X28N4NEd5cZGJ+WsZEaqVETurKeEa6TIzCLjuno+9RyjUite0OBRfPyHxh03StBZ2m2Kys/dkbaHqwwiHYIPdrD6EbNFG0zJQjNijy12NZ/uChDdIeChS8kvClGErh8WBV9bplECTBArWh/kmo53waJA50m5pwuwNmVWwC9e8K8WUXehEpI/Pzg6cJpZC2Ds/XnfUs+idXbRyG4DxgCw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3062.eurprd01.prod.exchangelabs.com (2603:10a6:209:b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Sun, 24 Apr 2022 03:34:39 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5186.020; Sun, 24 Apr 2022 03:34:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:49 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [bB2HB+LC4qer42+zl6FLm/pSKJ1DokHm] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e168123-60be-4be5-e994-08da25a35cf9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZZwRrMzTbTWNwFwaPCdfTBQbPfNYG+opu7kEVXkhoi/yB+6lcVKcGwc7j+U691u4GnG34qLZqLP1YDEfS6yZZG0nb8wM0SJ46Wu/mn/dPILMxgWRf0TYaZuFLfgphL9zJa3oOELL5qK9dh6SRK6AsrDo1dbMdkDTu6lJokPy+Yzvs5rlvR5MI1yauKllFH65IZmu7ArbPiZGNSU9fHo50JTBYvHW7zvUGBopD51aAGpOx4KXMYRv6pCBIOFynl56NFXylO9zQPxQH2AcebPgdC+3hry9gp7KqST3Wo9O20l+qb7LdZacd4heF7D+q2rVq/7uwMh7qnnhRRvJsKqVPoF3XRDWbzgj9v9tz3qRMEC6i+BaPlMWYpNBy9gO5Rw6KXGBCrmy/5mtK/kS7yxHJfm18/qPjKsuHDY95xu+ZD/MJuZ+6DYUKOHlM6JjlFKa7+lJ3VXL2GPbKVAoFlRrgTaMNJ6J7quhDh/t9UYODisJNXYLNsCLQb6yfC5LY5fHLB4oV9y6gjvMw8Wly8wXA7AsIxgG5p7ceIqaFcTA9Tc+WJZPKhTnsCeeNXRo/I3GA8Y03bTDqQz05Zxmj0CyYCZg7v1LUtR9J6dHayitPu9XALMUlY2W9oiSBtKvqNpDy0dEW/cPDcGZEcAfSvulijcUGJ6GsDYbPH4cqKesT8HN8toJ0JcmoGRHp5QcJMDarqylEYfHCm4BR4yj+cPDYN/1jWRqfHA= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZGnTHJWkCfFs2Dp3uziisKAyQJuKJlUw0+zVpwm98CpOh8e3mHjaulzWu9yzgZXH5VaRVI1cXMW1QsY3/ky/avCyjywBmdrvzO4RA/KzZULCT6D8GcIBTQX5vdE8lOjvF3KAXBYWa4CRgnxX6qWQe+TyQxLqBWgFhL9QQuXfcvVoPBRQKY2eVijukieErTZ8LwjJmeAiEL1Av0ZM9r25ldh0PgZ8HQCUpesCjRUbUBsAxu4UzKgMWF8c6fw+lT+nuj5uS0+CvBTmkvVlLJeIgNJ0uOVRBLoNVmvNmxoNFyDrx1saIV05BVMOsyHe1v3ajIMfd+iKcqIGjF9VnLxdPnkecnGYV9lwkwnIQB/1G4u+jlvW5131EuhobcfBxd0emwjPY2jbFVYkt9+hkP0vryD3k1HIMpEWYUgREHIM1gM2RgaJ2NL/+uAETrlA7hQbvsMnaga+TpV+csRDe1zL/MBzJtnDbMYbQoqIY+Kwh60Xv7zjDvbZxDJZe9RmrMxOqSjXemYFYNTQb+09ogxhkOXIPKSUBE2AzhytmXywGwwSU52ZW3tuEvOkEcs5QNOCt13Nu2RenwS/3tbfhw3vvw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sboDz5yyOHtYGBpVLmYWgtGFC7slqYUUYe5c/CHDs2cbX7R0wH3RJZekPVO5g8vksRFOw5JHG/D2pMVBx/CSwTxWAmDxlPUb2x4xMJltjvCZjet/5SzE6KTg/nxt3CaM6Wre7arpbLm7GFQxJGZX+OsDB/4Pa3NmmY2nWTlu1o8ci6fithkHczel+2VNrfVFOLcUGafdVRg2mBR54AKvKU92ejKpBqNIX6GXd+/CG4UcgOeu3cePJJXi2+FuAlFlkNiGmyPBFTAkFHDsjgjde+icxteVBbQMHi2hi4PmRtKwMNRbOk+fewdggqgto7AxCV9no/R3XTsE/s0OlBHXSs1nZ0ZwSL+KduAHYOwfqj6HLkkjjqstzkETxnJLD0IPNJEqk95ASxeOWRIBh7F/fmZgwT57We99Vbmr/09DhXFyC+eWpDDELF1xZKMu50f8FeQdg0KhZx6uTIk0IUDxKs3LKk33WKLR3LOp2fMhn3+km6avtKGUr0qgESDiyRCqLM4f4W7C4uSQ5ry2/iIPc/mztP3yGJIfutuGHusfFVhqzo8VHwgHEOj5w4mUOT597SMeU5Ar8HT+KmM/GsGn8Kwb26jLJs1pZNGV9eQc3uJlkq+psQlZLM1IlsAe+Z87zlqdp/oBWQxJSYVs0jT4+7GyRL0kzyKbWXWNjIhmqLGnsz+tue9LB8p4+ash4/6V63eG9Zy5fHZDXdLjAyTgCvUsHMruM0oAyptCBWIEAhvZ4FtGEH8RDyGSPOA/VU2HM4vOVLB6M2MeKIL0Ooyfe8JNJ2QC+lxgwnczCoc/ZEJXgU+2KTOg+vD8Po9WzdxfXwXWY9qaBS+6LWBjO6/tz4VVzbujELUubQ/vfsKRx61D2qcU155dIlCcqKyi3Y539+OYRnqo+U+ykPdzVHl24FBSDhdJpJZTa+yDgZzE+CNOAxXyu9UPIIGudyUgs1SY1CoF05jbE8HY30moFgU98iVny7jQmA0ss4Xg7jdAVxrwbdzMMjUeT0Eex7ETnIBf2wF0nOaG3L4ZXB9EhkGFUvCUYaynAnafANU5C0BwwNzxvsyRG7UGayiQo3qp4uxDYIZir+pQ81osTdpu7U6AwGtXi95pAKXahpS/qTdvG/iRYM59MoUz4FgDlCR+ZiarPNj0LQVLZvjF/wm7pPo2uvRUfvdcXjvZsJ5/+4d32n2NxUJruLcHwyAUiCz6fPL388eUb5Y3OZVs1qzM2NnnyuzYfkv4SwBxoMKItYrMDddn95nJ3tGlw3na3ou5wogpag7wyBkl9N7oZgD52O6mGtLfLmPKleHEXjXbUJFB/YU0IkqfMusvQMxDRVy/WYUMpF7lE6KrFCio5tmIoplpUnaIul/JS/DFDi/K0pZhQIgYkxSvRS9yTmBmFNym0PqMJF9I2se8nXylfvo9N2CcR/v/I/TkpIdI/roMhjkymcerQPD4pR1TxcdUmmzsEgZ6PzfsgOglkpnHJ3xAv7xSZw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e168123-60be-4be5-e994-08da25a35cf9 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 03:34:39.7843 (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: AM6PR0102MB3062 Subject: [FFmpeg-devel] [PATCH 04/32] fate/caf: Use REMUX where appropriate 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: 9PiMeO3z7tgg And drop the FATE_CAF_REMUX variables which only existed to avoid having to repeat the common FILE_PROTOCOL PIPE_PROTOCOL FRAMECRC_MUXER stuff. Signed-off-by: Andreas Rheinhardt --- tests/fate/caf.mak | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/tests/fate/caf.mak b/tests/fate/caf.mak index ae2c543358..f153bfeb79 100644 --- a/tests/fate/caf.mak +++ b/tests/fate/caf.mak @@ -1,33 +1,26 @@ FATE_CAF_FFMPEG-$(call ALLYES, CAF_DEMUXER CRC_MUXER) += fate-caf-demux fate-caf-demux: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy -FATE_CAF_REMUX_FFPROBE-$(CONFIG_MOV_DEMUXER) += fate-caf-alac-remux +FATE_CAF_FFMPEG_FFPROBE-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-alac-remux fate-caf-alac-remux: CMD = transcode m4a $(TARGET_SAMPLES)/lossless-audio/inside.m4a caf "-map 0:a -c copy -metadata major_brand= " "-c copy -t 0.2" "" "-show_entries format_tags" -FATE_CAF_REMUX-$(CONFIG_AMR_DEMUXER) += fate-caf-amr_nb-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, AMR_DEMUXER) += fate-caf-amr_nb-remux fate-caf-amr_nb-remux: CMD = transcode amr $(TARGET_SAMPLES)/amrnb/4.75k.amr caf "-c copy" "-c copy -t 0.2" -FATE_CAF_REMUX-$(CONFIG_MOV_DEMUXER) += fate-caf-qdm2-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-qdm2-remux fate-caf-qdm2-remux: CMD = transcode mov $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov caf "-c copy" "-c copy -t 0.2" -FATE_CAF_REMUX-$(CONFIG_WAV_DEMUXER) += fate-caf-pcm_s24le-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, WAV_DEMUXER) += fate-caf-pcm_s24le-remux fate-caf-pcm_s24le-remux: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav caf "-c copy" "-c copy -t 0.05" -FATE_CAF_REMUX-$(call ALLYES, WAV_DEMUXER PCM_S24LE_DECODER \ - PCM_S24BE_ENCODER) \ +FATE_CAF_FFMPEG-$(call REMUX, CAF, WAV_DEMUXER PCM_S24LE_DECODER \ + PCM_S24BE_ENCODER) \ += fate-caf-pcm_s24-remux fate-caf-pcm_s24-remux: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav caf "-c pcm_s24be" "-c copy -t 0.05" -FATE_CAF_REMUX-$(CONFIG_MOV_DEMUXER) += fate-caf-mace6-remux +FATE_CAF_FFMPEG-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-mace6-remux fate-caf-mace6-remux: CMD = transcode mov $(TARGET_SAMPLES)/qtrle/Animation-16Greys.mov caf "-map 0:a -c copy" "-c copy -t 0.003" -FATE_CAF_FFMPEG-$(call ALLYES, FILE_PROTOCOL CAF_MUXER CAF_DEMUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ - += $(FATE_CAF_REMUX-yes) -FATE_CAF_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL CAF_MUXER \ - CAF_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ - += $(FATE_CAF_REMUX_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_CAF_FFMPEG-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_CAF_FFMPEG_FFPROBE-yes) fate-caf: $(FATE_CAF_FFMPEG-yes) $(FATE_CAF_FFMPEG_FFPROBE-yes)