From patchwork Thu Jun 17 02:31:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28447 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp202310iol; Wed, 16 Jun 2021 19:37:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxq2YV95OkgprQ6MaCtnX1TKaUuTOO7LFcGhrLz7YpVmZ7YBFL/nXA085OtJ/VlezZj2jAg X-Received: by 2002:a17:907:9487:: with SMTP id dm7mr2557486ejc.349.1623897466873; Wed, 16 Jun 2021 19:37: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 di18si3784509edb.218.2021.06.16.19.37.46; Wed, 16 Jun 2021 19:37: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="DLfBJ/9p"; 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 6199A689F0D; Thu, 17 Jun 2021 05:33:43 +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-oln040092074086.outbound.protection.outlook.com [40.92.74.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9754689905 for ; Thu, 17 Jun 2021 05:33:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BW2ZTmlJ1jPvS2XHefv6icqtXGWn6H12VIEeSL/yWmwzXtRgPG6Mln2rXjTqJnu6/rN6xisg7pAS5pBwlJKRGcmRuHBhDNX0nEinmem2wWJ3OF0JqC3pnMgnFKjdWSL0XfakR3Jg5l4qhhdz+Q6vtY8OlCFl9YaHv+gqtNBk/5521prcx3Up6wn+wHlihFNzDDbkl4uaIoh2a6Sj6aJVxaeKvz7NIHezlDej7ND0l7gzadSagam4DyHoYpGw1ZvsU7OTDe4NRGtk8QyD59mh0cwK3cWAcPwSbFPJibWpdJ5gmuF0jBx0aDKOzLp9omoL6qLynsJHVXkgzl3p2Eqv6A== 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=MCdcmjkyBw3EcqQgIn23FcMHxDbjTftOGEtLMmDlpeE=; b=N8TLcz5O5LzfIVKhxnChysUFhwucRDQg529QX9VvD358hmawoZUuAse2EzCYmWGzufWxj2JilafvGvxqDoZnBTmFsLqv/3ieywwK+5r1f+ilpgzq89J6ebYByN8sgm6ox0i+FfY9PizRijfDa+9oJ8H5NAvBqftjfgeLMt7qGlnMMso+T7/PXFb1hXrQMVTNQyzEUIDqfPWl2qkM0mgd86+uYUV4JLjMaA22MA9yagRFABFVEHVpyNlgjKD75XYA0Qpq2GQYs9T3IcTT6G9fRqmj1ZLSBt1JmsWJJYQVpwdK22iGFmyjjQ+qW/L2joXZAJoDrbxjhsdOXrZMfwlESw== 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=MCdcmjkyBw3EcqQgIn23FcMHxDbjTftOGEtLMmDlpeE=; b=DLfBJ/9pKj1cpLvKQf4cH6tzSPOxBj0/VBCvYASx93TZsa7e/yVMujs7oVn0YswZQ7bWaBlIxsluJdBhJUf839a0+ZpVeCP3uKON++ibt/g1Q/KSa3lP+9NjBGSyeg3+XQREfgkOJpGhXkKxZvVIgEP5zQl0DeqZhRYM9rSgEasoGZYU4cEupaj3YL0gT52EnsJdpWrbCd1kJQR/vrib9k5VdjcfDxBJBouR/VUVdFk2nfgmYmrfGgpricgw3avh4DI+chg4cKaG6by3rd/6qQ+lkPjPXvTsqDHSrfrG9FHNXf/3kyFkttdUwC0RWyJjxDdIH531WPtbdavYVWTB/g== Received: from HE1EUR04FT053.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::52) by HE1EUR04HT082.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16; Thu, 17 Jun 2021 02:33:25 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::4b) by HE1EUR04FT053.mail.protection.outlook.com (2a01:111:e400:7e0d::298) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:25 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:9EA8330FFEBC049B01F5E524A453AB2CFE60115DEB60504BAEBB850F0D2F9F5B; UpperCasedChecksum:FE7FA203C2F75C2293A7A4B2601A77827866D352F03801EE1F5A8170B752ABA2; SizeAsReceived:7767; Count:50 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.4242.019; Thu, 17 Jun 2021 02:33:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 04:31:53 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Tdgs2UHct10V/vLafQqaYBqxDBeUNh8J] X-ClientProxiedBy: AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210617023202.1318312-31-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR04CA0115.eurprd04.prod.outlook.com (2603:10a6:208:55::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Thu, 17 Jun 2021 02:33:25 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 3d0581dc-5b60-4c16-4931-08d93138488a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSz7Gd0YLSftKT0G4ETHQtWf41WwZoCV05B4d0IieS6GOZmHmMOkXPHqRMa8rIjGgJGQ1JHq5MUGDnB/ZhuCdBh5M1Bhsz03AhsKVXdJsIrVBYrq3GkWswOwBOoFNd3p7oCDNhCfW5Emkz4SHSb2bbNdZwiZz3DLpkYi0d/bT+Dt8/wayBwa2mPSbtMDRo4SxYp3gedeOlcQlx50qrTWMZJWu+IuuDkUdjLZnw96qamVBswgVbr/ztpHw271pl0Q2h1Gp/AtjTsk+CQGP0OjCVcBMxtrH5q/zZiBF9mSyKZ4C69m4mTJmUdphM5oBFewHatXDmtTGml0pbojEfdC1TbxkDq6pBgwn/O8o1O6DI/wK0DKQ5ZEpjj2qdHv4utQidNnFg98foQRMHWB9+VheQ1QYwdKxbHLdmosBVp7HDr/qJpz8cymRnajkBIt0HHz+uOyOwsfF7a4RJ7RSSmaDwQo/lBJMbGHJwUvjqCnUw6U+21+cFF61UQuMq1e/srtIuhBTwMEaRaG5nCovIzHXdJq/pAWSYpzXA4su4iyXhbAM5k+JC927ZDyhjafFZzZwZx81WKnjqHV7YYlV4Hz8Xhg268OuFtdjhMdToH/97kWI73pa3NvJf5UpohQ/hFtGy7lJ3zwMLnD8I/gdm1fgGcqyOdzxpAYquDOTvSg/nY9O9J4dK4+3s/P4cJGHt1GCzxPyRpYRegJEpUmDYqZ8lUw21kJp/KeFqA0idN7o+B2uo6jFU63924wic9qBO9fIE= X-MS-TrafficTypeDiagnostic: HE1EUR04HT082: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tulg41MHwIzx5X0f0ltG0jrWJVuNPUHiaEycoJ8sBHSlxL6TwBZJLki/p2lj+FARPDDHtF6G7GbaiS50X437ahxS/8eRvHmAF+Z+O34LWFoDRx7JaQIfDL/1NA/I95DQegP/5Micgi8HoSuJjL001idomesO8LePpbv9mlZbbSN1DYpUNB9yWgagOrJBq6sdHJxi4bapd0k6IYC3W1wRnhG4g4pR506Q9RzVTS/Cm+m8Hm0nwTeya+qnnBqVuqtdiF0qLZiZZoB3nvak7HIJQ6FMZBcsjhHvsFzfBKpxIZMWLtp1kd5T+quGmzI58FK0Q0iUT8V8lymbQoI9tgdVaCu8rFM2cmkLA0nd7k0kjEziz8ZntynMeyj4NNP0yq+7AIDfT7dwRii8yK9kbGPK3Q== X-MS-Exchange-AntiSpam-MessageData: cYQcpkacjJ/57VLISt9pQ4o05dMTTAkjZ+ZUnS8Pw24NB2nGX/hMYXpp0KqIYnUMmQaK5S61NEeBkuAfOH/I4juVzz5nuMavZZYaCNxg0ES3LxpmI/uTSOqACWVpS7M7+4N4eKK4gGfb62xLVAafrw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d0581dc-5b60-4c16-4931-08d93138488a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 02:33:25.7006 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT053.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: HE1EUR04HT082 Subject: [FFmpeg-devel] [PATCH 32/41] avcodec/adpcm_data: Fix type mismatch for ff_adpcm_afc_coeffs 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: tMpz+XNKpRZV According to the header it is an array of int16_t, yet it is declared as uint16_t. Fix this by using int16_t troughout and convert the definition to use values in the range of int16_t. Signed-off-by: Andreas Rheinhardt --- libavcodec/adpcm_data.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/adpcm_data.c b/libavcodec/adpcm_data.c index 768a18a378..4c81799bd0 100644 --- a/libavcodec/adpcm_data.c +++ b/libavcodec/adpcm_data.c @@ -106,9 +106,9 @@ const int8_t ff_adpcm_yamaha_difflookup[] = { -1, -3, -5, -7, -9, -11, -13, -15 }; -const uint16_t ff_adpcm_afc_coeffs[2][16] = { - { 0, 2048, 0, 1024, 4096, 3584, 3072, 4608, 4200, 4800, 5120, 2048, 1024, 64512, 64512, 63488 }, - { 0, 0, 2048, 1024, 63488, 64000, 64512, 62976, 63288, 63236, 62464, 63488, 64512, 1024, 0, 0 } +const int16_t ff_adpcm_afc_coeffs[2][16] = { + { 0, 2048, 0, 1024, 4096, 3584, 3072, 4608, 4200, 4800, 5120, 2048, 1024, -1024, -1024, -2048 }, + { 0, 0, 2048, 1024, -2048, -1536, -1024, -2560, -2248, -2300, -3072, -2048, -1024, 1024, 0, 0 } }; const int16_t ff_adpcm_mtaf_stepsize[32][16] = {