From patchwork Sun Apr 24 03:33:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35395 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219438pzh; Sat, 23 Apr 2022 20:34:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXJqaWR/xc5yWULCf+wL0kc5Nd8Q8k5Tl+WeyDXiKLMoCjKAhaPWcWznScX4aVeURK5ilo X-Received: by 2002:a05:6402:34cd:b0:424:793:9f65 with SMTP id w13-20020a05640234cd00b0042407939f65mr12555288edc.88.1650771286503; Sat, 23 Apr 2022 20:34:46 -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 j15-20020a05640211cf00b0041d54d7dc95si11904599edw.451.2022.04.23.20.34.46; Sat, 23 Apr 2022 20:34:46 -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=S6rHQi8M; 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 E2AFA68B2C9; Sun, 24 Apr 2022 06:34:42 +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 DC736680588 for ; Sun, 24 Apr 2022 06:34:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TW3xIE8KEc59nouo8yv1cgPlRZxylEHI/aBi0orPuonR2l4dtDt1qKxgQXXjSiWiRbJXENxYfn6QROK504wI3HZsti+0exPzx76r9v17prEqv/RyjQa52TsYTBMhE5yV7cqY01ils3uzVGn6Pwg3v1gn4svbWTsN/vWCy/UKy1QZHeK8VwmuIx5id3OHLIr7Qj991UbB/SadNSIiru4QJt7p+wOb+pI0L9tKFaV1UaE4cRBshPZstDD+6LDji9/DwUhQaNla86dTCPxAvMiheUL5ZsiiAkmIJX8g1xcQ2kkplCaAF9k1K3lTcQJzsIVnWsL/+xYnjHT1vYz4Ac7Tyw== 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=GaPBcynqCOjv/CeHHtQjoROMlghttbh/ecSVmVD+NFk=; b=CK6yTXjvSpgHOXLwg9njdZPspjCLnPGLLdFyHgjsq5MtWXqFhklOs6OF7RUwVUF/ANFbcHW5p0JhtP63u/eQUMVK8pOBaF3rHqNkTOcwDQAnOF2px+GfE1EL28QP/ASVwdwmRKH9aHwYp0ORwmS86927dUNb9cHKiB2VGd3lj9u+sUNxMeDwKVzrgsNSP4mkqwl20czb7JURgUFKlqVxePqfNxFdOOb27H+puNp3wxDgrWCGsjPWHgFz8wEKJJjJih6XjaPYtGWOAHasgH04Q7/LYaSl4+0DMQMj07DHD2bai1O/C/ad5zRPEsfJW/mb00axpYKPtc8crDNzRKVB1w== 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=GaPBcynqCOjv/CeHHtQjoROMlghttbh/ecSVmVD+NFk=; b=S6rHQi8MFmCFDeLXlpZK3itpgojvAFChgKXCGyLH/op9BjZD40MVc/XqIQWqp2jb6dA/N+iKV+OvibFwTaf6tWVQmPiwsJY7S83asc+wUkSOgmJ5N0Ftb20dxp1l8ekQymlyHvJOpikFCXktm2HPDK/VQmO0NRxdkNAe3y/55N6UAaGdw8w4ArqqtIEi5StF+7Sz4tE32sKOAcbzibqZZwQfO//Y53UhbAZrObm2eJcf+HBq2roiHRGkzkJgZxuG1HtRzJno2/16I4igzU3TUWfVFyKfDjM0fClhaqhqQXHS3/ErtlHYsysd7AHnMqsn4DFXwe1CUXnGH6qg70Q1Hw== 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:34 +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:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:48 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [iHz+RvJYALyqk/s6pJxLF1nTGQX0MJXx] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b253182d-bb78-4b89-bbbf-08da25a359df X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDW3zUT8r+c/1YcOgcbAiBseUA8lXGCnwR3cLaTH6Q3KQcQEjOMJAbOo+PuDDnhxw/4Nvo+iTdTU5FTyboUJCxmSNlyPmiQ1zDmSUOfR1luXXxRQOGUjDbDCcKBxzp51ywirDVdgDTgRIFoqHIEKA7akYF7QtV81+cFZ6Fs9anYb/0Lpbo4Xq985pU2DLH4lZ810bSbU0ue8lSfo5qUDeDwXY+BICC4iTnRn1cwNHnueu3SUjv58FwnC+FnWBFMyvD/UoUHh1eI+Wg1JXo7vg0dZ5XBtbb5HNjiQUu4RoPsMBFmCH6VtEoS4oTHLHXayFW+rI8jbUJJOmDX0ZCdKj+oMNN/oX8QUfaNx3x4k7HM+IKkF3+oKHSMUlkgLgUZoweguUeNweNhYf3SD/BEE20aLOIAF4TAD9g/dsxLAhGYZccxuDOcHekGDt0Ojg8mOntjSF+r86fzSmIcT/IxFShPVt75otMhnRwIh+Rh4L0RXHjgVHrZYrlA4aiOIWZTeJ2GnZB1q4OGLoghyKdmh3FWib9NrMaRNO0bfG05wmjb1VTrfsVdS1WnVWurfwHSNJgilMvG6xklcGF+rAK1Z4BynZWk8ZHBnytjaZYM1eXtZaFLHXC36KkwSw/XhDefkSiGsbKcak3sxgFYkUmeOvM2BTfWqg0prPQjeJ8QTvpX5q0GHNuBaCHEt5og/d7m9LbVnf8uGYDKJ+9QKxSRPPgbK3APDQaH0sjn9DMhpnmWBk= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yVKphACbAM2E7qOBYVJFH8zJ7le4YiUqbcNuY1mWL1fvvZ7qH3gDagkxEhQ9oJL1n3wlFLIX4W055xRTjc/5tYCr1PLE+K9fJwgntlQGvSXEhOVwC0yQ8bx6CSG6xeWscqUzlMB4gRABrC+7KO2eL3Cj1nigKMBX1EtRqHcpnshHQ0qzbYnfcCsGz9kOUY8HZAENefVPzdQcDtlGJyHGicxoRtsZhqrQ+mb1LTrs2GZ1NDOr3l6d1VFgBmsXhLKx5kUaizZWCJdMgAU/6BlxTk8dZ65JIQbIaOVCZPFpgsnWmfp9GCJHTZJyk9WinfksJVZ+DgujyXU9TX3O7C4oavLJLjt3iip7tulT7tQiPEHMZ2dYzs56k/fxjvlKvWLkZh6bx4XG297Xou+zZlQRTWVlPKdp/WH80FJdWqAR7UH5VEOdTLNp1MF1q63lop6DpF3IDX/lkca3Yis5CoL0lowef643WqKNL2MHwOTeBOrHG0fbzdV1F51Fh5KorAP651IZ/I5Tto/kamJd2XcPrLIAOHkoXqTWeLIxr+TGLjF84j7iGFDRCmmq3oC3VPdoCb6Azuz30ERU7fTfEmTflA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J0Sl40YeFxJc6KJEC4NQTop6w2lflFZvi867618brNhoSljX8mVSc8wlar3IZzRQkzapchRrkLp1SjBx5YqUrpbkxLtys0KgqTMCZGGRUcBxtAxphwhh3gIRkYrCUYC6H7jLuxvelOmQG0OlPwZoWiUjFHk6PAM+G9Gkn8kTNDpJMDQ/BDb8aoPy0z8i2ykns/3KET0igPJDr9XAe4Jre5csWGV1ZhZf0xCg4sPxnd4d7pNnKc2ahAOSQ657wV04tmzfAbSG4+R1S/3bG30VE8c8R1h+4oGMjqZ7UqtYVVonM/FRXTxqyAjv2djxKXvglh3+foLjrIfDfNEz9AX3vqTLTL0fJNCcUuxN6LE8Z+JV5AFxibPrMtCaCwB5TmeTPRD1xuho1f0UW611okmNwNxniigiCSogv9VZD9FcopEmB3VnzuP2JHqRL3g9m3M4TSVNdz5+Dsurll2A9nqRj66jTlIlbj3SlKDtiODDHOO/o3mPj+XzAsfP3J/UM/C+90sSl40moz+yBs6op+4ubn/+Xk029SymNwQNhsWpjTFUbUJRK2DyJayBIiWXpO4HjXuocmSQWhl0aQB/OASrVPcJGzwG4voCWwbiWeJs+l4DvkM+5hZJtqzWwich1J/4elqIan0+GLO3pDeEjiOw4qusRMkFWliUFVNSWu4c7XrjJVqiASGuvr/T6xlC2PcIXjmHl5rAh0sETQmh/ZTpE2+d7aAu3XjDeU34lOw7p20HCgjtje52fhtOFJ0PSeSfh/pUngIxkRDRQjNiDjtJzhY69iWaq8AG/UADuKY+dGZH5IwlTvG8MQhwGPI38YNG8YnlT9+gqjvWGlikp4qLoAW1Bs5XntvwaIwU6Ueh1rq6kqeXl8QOAynYfSWkHCh6RELbwYNzurGL1o8MNcI0rzAqptoFMlb9Zq46h1KdLfDHcrase8WWgf01H0/WpA1KPnc7P+0nAvK+JvmVZrunI+D3+1WQlr22mdqaTotrjsFB5hSdPo1HpjFZ4d+Nl9AjD2pOnlxUFqsvHKBbz8u+ztAMNqCQ1/HIMr9wEti/hwtHrkUaA3NF1ZUHw5XgbnvQMfi9VFQ6FQR1+tAm45/Uj/HURsF8sBCbBiadm1tX6oIIYREMgwXFS67b0RmlkzDQPCrZX07omuLeNj1b8pSF52NgNpRyKa/PSXa7962VGd/T0bZWa0qnn01pxw9m7sUHG5MWzcNmv+MYqqMBNk4+tPaf2nD7giUyDkNgmcsEgZr8CI1Y5LwarUowkpMqG0Vsypx6U7e1jRFTKTym7VrTvmikR1P2KDwb8iAJWSwbGJyNkJfEoWH9mVjTMhMXhNH52kq4QbtiP87WPeGoMVhv0l4el4mXP133BZ5zvKQ8upmh5VJRbVf9vhGndNxXWf7KRBIuITz09y/h520LCM+KtmpHANw2GktNGXntDl8tq/vGxpQsmM8I2rrMOVBQZe+u4JQmHZUHI/K7IqkOziy7Vw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b253182d-bb78-4b89-bbbf-08da25a359df 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:34.6109 (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 03/32] fate/amr[nw]b: 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: hgZHdO6oW0Pf Signed-off-by: Andreas Rheinhardt --- tests/fate/amrnb.mak | 4 +--- tests/fate/amrwb.mak | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/fate/amrnb.mak b/tests/fate/amrnb.mak index f4f74f14d9..6f5ed413e3 100644 --- a/tests/fate/amrnb.mak +++ b/tests/fate/amrnb.mak @@ -30,9 +30,7 @@ FATE_AMRNB += fate-amrnb-12k2 fate-amrnb-12k2: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/12.2k.amr fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm -FATE_AMRNB_REMUX-$(call ALLYES, FILE_PROTOCOL AMR_DEMUXER AMR_PARSER \ - AMR_MUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-amrnb-remux +FATE_AMRNB_REMUX-$(call REMUX, AMR, AMR_PARSER) += fate-amrnb-remux fate-amrnb-remux: CMD = transcode amr $(TARGET_SAMPLES)/amrnb/10.2k.amr amr "-c copy" "-c copy -t 1" $(FATE_AMRNB): CMP = stddev diff --git a/tests/fate/amrwb.mak b/tests/fate/amrwb.mak index 8450c28bba..7cd17d266e 100644 --- a/tests/fate/amrwb.mak +++ b/tests/fate/amrwb.mak @@ -41,9 +41,7 @@ FATE_AMRWB += fate-amrwb-23k85-2 fate-amrwb-23k85-2: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/deus-23k85.awb fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm -FATE_AMRWB_REMUX-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER AMR_PARSER AMR_MUXER \ - AMR_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-amrwb-remux +FATE_AMRWB_REMUX-$(call REMUX, AMR, MOV_DEMUXER AMR_PARSER) += fate-amrwb-remux fate-amrwb-remux: CMD = transcode mov $(TARGET_SAMPLES)/amrwb/seed-23k85.awb amr "-c copy" "-c copy -t 1" $(FATE_AMRWB): CMP = stddev