From patchwork Thu May 6 05:11:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27597 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp981230iob; Wed, 5 May 2021 22:13:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvk1QwqQMMAxDptnv0qeQWUKoZ6vPrtbkVSa/WN2rCgp8H4hbnOK39N+xTpP250M+Xo9fV X-Received: by 2002:a17:906:32d1:: with SMTP id k17mr2446615ejk.94.1620278035213; Wed, 05 May 2021 22:13: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 m11si665731edc.201.2021.05.05.22.13.54; Wed, 05 May 2021 22:13: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=TS9BThNH; 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 03300680CF3; Thu, 6 May 2021 08:12:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074096.outbound.protection.outlook.com [40.92.74.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5A016808A7 for ; Thu, 6 May 2021 08:11:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lAHgEcrssgmy+LpvWSYjwUA2gp9WD9Kf6z8bMBpqE0V65k5rlw/xthFFGkZram553pYvt3QEqP4yOdUC/poXG48IOusmZa3MtVMVFOyzl8G3yWSxd81e8eTZZtGQO4IHwcAnGaGa80MCde6ZmQ8H/uapQPHht3v4AlI4VRRkvCjFPKrKf7LvAnVMuG3SASW6drUz4rwQ4eSg4QZz4VXTZCFJxS4nAXz5120PqWWi34XqWS2bg6NgYxDSlcLQUjgPhB8RG36TLEBHaFmWd6lrq1Zemjt4UUbyUGOLWEJ+ddAhW9/Q481ZBxXNRVvEuqg/qXK6pW0yBUP4C6yVZL9VXQ== 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-SenderADCheck; bh=t0xMDtPVHWF0266SlIMY62Nu6i+XOuLfxoIAgqw7Gfc=; b=StPx1zVemp1VinBtv2J/Yc4r62vFDbuGaAP/qV0cRqS5fqw73p/3fiuLgddRSYVi40EzxGPhEbTVYJEQqar8LE5OLFRfo/0ZXTcZmf0jjQxrY4ztTADOWYiqc3+HuL2rKcGovcNxhydVCZHzXD+UsipacS4XQRiypG0K9p8oe9O2034Wr2hD9C+FVNMW0GBBRbP21HcrX3YmMEkqippD8iplJQzYmcFJrXon9QFJ/N9eqqzCXhMIIWsuwOfSgTca71A91rLaIUdRgf/xSEzMwCpuh8Zyrhtvt3j3ld2InKF/jtDuU+XCGhEPAjA/dWkltjgvgq+/6YWTDKEG+J5bSQ== 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=t0xMDtPVHWF0266SlIMY62Nu6i+XOuLfxoIAgqw7Gfc=; b=TS9BThNHdH9PMw9ZYJbqp9z99LT5XbvIBnGHbXn1Oy0KuWHFYkyMOBP3xZlh/SvNYuwOsPSheVuToIq9flpHmbZIkUr1vwpJ4A7HdThQabvdTZIeUGG5VhxxM3vG8iPq/EDQ6UIgKwAEBUqEhj99LvtbMkvDGuBnYwa5EkdOu1oPt9Q+9qaeUCuKkdK0y3O12UKDYriS5QMfvsOXu6q6e48idpLutUGisPGi4mBljdBwZCmsM0zCJ8ITJa8wjDEJ8zMsRcNG+kejGdj5WfghhTHGG6Iv388MdyuQuAL8679HtXl/lbnrSVcA9YfbjDrjvR2RuZtOb02M+oBG67lIUg== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::42) by DB3EUR04HT250.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::405) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:57 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:57 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:FC09406170E0AFC52636DFA1A84F4314336DFE41DFF3E6990D02EE4B6A6B7A17; UpperCasedChecksum:6FC0D56DEEFC0370C27F26A18B9F74D506B48DBB49D8A6922939D7EC0C8EA0EF; SizeAsReceived:7597; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:14 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [iu/1799zpg2uEJKzwjkTS9lyD++Qey3l/LqW2xTN5gE=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:57 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9e493842-a9b7-4c00-e487-08d9104d78b6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX1vi4Zzd+e+UNdoYIlAK0S8Q705S0v7LHdAQCMWssZLzc+FjFUk1e1cH+dopwgdrVZvWTyGAlZ/I8xEwPumnUgq/nG3roTt94vqPJQf4eSgVhuOI1lQ6fQdnezhy86K5zBi2uv6sTHC2zRap+dPIZmIqyHfSg4h7zlHyapFsUVhEhQnoBh+F68TbtE3hfFj5S8FwI/h4fnxDDlH1UDDTj7QDa/JncqVEAfSceO66MD1QIfo6iElHabqv9bJGYfcw28DNkoud9DhpM3fgsAD9GTrw2dEIkgRLEDHxNAFgEop0H3zPd7Yc2N/jIsOp3JQ9opLzlV/wMokgJ+//cz0ORx9iJdGNOM1/n/3hwL9ZVuR9VCsXOEIxWMtfdEOPGKIgh5hYxKm8uhZR/ABVKy/BjYomtrKuu0gZ2y9bMU+St657OoYaCF8DeBh+bD0nBSuPrNUx/s4v+AuKaqPvuxfezkRKpcf+j0uRYDsoXY5fC78tWFtSP0sVUkg/P8U3BZHgxEtjsE/KxyqUt8pmMC6Rxh0TfGmx1K/94t/XduuSeT80KebMR5wNkm+6c35++IpuI8omlrScmjQUyuAiqjdvP1Jy1P7rGM7mjSAAuBM6Aufbi9+4XFqN/XNTrJ3vvv3tL35guPE2TokaM1zWiIh8zZJCuyMSgYUQ2rr1650k2Beek5jB5JLa30jH3MuYalf7mCGuay8RQSCTZ+yuCtcvaPnI5JnZj2mS8= X-MS-TrafficTypeDiagnostic: DB3EUR04HT250: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zZT+jmEQ1IV1UX9Ke3VH/8oynx1GunUlmBWrxaWM2ZmaWK3bRLCPuPjlrtbKvWCnbdEBfUsCU1rTAXTimqzlHf+d3w4/VO6KIL3VXlCncyTM2cRZWhXd5AOL5nsMz4oXt/sRr+uNoWLhmG/BTTWlp1njY5Knimmn5+qdgMmP12AKJyEqQVYk9/DgyNvVyFPhFcvTmHizPQ6AamUTb9yLO2uBJyrcLKN9bNLTqggKEK6vzm//cOfCeu4XVxX1duq6l0TEZPiB/NF552idSa0W53DW+7CnKmZKtMbKKg1mslKCvFbI4m8Q7T8BclEtQ9DpEd0AYNCqelnvjAibjCqYFzQLhoVsQEwzqG87tcerXEi3SYhwSodUQH7fXsYkHC4SswpRb38yzAfyaoNccnojTg== X-MS-Exchange-AntiSpam-MessageData: y/qhsP5h4nuoa7owGsSpguFNfvFP45TxCQPFfhQggoS0ae8goObV8+6UrndrO5J5hNiSVolWHNgzQr4klUyai2YeyWdnIGhbpHa7h+GCdPPHKtI5/3RADXpi0kSU8ri6Yyf/5U+6Qgmdbdv1mF90Ag== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e493842-a9b7-4c00-e487-08d9104d78b6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:57.5403 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3EUR04HT250 Subject: [FFmpeg-devel] [PATCH 16/23] avcodec/wmaprodec: Check ff_mdct_init() for failure 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: 8IUddt+XoJJI Signed-off-by: Andreas Rheinhardt --- libavcodec/wmaprodec.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 9607e50968..4b2dceb5bc 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -318,7 +318,7 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu { uint8_t *edata_ptr = avctx->extradata; unsigned int channel_mask; - int i, bits; + int i, bits, ret; int log2_max_num_subframes; int num_possible_block_sizes; @@ -543,10 +543,13 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu return AVERROR(ENOMEM); /** init MDCT, FIXME: only init needed sizes */ - for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) - ff_mdct_init(&s->mdct_ctx[i], WMAPRO_BLOCK_MIN_BITS+1+i, 1, - 1.0 / (1 << (WMAPRO_BLOCK_MIN_BITS + i - 1)) - / (1ll << (s->bits_per_sample - 1))); + for (int i = 0; i < WMAPRO_BLOCK_SIZES; i++) { + ret = ff_mdct_init(&s->mdct_ctx[i], WMAPRO_BLOCK_MIN_BITS + 1 + i, 1, + 1.0 / (1 << (WMAPRO_BLOCK_MIN_BITS + i - 1)) + / (1ll << (s->bits_per_sample - 1))); + if (ret < 0) + return ret; + } /** init MDCT windows: simple sine window */ for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) {