From patchwork Thu Sep 23 15:28:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30493 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp566092iob; Thu, 23 Sep 2021 08:30:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzD/UlEbsMnU9VIOJXP4CjXeWW5mDGTzW+iK6oj2f0Ve7ZqFQVFSQTdrAWt+ACAA2nD1DCA X-Received: by 2002:a50:da84:: with SMTP id q4mr6177034edj.1.1632411008744; Thu, 23 Sep 2021 08:30:08 -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 s11si5129549edh.30.2021.09.23.08.30.08; Thu, 23 Sep 2021 08:30:08 -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="QN/E/XK+"; 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 2BEA268AA9C; Thu, 23 Sep 2021 18:29:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065047.outbound.protection.outlook.com [40.92.65.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48D9D68A94E for ; Thu, 23 Sep 2021 18:29:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=myn2mkJiZ0RxZ7u6Q895QldWsnmmKyXUL45Q08/Yf37uCYpObrtbyar28HrUaahnZ/Cy0iOvSyhD2NIGIpQY580SB88I8fv8CZkFh5xyKHHtLP7OGi0w0m6/w+JMkAzKhbToUTk8MSVQFcTuXhBcfUiqgyg5vYp7MRadxTOZol/PQuS2Fn33lxFS03m9PCJK2b6x4X/ZCi2vlQmRZBY1jqu5ikI99Y64y7LkUNpSoNoZ5XM3MAa1O3b6TQ50lnAfZICXoqIHvN75Q8cd6tly2xNDDNe6MMgjRzCPz/bFxfKVgKpM1KyaTyvpY6wvsJnooTuIbIrGhTE1VfZDWZ4XSQ== 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; bh=BCCs8RcaWCpG3IwFONkbz1HNTd3hEHeoxM/9HEX0iXM=; b=RYmUCbtnQB6KTB+Pq2FlotMhqy9GMAmlMcmKO/b5e+B4dn4ABOsZrcVWpUYjb6A1ARxNbQYe2pI+6K9e9nuLTqc+SHnXS0gP7GlG4aIGhA/eW7DIeowlxQYcyMxuZPnbUWxaQwp4Z+x38OHJPkJnQjo6rN8zbeQ8dGchabilI9YeGuKKvX6xEkG1F9q+kvx4VAK6VXt4H89HTFEk9/S6GH5fhY+bNuldDmXhgyEnSRtVwlHSYOd9MvGnANOh/Q+Zfc+A3YvGvabh1Yod1fnvxH5iu8i8lcL6sVmxCHGx4OYNxjEYMeVZ4bXZxeh4D/SEG0kZotzF9SPnASEiiRvo3w== 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=BCCs8RcaWCpG3IwFONkbz1HNTd3hEHeoxM/9HEX0iXM=; b=QN/E/XK+PPXdzUBzg692LQUPXDpmCSvo2PEwiXmBnm7N2x7G3O/sd83rKFdD3e+K9PZWxL+fCxL1+Yqgky9/k7Z5rK7J1jtLguedfhH9M8WzyhQeUlB9yBPx2cK86e/BMN9Wlpbe97veL7pjCsgCT+LDuvPHug9s6bIo7sp1EktV5iXmJCqRD0Pb24EM0vxnvYl40L7SYZhP2dL2bQH+xcfST7Pn6uxc9z0kvc4RoKwzHan0SKQLFtAbfTJ1QD2Ej1kIOq4c54J09zrsMYUMYDnrjgDrTAikRInknD8vhgCSCgoa+QW+Gzt4WGsUCjU0X7cwTVpzqpX9Ntbhlxiu0g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7061.eurprd03.prod.outlook.com (2603:10a6:20b:295::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 23 Sep 2021 15:29:22 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.021; Thu, 23 Sep 2021 15:29:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [07YR7C2Ih70iYzhldX9mUACDKPTY0xZj] X-ClientProxiedBy: AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210923152902.42865-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 15:29:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 87e94b11-ed5f-431a-6e90-08d97ea6eb49 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWt8qMG3IjM1pM+gnFiFAdPqGnYvdmXqHWPMBMm5yeeCr7TBWr3+Tfn7mhhuG7L5SyDPvIsymbps1gY1CQuPVtWRjpNFc+nbo7cba5swWoD9JHpmyHov+llvpz5wrI0+efe4kAu9sfnxi//jOgsuLk8DlWlzKz/DMdTZtbm4gGcwODkYNbdboxdoB4R0Dm19x7421+SA4BqFnDHv7UxkDGA+nHhFMW3xc4FxZielRInGpYfulAvP1GtIAtVUoTFMN1SbxLf/8hh2f+fqgBFxYLLhtw2uUpOTZxzg7flHtUWylQyVeYyOYyhLXXgdYLm+lUcG17wD7Gi8dgI76XL9vfaXZEFC6Xdd3uH2zmQCa6tDE30i1jz5m3jNWPQv7aFN2NDWP4qvz5KN0Yz/F4dEfzMWClVNwQuZP6hjyCKe8Djwb7HvIm8F5pAiHYFgYcPOKHtUVtSP92Fw5DJWCPQP6iU7GOggvr0j835YvqC0CZrm948eivzO6cTMGSjDhbFuYSNaxVkNQQWzQckPeH+74z1yXnV8qfUW4ricAWyPjRDaafk7qeNYv6zbdELaQU0/O3v0pKD9spHW5XvuVZOcOPbT1wIWEGObA1AQ9fPJ3GahauxpPFPOAHS8SoCpHu9EOgScl8g5lKYVf3/U8bpmktM5Se6QrvS/Lt9VPjZFbQV4M0bGPCVkf8/8XMwdRVAg2o6q9qK/2QvZa2O21DnGTRdr2mhg70ie9w= X-MS-TrafficTypeDiagnostic: AS8PR03MB7061: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fTIEyQnZfGoWkCAiEsatYKUKMbUPCHMiEtF9ujsrQDp1Yp1D6pcKh3P3+lu/0JBhiW8UgKiFNKd/Egb83z5FOYDikwVl+Wxd7MnGe7Lf84/PTJ0Fe8J15jSAe3l2G/pRuMjelF9cxt9aBSCpwvPsXTW+Udf3skoDB206dpd+OCHa7RV2rtvsP31NApE/9+MKORfAnuXly8bDPx9sIcHgifLfxEw6rR2v8l3133xJfkb698pBU2+7DVGkKe36ltXv+5Cxwesp05wontxWeHIHTWarpPYuFpKX3Ovmwbr4+uY8BrzybnRsB3tVbyo4JYmxNO/h6uyOq0KLEThHwUVdOgdxuJDUGMiJMbwoagJYTpX7lfteGWE/8RPeNmODMF5QJ5qudKbXI7Ckr+A48mZ4GLi2rrDOhfcD6q4/6MU8e0kmgCMBoB/hCXeV/oiR98s6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lpEW68UNFhb3mLVKFhDpE3gJfLcsll6/XZQFD3OgXLWJhhIWGXK6fcykIVHWNyyEVrGMAQ9wOzl3MZsFXAKdXrbaj9VoI/+RyBl2NRw6sk/IGgnjXZZcjSdP9w+rYCBynHzwaebyVAkMXWz3SEW3jQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87e94b11-ed5f-431a-6e90-08d97ea6eb49 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 15:29:22.8776 (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: AS8PR03MB7061 Subject: [FFmpeg-devel] [PATCH 06/27] fate/demux: Move caf test to its own file 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: FKkV7SONpkWO Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 1 + tests/fate/caf.mak | 5 +++++ tests/fate/demux.mak | 3 --- tests/ref/fate/{caf => caf-demux} | 0 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 tests/fate/caf.mak rename tests/ref/fate/{caf => caf-demux} (100%) diff --git a/tests/Makefile b/tests/Makefile index e42e66d81b..d5595908b8 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -121,6 +121,7 @@ include $(SRC_PATH)/tests/fate/atrac.mak include $(SRC_PATH)/tests/fate/audio.mak include $(SRC_PATH)/tests/fate/bmp.mak include $(SRC_PATH)/tests/fate/build.mak +include $(SRC_PATH)/tests/fate/caf.mak include $(SRC_PATH)/tests/fate/canopus.mak include $(SRC_PATH)/tests/fate/cbs.mak include $(SRC_PATH)/tests/fate/cdxl.mak diff --git a/tests/fate/caf.mak b/tests/fate/caf.mak new file mode 100644 index 0000000000..e921fcc297 --- /dev/null +++ b/tests/fate/caf.mak @@ -0,0 +1,5 @@ +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_SAMPLES_FFMPEG += $(FATE_CAF_FFMPEG-yes) +fate-caf: $(FATE_CAF_FFMPEG-yes) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 6ddbbcbd4d..20aa90427b 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -29,9 +29,6 @@ fate-bcstm: CMD = crc -i $(TARGET_SAMPLES)/bfstm/loz-mm-mikau.bcstm -c:a copy FATE_SAMPLES_DEMUX-$(CONFIG_BRSTM_DEMUXER) += fate-brstm fate-brstm: CMD = crc -i $(TARGET_SAMPLES)/brstm/lozswd_partial.brstm -c:a copy -FATE_SAMPLES_DEMUX-$(CONFIG_CAF_DEMUXER) += fate-caf -fate-caf: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy - FATE_SAMPLES_DEMUX-$(CONFIG_CDXL_DEMUXER) += fate-cdxl-demux fate-cdxl-demux: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -c:v copy -c:a copy diff --git a/tests/ref/fate/caf b/tests/ref/fate/caf-demux similarity index 100% rename from tests/ref/fate/caf rename to tests/ref/fate/caf-demux