From patchwork Tue Apr 12 01:52:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35273 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1341664pzh; Mon, 11 Apr 2022 18:53:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTm1hEJHdm+Ex0ukjoES5qsVvpx5aQPdxSb+Lw8k0sbmXrsy5oLi0k0/yBIIDct2o77eaw X-Received: by 2002:a17:906:b155:b0:6c9:ea2d:3363 with SMTP id bt21-20020a170906b15500b006c9ea2d3363mr32013513ejb.729.1649728380769; Mon, 11 Apr 2022 18:53:00 -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 26-20020a170906301a00b006dfacd07cc3si156897ejz.441.2022.04.11.18.53.00; Mon, 11 Apr 2022 18:53:00 -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=fFECm4wH; 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 5B81F68B2E9; Tue, 12 Apr 2022 04:52:50 +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-oln040092069097.outbound.protection.outlook.com [40.92.69.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E290768B2E9 for ; Tue, 12 Apr 2022 04:52:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ey0Bu5QWgEjCGwSm6I265uDBiYQaT+UU9KZADM5foxKXzobieIavQS1sHYk0ou/aqyWYtjlp2f5dHk0Rs8DmpuzjeBfmP31GPbskUPgjNlox5BJZ3XHOEoCFjk0UgYqvZCA3M40EiW80egR32vMTy6kVphOo6GZyCx/JuJ7x5NFksfvoQ+NxKm6YpN/Ew4jLsjGX13/O+O6PWknHcMw9736p8DdMTNMBjnXcz4WGmTA+yfSINRsIno6o9tKC4y3bxXobpv/9HGWrrFTmJ+vcOcVsXFFQoTneA44o4zOXvyfWUXK9aagF12P8A/JHmv1ZWsoO/x7+qGYX7GGk7ZgF9A== 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=bQyTz4YGXT2gstv3ZczczeoB8sFZtZge7uuwic/Aows=; b=ajfKgXfJ/OUd00l4gvA2bos5VSvwq1/E/5HumhSgUvUKmE1XYfzPhKsPFteeaYq5pl7fzKCLkSqUXgUnFdqIlE3SBXsu/KEsyh+eNSR4WNru2LOupXG6eeFcp9yxVgJcHXUAGg5dW78UGEIiTvH7Tq8fs0MQ7GR+mmY9lWUU/Wb5213R/uULRPEwyT1lFqEIQ6tN9gwvmNc3gjczP9w5VxCTPz5A+7njdeZgN0YeNrKjEG16qnde1zTvWjeaLNb9ssXvHNB7gk9SviUyqOUOviuRxuXgvkHJVxtUJdBkLRde7Au7BSGD5pO/XmjPLbWR/NV1MGJqkAuJm3mn9Ytbwg== 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=bQyTz4YGXT2gstv3ZczczeoB8sFZtZge7uuwic/Aows=; b=fFECm4wHL45IVdwuq4feedkI3/n2+MtPoooUJXUnSgx/bWFApb7lwwbjxL0yxfaW9+JG02hCi+pMDxbGfwjP2iXlUg95rAIWUYgFXNZ/RN11YEBQAzjezmZ+C5DhDV1O2xpAMEI610mbCd/9mN+e0ZK60rqY7uSvBpvhbPQw2vBr+OaK7EjlfKVE40snH29c5X/Zn65KcImFFFb6F9FWaNnj/floY9yJADUeFjv4x1dDTSmvP3kH7krJ97BIimuhGBLiBRpisb/WYKgM6G6NY/MZwiEeReE81thN8mPQBe864zkiae4Ou/ga10ijzZlPZfSe3CM+cb+4Us/dgLKrQw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PR3PR01MB6409.eurprd01.prod.exchangelabs.com (2603:10a6:102:24::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Tue, 12 Apr 2022 01:52:34 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5144.030; Tue, 12 Apr 2022 01:52:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 03:52:23 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [kWoDyUO62DnWEH3SJFbDuRCKZrrzZkmP] X-ClientProxiedBy: ZR0P278CA0153.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220412015223.495845-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cf2ce400-eb1b-426c-e176-08da1c271d3b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiThIBhrdRr4cLcE9KU0705soFxsQsA/6i0Q28XGSvbsbCNs4C65TwoQUrotIoYIaHeUg83PPRFLY6GI77wmKmTAo+1xKD5c6GAbnkAsZY0KYIH2+Ge5EuKssZlwvqz6dy0CjA/QS9945yLaK3/lBW80caA7KxKMmyzJzIe5Tq/JfB9eOhlVLzmI/iAqDsIJgEy82cAdoDwqgPvohZYJtP/eSHa8L2Dnb4zHmJtlisVt+sluhJctpx1V0EaR32saxqmzORy+rOSHS1UgGCQO7eOW9BvFFvmR1in9889ducVHXN8lUe0H4UfPSlEZ15D5VE9IN1h3w8CMY1eDoRExonc5UDZTOPETkGQR8aC3oTPwYz7ypMyVRXEPLbgLXz8I3ipHKwAQAYIMy1+LXMM1N1PeXldkaNcM7JKUo2rngfl92AnDShO7qJyES8AgmCM3ZeP4E0WN8x1y8mwAAyfozCHsp0sSbhTzjwG+HObRbF7ZmhsP8t/H70A5Xy1HIRsncJDpBCtRmC9P4TtI+8QSfFLd5E0vGm5rvYC4ebGC8THVh17yDehpgxUW2E2vQhgTj9fUkCbVfxArVmFIfh5FY7Nij9PgNYOPIpSXtTTy0vIFqJnmDaZHpPvfWKRjLhuXBqoOyzi/8GKHNh1lMtwOw7sOYa+4BpBQbnBqObplj7Z+C9Rel0Cp+x/Cl1GZmycjg1P2SD7XeTdVMg1l1JeqKt2uJtcY08DJiqgU/tij3fod589E/1WYEzLd05ZGOGtDZ5s= X-MS-TrafficTypeDiagnostic: PR3PR01MB6409:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5TfUuTHA45MiPR9LzMz4Q5E4vrrIbkIRkskbv9o+0cgZ3oaFHDtPnu1r8ORoqpqAkh6zWeR9dkC/+I24gueCRUYfNdlkWRsZJO9BMHUNB6z1ru/k1F/jUAPQUcW/sN8e8d7n3+yCbBfvrHsM70LVUi5A1wqrob8U7jaE9lvZCaq6yXyWR4Lsr+CfETM2m9Z6kq4W2nHnegQaE2GVjbCoB95KnkS5rFWTzARzapXmFciOdqPZC01o1K6wsWROaQ/92DdGnDB1jeiCZcSt526xTPYrWou/3bDLnbGwVNmpJZBOzOSGQcptjNOqkiLzcHm9xYCNHqRTeKQmJ9lDYVYUnQL7yLLji7H+M/foupsDC3hBSYv+ZYcC214vvPG88X69/D7uhxzlCtAAIeL+RRDGXw98sGeApvFCciGe4u/aK5SL69E/A47O1Y76OU3dXIyfFnd2lKQDNqrUHv508ebJLFxwIDcBADboTgm4bWSGl8HYIC6EVjrhRoKFDZYagpfA0k20NL1MUAiPLl2PV3HOLPAoxYAKRsnt2llKRXKhuoTlT/20sMFZ5r5/Nj4wdIL6A+K+GfkR56u0KNzRr7J2Dg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: imA8WDTpkmzULCtqObmsNeuH5h3qd1FlMxCgEX5TQUZMGxu0RDeFjYP45xjDOsyyqY2cgGdvO9GekkAORUL/leQWJRy34RBuiMK4IK0wyOjBwkl8Nf4lRFJa1ozXAZGo8uiZ3YP1mvnLpYaYS6ZMP8B/XYcY83506XG4JbvMUvDSmunsCkAbvs8hmg5sF39lL0MpWovciqmEIwokUFVnTXgow2p9TbwZdvvUEmj6wYWj0z0yygIBGmwNXijdkXbQ68EOH9/sU53majA0Yd3unXlbCnt0W9ErbQwTrA456vJVtGmhgdgF04ynzoGvXoXoki4X0eRZVQ8Qn6CaEj8l6WP8ZiBn9iX08tPZpWkDbNysy0AP9NWBJHMbb5pHQLG3QM6xjao/CEHJldn2nEM1GPj8gSPDD25UogAF3h4c/ElVxzqANju0uLYXmEUEOR2nPSTo64InNHAHjhchP7zbchoI72wx3kmeDdcHum6lMVYmRi5pq9GKdFvHy3UGHvzpARaBHL+5dEHnsTJY8qVDEEo19tFZMzTsrBcwSqP4vcxxhPl5ACMIuzq1BfhZ07nRCj6Emyv7n7uy1ZPFunv2qETbe6+8+HSInxqXKpKWh3lhptikrpG1ldGHB0LgjlS8NL2HTyfwMZSvrnHxH96+JnGNMfw6zZjTar+4ukAsNIq+VHJdIfyLKmlcVH5r6VEcRzfPFOmiGketBaS81QZwUZw1bjb7shRmoZWcA4CUwbdtU40xappxwsWx9RbpqaXLUR91TOX9lxJHbzWA1M2315DC6VS7g327/Uo08+hzwj3QJPmxPneHIvliU4ZuoBZc99nOq+Sz/Ygu0yU9akpTrLZTXWk8ZFbUo1H/DhtC1vRuWRm26Zo8jb3wrMF4DWjDgBAcL/JHvzStGUMNouvXNJK1/Jmc6FkMH0prjm99p60oxXSmB3nOx8KwgaizVj0UfzZ8ZbwJKM07EpC8SB0zqEkspyMDxw0DE2eorM7/cxBlDHzb5fDyFqxW0u8/yiJMIMXRPOOJLS4buM8qzNVjuLbgXTb5e6NPSElnnNXMtmSQLQUIe/RVQjI2ZH2Ed9w7ZbLe9zlONKZa8aZqNBENGkkVwMmgdGRA5kxnYhsDg7aMBONoKetPqo1f4b2rMmOpJzV/tOQgjQptDFKRzuT0gEzzv4eJ4ZvnIpXM65PUgi4azSUVQtwqefwDoKE66zLUqSxlEd8B6MLKompkVN9wzfkRIaFjQ5w1Eo+FPgTd3nnvdQlw6ndJcsQQKKb5g0A50iCzw7faB/K5YJyJgTjAG4V/B8+5Pm3tKHGjUuNZsqSwJZhZcbVuyZeYjxXNRn8m+wNe9mD2U2/26+yFt4bPG6fhQOo255mZ9/hqlUcrMMHUrJg5cDYfHVe+jdvuq+gztheFl+nS6EoN7jRAoj9xeEvXIW0cJ7snGKhtDvkCbL5nTfuzGwzKGZXCwhTLzJI/ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf2ce400-eb1b-426c-e176-08da1c271d3b X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2022 01:52:34.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: PR3PR01MB6409 Subject: [FFmpeg-devel] [PATCH 4/4] fate/oma: 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: yGOq9ERbxcoL Simplifies the checks. Signed-off-by: Andreas Rheinhardt --- tests/fate/oma.mak | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/fate/oma.mak b/tests/fate/oma.mak index a088feff21..7e2020b7d0 100644 --- a/tests/fate/oma.mak +++ b/tests/fate/oma.mak @@ -8,14 +8,8 @@ fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sampl 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_OMA_FFMPEG-$(call REMUX, OMA) += $(FATE_OMA_REMUX-yes) +FATE_OMA_FFMPEG_FFPROBE-$(call REMUX, OMA) += $(FATE_OMA_REMUX_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_OMA_FFMPEG-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_OMA_FFMPEG_FFPROBE-yes) fate-oma: $(FATE_OMA_FFMPEG-yes) $(FATE_OMA_FFMPEG_FFPROBE-yes)