From patchwork Fri Sep 16 01:10:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37948 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp666195pzh; Thu, 15 Sep 2022 18:10:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5DSvXf4FTTmF9SLUuabGeYuLwcIRHfcpEm9d+MODvMM89Z6pqC9uaIopGESCLzhvawY/GJ X-Received: by 2002:a17:906:9bd4:b0:770:4efb:acbe with SMTP id de20-20020a1709069bd400b007704efbacbemr1824777ejc.436.1663290639053; Thu, 15 Sep 2022 18:10:39 -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 h13-20020a170906398d00b00741c0bd705dsi13435873eje.631.2022.09.15.18.10.38; Thu, 15 Sep 2022 18:10:39 -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=QRimj4Sg; 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 A9DF268BBCB; Fri, 16 Sep 2022 04:10:34 +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-oln040092069065.outbound.protection.outlook.com [40.92.69.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B80868BB2B for ; Fri, 16 Sep 2022 04:10:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ew+Sg5GI4A96evkn7QqPXWXr2jYsGqujEWv3pZIEc/ABFbpTlspHlB3RPK34LfBZo/EvB4pxyQHg8XN8mV5aAkoIXcoR+RP0re2SP9MDE0RnhSt/sidbqUxNNXOydKRdgku1DOMIJ4EJtCtH7F/WeokNxwkmYit4m0sg598gqwosKs+9FK182Jv4ptvZE/bSXFXyd5t7VgvLS/sZIQkVutMdEVhUgVgQm0uCjtjzRko5SjiobJzXhX5pPDpDEG+F5hE6EpPj+/x5B36yvIThYSuKDta+kfLN5G8GzbXOMYfv8sM6Lwz48AkOkMhI5+X05tE9Wku2kIIci3o6N6YKAA== 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=4Neu78BAVZowdtGLZ5VWsPl2Pg2zouT2aW5Jzigr3Hg=; b=iHi5qZ2Vua0EHfXpuoDmOnJ2BbRSkPS0g4VQzlolGNccqXFfbEYUmLgOQppM9lNuUv/R5xn4kkmONjcBj2jIw4LaOKWI60U/46SgRZxFbGRuhADLCeMWTq6762j+aHqwiceFFJRJmIF9uh/XnKtBy7WPQHVTEo2inxqndTTiyd8FQZtIqwWYdnuHsTa4b11Ow7+U3vbe94FF2Pjapqzb44JWhf5HNtKdHYCgy6qyoCEdBemN73hLlQxTXCvKHT2/gish3L64nMMNvfDS7U5JbMF9bHM4+p4cfUiqswhBIX+FGn0EO4sM2xv3qyUA4EZAsx7j/jqjhBeza51Cc4WF/Q== 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=4Neu78BAVZowdtGLZ5VWsPl2Pg2zouT2aW5Jzigr3Hg=; b=QRimj4SglbHppjYpV4yCrYwy9oU1n1ZHQ/sNtdwhJdu4uQg1qEn4WQgTe9jfj/2mtNuboM7FX8isk7jCkjkIs1w1z5g9oV9UmFECe8zjOgs5pw5WwpmVrvOCH6zmTZ66yT3SsnYsDLT+ImzuYcBappoBMNiXNJQ3X4mVEw9Vrnx3KL3PNLr8bJlAg7DCmPQyhSaKAyRdH375rWrOu7Aa7+0eRLkfVEE30AJwVo+1Rw83el31L2pgxgDM18en9Xjr/b3b7nb6JwQBTymJTVbRxs8JH/zXM0bLJNq+texjjtH1JZCUfPx05bAMuI3HMDN2ZLd+ybc9am/F8KXrphVqJg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0065.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Fri, 16 Sep 2022 01:10:25 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Fri, 16 Sep 2022 01:10:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Sep 2022 03:10:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [73PVn9fTvMwhNsrWZOnlkNOjFPGwxeGInpv0C1/H5Nc=] X-ClientProxiedBy: ZR0P278CA0131.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220916011021.3019960-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0065:EE_ X-MS-Office365-Filtering-Correlation-Id: 14e674f4-cd3d-4ae8-a880-08da97803c40 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKwiAlKx4YLPXZ4B4JRSVY2qlH6CT61LJ5ueHUaU9EBsJRtrjBStuDhP0OBw1Qs6vLxhjhXuiuMTKCLNa27uZs9Z7xbi8uRo5k2+sLtlAft4v7YH/W/JVPuWWdrJl+hwz9ZFMbSaGgUFE4qlSwCPKv7p+KNTNG42iuA4xSR0q46TOpKWqZkIIVJn2FI3sD+GSNSj3GjEwSRlC6SVHOiD18hOcO1OpYEKcO39+BppJNEklD5281wUoo+qikX7ewhYbSBmzh37+caoc0+CViDukt2QboRBTfQFDDCpiqumFHIEeTILDDdyL9XIPIDyM3L9tvqw07gPHvbt9h6fYsoQ3M9HxI0UsGnyOv/ypIr5EXIXpdE13gOS6ZVt8Sg/k5psFRfS76YZ2QMkZtH8cDOD0BFVGhJ8gRF0od+4A9fMVxJQfKzmQLe0P62TqIIJNARbCYnqEpoT0fyJAs756T/cFLm+ehWZiAPvF5Uc519vUqCmWfGeFq/Ed25bfBlS3OBIfEp/7ynxmOzW5aMOEuEhQKlkiMK5Cz0eezLWv565B6L358IWs5bBftC1DhcDr3ZTbWiJXEpnxWS6Zaq6n5R8rWUh2Eez4Wq2v4IzsO26JS6k0Yo81D8hUj0PqGJxYZ6gWqZzrZY8pikP/lwCgIs8bg5PuILmASyBo1O3AjLXG1NYd3fPD7/bfg4ssGNLSXg1b/aqFPC5fNbqzbhYhzMy2Y1k9K+teq/cDX0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GVXmKryYmwMjem5sN03vRpslnKeSY1nhiDCjml2uGaxV18ih3imdI86Ow5cgQstLoPXNzv6C3mLGK7Xbw4AdblQcR4G8FiSGNHv6RC6fKe4zixql1aKISA+1UR80+5o2avXfgY6+djbHtD2iH3lNNOjAiAyQ/liaGHFmdAIAk9gYp9VtMLo8d5tDV3mYOarrukLyuDPz7amjiabcwFpwM4JuIU71csixk0hpS8XvKuTap1Lz8lKIEtMIhrJa00zTZ+JR1N4XHVIFQTEjNqfpxZUDYEErtLnBAFtdp3g/eGKQas5BRmvaoVKKcRXkcJ1TLB6vPFHZPNf1BnUXiFMUrjrip6m9spD2CXZ+yMIZYWFLnTEK6wn4JObuDWjOqyy2ezpQtoAvzN7QO3hhNinlLxjBuck3N7ViNFq5vg11a8nZ7xnFgTU3v4evcbjZcp+id7F/ddpNim3sekcFbH0aaSBv+iTUj44niCxuvK7S14I3hqyz+FjGD2kD16pERCNhhJfwSDQqNCvSORKwaaQ62C1Xr1wiQP3EVddmJcBSg39vdugWsWgvZuv86IgjY+5y7Q9rfu2/DzpjzNzUcGE9fWaPG6QWH7+6XYzKvSmihdvEpE98olsDKIlMyhtdwn/pr21Jm8z6DvC+jcxbNsI4bg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EwQvDYZ7ObOfNIgGAfVHJSZavzkPk9XEV1KH3XtK1rtDEonib0/gElEKqg5oN8z0eTrcoFncNqW6aVOE5OiE3CpNT4EIHGp5QzoIDTnHkMu7WU8o8p0EUS20WPBLKWCoTV1gDoqHso84/YYPFV4K3dN8Ph5r5bEFwbIiTHV2DTCfexU3jvQTlfgU95N543BQsafZSxOEwBVmg/FqaQLld6jljJ/a6X18WvqevD/t3//LIYcWSETooAU0iE4xLbt2WpyGvBgAi+cUi7KYxlpRS5EQmPgQH+KV/LrZXqkzxQPIVtSXV5lqfT5CCh8WmrFpMTzGi6z5tH4rYIqbMPkn9s30rU04wgzRfTXJDthl7IDYWR3hFmFVmBZePUmM6JqAJvzAmR7rPJqiB04sTEwypw++dgTLNfCCJEBRc42JQDtHIZ3IinOoAs7omPYggTUbm5fhUB1dMFffNGbtM85hpPkMP9QrobYHahmU2y3Gu1vPX7nDnKvFVSeQE+2E+Zg1xQ6cwM79ii9eG5z+I78rVMWT+DqB3Sz4FYroYC2HMKeF6NLzEjNu5rkpHqSNKoTJqHhruBI4gz4MCJGF0dGdFR6xhrJoHdy5P4Ybu2f8kl9/SVo6XeInQfNJ+82FXYoi2E/9HciUjrXJcb6ySV+FjZDSxIXmTsJh3pDhv//o3u5dGsRPjXUGKbD/JgNg/ZfRdaDGH3nXa+FQuezMVDT1lwCRjfRPMWAsM5KUsoVivQawa+nkQST5ZJuH5EsP4zXh5lzYZXCmW39H8V5MMHcZGyu9FgXtXJ8sPx+vnW87b/ANv6enMdVuAk8GlaIEqnfJSpZQYntkwWDTvIcRrPhhUqqa35rSoydPcaAXBqWAlNoNrR96Jg1W6P8ojdOd6hZsYCV4XpPqwLiNzpFjfdRcG3NzIFeP5//BnZaAApIL6q4SMIWpvZ4XVe5sD5dk94Glhf+ltBPBZZV2Sga8RXK3yE8JF6HtEIcTaQQkV8l24WQ8D8ofBpe4DuX9EofsH+NVWXt3hMuuDvZeBY5U4LZraCWo3Ax5O8BsmfG1n00jjjyJxpeWNtUbRoyeKU7N0tXylHsOUwTMvwJI9MlPd/HsvuSmYwPstwByJzoAiBQkJk6YKlPczH9V4VWuCCZJSEMcQFJiACTATeoRBLX/A6X9FyKHhu4whF4raHZaGU+wXUNkOQwG89iwLeBkWjXAHyez/S9VGgNwl8auqPaWmUg2edUWnO6NVkQQxKnIIZM5Y8u5bkMb+MbCEzjt/+G2kogHiUNJvKFHXHfuuORpD+2c6NAhc14GBt0Uv9h4pQtFEU1q/3LJzofUS2Gt6N1J+l60 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14e674f4-cd3d-4ae8-a880-08da97803c40 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2022 01:10:25.1636 (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: PR3P250MB0065 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/decode: Check for more invalid channel counts 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: 6hwwUsFBFZzM Signed-off-by: Andreas Rheinhardt --- Maybe use av_channel_layout_check? libavcodec/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 2961705c9d..e24005cc44 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1595,7 +1595,7 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && avctx->ch_layout.nb_channels == 0 && + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && avctx->ch_layout.nb_channels <= 0 && !(avctx->codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF)) { av_log(avctx, AV_LOG_ERROR, "Decoder requires channel count but channels not set\n"); return AVERROR(EINVAL); From patchwork Fri Sep 16 01:11:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37949 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp666665pzh; Thu, 15 Sep 2022 18:11:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5d4hCexgabTL2y339lCfwCx76ZpMquy8cvShDEvqQ5Zttudhv6SvAsEdpgP+06gLrdrwE6 X-Received: by 2002:a17:907:1b12:b0:72f:9b44:f9e with SMTP id mp18-20020a1709071b1200b0072f9b440f9emr1746265ejc.653.1663290705091; Thu, 15 Sep 2022 18:11:45 -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 du18-20020a17090772d200b007417c6edb0asi18000226ejc.402.2022.09.15.18.11.44; Thu, 15 Sep 2022 18:11:45 -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=XJvhCP9C; 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 DFBBF68BBD4; Fri, 16 Sep 2022 04:11:42 +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-oln040092069013.outbound.protection.outlook.com [40.92.69.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FD3768B1CE for ; Fri, 16 Sep 2022 04:11:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MsZj769sQlsoT7hKfru42H7jCdabyCKMQeINZBNPp6QrD3hQPysOWaQDW6SREsXb8DRiOwhL8HiFz3CuNYdyqBGnMV/CFn5YsoG8X6Ci4wVz6Ua/zP9pnFxeShi6b4+cHKJrYCeivIIlKQaQ3My1bWbJKbocEUReF2nj6d0p+Wo5pmTNgCHsCjjVDDuEqXzZ1ppAJ5PuDwfOHEbl35Ai0y8plb6c+gxa8SK8LrstITx5Zz0ZhNJvv2JTKdQNBojrWmYej1WGnmbibrB1kqSWDNefa+QI1hFFgEKntXL1SCGrVfOrv5sNmcKFwSC+fNUvXnNQh4FwXSNC8ZEyhHOTSA== 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=9p5lwyMPwYFMPplXdtLMj3U8cjzsQhf+vd+GFs0wZlE=; b=RiCtgSjfCIrW/hn9i6q314UDEx+AiJIqVojZK7nzwGsPdJaT3WAZQlGUqQh+LMQqqjO9SGwRhs7APpvxm0QOhaM8CNUzTzV01dGr56irkoXnYyirudXQ83B47xZKctY3LRFbrBri2ZA7HRjOkvNSIpn+uqLTOGuz8EG9UF/dfgcrfjWT5F1/RRBkhBPDlgJ+QrbBa2j5eWRFs6vz/lhTl3wYvZXkuwuxGqrmUfC7eJR2020O+TBP5uRuuPNPWAwI1Fe69RY9VxDqrk1BZnJAoKVAs1MgnKGl0jrLaRp525bFuyKuKDDFNb7uje3IKnvDfhFL/iCRk8h0CCrOwa+zgg== 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=9p5lwyMPwYFMPplXdtLMj3U8cjzsQhf+vd+GFs0wZlE=; b=XJvhCP9CXMMblXyrjGS5wGAU40XzJCpksx7kvi+8AQawSLLFIzjx2x+sY6NiKjyU34ETv2kI2nOyoPxj5TyJRSNBAzhXRDUO3KhrwMAXUWzb/Lwpjoq13+RuJeUg1F3hGgIS/28qG6oC9WGUJL2XlVDF3IiWXdJeLbK0BJzCNlz188mxXBr/QPa/RjlzNQe+vLgsBM2wRqfYj2zMT943UYti4OK92El+DknrA7zliyvvKzp9YElvBehqItrD742bQLBK8/rwiYbOttaWLHDEbN0Z4SB4Bd1DZwrnuNkBNwf0giKb2zGh1a9xsaltCwFbkgulu+b6hMlkx6mRyU6dTw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0065.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Fri, 16 Sep 2022 01:11:33 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Fri, 16 Sep 2022 01:11:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Sep 2022 03:11:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [JOLRWVsOWnkJa0Nyh+jjT3S8Sjj8VLQ9hTvaY09NxtQ=] X-ClientProxiedBy: ZR0P278CA0186.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220916011130.3120959-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0065:EE_ X-MS-Office365-Filtering-Correlation-Id: faed1778-22f6-498a-7111-08da97806532 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpAR802nmGrL5i77DvupB327MVkNBNfJp64wrF+EZBacSfBFaPoJbpgMGrQ14rf6j/To//zDbqDCEl3cg43FKSN/29nxPQz9R+F2qwd4afjznsKpumbZPEYmsq3icjxNmQK/I6qrFB9JCU1/LpcBhYNLi6gHHKEylI09kF3fmI62mG5hYPY38sK8/XHqzb7K+3O1K2xyLDWgIObwD1kU47F7UXpGzPvtWCjY29QgjcikMMgh0YJg9rWxU5q1RJdy8VcDmvvzwe/i3TOVNWuwvtNBQZVUtTn37yg8tDw4Xq6KyDSRGixolld7D2A/MgovHYw4j7pPSKYUnb1Gm0pTFLsPgesEVZAa7PxdYUu4VCQ3M/krZHjUyiwSIZJjnthe8gNa/s5Q6BRbyqBagBoH6pdJixBp1QwLHrLNQkG0JFAID0KbYA3xz8iTSdR16A/d8SfOsBH52UiUVw26TbHda4csRV6Y+PZeUpVQ0dOuyIHZgIXyfplSaoqyi66Gl8aHGgS90ZAgeUcTBKAL+oKQOgqdr68eKw6qu9bkfvuGGUcx+J52dF8iDUKs5zpAJDmLJ0EdXImv86Cv2cW1p4piu5G0Xl4/I9h7NF6BdalgPELDoi5HbGYfdKhjeEm8NRHZUllId9+MODJoiZohSMe0fWRN+GGwzTNykY+ibcJD+EMmSzq/1ogjNPPrpQ4DznSluYObrJoguUCyuCpOzU4Cq0nXCiwwnrRSFxqEHwLmIwMZWiprRJFG6bVloR0cKK3s6E= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rwYozYGFAc9VuV7avUs4Sk3FeuwXtBt0JmSnbWfmd7l1PkgeFWguvgzbx1wcjqsu27qcLzBah/HQDh/1PCaGO4dsZ86xW4c3RC08zn7jZfF7EEEGcR5QJj9Gu1FgmZVojkBntq9A6MC0uFajIElOJ7y8kUq4L9us96dTQLjOI2q9vANIlgyALuJ46a8IQ5eSGQTJWyEN+eLzx+iFeOHNOQ+WjF65DhMwYepGkYhQqsdU/xW+whNmWT96NGpi4Aqz/2HIP9UxN7Br+smiEHgdnl7h2LMUdN3Kr1riXn00wTVLx2vD/ZvMjAkQmC7tfzJUOYWxUJ+YBtts3dziIOTVLBxHKytOnGaJTU1d1jceJp4NroheeAda5ITcna3DbVZCYR/uII6rPgN532vas4qioAmGn89m0g6CLX5Qn0i6MTCieu/v73/1RipVeWpPhXwMaiofrDHo2KnGbw+obalBYkKH9YgDt4a3RJS1i+rH6yuNCXkQRlbu5ItWHjjS0TDAgvOUrideTU6l3TSj907/aWLt4JeolGvVTNBORTOK45+Db9pWfv8hzg+VebgEA8HPG067LTRf6cEl8urmn4RdCfmlbKn8qXnGA0gx5T1RRtuNSdLKJNa0JXKFQqtw6vAOulC34/mJbq9DfolO+El4pA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qlOtnLoy/vT4BTKmHwOq6B4swqgFZacTqUxAVmmMD1W6SY6mGEMvTV8Qylrymmg8KtH6ouDLGdJnyq/8c1nRs8bjiFsn/aR3EeVBXdSwG5RGHPBIX7opVspWlwcM8n9bM6AeBlZkgvy8tUbK8VJVV/3/znsep3Qlo1st+cyxXNih5Ohq5h8aY+XHGUBol2Xbc5FzQF/eCLx6vvGUX/ZzJalyDywnQEhDYPNgj09+LbeG1UKFEfzAxdR9XyGhuwsu4poqT2aI5cypJJ6H0O4/M1/C7xum+G5o4J4D/Qbq5DkkwVUjIplZjGJBJCfqmgcO+WsgLeFZU5sw1JkH8K9mOrJilcSG/LMoEYzrtTT9yWnhuZ6CUkEfg0k8L9vOCwRL1Gc986RuePwebndRcHYGZ3pbvMZwRxQe0lcJzFODBRk6qVjie8L5iwPot16ygAuYV6uRHAyjBLjKOyGqgcvcbjKeVdeJwRheHbGfkI4DCMbxuzaC/UCn8KCZtBBBzRQwWZ5khrw26cUNp1jM09dw/k31HeXQv9yKakYAb7wuKQ1RGJZ77T+65v7fdlE8DUSA+B9JIFyP7d+3T+zB2cPgiKZ0A8pB9m5I4GMVDmjVrQlwF1Lvl8INEEVmtJ0O++k/K3L+n3IN9o3ldIP2edfxUifo21HgV+3QPsKPR2PWNgWI2Ky1CvbiyqmN8PaBeruy/IWtaVglbZ4YyksFHgTLk2TXDQAFexCVMdafIorCo2vmLlvb15t91xZe4kqWn+hhJoMxtHuJ66FR7AUP3uaBEfIV4d6lxxa0DeySQfJyZ/CxIucu3xsAJefCnivWILsI2CTej5/2fu7j567FhjIHVe63v5D/0HQLKpsxIU53J1tdCzkxSgHHA0SaeFy9RMNpNNTkcHb2R09KHza3Fj8QwJYX1dr5EjBpPupbw/NtvzrGJOka8IYjcqIsB6L3z1Kxe/TCmtFkVgrwURmvd50HJWuqOFoE0+BBHh8yOwjvZxNDtSmKB6UXFyEZeHr3scziF3OBC+F9NGA8f6LGsCj32dUIwoPDkKJ2lgQPi93PhGW5NqjVmyswr428mafA8xyTen++Bo3+XzD4nhht9GCLgwLs/UB1saQDzqyidDj5ggEfKjEPlBJNnvBrv+amEcfKaS5Q/LrtBLrX++FqlT7gbiWoowKX+TRqgZ57qVz0iIQNdpw34aXNKUGKBK51lkUHoT8jwdSoA5vxshwTR1wF54g2SQRZbESHcPdTSZKHkOUstbyrHvI9mlI4pE6FkRSKXCMT9fj/L3UkIKi48Q5T9QCQD8G2yucRKKSRQIpCVI0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: faed1778-22f6-498a-7111-08da97806532 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2022 01:11:33.8102 (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: PR3P250MB0065 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/dfpwmdec: Remove always-false check 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: fAHepgdg6LVc This decoder does not have the AV_CODEC_CAP_CHANNEL_CONF set, so that number of channels has to be set by the user before avcodec_open2(). Signed-off-by: Andreas Rheinhardt --- libavcodec/dfpwmdec.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/dfpwmdec.c b/libavcodec/dfpwmdec.c index 532a955b4c..4ddb806561 100644 --- a/libavcodec/dfpwmdec.c +++ b/libavcodec/dfpwmdec.c @@ -85,11 +85,6 @@ static av_cold int dfpwm_dec_init(struct AVCodecContext *ctx) { DFPWMState *state = ctx->priv_data; - if (ctx->ch_layout.nb_channels <= 0) { - av_log(ctx, AV_LOG_ERROR, "Invalid number of channels\n"); - return AVERROR(EINVAL); - } - state->fq = 0; state->q = 0; state->s = 0; From patchwork Fri Sep 16 01:11:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37950 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp666753pzh; Thu, 15 Sep 2022 18:11:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5me708pex+aWZHCF/nswzBTMjdoTjGyNM4z7a2AF7ieiZmxpURrkwOk1WZm5pE+VD+aI0R X-Received: by 2002:a17:907:8a1f:b0:77d:8e2:66bc with SMTP id sc31-20020a1709078a1f00b0077d08e266bcmr1855834ejc.189.1663290713423; Thu, 15 Sep 2022 18:11:53 -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 j17-20020aa7c411000000b00451d2a123a7si763315edq.332.2022.09.15.18.11.53; Thu, 15 Sep 2022 18:11:53 -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=WDTZDpqj; 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 0DF4D68BBD9; Fri, 16 Sep 2022 04:11:47 +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-oln040092069013.outbound.protection.outlook.com [40.92.69.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB56268B1CE for ; Fri, 16 Sep 2022 04:11:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nWAE/26thPJG61bNJeh60hdvr99+m6qyr8uC6ImdMcdcuLtung5SrjV4BlcTyjgomJUtee4elz0ouemHAMckLrf3rDdWWoVj4XJqYbXciAWXvuVSdwD9scfNOkxPM7mjLukV1Aq3o7hC39Jr0UeFEbWmRzfnX1ttxpbeMncC2Cdatp4AFVT9GsAq4vsXC+vg+l2bwPiHupyVFfbdbH6TmQdfs/DC8Jt188qZjls1Xu21yqhp16lZ3Nepfm9yAxizU44OwvQqOGV0iiuvIEH1jy7ERMjTRoiTY7rHvyz0XdyansBy/uHwBlgC8TvFMnp3j0DAetWWOU1G6Nj2GlzRBw== 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=Vm/OFVrXJKRB0wS/8pI6r/02C/b4vpX0MNZG8mKQrvo=; b=MAXN3nPcHMsyQG+TvOncADXAWLg2csS2mAR03sYfNyn244NBpsOxO0k34l8fm0vF2cCAX/EwJgt5wU8fxoLRJMz20/6Sp2jvNRBpC/TRl5iPcpCWNxBfzYxMi+FH9W9B0+rNDAVipbwkEBC/VPWS34dDLNFTUDJIZr/sSHe+slNYMoROSB63GV23CG1c8AlgCWcwZnqmXBGQSjcwfMsSCs4OImc2ooR+wJydWA1uVAuL6K+HkJQNFYlmAkQ844xLnT6zTMnVbHljlpoAjaxw+vdOcbxe2Krw5B5SD1ykpxmNRWr5h/TcOlr5oEl92IF4IL/Lmrrz80MmMUcsVYvVKA== 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=Vm/OFVrXJKRB0wS/8pI6r/02C/b4vpX0MNZG8mKQrvo=; b=WDTZDpqjjoJ0Xbc+jOuvoLS0bo/BthP2NLlVCGfmXEB8Bdjd6hXcG6Uh8aF5xAZxE3EF+jbROIokKrSnykDQjh1FGdk3l/vc9jol1L0lKgCsDl5mUiF3q3sVq7UMGQ6rE7QOKOagtpgeNmDWcut1c0XQ1lLtHBJRFWoZ1q/NgBn0J20XOl/Unwe+zGGqi2p/qazuDEUoQM5udg/OvAcZY3jhk782wig0a25Svbn4HLxjgIx2VbnXq7Jd5MFUJz1PzS7LMsJ2JloLhVbEnjhjU1ZXcABEOyS0QczVXtfGf+JNuXd2sQe5rETJa4G3ZZkyFRhafvVj+KHO8zDJTAe1/w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0065.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Fri, 16 Sep 2022 01:11:35 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Fri, 16 Sep 2022 01:11:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Sep 2022 03:11:28 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [VQHEuF6HwF4Pcp8UPPB95cB9+bohKeZVu/D9DXTkHJQ=] X-ClientProxiedBy: ZR0P278CA0186.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220916011130.3120959-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0065:EE_ X-MS-Office365-Filtering-Correlation-Id: f90bf1d0-464a-4f8f-dd41-08da9780663f X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpAR802nmGrL5i77DvupB32jgijRD7F8YtOOUF6IXQtInNCp1A1XZfCtn/jIoONJ3XsnN9NXANAzoBqTItcYLNbJl0DNXfG4gTMCkitFkmOq6GB9r40eMmpEsx7oToWASOKBw0QJ8DHN8cuTF/m+50iHtmrSrO/amMfdkWm8jPOkPSrZdAjfYh8euR+M/8KMWn4SgOYW07Sy+BeEhpuJBK6t9BBErd0fJRDnyOshWeys0pmiXxEEjOQYQQSK2Lh7Z3sVftTmI+/QmwtIAmVgWPVabjUHeDrTkclMjpV/ZZZnvKL10P28tmL4q/k+x9YluPdya3VQTfdfS4n4imnzBmMb8nAoxX5aUIRRRr2Q7Da7qznDCJP6hOQdKOvT00fy6SgA+gA1quWRx1HiWiXLDSbMt/YXry3a19I6+cmzzNSENrrceLAFoU89Jy0WbXttR2XoJnBeSlWwd6rOLjDv+d5t0rP0m9OclVgwcOKkTExn0nZRKZp/x3ERfaos7AxM4j5OiB0SG613vzKd60fIl7loTVbvJhAoSMGSPN9gY3GA1DvqbPgui9Nq8np/kZNEvLylNBCSOaqsIoAPCh/yVy4hh7sBmCVum2uIV9n/VGLjFArPmsZin1fojR8O3u7VRwW8rXEJ1n21uCxANstTj7nXEI1GNXB7n2F6TMtl/w6Txd36VcLIHcdvvb7LTFApF80Kl4xrJpAGfajTgJ78Ji8jnmhcF44Q15qW44lq+XF9h8Nf10dBLtXs1ZHwCFd+U0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mEqutBWIOZMxKxnlwM7yNwIss+X5woSOZcg7k3q7KFUzclolORe9PCEtfup7iXtk+rf5g6bFprku64TLtAe0+nBcbEbdtzIJjl0mfRPYNTjb5OgDJEukTJRj1fg+NDlmQ5sYrHp2fXbztwHkjY5vBL/kbeXO9eUeBQb5Yrv0D47izEkSpLz2xF1toR6CWhyAK6kPQiJ6UT1fl29AUwwFhS2tO3jWoIO46oW7t7uT+Bv3OKk4YYREqVUtQeXSOSwB1CXcsVsakGiupGFr7Z8aIKEsqZ2tVCbumGTgoneHTJFSrdVVYPH56cj9x8JbwkMSz3xehGX5/dvxbyNQxgAAPmzlXXQ8n6tXp/DL7GrYeDNbak6wbhq9SIUMmMNdGYQTbUhvne/yAVmqZ5+hZI+WHZPwWJvN1xOorR2jxodJbiR+ncbkl0Z6J4wWw0t1dbb+Vz8AG/rqWhvCN8R9T4Obj3CPGHpfGKcQjxDardVY9R8KA5r5XPrlvN13Vm4M5CqaGU41AmmQ77govkSuDM+bpQblaJlQFpmvKhEUV39vzBPrMxaAG5p67yQyw3t4mP0hUgKtFimCVS5bt926aZXbPj3dHE4WBK9GUXqJqM+aTkGEsQbNLXVtXdMcJGcUVLmNcUzRsTPu/rY9t3HijO1lTg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h6rcigVoDLd/pjlPO7L1qhECyiGW30KY1jQUiiVX8eg/nnd9ZTXcRq8YB83v//07+PPI1+7cQasRRj2F2EZUeWAVIJYooJFqOVKbWPBmUz6Z7Yq9aY+F+W6U7J/5R+rBIZfc40YaXV+VcbmIdXSJvF0K1fFonoIzJACk6QwG7by5bqbkTTtBIa/xRQWWpMi5p/n8OBW80vZbId47WbOwy6HbTIqZ3s1r24SO98P0iFzBkkL5fs842HcKnv7VB+6SWwbwPLAZb0fD1Fxixq50X1ELvM0yejBDeIhpBWQvKIM/SbywoH2eAZDPDLPqY7SvAdKA2ojHGWG9Sui9a/7P2V1lF+3EgaWPk5yz/OnJq+HR0BE94PPs1IHP5ZjckWmlCVCZaVvQjZho+5Mr3tsmQmYGKMkgNp6zeOpl7yLSn7GZ1h7+cHbI6LnxLguIdZI5wIC3yrM3F2JfylQa84Bw/Gi1zMUVIFkSCtTKIMeWRUBgw1IXU+f/qjsqEDTOQSDe2P0XNCl54dzIPBHr+HWDawFZE/d2AXmcIzSOIa39K5dzLav746eMBEEXElW2nuOfLwatvIr5D0oGaz2yg2y6pwmax9UgC3O75ecNEyDrKSiaBNnZKBlN71TvCmVSdTEdSD5KFXkeQ+fhyrwu/j2Dx7SR1e536ERj+zpVouaGp02dhjagb/KQ6ZUBBhsqKyeVFOUMGZonYDFKgSQ6HDaaLrGCE7IJlleKfYcQTLm18FCHHRxw8qfipcpqxQ3Sp+jGA5cpAY+84AKNUqznTEnKRjKEm2Uj74Y5mEa/9L1PeezmEBbs5jNyVjieVAES3EyiDELKc2h7RDImXkjfFQSjsyF64gLJHvzGsF3txP2f9lNk/kz/V6eOvWKSLAb783QicmjAV/vT96vZPQ0umZgW5KqWovi4nUh97dtYu0xW7soVnhADrnI/11IzwDaWDMo7pQlrSWkRpGAUD8uSkwRDZ5RbzcRj01kH3lam0+oYAdTeSOt+gZbZae8CnCG3Gq4yU2Ip7x03Myjc91vaKA2CiMdG00hD085GtLEUKUhaMDEAhPP124EGnCbpmfIYdAgEVvd/e4XSoIBnSVDRYFT1qVQ4RsIiEVSquhPfr6Qq/i1igWlHIzqQVNcDSMCwCkb3TLzv/CfROQh1q2+22cwtWSBZ3l4RHUJ3YQ2LSZrBZcmxC+FFsE8pMqg63LEGcgk/wYP1//2I+7GM7p2ZM5ZL9pBazJUWsz//uB3ZOASM3CcjoD2Lb2N+dAxTG8AANW9GgfixtYAREYS9qYiOgnInjntPUgQ4nnxM9k3tb5M6OROZE+MJfaGuI5PNDfGX99hY X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f90bf1d0-464a-4f8f-dd41-08da9780663f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2022 01:11:35.5759 (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: PR3P250MB0065 Subject: [FFmpeg-devel] [PATCH 3/5] avformat/dfpwmdec: Inline raw_codec_id 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: q7AOc+iTD7YF Signed-off-by: Andreas Rheinhardt --- libavformat/dfpwmdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/dfpwmdec.c b/libavformat/dfpwmdec.c index 685b95148c..98fb4102e3 100644 --- a/libavformat/dfpwmdec.c +++ b/libavformat/dfpwmdec.c @@ -50,7 +50,7 @@ static int dfpwm_read_header(AVFormatContext *s) par = st->codecpar; par->codec_type = AVMEDIA_TYPE_AUDIO; - par->codec_id = s->iformat->raw_codec_id; + par->codec_id = AV_CODEC_ID_DFPWM; par->sample_rate = s1->sample_rate; #if FF_API_OLD_CHANNEL_LAYOUT if (s1->ch_layout.nb_channels) { @@ -95,6 +95,5 @@ const AVInputFormat ff_dfpwm_demuxer = { .read_seek = ff_pcm_read_seek, .flags = AVFMT_GENERIC_INDEX, .extensions = "dfpwm", - .raw_codec_id = AV_CODEC_ID_DFPWM, .priv_class = &dfpwm_demuxer_class, }; From patchwork Fri Sep 16 01:11:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37951 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp666840pzh; Thu, 15 Sep 2022 18:12:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5UNL3mPuvGy8hrj9o14a53frjHIu8IagVsOqkqVgZ6JS8NIQk6ZHJ809Q5r1Jei2IMbzgs X-Received: by 2002:a17:906:9fc1:b0:761:9192:504f with SMTP id hj1-20020a1709069fc100b007619192504fmr1797004ejc.116.1663290722243; Thu, 15 Sep 2022 18:12:02 -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 qb8-20020a1709077e8800b007803a315903si6111108ejc.197.2022.09.15.18.12.01; Thu, 15 Sep 2022 18:12:02 -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=pmaa1KIs; 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 2ECCE68BBE2; Fri, 16 Sep 2022 04:11:52 +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-oln040092069013.outbound.protection.outlook.com [40.92.69.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0226C68BB77 for ; Fri, 16 Sep 2022 04:11:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RiYm81hIzqMDe3FlKSTcX1jfEm7Ea/pzCP9VlsSJhXrbg0jrPZT6P/7qNfPzMV+KPk0MWSUILgZaoh0mlPMgauj/x1tZgg20VOtFjnqiiEEa6zCFeMKN7IeYzywsw4F+q5gBz7EVfhbTz0G34xnBVA5881CDbgnf3eAjwEAiudvLObJqzYh5OuR+2c4tvh8b5PkzH+vtqRb8nsz9M9l+AUS8OnJtdJZEQCM/iswAbPq7g3xsoRkrim9TUmUIUI8yiQP1miuc9aCDyLkkrgxtU8CdEvF9NJjKW18yqcnXREstyzJNAzWpi1Wbhs3NhogM1c7KPDinQrMYONlk8tgbRw== 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=YzRWFWDtiVK8u4r5iIL94tCjQhBZU2ePONs7nFoL+og=; b=h4fg9lO0+2W4bKKURr4L+EkidfvmGNsqYbHVNSs0h1OnbTUEnu3TO8SngqF+c0XXnl/hF49fO6Uk9zebinZeANh0Y+LOqCqDFeO4aWx+6MAmCLukV+8WxDlIRDqGczBqdxm6YHDvKCXDJWdc4PXCFzc6sY40OWxA18PItn0J7EoBzmOvu5fhffL1NOS0U4iYdW2gNrjHq6s63982B8YniG5SKoPdfTzSrEuDiF45k3lMnBxDM+EAnqs0L2E2y7ndIU+rgowWu2usLg9hsS7wOKqpP2h26fKGJew6x81kqqzvmynEL/fP+hvJdo1pxoZfVglZVwnM0N931w368GAopw== 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=YzRWFWDtiVK8u4r5iIL94tCjQhBZU2ePONs7nFoL+og=; b=pmaa1KIsY0eDI01loP4MT6e/N2OJKajmN7nEB6mphu7ndUK5H07nvh2656A0T2zADVyBQtXEwTXcfbhOzlvh+xzB6H8tCSPjpAWJQ5kL4V+aZf+xULEWX18g1gJcL0hVrRJG9CM5KYz0y8K0B7n7cf8EQr5s3MFoK0KTnlzTxk8eT5vHc1gWBrddWVSqkpBTsmZihYg8roXC7nRCBqReN97HCfac7Z8mOXPJiHKYuMxEvuPx5Djm1w2ZpuqO3xeC2yVQ/GHLOhHnZMbp+TwAXgoLIyOWbPYamhFSosMwK/K1qPGHS/STUCbQDrDfOYfWD90uwAuwc4p8Vn6zUB977w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0065.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Fri, 16 Sep 2022 01:11:36 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Fri, 16 Sep 2022 01:11:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Sep 2022 03:11:29 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [42Rq2t4ZnTT2+ZIxuxLGOA6MtMPy+sV+PlOHC8mBg3Q=] X-ClientProxiedBy: ZR0P278CA0186.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220916011130.3120959-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0065:EE_ X-MS-Office365-Filtering-Correlation-Id: a620da21-8656-487c-56b0-08da978066e4 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpAR802nmGrL5i77DvupB32uH/2xB6yubYB1kyZGwXoBaERBzQlvK6B0BHBG8ThG/Ubw85HCIQ4esPW+0E8RXknc8616h5ffP8NLKIBZtfdXZ9IpmhhAOBu0EUrYlJamkQ/2VK03VkPxWUGcgBrWFQ0uvLikrbXIPtbiwm9uVz85pdLf8sBcLkGiY8mZLSFwAAPq8Aaw0f1/JJSr8Qkcl4lXKoUi5xb/f496RPstugYOd0cEEHjOHH3LbmTsvMGsnGTU5zYPvP0Vd24mi+BtN+RBW6dGFqMZEjAfAI7ZDO9bgA+VUBYrpWykSrt1gw/rigILxAbMNKbQU+FIb1kuoAY6Cry3fj1+SMJkbQbTPuB8lwm2oFgE7sIWjciPWjCeMmZ0dsiQU7XV2OSmo13zFJ5DtwRVTRjChyfZrogGFNpuVpreqSrmVfu7evBGsHUCJyFy70EFvQrqLi9BVujeIBWuDmcfa7g8WV0OULmp5wFeTzH8xKOENWa7VOLSaSsEXuyj1PL4sIQc7LIaTbyCFD9d0SgV++UnJi1K+DwciknO7FFZtcZlcHSJkdLRehZPKvveFNaiIKKvJ3XJaPxcPxIB8RsIvOEuE58VgOopz9XWwM5KFNU/9+24Z0qDCGXDrsBzscwsdkxf/mHcmZt/6wqDV4QRY2mSpy+lXB+PWoOcfGRWDyHBkkGgItcqygHb58TPc91QEgP3wb+POG4ZYPIN6/gbXhnGy3wQC4Q5sIbvnsQ/K8fzkVclzqZ6tlGxmI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wMa/xlPL2n05l8ckC9+JIf/TITZnhaJ7NuTyGzY65EwfTghLoPQeVmfCCBjekvwGuYHtsvEYnxvAOkd6eHT5zUCr8G4rDyDW0tLbGjsB1uBN+F0AJgkhIQdOYKYYqKbVVGFo+dYWwtpgsX1Is1ESEu/lB5tyu0/mSHbk6RdXh8qdsfrI1tSUeeFZD7gQJCw3oSlcWrUzH/e4+g+NAKgxehfMIajzAza5E2HXA6zbuKjnTiYVzGnern8isxX9bratLr/hiS6EPYcKeIix4/gMRX8z7tuJfEiXIB3mY5ykNYFXcnaikZKkcnN7bpvnv2BDMI4nci+Y4gYaYCuPUCyWZAZez5CjH6eGGV1riLOcjdw83r70fstaZ6i+fVRjJyKsdT90+YriVVW1DgZMeylwAVmbJoPUJvgK5GYgBxWyEhg3bKPnOx8d7wbFpR/g3Sm2gYEVT7hsSnEMaGAcZQv5zfCjOcFj8F1psySws905M8vW9VVi6ozJ00IbIfVgyOz4LinZthr0yxA9Kjz1kQnZEiuLQtO9IMt8TfjP0sduqUR45zJHAzFrh/LiiDwXr8qU+FSNX6HwT6FQFc8pvg7cpAPE7K9qJP1fvWQAvBAqwhVYWsirEdPVJQQXhlJktTaNxTvL0IVAyAzHJiTCcSA4GQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ivGjqjCos06imOrk2ZvAmm7U6IfgAtVLuCdCccAbLhLIm1PYTNPw6ZWWDa63CglbIFwAEwzO04r1kxGlB5VMrqtdgekocFilRg8fGvo4zaCRzstw0vlno3uB3sF5vvBY3zTq3q7EVEcxB83jPty0yerlSoHq1IWEdNTzBXUrLdI5w/2HoUVb7RdPxVCqAQV6RT2TTMrzRiMlcPMJMaCOUdwAXhX47E7QkE6pdQGXlTMY4bdXkqX5wNIZCunImf8lUfoIK+otoSZo1z/INPw9PE1V9bsf9amQkxcQ6Yqd9Df4fxgoDKG+pw6izZai4yLJVy2a/Rg6aO5OX/RNHoY7F8sWWJpY4AT70Qc/Rx7Sn0kn50OaNZPcV1ue0cn0zWnvBMr2OIRtd5Zp/vKs/Yo7h1TJ4KmY5L2T9nQqdDPNfWk1yAux+eHFaEStkeMc0eRffTAECITukVsv3+IO9s1DPt6mV2sgjspCa8TKhci5JerQrEOTYjqU87NHt+Pba+5V6T7hSUjT7STCf6lZokaSY2nAHW1NLz1ilZ2A4aMq7C4xnox0YDCAK9T/Q56bSsQAME07AcYFbTsAasjX18MyMe+xY8xh30geNXhtg9UQKab4811rKbNivTR2e5pNPDeHynBnQvOvGgPEVLTOAmUNydMLeDEyboAahg+ZC0NIbzX6vjph/TP7kUE/ErH9yzzz+YNnJmhWTtmI5eoATPPQdzW2F6N5urIrmbNuVpfmtgOUIJYq1BlmWz1lzv9C847PwmJ0erU3evakWDZnXtsYQEZBhMpYRWuB1RAJZ4gXLzicJAX2P+0KmTLSNayLby24bMzeXgHK2P1M3o5m5PWjxU+/43SFFYrO7rMbAXC+4b8o1b8kMRq5F+GcYUGd/58rHuAOYqwP4j/TZc7iJcxz6EGzssx4ruwfElm+C5nmkXIE6Vkxh5JOzj/7eitiDq8LGg4i+j9YZn2DmgQzOmYBNxn1YLNjqOeYUYcmo0QXnm3JSMdbtHZLks/PbzkQjC66d/IhYYthfNLUzgfZab2WJBpuc9x8+1Gw6aJNrR1s7eHzLgHkoSbZjpkHuOFJAEspufM6YqJI6jWWlHYYKn2rCo27o5nNuWD9Wh8A+YnaVH+heruoOniMgeNTCCBtoqSyNZ5/5rqYPa4e+Ja8JMGeOIX9/epmX5KSXO4KEWVGIwap4NU1sSoKPYwrY1q2TnN7Mk2UW06D7aK97AkaYl34RYfSXmj0MVvAAdFRVULGcegMTVm+YuUT5PWU/HLbjUuBu04LVykywKE3mKBnTamknYKb0adhwbQkXvozveNaAik= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a620da21-8656-487c-56b0-08da978066e4 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2022 01:11:36.6393 (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: PR3P250MB0065 Subject: [FFmpeg-devel] [PATCH 4/5] avformat/dfpwmdec: Remove unnecessary headers 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: oJiiyyWFxpOO Signed-off-by: Andreas Rheinhardt --- libavformat/dfpwmdec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/dfpwmdec.c b/libavformat/dfpwmdec.c index 98fb4102e3..2244aa99fe 100644 --- a/libavformat/dfpwmdec.c +++ b/libavformat/dfpwmdec.c @@ -20,13 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/avstring.h" #include "avformat.h" #include "internal.h" #include "pcm.h" #include "libavutil/log.h" #include "libavutil/opt.h" -#include "libavutil/avassert.h" typedef struct DFPWMAudioDemuxerContext { AVClass *class; From patchwork Fri Sep 16 01:11:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37952 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp666933pzh; Thu, 15 Sep 2022 18:12:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Qn7jMwbSPpedDw/TZJA8zqDNperftHMPRonSVj3Rq65VvW+Ly7lS5YiQABqrIObiWkkMu X-Received: by 2002:a17:907:a05:b0:77b:b538:6476 with SMTP id bb5-20020a1709070a0500b0077bb5386476mr1814944ejc.324.1663290730902; Thu, 15 Sep 2022 18:12:10 -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 v5-20020a056402184500b0044e86bdc80dsi727221edy.171.2022.09.15.18.12.10; Thu, 15 Sep 2022 18:12:10 -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=MWQx8YBF; 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 51D6D68BBE7; Fri, 16 Sep 2022 04:11:57 +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-oln040092069013.outbound.protection.outlook.com [40.92.69.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AE3668BBD6 for ; Fri, 16 Sep 2022 04:11:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FrY6qhHUl3qtxXQyAQP8jojteyxgXKLGMmt8rMZ2/38/XjZHV7xcRv8JDGFkfy7bBG2/foAuAIyTkq3gdXeWlxLdLt9yaNppvhf8S50jSeA86/YdKQfPn4Q2hSv3lqRTvLjrQq4aTtBSsTmTU4MHIUDf4kugyYrRhipn6abPyQdx7qirF/b1koYSqM/8qdJkAazEOsi+ICpgPCXnbcMdHSG+0OujKg/H7Xwaky1M6BZif80jgyaepkXR1z/L3QyKhHU042oVZgcPdMOX0WrEH+6F7mgPPKuEZA0Oke58fx7JhbXBA3+zojbfTAYv/NZAN6/tKmhOE8FdYu4RsU99DQ== 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=8ctO5TDH34rGQ18aDzBLDC8+EITr2TBO4F4nCoDWUhE=; b=RsfCRc/PbZkTqKn5woRdxGLHJP5adf/qGIFBR6sCwH93Yc39a4Bz22sa21+V1ep9Quprujc/6rQ9IwSNEr6QgMIe4sojjmaWVblUTo6o43gAHN/KG1ae5yIIGpLES5/3opXV/Ust4qrDPQvcT7pMsKbYcG/tYvIzyNeLFc+0DqV4VpCJUNWU7TRSM22Qacqsna9SBTUdQI/ESLj9oAsA1lIuClaEyrLluQLRh0cfKABV+vM5t20L9/8+X2efANi81C4GzwA0bXF14I3T/ixuZxJlyn6Lzr4F6phg17176kf7YxkIFS3BdseZPUHol4F9uRBWdLylUlmVrW+6JQPNuA== 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=8ctO5TDH34rGQ18aDzBLDC8+EITr2TBO4F4nCoDWUhE=; b=MWQx8YBFK/1FNlFZur98pgEvC/R+NQJ83qThYViVkxcLHZBcF1CWX4RkJIO/SXfUxqv1BP2kVzrA/gpsiFDHQFKsF6vEU+RMNBhw8Q4dtOYLta4M4Mce/s9Cr35xzgySjUr43huuEhs74AviGzHKWfqsEoBUU2uEsUQiPQ0/56rBY5wLZa6qF6Xrf43WktKv2Ng2faYQO0OfcMjYTPvaKSLZelBa/qo9f3D07yU5VMg4ql37lRndFKX3CFsqq1fYNvI232DABkE+MfC7T6IJKn5+86Hv3ZRH9cAMyItf40KJej4K4ngbXUgkvgaHTmRuYJ0qP/z579PBaEyyRf46Ww== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0065.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Fri, 16 Sep 2022 01:11:37 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Fri, 16 Sep 2022 01:11:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Sep 2022 03:11:30 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [mrp3Sp/L0Ypse90MxAXt6OJ8e5+O7LU0Ptse+lPW2CQ=] X-ClientProxiedBy: ZR0P278CA0186.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220916011130.3120959-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0065:EE_ X-MS-Office365-Filtering-Correlation-Id: 06a9d961-3cf3-4520-780a-08da9780677f X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKwiAlKx4YLPXZ4B4JRSVY2qKH97HC3bRyuMK18jvZru3deUPcuHM19doj6/V8xUXuT0hzUBHh0VjjYesJS53+uwOWDsobFE7mCiM6GlCQjzhBZLgwNdf0SDigRtDYbWsoXNJuUnfQMURBMUnUQFjEMp71shjXZzm2WyTPgix8jQyqCtfP0v8fk5EE27jl32/mDhW3S/nQ/4TegP5NVZfP36TbZYMuRa/KgAHEB5wmaQqLUSivNXrvAc1F5G9Uy//1PqpdUJEs4FAqIRo5w3VlhOHGKZAO1ygl+px64RL3TPlgBnPtuw2XSaconSudwO8yjESQLMYOy4b9e0UOXZaGmlxlQypd2FibRRDVTkfd+Xck7mo+f4AfVO44xQirjalKJ42FrnapaK5elOEYlry01K1MwwEbhbO++J92wx/bWBEeADYOelRGo4W2d3x00vxGrkevdH++eFcsVITnEswOpL/h1Sc9/+zk99dTAMunTlZviJPUbZzGEte0319KwLWH+OV8GY4GlQXJCQ0QIlHqklwnhNKfDIusMfijwipFCw/hiJpQlvI9c2sgLDPzBpWdaMXooaatjPD+MYYZQh62pOuv51p7TwxWzJjjAXDhQKQlmpKU8vhda9qgozU/VzrfLQh/iQn0NHC3WjGPz0f/B7iNj4rtpAskSPMqQzIyVOyoVsWYtBXz7ZvN5La7wSg8HhrzeGNRKRQZ2JX5R2TfrHKplW0YzUOuQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D4muuauh40x/vcPacis3og4gswWBh7miJzQjvVUQHNt5cl1dMeCqJ88NTtVN72YBO8mBdq6N5uwOkkTMGwD3XvHwil8RlR8X3A0o93YG2hIKAcA4Hb7ep69/GTDdmHmcZsX6FCzJB8dWfUKlyWs9rYNdhwZjljjaxI9DgEsMAlwG06/0hHRG1IWBgHDbsGJFBzbOIxVYn6QtrsdGc5JhBayFLFReqXRwK0ZDnhpOc9jMCKihSaLAmREqVax0f8Eu6RwmzklbWjcalA8pUkHKgXF9tL79ltFaGvjbKMaXrShkRzzYu97OD6DZb2Cftj46ZAD0Ph2yHIOttPHvn65SoABxZbmvq5guJY2Es8dZFCfpUm302t5krPXbSnPElNe1LKp9RA3/Nk3eQH3PDyNQoqRU0AuhIbJ4qbJnok9wZySWAaxWirpA28w3P78yi2UKlX45UOrkb/rcFtJTYFdJ2c7kwJMcwFd4sS+b1IDT2h1FCtwTrMyrWDYlZrNQ1oIDUE0axcaHcBJod3krMh2tM3rGshIwIx9VhTH58N931Lvhwv9G6DBktPJXKrEkc73AZ9n/rcgKfrY++Qey7CZVDlyLecxYEebNTdjYNq87GDTdqg14ukJD2buGeIj/AzuPjRNFDz7Y1DSVV7WJ4ke4/Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pUS3Gt/lrDel80OmjIQg8fS/g3zgC4R4Q5irkCNpjvC4mljlLv08EQgIIN9/Csxenx/e8c1m0OngCn6taOHWXfLUBCXSQMCYDCFwi0RHmwReKgpL2Bi2F8u95OZ8a+2kfGexPa93TxJ05s20Xd/fnPJsJghRm/oylNUyfkhwIukSs8bRpwJ8AYdyidb+jyxtLNlwcW0WWBE6Te64266cIBtM75cHpUVPPNMIZfsbOzg9V+GBBYzm/ET13gweaTXjzg3j3OwDDzdbrysCJo20ABSi0hpNIf7SBQHsIoAX5OzsQQGeIrgsiIt/M6Bdqo8P3d7B+6aV6g5ZZVHEQUB+PmpiR6ikemPAVKj1K/CFs+n1Q76GakR8HfJHEzZbPd/Dkk/vahdaew1og1qX5LAQowus0KmQLuXrwBpCOoXMuzXibOYCYr4qbpCr7dGfvvx7pkc3t3ZKlo+hsDMmkCk6AlH1rfaPdMHePeBC5MLYAUD4bPyFec0nfpi9gmZxsFSmuBOfcn1gnTatkN1xBYcSo3j/CpnNYDOgYmfkYZmHRvw8Iax3r0r220GrsoKCdBcLzf8+Hb1wO3it6y1SKL4JvefZg8i1OpT2JsU3XxXfl5Kd6Mj+5zHq5H7ZUOYmok/WvUFfRK3Imv9DEyGLFxJKYCaEycnSYZZDme7fZInn19/dXEpGaNZu4JT/c/37akUZ1ERyLV3BkQ9ibB70IqLu7asOok/MpMrguDFhNrzmaeoYL65YuLIvdfYMxijXWDb0OTaZOLXzhXL+56tQMSP+vH/5fFCD5bxc6dqSwxULwHMAxU9nn6esG//g/rE3c7Av1Gsq51/H4GH0TzVF69xkfhcwBlHBxmZsZxVDckhimGgy6zCyCN7o4qOgOyyAEMbFaaE482JUA8GRfIZHf4jVBotD8x9mNGIOc5mjZg8EM+JRxMArdW9le+ecvcAOEEbKoz6QC1kBDzjs3gILUcg0FRlY6pYTSNy8Vw17BDdy4nlvKDpld1y/QSB2WSS6OU/iao5xgropMuYVYNzpQL1Jj/ivyo5kNpm+SZ+VgsOoISCwoE6B49xgt8Lpn+7HaTzjFAhU/ldMzSEcCS/fm3o/mSOQQAeqQHLttmrZN+axZy3dUx+uqQsc5GgFfhXDh/dkGWyechPEWSbcsf2d2rCm9ZE9DqHoGcpyO5/9ZTYCrsDTfbdcteiAI0n6qTvsMUqRSMG1hnV7X6pbQQpHCipyjvNSstryzsCfAvUjSdUebPj3dXcbu8xjFxwYjXeOqudgbtvApBij2DitXfMaQISTsXbuTasw1eaCrbBbXea134KBxXn/PWMfo3nbnfTr5wMo X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06a9d961-3cf3-4520-780a-08da9780677f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2022 01:11:37.6079 (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: PR3P250MB0065 Subject: [FFmpeg-devel] [PATCH 5/5] fate/lavf-audio: Add dfpwm 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: 1N1qJfhsTmRQ Signed-off-by: Andreas Rheinhardt --- tests/fate/lavf-audio.mak | 2 ++ tests/ref/lavf/dfpwm | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 tests/ref/lavf/dfpwm diff --git a/tests/fate/lavf-audio.mak b/tests/fate/lavf-audio.mak index 68fca35298..d557d43c08 100644 --- a/tests/fate/lavf-audio.mak +++ b/tests/fate/lavf-audio.mak @@ -14,6 +14,7 @@ FATE_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, W64) += w64 FATE_LAVF_AUDIO-$(call ENCDEC, TTA, TTA) += tta FATE_LAVF_AUDIO-$(call ENCMUX, TTA, MATROSKA_AUDIO) += mka FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, PCM_S16BE_PLANAR, AST) += ast +FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, PCM_S16BE_PLANAR, AST) += dfpwm FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, PCM_U8, RSO) += rso FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, PCM_S16LE, SOX) += sox FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, PCM_U8, VOC) += voc @@ -28,6 +29,7 @@ $(FATE_LAVF_AUDIO): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%) $(FATE_LAVF_AUDIO): $(AREF) fate-lavf-al fate-lavf-ul: CMD = lavf_audio "" "" "-ar 44100" +fate-lavf-dfpwm: CMD = lavf_audio "" "" "-sample_rate 44100" fate-lavf-ogg: CMD = lavf_audio "" "-c:a flac" fate-lavf-s16.voc: CMD = lavf_audio "-ac 2" "-c:a pcm_s16le" fate-lavf-ast: CMD = lavf_audio "-ac 2" "-loopstart 1 -loopend 10" diff --git a/tests/ref/lavf/dfpwm b/tests/ref/lavf/dfpwm new file mode 100644 index 0000000000..b9423bc1c1 --- /dev/null +++ b/tests/ref/lavf/dfpwm @@ -0,0 +1,3 @@ +c216a2b5576f3e7f31516854bbb41eb8 *tests/data/lavf/lavf.dfpwm +5513 tests/data/lavf/lavf.dfpwm +tests/data/lavf/lavf.dfpwm CRC=0x226be6b3