From patchwork Sun Apr 24 04:39:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35417 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1236898pzh; Sat, 23 Apr 2022 21:40:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFpF3ej+Ujeq6g9MbKLZ9oQXkB8IdLt2OisvoOVW3gQ9QBgNEfWiJTZSixp2QN5k+p6N6t X-Received: by 2002:a17:907:94c9:b0:6e8:ab67:829e with SMTP id dn9-20020a17090794c900b006e8ab67829emr10527620ejc.313.1650775208356; Sat, 23 Apr 2022 21:40: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 kf12-20020a17090776cc00b006efd8c768aasi9544514ejc.405.2022.04.23.21.40.07; Sat, 23 Apr 2022 21:40: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=joYNDDcV; 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 EB39568B3D9; Sun, 24 Apr 2022 07:40:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2079.outbound.protection.outlook.com [40.92.58.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55B4068B08A for ; Sun, 24 Apr 2022 07:39:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N8+Jk9k7zMK2lADWFGU5l4IMXQ6VsuEPMBXyeym3vUyzMhgRjAPSkkye1e5MUdEJqTxDM64sZno9iIe68rlhxhDkonfdcmlDKsFPY5fARkERHNheC4sj7bMzj15TJRfLQ5pKtWHENk62StekuZYki6oRnMUhboyj4Sw0cIPLbEaYxx77AX5moOKaG3r/iTr4CqzSbXZz9EGEu+EDGl4TOFsNvn5SQ+KlKK0GnU7DHejXotTtYyeONtaOH98Fyq7tguphieZz1IH5xRLHC7AqhvX6H1l0207dfFZAbbcVJK/oAKXXR7q2WE43hWuma7erYbQHwHEeSb5IYNTMjOeVcA== 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=Nzn2Z+Nd+A9yGeLOeJd6FcZrj8wB4C6DXcqAAF9Mh+4=; b=fzz3bL+z9GPIWYjWlZsJRj5AVD/Vwuvjfctq34H4wn58gLR9kpsQvreIAvJCeaXrjfHVn8hl+nGtcink/HldvA4Gv9sWmkPWb2flTZJYGva/qnqoCKRIUlIcy+FnmOEWQPfMyihsdRyy4JTBRFyZZeBnoiT0L923U0z4+XbN/cBnR/RhCXWgMzlhseV9CSwjTC7uJ8nP/yQ+I9Gsz5INCGKQxUh7EqfiLjdb0pGju9BQBccbASFV4Nz0Yix05+JFqeVJfL0oP5tO17icXmogNZIPfQSuQWoV0SAlGk2osVTfi04ZVZZ9JXXNyAhxbcV/E+D/R5HRJVzi9VY1fsW9nQ== 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=Nzn2Z+Nd+A9yGeLOeJd6FcZrj8wB4C6DXcqAAF9Mh+4=; b=joYNDDcVTseWBpHlxM9EH1Oe1qgcqf79ruflmyggaTT6RQ1cUGon7l3FcKaoE8f3pCXpsinh5S11UuFM/KxFOwPU15DxUZfOeDnG87FoBN1Rf/8rOb3btvN8sWrz1OjAS7q1aqR3H+keq2bDEecwU/JFJno6t7lZiAM++HA3GwSw4pHUsM6XAaPMeAFnVDpbQKhD0po/b48wz1gxjFHmUWRi1dLrGx/73TLzZ7reVWkTdxTPEVZ8w6g8rm1LigIhGvZpuaoYIACpkeuG54PqE2zmNLzEw5vglgTgm10XFBz7GkB0kqHLRln7e+z0IRLVeQWTPxWi8cX0yy9f60Nt+Q== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM4PR0101MB2210.eurprd01.prod.exchangelabs.com (2603:10a6:200:53::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Sun, 24 Apr 2022 04:39:55 +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 04:39:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 06:39:41 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [daHStQtFDQyHfjQQrLOdQV4kkbx5gvwN] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424043947.887816-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7dd33fe0-6b5b-4e50-58c3-08da25ac7aba X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDxgl7UOo1rTi3EAQQbJTpex8x5t3sr2mjRVdf8C60/rkGslGyFqXSOQq5Py3T1zvglnfE4R5l9kppjlIGOC7SVn9fiIw58OqiAepYhc2gAetnoGfaxNJUSepLMiNEglSM2Sdz18qgzL90fHcXe3kgnSMwUX2VFwteXp/w+zShmpw2bZu1KnpIUUtjnqzHUWCFr8cYOs3kiiHIiqFU1lwO7a2ZeM+tsuHXnUq7kr8NokyivS/0QQOd7ExhAOdRXhZgaXWvBQcQCKc8aQuTtz+J2EC3ht6H68kH7BLKcCE/v0B4+F9Ks+vc1y+UN6AgDLrnAySKX/O7obNvnVY71EqYM4evY+/orzzuiryFeWWAwLwvAzoM1aXGMvfuDc09sobMERPlz08DgSiP0PQqWnfrh/Fh/6lEr7KkQ6JwUe6x+ZpeXUw76QWmBNuvH4D/zas6gGrlZdzLokBcHve478QaXOr/MaCdgJWEZAYqi3ptfFrAehXTrQM9zLW0TCOweCoe+zP0QXc48EXgOUs7a0di0GYSJSGIJYYZQ2Lw4E3FnMDyCX/RjRJG2Yq2bIqzrDtWOYYSu2YrFl3pyU1Y4ESSO/1/oxdoR1bxWaPJNIc+Xgta7Z9RN4LzrTKZ5JEmMmXXN4aid4r3jaUEIoaK6PJSruWb5N3RZhMo3vpUnlS0H1kKgPTu6aCmI8lJai1cE6X/gBQ3YO0Qr3eye2tZ64dwet8H/XbPF3cd6tOauKwKGFc= X-MS-TrafficTypeDiagnostic: AM4PR0101MB2210:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e2H8VQrF38N3rRAk/DDL7eqWWDmzEYghwtl1NgcWW/Bvag1bur5+CsRtevvKAhBd3slpPCMJzlAdTof5bqXD7F+g2Xfmq14duDaRj8adIDNXxV0Cu9Fdn6oVXDwFaxkKd8GKttQRhZ3dyW1+AW1E0jMeFKgxP4znSPsCNd4h2npNgG8xMkATcKh3D92gkcbMODyF4VSDlntpnXQP/TJ2qC/DLdRCZZX87Qr9nPVQMWJLfIfCN0Q7yB76CtzdTmygWQ5At4VcBeIK8BkNMfCjKv/TzPLc1VYFwuAWorO3jMLU5IDlIM5OGTE9sPmH5NrD2/V9dj89UxDRHW1HOeSOckdGg2xS//WCsYMJidpybJQToZJLz4yP/bga0bfbgRl0p4kwJD0YAGXBUf2EZ5xYEa6onzc0sMikDRsjb58Oj5fVEnOk96Na1F4I7T+LWpAmoqvPUao4qCBarHaEs0Z6DuRvkVZ34XqsgIStblhTLyxXeBkmc1N7BJiBot7JVQqQh0uQ0x2Lf7t2y6BKIQP03A3TDnnBy6DPwM3uLBVEO0Ullfjse011cJY+Wmr9gl4kWgqkyr7v3DKXcwj0dqZxQA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bUBgyKeJ5a6tYb597K2rn7gsohy9dp4Amtx+BB+J8QSVXeG4vNTneAT57tJaVdP2sN+m6c0WFmSzO6NXbY9yvhdDe92IlZ27yZFBK35bGpDMAJkWhn7t1kmJjrmYRTl400qM26yDJulFWmUDVOLavfvV0bhssSnVkhK+Uwla8Oha4mM8Av4OXfLchVapJdgiamzg7o7baSkk5rEclyWNTgXC9p5GPx0wIUHeNATsWNFT432JbjVlInQ09VXpZ7+3vDCu+aKfMIYtCZorIVI0m61mtQLs2D6EUcdLxhMm4HF8wG04WKFIosxvh4SMgPqCq8I7MkgaH8fdnRgoMVbXiuJA4McU9W2tv9BaTy1fMXefPjBsEqunas8h30ng5RswXRiqkVmic2cKnkmjz2j/8u0/4p73Y0g4fZ7n+ndE6i3GE55wDAwrfAaC7mL8tu7A1H14/XcGFyqm1yAH+8arQUNq5+owmPhf+5mwVpXLX9ks1A5SGg9W/gb4b374bkKFZyYSNcsWUbk9LWCmQ/6MZJ81AONzU+nRT34Ux+h5t2UKf/scivjaH5TU0roiD3O17B6ZFOogzywXqSDBzxdlBUba3sOxQF2pdOW+7mgkx5VObO3h3xPcAqsUuV0tLXOAKMddoIgj/WG1oEJBAR6OiOyx/XJlRG7MFv81tX8OFVyI+VU9NVtl/2kIu+PheKKmSU4T1EPzxvdySIbjjWothSue0UkOcXstu6OUflXb+rzRFbyhBkzSP3pnTwVoxqR2hmPLJruTsUUkPwf2JYV6jCVpV28OH3D0QxWc8iJet51+7OWFB9zs3HM2dcRVdgcNhbdhzi//D2j3L3sLDXv1gjrQkmBAgQNzKBlnoed44tSiN4fPSB6ONk9u/eppi2529ZeZMN6GXSckJrVyABTGUyKLUjh95E06IzMZrWCHPn5To51fFvElNPzZB29piNMN6qlhfC+RKqJWPnR0Mh9qwwqOBQxQsB2ipnfL/uen+EEMgAfe7QFyp/olcd50Pg8uAMk8+vTa3qpObf/H9ssvFnXxAgplZGNYsQpKz7eMBU/72/TYbowXNNB5lUeMFPygJf5mgSjfkfcBpPHT8hPxFHwmYOmGSApLCUhkDj1M1CYQPf+wbsPduDU/zWCU1tmn/JwHKeZ6rKWJteTd4Cu76woQByNIlv/krvYqlIFLc9DmtfwcRi7WyPja+RYVu9/YcUVDBNjy4bYmRcLl01OPw6uyGuBZKuHCipaMQ7+kmvvzuQZsoBzM/eBn1tM7N+cFViiWIZHJ+7Uozmjr1Unl0Q/ihEvQ1HmotenGi+jmtKMvrvC3itIFKPtbc9xTjN+C2rmZ1LXkN15kN0iUiKcZ3Oax5SyVJfOojOCVJBfIQTLu0wOYLsg/FoGM4PleRP8G683CQ0JkgGmxQX0C20J00qoI9fmXZ6IeqZE6hxr4YP2qtgE489/BMnZzVGFvGviM/RjNBhtfkTg+Uti9gKQAYA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7dd33fe0-6b5b-4e50-58c3-08da25ac7aba X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 04:39:55.3273 (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: AM4PR0101MB2210 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/pgxdec: Make better use of size 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: qhmCyTJ6DFoa Each of the three calls to pgx_get_number() consumes at least two bytes. Signed-off-by: Andreas Rheinhardt --- libavcodec/pgxdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c index 899e7a9994..154a683b4f 100644 --- a/libavcodec/pgxdec.c +++ b/libavcodec/pgxdec.c @@ -56,9 +56,8 @@ static int pgx_decode_header(AVCodecContext *avctx, GetByteContext *g, { int byte; - if (bytestream2_get_bytes_left(g) < 6) { + if (bytestream2_get_bytes_left(g) < 12) return AVERROR_INVALIDDATA; - } bytestream2_skip(g, 6); From patchwork Sun Apr 24 04:42:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1237671pzh; Sat, 23 Apr 2022 21:43:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMjQM/UN3GaDG5p3Tgoou0f4NA2xl3VhyRocMGGZytdj+4ZXSow8W/O95SL3IozlYERpCv X-Received: by 2002:a17:906:cec3:b0:6e8:a49f:2189 with SMTP id si3-20020a170906cec300b006e8a49f2189mr10738978ejb.119.1650775399324; Sat, 23 Apr 2022 21:43:19 -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 17-20020a170906309100b006e8d12994c7si11218337ejv.395.2022.04.23.21.43.18; Sat, 23 Apr 2022 21:43:19 -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=tW3Bb9w8; 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 36DD168B411; Sun, 24 Apr 2022 07:43:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2093.outbound.protection.outlook.com [40.92.58.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18B8A68B08F for ; Sun, 24 Apr 2022 07:43:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lssZaP6TdDu/pHXx91ETAoXcgGGKMjVtaaPCM8pWa+eaM/wsHgJF7gEJz50XU3sqdMXL9P6Cl0t2vaxafJWMhX8/h7UpQOmDnh4EJcxtgb4eV108MHTKuyQxz2Y4Jazup7PzsVNd9q6J0aKMODAQm5dp7PpEY2NRMQnZ42SJvw5J3H11TAs5J9d7LSHJBNS9Du2NELbVew3avIYqiK7SP/9xKQifzOei2dAq7HR8yDVH1ZFB3JO+JVgPiiW0qI4vkjrCsCKexVOJ4gs1WXaFnFyvLK1Ty16eYUWNetW0FVI6nMEg1yolkqI2hBc4okdY/XalTLzKX3Cx5z0H9R2euQ== 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=30Fy50ifajwaPp3a/e3SW6RfmN22H69mQ9Vj3XkAUJw=; b=Rxh0B/eC1efnjWuRGuX2B3WGqmqOvOTuq05jn1q8rihC+YToDOeGdBRhS3Qxkobp+bO1OWeTw5AWvzsk5ote4lKyDez1gshsHF7J+GnndV0IpZSctIYtaHahBc3xbt6XPXyyuq87IVUxcIMCoEEg0hD7A7wIOrSfLWigKYdaNhPkinOFts6ZsQ9HwuxQSucOZwKfYluGZ+UYVZFp3lRgnJQAWFWWLBIXjrzdpZr8XzcKJIzjJ9nj7X4F4SdwYo+NHzuHNd18l7+pJwe/nsigTujf2hThoWBZhwbBTXUJRycQ9xM5X5J91QjW3kaMOJasKJyoRpBn5j8BMGxRsg3urg== 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=30Fy50ifajwaPp3a/e3SW6RfmN22H69mQ9Vj3XkAUJw=; b=tW3Bb9w8CTh54xnExPX5hx7KjZ2GHeMD3g0knFU202EoF4n7JkSwZVdt1i9m3P1fu1y5C7D1PzHi2zVnfPXm0xe/9I8vgqSqrHS15nVAUvc0vhEqSNfQeILpTgdWnho2qq7liP5iugOGSCQfPh9kvyXAzyP8PMYoTAjaIEkqwFBtvBeXAkfhNBJl+KfG5x53pBKZee6oqQApDXgR1Aq4YIuNSLKEkWl8y1DAD+QUSKwg4dqBmICml6yzEsec0oCmNKwt/d7UIs2ZJ2TQSs8pqmRPElStSq592nzgLykMKNGP6Bp6qJoAyvlKwOY8UPTZj/bzHzJKKDKFmhu/oR4q2w== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM4PR0101MB2210.eurprd01.prod.exchangelabs.com (2603:10a6:200:53::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Sun, 24 Apr 2022 04:43:07 +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 04:43:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 06:42:53 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [N0ciJusYpSNENa4LQl2thW89P/3zni5L] X-ClientProxiedBy: ZR0P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424044258.888081-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6beda58a-c53a-4b83-c39a-08da25aced9c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDzSBxYXPTajp35rHqPEqPyodSCsEo2uauvS8PDzbBdiwZUjgQ2VXX/7Rz7ta/SvpHwmo5H2+JZcf1Qtye7D6IKgYUkFcgGFuTH903ulyiMs+Uwxj3l9z6A+8e5Hp/A6p1sFYN1jWdmazXGB2tIjmDC/RwXWAtowEovlONdYj4giyAp1vd2VDAhfUbRDGHaRzuV1W6o3BuJDRnL/IlisRqPOhlQGfErA57j8/nmbxy5HzKvo5G8JPZ9nJqyax7xzncJXOIJvzMhHGdBHeyGd/wPzXk2ZAL8xJbgIbWdiNmbz8ZDZgLdPJkqo2FSr/eAdcoGzsbxt2KdgNwo/kurIPm0HnK0Eij1QjbkzFgTlaEcEv9RBwTVGEUSFNATshvLg7J80t/fOrRTDJTwoRoddK3I/TD5EO0Vn4UBo9i1x8xz7h3T1uMx2gn4r/V9TpGxM27Be5k5rTti77rRkCA70iPvH2b+cYNeEC6Ha6lABqvHTbmFua4IEnSwf+7EEp+8DYsSauQML+gxAbR75tab8rmkJue48vCecIwPSQ2CNNZvNbqsWfEO3fpYaETaraSfcmqX9aVctYxnMJRQpEVYZFTGKR1X0MURqlME5/gGlLv8cLpE655ao9v8ziyPl53SxhbdNnXc79ML6uazI82Qj2GuyD+kEmjAazjNQfRiudmyWmMarWWb4udSOpBfGA+0Mwxwtpq8SF8q5SogZGoSZfEursX2BLTMRh7fQ6t+vDrS2g= X-MS-TrafficTypeDiagnostic: AM4PR0101MB2210:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xm42+bjfQVfBuP8Zj/KW4kgoW6nHi6a5RhCrSDSLwjKjm2zERK9lPinXYAvk17t1o0eFshdBmUjzMp82eu3s2oFPm0AWqeL06T9cqQC+Puuuk0Z0Ny/wNUyT9Y6HQx0HuO4zrp1POIcfek1+gE+7z6B3r9Mka8oa6sMIj2eUd0/l+G75W/3VJqmJe3UzPyCKNetaNv0jAIZWqLq4uaJtW1FRptBgp8MBi+GnaeqzuULOlhoycwSKBD2CMxD+N+LR1uPdCcqmAbHkfBf5hgGP/gs8JE60roY48gcUS9PIJrgThfv3tGP0duaChyIL/RfJBHq2lF+THXzySgEHzpQL7cu1yncbN/cgvjzFaPjRicwWORPfR1fF+okxQ71Zr2tXDaz8eiPz4DvSi8C660os79EIN/ciUlks0wR1T1IRJtnAyhdJXxh840AWcPCI8jRqIXniuGglxwlyzBn/KXOqKpgw6GkVnNQlu6oidh8M4M11A50NuFd8h9wckysZGm5+jALOQRvtev2kw3PeAfO/dka7gaTBSCR3/EIiVpaYjJT/KVy0BwZGp3HszqcEJpExXKD8rsCXWTJiTrWCJW1Z2w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4Tdj7xi2Q/3V8JCgqRhXDmfqcWKB7cQhSDQRa6Wta1e3DK5mJDIDwO+qd/4CD+wqOH4x2Dkeqzwo/GKFyn1hAEQbp/QRv9Ulc+w4owxEKP2zbCgqGEX7g0qcFdRHcCodGxYVC17b/QBUWRUkGPEhzLIJHChcUPn32OGn0krv6Qc205nJd/wSM+mt3ePKbZAF70q9Y4sBTWwdqdDOj3PvyIcdJon5RtU8RQQuGiNLLKwTy7DW29A3V32BsMnObnSNqj4EzsWBZnAr8iDqtbR8cgdVE0p2autKAeOFG6irE53ExBMigeNYFHM7+FgNRhlPeo2DSR6soU9XMuhiKGO/68yPI4zOJ1FpdMzNXtfcQoZQx5pbjhtxzffVgagMXQ8a9Ym9OQOvAr1lOWxNxy+sMJf9TFoohmsAtgyHAOgnyplY3gY+S2MNm56uACidqze8+nlaUrl0TIZ62dcqhkmr6sivHDv44PGai+Uxsly0XfGVDebR7E4FvEIKX6Ex4rZ43UM9ez/RYOxDCRONLAB3SP1pctyX2JxprxEKOnJOmG5Cg5I0je6NJbdCx8ewgrpejEsH8PSHJgY8qXbf5GmtODfugXMQgg10ujNRoX0i7kPeK+DnUamehZuzh3De/o1NBvFTcnIzDxIR38RKSq8SL2LkVPNR8SALZiGNw0yBr+vVNL7OHXxraV+kydWXwHI2pU+yJOfSLTAT9Wc+OW56S6mQIs80umqPwJz2RKRD0H8Fn1BJp2OkqxdrI2X+8cvkFm8dtCud+r9YJ3iWVVXW/LErfc2HyuV5x6/H5wmNJRu3j9q4m+qrMhY7s+rN7ie+m1N3jG3PWod31h6qpaDfl1nWNgmywqCxn+q75nIJ8RUZmcshsU4+hHtxk1ZQj/pr/mBzsVpzpMz1kct4Z5unLpU+Czf6+V6ANxFjEeRuKJNfwEz7gQX/gSeWISgJT+hWPlzRdHaOu4krpbPnkFg5josx0Y4SOx8qCQUFF6fEF1TsCC0v/JCbMmS1ki44yo1KmzQtpa/rs/JvIlhSyEl09/d8WC7+Kg9E/L24bu77cuQQtBGv8vzN4kEdu+2ASyloTv1zcCi6uAhQTrP0oad0R96PHSO1VnJiFY2kGu15YqXGf15kfWlxT06hJuV4wDtjmFdtqajwBMiht4ATS8iRG+kdterODncCIcruBT6gT6C0buPGhHIb3EqU87Jurl9UaCEqkdShu5+rplrsJZIzQSchVH4TIqtzXxvby0Su6tZvsBuNlF4NJGM31vn8FLnIXlic6keSvSh551Cn4QwIe4tRqpOm54aRNvFMpB7+D6n0zcEJXQ/AwWEZRQowuB6ePkTJblLBgdUnpvlgjHi1o0NdIyce5ns079NQqLinJH5MakVOdVykK6oPs/9MPscjAeEG57tJLoFzIKLffWOH8jNH0fCl7OBdTogyuopuo4N4Rgnz3Q409OHxsYt2yit9l4LVz/fKRfNIhBbzY0g6yA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6beda58a-c53a-4b83-c39a-08da25aced9c X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 04:43:07.9298 (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: AM4PR0101MB2210 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/pgxdec: Avoid always-false checks 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: +POv1HSvzRtm We have already checked that there is data to be read. Signed-off-by: Andreas Rheinhardt --- libavcodec/pgxdec.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c index 154a683b4f..9c474036da 100644 --- a/libavcodec/pgxdec.c +++ b/libavcodec/pgxdec.c @@ -32,9 +32,9 @@ static int pgx_get_number(AVCodecContext *avctx, GetByteContext *g, int *number) *number = 0; while (1) { uint64_t temp; - if (!bytestream2_get_bytes_left(g)) + if (bytestream2_get_bytes_left(g) <= 0) return AVERROR_INVALIDDATA; - digit = bytestream2_get_byte(g); + digit = bytestream2_get_byteu(g); if (digit == ' ' || digit == 0xA || digit == 0xD) break; else if (digit < '0' || digit > '9') @@ -59,22 +59,22 @@ static int pgx_decode_header(AVCodecContext *avctx, GetByteContext *g, if (bytestream2_get_bytes_left(g) < 12) return AVERROR_INVALIDDATA; - bytestream2_skip(g, 6); + bytestream2_skipu(g, 6); // Is the component signed? - byte = bytestream2_peek_byte(g); + byte = bytestream2_peek_byteu(g); if (byte == '+') { *sign = 0; - bytestream2_skip(g, 1); + bytestream2_skipu(g, 1); } else if (byte == '-') { *sign = 1; - bytestream2_skip(g, 1); + bytestream2_skipu(g, 1); } else if (byte == 0) goto error; - byte = bytestream2_peek_byte(g); + byte = bytestream2_peek_byteu(g); if (byte == ' ') - bytestream2_skip(g, 1); + bytestream2_skipu(g, 1); else if (byte == 0) goto error; @@ -104,9 +104,9 @@ error: for (j = 0; j < width; j++) { \ unsigned val; \ if (sign) \ - val = (PIXEL)bytestream2_get_ ##suffix(g) + (1 << (depth - 1)); \ + val = (PIXEL)bytestream2_get_ ##suffix##u(g) + (1 << (depth - 1)); \ else \ - val = bytestream2_get_ ##suffix(g); \ + val = bytestream2_get_ ##suffix##u(g); \ val <<= (D - depth); \ *(line + j) = val; \ } \ From patchwork Sun Apr 24 04:42:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1237705pzh; Sat, 23 Apr 2022 21:43:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/aPuB7vQcgB9jSbzpLMbVcdkXgR/V7A4Q4y+kXiTgeiEXPBUGC04ern1YrBLBgUaUevxf X-Received: by 2002:a05:6402:128b:b0:425:d1d7:b321 with SMTP id w11-20020a056402128b00b00425d1d7b321mr6074147edv.179.1650775406919; Sat, 23 Apr 2022 21:43:26 -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 f1-20020a056402194100b00425d5112cacsi2667689edz.390.2022.04.23.21.43.26; Sat, 23 Apr 2022 21:43:26 -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=AFWHeLLi; 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 4CCB168B424; Sun, 24 Apr 2022 07:43:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2093.outbound.protection.outlook.com [40.92.58.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A5BD68B08F for ; Sun, 24 Apr 2022 07:43:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f4e2eNupkiBEe3UQ7m/1AtXk5dHYwpRUE4adhPW8JiqbFJhvDpP6E+2WhQfFtYguCqSBUJ0p04PZIvRsHsh3yN+j/nLf6E6kbvV2DZQFYnYd0dpFs642RJhK7qyeGsZdPfnwn6sLS2CBSU4y4swtj4vrtYAgBvmaGW9j91OiqOHR7DNllFa/UaZZ7cYhak+BqMYnY1fhUxpCGVfu9oWBBXJXIVjRWnFo0r4Wr/Ax2DRDqsjkR8xcDmAou+eKkz3U2NSVQ1FBkvnqPtbrZZoVeHR4GQLOqdyuuBMGGrAgxZ4KXeiNKtvlTRL6ndPtj/aBSFhPjg5vOdWPVTL3SOtfqw== 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=Htnwa5KzrDe1v1pIiYSH9nGjmjNE9Yrn2dUcN+fgGes=; b=IFbfKW8/+UZEqYYi+yMxX8SMbnIkT/CjjMuORugAPOQYW+szo29f7ot9yMzEEr0nYSZb0yY5s8KuyAVkW8o2Zm06rCWN38tOYOqNwB9fjFPVpYSpOyS8+nuF6D7fB+shCbVFfu4RiCvXHvJdoSpxNCUf316k2WMI37sDtjoCX9nSqZdU+alTROjFxmf2uf0oozD6vlYvAkgECX/9gcx52t1K52ZO5VUmN6b+SydnDEZEkdDcjN3NhhO8hg67eRXpv/eRyTgQtRC8woBM2mJyJCvvUpEBtrnMb6VhAWC4Rt1x0mahT9O1yrJ3cGFXJxyziHL53vQAu7tH3wgZHVq9JQ== 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=Htnwa5KzrDe1v1pIiYSH9nGjmjNE9Yrn2dUcN+fgGes=; b=AFWHeLLi3H3RrbNT5lQYzBJrNqNzPUT/rE89eNM0vAufBRJ6toz0iQLRbfzAqHhcUzRQrE11LsaD5h7BlFeY9h8yhdRbHQYBRTRoTvChwlOOEXgN/zZg82QMQxy8VyPwuZRQAHPJDpu92xD5PQu551JuRHEHMb1zOmJ4xI8XLMAhWFn3OwiRzuOL36Wol6yUeFhWF+jFrTtxnLujAgjLcqmpO1FDdGwApKGoyiDg/Ii5rJO0vUeCDBnAygzMPSf4aNTaC00i8YeB8/sBx5enUZSG8063B8sBmLoZ8PRrsoTUYGCE5Tm8NjAfbLIMYkPguw5OiHpbjShNbEet4dHE9A== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM4PR0101MB2210.eurprd01.prod.exchangelabs.com (2603:10a6:200:53::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Sun, 24 Apr 2022 04:43:09 +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 04:43:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 06:42:54 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [89AUxo+eDLPjcuvpq4kdHZJKDhYUArKi] X-ClientProxiedBy: ZR0P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424044258.888081-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c883bac-22d2-42eb-41a5-08da25aceeb6 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXfx7FFJ2ZviRAYWFQIJDClrgO6xxNp8sDFaTLTzqUupMOwgFO00WRLpwv8yLRk1BiR/2CBlFgT6Ar/lr94TtbaUXZ7r5+MtvMWluqngTPR729wF64Q3Vk8RwgJTOHLB3hfyndlZyFNP+jx6wlRcV71JjYS4bDlOzAAxDLs+E0z18WfRHPhx+J/JmiChH7gz8DDUwDhfppgSjDhzM1Y0wWclHKdrFkyEHdWm10d/OU5YyYGGSVmpTukGRCSlC5J7aWlCzukllWdW43vrNw3HEie1zesvHswAEclBPTMgQXqdQmh8fhWiJbEU4SJrINERRln4b5Qyzvgk0idy7mzAw/RUJt/grjPB1QU8mTV280RlN+KG3A6byM9DOYlp3HF5ITotaey1Kk5/+gAhrfHtvbOg7Wr9vYgHcXH/bcpEIwC7QkqMWZQiXPo4DwM9gZyILyOF1a2Wza4x4BuZZvpR0WX18+eXm+b7GPHX+yp8Q9zEFN7OPG6f48P9imbvtuV400vBq3oWSj7NEkOTS9NFle864x9nrIoNBk4f2lbV2A6zwD5AHcQVt3+mQ2TUaPTYvjrsdm3Wq5nzFia5ZMtc/S8YFe7AvOKQ+qzLe1yv4O++Mct4mugBwEXlsUXt5qXyomJXEzlxr+DTMybhnrKl4x3PCzSEmcL0ukpLyOsBytTGDKvsRF0/I7yNg== X-MS-TrafficTypeDiagnostic: AM4PR0101MB2210:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TiF2VxtjhlF9Hgtvo1k+p2bm3mjZ6J6RcdSPvlb9f1rrIZFm5F+pJ9WBM/+EXU5ArxpWQcbxPHisBWp2KbUOsAo/bK0KnOcSAzjaoLiuNKLPPYid+GXrRbEuityanR0+eKvm/QCVstQxj6JcBIU7iW27pQpUtAEdN4FEfPv5bl8+/Ih/uxTWHRrqKiZacbMpEdSAP9BDqo94yrPqjwoEFUsan7gJm86ixyep4jNwvehr86RLNM2hBGUcQ6b7ZTAZZbT5AKrp9XMkb7uBsJ/lYjtDVl2ygmRBdjyPwYvDK7+Xiccd7V0zRD40wbjrVdr1aJuk01gCaTpOlFyEQRoZoyLXEDMDuNIK0+FaziVrDze5KoKUcCCDqIBRRJx+5y5OogzkxvbgWGwwrhAkllV0Aa+zam8P9Vv3+DYhmgkxhqiWJVF/cL4K+gEIt2BHt7iRRWXDZZzkeZF+bH3WEy03j3XGyqUltrNW1pOqMJRoBoeiRkWJbFFEQl0mzRnOqjjXUZppTVneO6P4RdP0wbA0UopeDJWZ3i9U9UY9ilhr85cJb8lc3nHMV4yPQ2JM4d0Ey4KVG/1iBMS6jUdkBrWhcw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 80nC41Sy5tnF+g+JxYRMs3WU7B785cAdSZwcfsAL4kpkoKO4uqmeI6BimEFKGldSRf7lhIwTzP14lZuRjcDueOPfZ0uNtTPPHS0mVISusLkk1s3NqPfYip/QsEseyYhYpzqSmlXqrUSgUp9An2MmJRlFYRqwvQRWN+2uxOAe+IrbjJTMretcilU9K5Pln9gFJIiVpEyRhD6CN/T15ZNSSdog19BdkRAf2yVcRYyxAnoTLFY7Z6eVz3aFZRuYCSbEYbGWupYZ4l+XdqBIxyP0W6m4ACmSO9h7KRewQ07VN2a6+Uiw7tZxNdqNgLUrqOudShmc2ixEs1h6MI2A7epQ4yqIAe3+rwo0ceGXXeOZTUgJxJSvmF3NWizs+QggRU4R6Uvl/wUQRMJtalz3CkIK5dgw0w36Ola6rqJJpuY7Wh7RxpuNCsBSLSl07DpJEx3JLYouBALoVwVjNN9c6pxQEzH4RRTmvmh9kEq8CiNzI7SjQpD30HUduuYGjIB9esFItqxCt2PJmwWwXJ6Xd5nI+9VGs7i83IctJ05CcMxlnPxWO5Alec+PfSBBrpv3YMHgiWQIoRnb/aPRjdj3TipZidwag52CZL3btTFii7s0k1wl1dLd27hpCceg+31NA9rMIX+QVuS48GXgSRLZbbtah55Jwmh1kUckvZQxK7exxjcXSWopMpxTcjh/nPrLeffDDjKNBaxPu7gwM5NT73RPNiVHajq3CCx9mrKz0AlBGxsWoL9k2HF2B56Pgw+zNbF343JjjhjmHsV6CTfXbIOapKOoz6ARR1I1KAQ/V+0d67M4ZE+DJ8E7OsIV7AId2kutFlzNsA2nObD3xw2nMnFn7DszEBlMmoqH57e/K0f3tXLGVEgvUqeXMFDk9tALZCZUbdkVyV4z9BhqUzcZ9uC68nPJN3bHVMwME0igIQV1O3mCm5Q4DL5F1WTyEULJepuyVruxXdhk5bu5SqJJ/YZuycfMXffKYgcYI0rJLlILmp1GcA0DpWvbITz3/ZICIEJXzog4c2yl/NomKElksbVXlrxLEtQiPu6d2dZJVYXsnAreBTfpeTzpiWqUbUYrDP5cRSlzBOLdADnmSxGNkJPM6Z3bhZBbezKb4jFWpPpOWUwOXV4rzF0WqKfCtZr/Vw5gAbWaNSnJXPVbdLE/3Gsg618phOJiVwfC+iEeFhC9z8q675NlrzTwTr9c43fH222wZuSKxmDtzI4Sk1N0Egl3CgSr/LW6GB5lplF8kXs/KoBbOPMHRwfIdJVF6b+visfwSNxPZIoTl3MpMD8SbKd/QmQz4UWRjIWD+K/QyYy2oNz1v9CmNlDX9DmTt6xQw+jG3pe7fGdWzgcThe+/y+JaBIBCUuZikmWpj5Yzg5nUK2jlcNckOAYpsKPKAFkctlRo7UVi63sqKCDTd4BY77kIWdUqhQHalx1PuFbJQZLROevLxw6HVwsSoVGhrT+uFGZR2bFcOkR5ksqDnF6P9nsjmg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c883bac-22d2-42eb-41a5-08da25aceeb6 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 04:43:09.8057 (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: AM4PR0101MB2210 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/pgxdec: Remove pointless checks 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: ZMtk8DpwjVyM These checks were (most likely) added to check for overreads as the bytestream2_get_* functions return 0 in this case. Yet this is not necessary anymore as we now have an explicit check for the size. Should the input contain a real \0, pgx_get_number() will error out lateron. Signed-off-by: Andreas Rheinhardt --- libavcodec/pgxdec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c index 9c474036da..c9ada5afb5 100644 --- a/libavcodec/pgxdec.c +++ b/libavcodec/pgxdec.c @@ -69,14 +69,11 @@ static int pgx_decode_header(AVCodecContext *avctx, GetByteContext *g, } else if (byte == '-') { *sign = 1; bytestream2_skipu(g, 1); - } else if (byte == 0) - goto error; + } byte = bytestream2_peek_byteu(g); if (byte == ' ') bytestream2_skipu(g, 1); - else if (byte == 0) - goto error; if (pgx_get_number(avctx, g, depth)) goto error; From patchwork Sun Apr 24 04:42:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1237747pzh; Sat, 23 Apr 2022 21:43:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbBgQG+pz1vdFlwUK5qkk01+VIkDBhpEltLrqlPTSmHIHfMs//Vl9ybjiHSebLMWzkl8ZG X-Received: by 2002:a05:6402:5189:b0:423:f342:e0ce with SMTP id q9-20020a056402518900b00423f342e0cemr12828597edd.120.1650775415541; Sat, 23 Apr 2022 21:43:35 -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 dm19-20020a170907949300b006dfb1342cedsi12577560ejc.618.2022.04.23.21.43.35; Sat, 23 Apr 2022 21:43:35 -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=OBSw+juJ; 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 617FA68B42A; Sun, 24 Apr 2022 07:43:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2093.outbound.protection.outlook.com [40.92.58.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AA4B68B26C for ; Sun, 24 Apr 2022 07:43:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TdtIv1i5uhXNVDCO3WI+1GNJ87UoscVVDsbLAccgqjYkl9wVosMWyDJUdXFcOtQuN0Vmne8neXDdCrXIxdf+KjRXHfzaEBee/C8dxOEhsd4rRtIHQ2wCQGr/b/nFL4GPYlrAu1WojhhLIKWfDY1nkJwLcklrdtp053zsiAjGsOKLYtnOK/g8V0V04TH5HQrAjVnOoCrc0rGS3LSdAVXwM367sXh4BVXkKdpsjznz1CxJUYf+Ec/CmXodMaO4gL4YF88Fx7fTkcM2SfwoT0wNDLxHKNXo0gq3xp5wcfSiRR7HaZfX7JWaYcP4mHdA/6xQ6J+0Z0Dt1a/VDV9nmgU/6Q== 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=Ty8BjIjGJ3Ralx/Jok+44cpPSFAL/4FRt+ru6GrTRBs=; b=V/TKYSVMpPpMAxRyxS1MikI1Zc+5HnnRi62y9mxFnuwNR9LSYou+XnbFqjVZzr73f+4b5IVNqm65cNyCP5EkUuF4ZJ40OiZtkdIpz9TbPZWk+KedzRIGzFF2kWxWHVqI8FsytPPdP3WtQs1VT9bu+65F2M5JdU96SsUYec3ADtcSTHB13XFQ+zkBLfaykxLB8lRE3cwpjJWPVU17oL+eMGyKE0OUKzqVpPp/f0MqQkcSTIFXmK4N2M6tRwhrFqTCua3DG5VaHHl/Qqp/oGWCa9ln/nml6Br7pf+7EOOOybAIwkedT1X8CbfaQlA7ef82oGEc4I/LqEwOTuCCZAEq1A== 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=Ty8BjIjGJ3Ralx/Jok+44cpPSFAL/4FRt+ru6GrTRBs=; b=OBSw+juJUqNh+c9rP1nJsOvfXbmkoBxoPpySFeszJ1HNRml152jV/p+Te197VV9/VywofzIZgE+GdVtaTjpbyXg7GcvdwrOqcI2Dj/hFWW/2nyC4U2ACoTjSmCCOZ3IYrrXEfemmS+npiyr7yPYoxemiF6fnCyCcjp5E5OmVyYOJu0uOnH/fh1WcLSv6xanh1Pzmc5Dh26fmZuS4FxEkldWDjUSGoZhPqBMHz/OJvpMRfZJVYGmEVaCCoRbWDIEe79J9IRPjspVCr+5NCPlr7CgtqULOszLLuj18UeO4T9kxCPyaTIDV1AG+kcFlXQncVRvPt9S1HUzwQv9a93GniQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM4PR0101MB2210.eurprd01.prod.exchangelabs.com (2603:10a6:200:53::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Sun, 24 Apr 2022 04:43:11 +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 04:43:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 06:42:55 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [DSOqVD1+Kgmp1kD3HcJ7PIXQ5GjVJbFZ] X-ClientProxiedBy: ZR0P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424044258.888081-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b7ac8566-aacd-406e-f660-08da25acef74 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDnXLdqFQwCJIlneOBnZ47gzUBdsyOhAY6Qg0KPZ2HKr8z79ijV19mmzzyIyyT8rYx39/YIUdjiWgRI11n3Qy6LQTH2ACDPN55j17qj/5xY+Eo+Yi8KBMAC+kRT/LbXc3DrvXk0Mr7CNP7QJ1DxK1BAXA06TZvAedFLuuH2iHXJNIbt3vDtE14hM3leGyImguTitg5Xa9p3cjQdGLiC+rYmTJ68Qr9QM92fMN+NFTW+Xcq1cVYMA+tbLU0smlJPdZmdw4cWPJXzidoLNi9u7xQQik4gTZ9nA8QG4labyQeq+uCpP9VJx1KywKjdSgZXqsDR6l0F+MdCXa5WBniGO8/Gn28CTRsTpHF3eesOBFEE5Zb69rV1excGqSKGqxoTAj2QShAICMqAQcDRRgouWeXpUpJYTeesV4eLS/0UEy6Jrr+XFrhCv3XPidli9DfFedc59GR1QF5EZE5urrNxLH9iNAj6FhA6ehzLLC7rt5dI6fg4fn2bk4+yHnJx54FtXJ4C5v+EHZ0w3AhB6/jYAFmobVNklDrYFr9bmCTfYcqWCNNk5MGPdhsEGFWZumXnZ30ehIPXPQeShunxVhuRGfVRjQiO3PmV8Q8DkW2kPW/r0723wGLrQonGZfiRp/ZM4UtIpZkkSEMMgkVgjGIIGk0857CJcPPOxAWbcQe5Jytx6ZO7G/BK5hqFsK2i6kfCVYoOlfz5dH7LKTnAsf1UGYf1kCpsClSKbr6scGlimjpWNI= X-MS-TrafficTypeDiagnostic: AM4PR0101MB2210:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cdbQSY/X3hCiKLPGOHTJ8AChuMdmSERRLfseQPveJB/ND+1fy3E9OboE7XerqAPNAwcuRRo2gCCtJlfnB+NketRP9TFP/tVvSE41Y4+DHeLX2gq2uXEfwZY5z+OCvEtiafRYHT8eRi6xi9+UbO++0MVEnu0/YgK3GvkKUrjaVRDW5XEOCIhfE/S9Ve/kmMR5PfIJyg0w8VEjCkzUdXZqDx3aaNmMYtcuKMjJjtEm2cniDrWB6trWSH7aNqWX97FOfm/H1X/NbML5Q+8uq6PCxfYiJdQEy5PJgmWCPu9OJBNw22BbPk7QDNtoHTFDhz3qLnqi27dGKCcbLIRS4bSX91bSgCoEP0pffxF1VPTXy0QLYjqyt69D6ZVPC3mKxbo17NHb3RbcbDQqGqbrXPO8CdBjM9H0qjqQL+EwLMfhJY97i5bMIRLcJ2T4C6VIZP92z6HbpGh0QN/Y34eG25nsq7whVcEstBKCbLdiE9xlEkWU3IPSj/mhM1Qm1AVa9WPUnoRmz4oxc8WbV8TwoC3q9wxtJx1lfYcUCKzheK7oyeexcdf06ht5PbdEbREPwBF9U3c9r/7hTcq/6N0fPMZF4w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cWGJ6b3Q6ots0rfRF+xfIzioN009+9WPob0HxZKjhzyZpKHE08oRu5a4fCQtgWCe8Gm+iAxPyGZNgPRkjGwQDwhmYIuJtrYT9hp8mtkhLsk0CyIQmCnz7wyqVWfBRVnNF4qND8RpLxoF3nhKdpspvFrQO8kU6mgjoRBxStEhI0GLyufym349z7PyeLwQW1eKT0C44ZBIf1gHhlEvxKKLSSo6Mh1A5r+aAz3Egp/Nae2y+t60by+rl9z2RGZ3RRgbCaEPKQEEAdBH7MRW+Aog6TaK6mryBlHMo5ZnvRsoGtCpJMo16GRvNUwRoBxD7yBaxIQ6Nvtu2KQNEtHouM7ObIkCPUmrIoJsmZ+hmiUJAwdKSwLg0ypB6teooA7xb+nonmruXx1rOMOpgPVRb5UInpa03eCSaJYJOSHpTlfU/p6yTGHWK/MR/IElGVtT0ZUi/KP+kg16pEDMJ34d2XTI+y2h+QFApp4izRvWcwoDq8/SwJx7pPX9auTFwhb+dhvaJ3ZQMBPYrM1FwHaC1aOPQb4oO6hWJIamk8LhncgVeqgEqGnfqIRKpAQayeedGMCL83ORYtWS0O9sKuCfd0mP17rNANN7BcyZO7tfJFCCcJW6IhKRmFyMAobIbRt9odfhe6ToaTs6dbYPZMFPopLY2T5yaoHGj4t8N0ceElyEL9/VeCihI0uld58SsFy3IPkUtISA5gY+AFqXBD8RjWPWpQFaOQvAAyJKTxQlwhd+7YDDJxOWDuPRlz67+48oE1dVkrkQ7bb7l7K+UVVI49NoFlsszpFeF9tGheXRjyOKhm7ZaicGW7IeiLQ9Z4nHs2c9gq/G38YDhF+lz9hffncQCdtF4EZAI1FH7EZokT5Qt8gLFV/oEIfKnFHV6Es+5s9I3bqzqxCnBWvBg+9JOCbih9MzZtleZ8qDU6cKmv7+eocC7vYGg4yX1A6XSTK+GOKPelH80Akdhl8fidIiQckkU1CvuhAldEqMejGYWZRsJPwdpLS04s4cciiNhanQ5tbDanRw4qXSucP2Eu+z/qCAwpVDD2iaItQ9zwVL3JvTZUObrSDlf0h4L3k6/7g9vhXJ35ej3MSM5//b0j3RH+BweGp73VYVhw1+m6GhoAqDmCcHr3BIsCnylKFwqZ9Jk11/pl+F/a+zy122Ydv/leiG2lBfP2mnQaCzocGfx7xF9ExsRcpC1Qp72grK/6M6zMqix9sXPy5WHgJUZmL/w8gzYjPcbaskNhdxPs1KqmJHBH3PiQMzL2Q2oE/7iNqxfnvWPxkb3wH3ruqmVY3NyvZSBYZkZ3Xr/X/VnrFzeQs+OS8XA2w/v1fUZV2YqmtnObtTamBTa6wnbKmHkUv75uxDpeTY6QY3C8Bn5W1A40IttIGjO2ygd1D5dkoovvEorAY1oORqqGUJa3TIvnSRjjS7eLdNdgXJjfj75HHCf2I+/wHXyRqMNvBnvBgQi7JIwcDiq07RYkCL6Kge7Ep+gQZ46g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7ac8566-aacd-406e-f660-08da25acef74 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 04:43:11.0399 (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: AM4PR0101MB2210 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/pgxdec: Fix issue with negative linesizes 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: j/rf6Fm1y2Cg The PGX decoder accesses the lines via code like (PIXEL*)frame->data[0] + i*frame->linesize[0]/sizeof(PIXEL) where PIXEL is a macro parameter. This code has issues with negative linesizes, because the type of sizeof(PIXEL) is size_t, so that on common systems i*linesize/sizeof(PIXEL) will always be an unsigned type that is very large in case linesize is negative. This happens to work*, but it is undefined behaviour and e.g. leads to "src/libavcodec/pgxdec.c:114:1: runtime error: addition of unsigned offset to 0x7efe9c2b7040 overflowed to 0x7efe9c2b6040" errors from UBSAN. Fix this by using (PIXEL*)(frame->data[0] + i*frame->linesize[0]). This is allowed because linesize has to be suitably aligned. *: Converting a negative int to size_t works by adding SIZE_MAX + 1 to the number, so that the result is off by (SIZE_MAX + 1) / sizeof(PIXEL). Converting the pointer arithmetic (performed on PIXELs) back to ordinary pointers is tantamount to multiplying by sizeof(PIXEL), so that the result is off by SIZE_MAX + 1; but SIZE_MAX + 1 == 0 for the underlying pointers. Signed-off-by: Andreas Rheinhardt --- libavcodec/pgxdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c index c9ada5afb5..30895b51ee 100644 --- a/libavcodec/pgxdec.c +++ b/libavcodec/pgxdec.c @@ -97,7 +97,7 @@ error: { \ int i, j; \ for (i = 0; i < height; i++) { \ - PIXEL *line = (PIXEL*)frame->data[0] + i*frame->linesize[0]/sizeof(PIXEL); \ + PIXEL *line = (PIXEL*)(frame->data[0] + i * frame->linesize[0]); \ for (j = 0; j < width; j++) { \ unsigned val; \ if (sign) \ From patchwork Sun Apr 24 04:42:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35421 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1237788pzh; Sat, 23 Apr 2022 21:43:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWCb5FYI51vP4K1IYm/peTm0oSqnBqhXXJiCSbrLkxUKqtYkOOpWipZx/ARf3Fk6MQJDjb X-Received: by 2002:a17:906:3919:b0:6e8:688d:5fd9 with SMTP id f25-20020a170906391900b006e8688d5fd9mr10551438eje.263.1650775425350; Sat, 23 Apr 2022 21:43: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 v6-20020a17090690c600b006ec0aaff9cfsi10353415ejw.932.2022.04.23.21.43.45; Sat, 23 Apr 2022 21:43: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=J5wsKGPV; 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 549E168B452; Sun, 24 Apr 2022 07:43:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2093.outbound.protection.outlook.com [40.92.58.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B60568B26C for ; Sun, 24 Apr 2022 07:43:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YLstlEpalRt/rMAaJgPpAxm1B2Rxu4NYvkDZKwwNtXkb0rWUSCuq/5XpaJuH3lAd28uAH/LjoQd17wQu3CXH/fMr4Q20s43CdlUKpsZ/oRvIBajfRZBi2yeXYU87h3Hiqk/+ucQMQvy8/oCf5aiqNhePC0WpszlofCw05fYNbKYZaVo7ACRh7uhDrIOVJraW2WHIommpxr5tt0JEK1MBTsXJz/xlp3U/AQ0C5A2z5VTQoyhqA3xz80XcqLNsbPu+tv9gLAbnfJePOnOKWKcMFMLPI2qeAPCb2XsOrfWsV78W7ue91IlFvKqWHMSjJPM4R1IXAX8SRB998nl0Ha484Q== 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=fxwackNM79vI8dkmB7Ravrh7W5jedF+aIxzESGQKGSk=; b=RQ3lDH6BK01f6v+cHlT8oXqV32IB53PBUJzxDNUs9lgwEop3e5V2rz4QR+aioxKiNSQME5TqoYp+6ae6WCzcgAd0OTLkHdBSJn9dbAoJoIN7SHv0ZFbAJ31oxpbM8AUV7bL2qgUJUJfDImh0IOiXvrdm0UvKfy7itWp2lUkfYAxdocp+qhUp++Gf176kbmjfC5fWn0LGeIpV8Ba/5PP6KoK5+UraO0SowmToWPxZHpilVmK8LJ8VoQ2+7tcoeVXWOb/bs3zZejoi102nWKm2rwGCZ4gLXFlsJ84zh+q87Tr1tL2ZOJmQPGumOYdWyg90ObDphW9X7UGG7dkc50gt8g== 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=fxwackNM79vI8dkmB7Ravrh7W5jedF+aIxzESGQKGSk=; b=J5wsKGPVzEJbLb3VPn1RnstUBKJ3FcA1o7+rj/c2MHX7EuC77wzQ+Sg786sTAwBOOVplLM9BQR6GFOndWFClIyhF0Wsb1EAhbmEwzgozOkSN7SOosU+7Oi35t+N4GJfPYoWwur3vzQSo8rs/ogWcAqjrXK2etRpOHiU40BBzJ62Ipb+2uIl/hUa2oz3L5tQfr058n2KDxGI4VBvzWfR0jLwMDLDvPnLbxbIbEIcQ5SeTSkuen+RvEHK+/guojzE/phDgJjzO2rPUCJRo5HvjzUAihNB4uU7tvI0w+KQldVv3/KoI/roUaEBgBeYlHovsf+urGj5TqLgGxk83vx5dxw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM4PR0101MB2210.eurprd01.prod.exchangelabs.com (2603:10a6:200:53::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Sun, 24 Apr 2022 04:43:12 +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 04:43:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 06:42:56 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [+LhBLZaW3RjosSTwHaEOrt85cWddDLeP] X-ClientProxiedBy: ZR0P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424044258.888081-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 67cae249-d80c-4274-ef79-08da25acf014 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZZwRrMzTbTWNwFwaPCdfE9GSrfxDtxUJP/TFA/M43+wrAq7cAeEHP/QtjtnY8hnXLN9m72Nej4YCIdMev74Fn9Qa3fLL8kK23CpgespDYuj06Q/Zg0lzDB85re9cXkZq9z2RE/mmDT7rw/GxFVX8z6jsAmZTMr3njHGjHhVQo15XHHx4LysIK/d93pJBheOXbX9DYwqCF0QygPw0E7A6Ap3gAZ5NhUEex1+zmPV0RLBCGcFvIhuLQqhYS3WH80uQM6SI7Xx1Kxl0MHLDLcpb7vXnO59Kd8SeB+jZ8iTgpW7nEwt0RExHRomXY8x7odhVTMhjJZwK+q++CQCEl6/kNApAYwADV3pZjPjLsvIc2wN6m0Lu5pGwgGYL9U0uoX9ae/3F++xEED4CK3EqtLX6yxPYNDdPTGrZ1umX5Bht3ksnU3V+DFIA/ixilXURV69LStwQn373V4a/22sT75Vs4IA4mHKpT5sK8TysfcAogsHD1hiKtnO7YnTUBF5LaDtT0XPnzZmcdXcjGWA/OkmawmreLyCG6DyQEidw/q4VymSiYIqjopuzN96n9AGBkxHdbKOHDJmCFZNyWILJMrB/l75Zi3URk93nZJj9Ow5NNyK95gQPzi263RCn3nsmtnjI31G9PPmzfxJEt13+x50ZuS1G7iPnGrNq143NOJsCLRtFhXOCVNg6uvIEUbjUpkn3WNvSaFmQ8UTLLf/xEWVtiw72I/7oR40= X-MS-TrafficTypeDiagnostic: AM4PR0101MB2210:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eSIbKOM2GItekpS5bq3dHgKe5Sa5bIGBUHTNHj1Xq/uuE2SRazW6ev3A8IkETavJyr6tCovdHxqv7s0BhGG8bFhFp07+OMFOavwZjnqRctAyr6rXlcJGqHNl6GWI8IavqKSZUC+bS0/i3mGLCwt15alOvMmuYQRvlk0sRsoEm3uFcFAEIEUV+7td2DUZQoB1eN2YMXxWTVoq+yfz6wO0dpZlrOMy8G4wSJr1r85uVdQTCmsnuMh0P6Qx61IAjpg3t9om8HhFIeZ852ZEggDAXkVDI29yvZ/3pzcEwg6Ko7XSkR5ewDYnXyyoMwwsmZS3UbWvty/JT61DrEbuJjMNZML2vHHJIdTASMGI5nOVGfm08LF/rZGkG69C2CHva2MBM7zdsSZDejG1OZEVHGNB/eUekXcL/i6EsQ93ZfZbmmqHYXdVQDIXxLptmcG88BGvaySpUC3xfCNi6tUx2Jt2yiEZNOiUFTVtFz35ecBp60c5kdYRgkIOa0cXrXv6CGWzI1V1TyEq/B7Nb4m1uSDe8ncGD1SMuu9VDO1ay3KnWiHfSbis+LvuMebMmhAdjXJ+dQEvnv5Iv6f8UcqBWvEbeg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i6EgDJTfNtXLI657eYA6O9WOVplCbCRZqB14d1Lytf4Dmjv2MiytyUWHjcBEJtfrH9E9p9FOH7ne/JBSVrm8rrRAFOW+AK6DTF76e0vaJemntk8Km2ggsnAjWVgJRz5q1r7qJRH4Sr9hyNQCR1xPQDBGZ91WlpL6/2ZahwaHVMiaifPR3MLKsXHRFnRAQzqCluMriGel6kP+Hzq0pPk4b547xlt5DiKR0rYd/ChMTLTeHuWQJWxGer3vTRTB1ZlERzEs8tiuBq0MkTC2fbK2qlzsUVfB5v9uDxQOw89DZgVgYQDU0SsKILfTIuqaG7/SdKPUfWOJgCHdldzzx/vVEpmYw3ZHYUMNQz6NtLAudhOA0fgRUxPbim+0CiIaQZPs06CSKaRGWT7Foe0Q/HSdxSr6J3MqXUK9i5Z536kgvki3PaNvlnv4JuGj/+P+/Jt2gzWqD0cDstV0Y8CtcmObC1LZNrSSgYTZ/Ouc+GG+X8qJWao3xGYtQaOTG6BGGlDdV2RrYu8ZMWBak32xK+TftCaijaN4sRfoARULw3P7nyWESU8A1ka1H9IiVmM+EnZeL8Yaya/Rf0by/ZMq5J91VzwnHOlkbJPyzEnyLNWB6Cp1dLJigupH8yCgIVwQ+IFVRwt9Pc0uR1MJ0V4Smw7Adub3RaE84mSlzRRTyQglTjCqwfyDFfO7C50qZpQ+fsGFeXeQmzNbwrJTdlrNjNvxoRH7A7lyibMOPK0SuYcT5hvYb/ZxtW1dL/cQO0N5DISCU2NeP/6y4RIZBYGbzJknM3M5C15NwKwxoZcV88s/49tagaDfF75i7/3KE4S4x4ICuE6dYvSx8jenw4VQFYNT2O9yyNz/3cPO5PMTQIGx7STAqTW81CzFZXqBVW2mCH8e7pn05dN4bX7pCUA/8a4nvzKGYH5/suFIXAPWCYJ9bmiiJtE/1gGEpjThdSx/X2qQrD6jrX0RacgH044Q1sQmNrm3D0SwrdL+c/LKlYWqXzNmrZRohtvmrmluhGLkYUo08YaVAYU5y4DRrKmgL/5P6toQjWblxwbJu3qdEUBq85I74Kbtk92xlgKQOEn5En5tdILCJydSb4BTlEiPyzboIEbFFb19kBBi3DgEdYuRTom3kY+J6yn1LK4F+SRB5qDVfz4ZM8EEZgThm/OH8qjt9jZquCY4b+4T+3yWAlDmXWu/7yjR9CaWMG2x6p6QyIQtQw/klAjg/IYajP7NK/ERjR44RJjQQuO2W17RLsBBf3LBUJSbcqpGDsbi2qYpDGtEq/qViAdpdkqKpd1wJ+zDDl/cPFqXe9pEOr3MmkLrzfqRSMJ2MJ5bIRC3z/6tsylINkYDb4F/qcruJtXqMdCTvIBzs0Fx9KNuimo+LhVk2bAcNDMFUxF2NwSJwZb4bxae8yf2jHc/vv8fLgB3h8eoMysW5VnW9h6ZiSKl/Gm0Rw0U6tDZqKIyJwfceetq/2qZC3q7dDn2oLvE2L+22SihLw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67cae249-d80c-4274-ef79-08da25acf014 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 04:43:12.0555 (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: AM4PR0101MB2210 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/pgxdec: Hoist branch out of loop 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: 2hGJ7ylB5T5B Signed-off-by: Andreas Rheinhardt --- libavcodec/pgxdec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c index 30895b51ee..29de103167 100644 --- a/libavcodec/pgxdec.c +++ b/libavcodec/pgxdec.c @@ -95,16 +95,13 @@ error: static inline void write_frame_ ##D(AVFrame *frame, GetByteContext *g, \ int width, int height, int sign, int depth) \ { \ + const unsigned offset = sign ? (1 << (D - 1)) : 0; \ int i, j; \ for (i = 0; i < height; i++) { \ PIXEL *line = (PIXEL*)(frame->data[0] + i * frame->linesize[0]); \ for (j = 0; j < width; j++) { \ - unsigned val; \ - if (sign) \ - val = (PIXEL)bytestream2_get_ ##suffix##u(g) + (1 << (depth - 1)); \ - else \ - val = bytestream2_get_ ##suffix##u(g); \ - val <<= (D - depth); \ + unsigned val = bytestream2_get_ ##suffix##u(g) << (D - depth); \ + val ^= offset; \ *(line + j) = val; \ } \ } \ From patchwork Sun Apr 24 04:42:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35422 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1237818pzh; Sat, 23 Apr 2022 21:43:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuiPN5ePlInRslnjirQlQhx0sDOHCeu3u+vtQ0fEgmXfQi+wGyyvqTKp7Et/0D/o/zOzAL X-Received: by 2002:aa7:ce87:0:b0:425:d88c:bc92 with SMTP id y7-20020aa7ce87000000b00425d88cbc92mr2981625edv.147.1650775434995; Sat, 23 Apr 2022 21:43:54 -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 e21-20020aa7d7d5000000b00423da63c9cbsi7782439eds.182.2022.04.23.21.43.54; Sat, 23 Apr 2022 21:43:54 -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=kIRKpws2; 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 5BBD368B45D; Sun, 24 Apr 2022 07:43:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2093.outbound.protection.outlook.com [40.92.58.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BCFA68B42B for ; Sun, 24 Apr 2022 07:43:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FFyxs08GXTMnaVggwX+r26GjNBizDBUKc2nylinFqK5WstVYgRdZqxNO9YphvDOPDXOuwM77IiTh7hrqRbHpCcYDInaYYxSlRZTuJwnU6gapD4d2U0sDtjKX/v5rVn72XkLeJDpTDkLg7TcD6xNFe+qZy6FqtEoi6i+wFdy79jumdNEFOgDuMaQOHOvnG963+sATpjcBfodoglDiHl3fw076YlDSunxAqAImWZzn+FOkeoxm0XumaUD82QNqw/J+n4FUAVY6ykFaK4dsvrTkZYFD7oOBDkq9mQhX+5iO4XOaFWTMXFBUi7ooTnl6drwroRxDIpSL0GC9eDUdTuogFA== 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=uiPne4HSKns4rmSiXCtWjW3h8L193GaxbLb8/Me0vno=; b=fGcy/jL+ON0HQN9ioOg5l2P5I51MK/7lvsoJoWV73U6988piTT1zVINqlmrvceEzKkKVTrhoS2tWNyakNmqXrLCGOArq0hisi2GtrIk5RXcryLb4TCILxg68Yknxm65iQa/OjH7HJf+o/qUmBzpQ7rUz3A/4G7jorkN6/IUjzXt6OSrTM4gOidxqnW4jI/I/qbxHrG3ng9OR2bNXU2MzRrCMv1bAvwu4Q8ct5SwObtjy4QGndiIZSI3K+lmg/V30a6sPITbVfY0uDJKovHSMdy1JgpbECW+u/xy98i4o9kIUtnI2LbDQKeMtGIFC325L1VifChOnV53uSB2PATD78g== 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=uiPne4HSKns4rmSiXCtWjW3h8L193GaxbLb8/Me0vno=; b=kIRKpws2DZxuKVFb8kLmsFPjIpWwdFtHTy4dHck9kK4eqWGKAtzDDiTwYqggEtPAbyT3Mv9Qh8o5gaQGSNFlTLfoCHT0Gj6066dmQjaP6XI2IrMr3mQQaCfF5hnEfirQhHTGxkinVxECIshFWJo/U+ti2Ml46j70GYsLuch7+5yk1BvTOu2sGrjas5vWnrZmhzppm2ic1qb0naB+LKj6DVZ4oSgcqwPPBLX7JQb6MjrjeAh1Z9E1wYwKXd/fCHeU+tEHFhrRBwMszKXPFyfYs8cnTfSjxGYZ8UI6FY8XvN+xkAcmGNSUjxxPO/7HxAl6ybSlMkgq3qIIBgfV+YUzMA== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM4PR0101MB2210.eurprd01.prod.exchangelabs.com (2603:10a6:200:53::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Sun, 24 Apr 2022 04:43:13 +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 04:43:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 06:42:57 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [ArgIlmhP9r6Cb1rQzCIH/ru5zrmoZJn+] X-ClientProxiedBy: ZR0P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424044258.888081-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 99645271-4542-4adc-b912-08da25acf0c2 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL9mvhPTGbvwy9cgLHAFHXf8J+YI+yoaIpgyyMEEIEpE5YdhQdbTaeZ/Ls41KXn5tyElj42a32bX5RucBMAiyNOweUgvQW6gPZ9Gj+ELisE/p+qSMIVqGib+69dKPz16kcR2VPMXicihyScsclVzjemYnu7++CyS8TZ4JGRCQ4fJFhiwehwN5CMCgHl62t4jOH1zW4eSxNjRt6dXrXkNr2T1Em3F+v3UhcbAfKG9MX9yeiUTB4s8YIIJDpptdvqCV7ja0/L5BlWZLlxDouxhDwhPHCJEzHdQTEVSx15w4qEj9pqMENeDISvudTWMDHNju40FwAkw/cHZ9g+BNQjpY2I+6FdK/2jrORLMW58qGjK8WNx1HR/mDfw3O100taKW1SNGzQ4GJ05UMNRjF2IPU6btCexwx9V19AZiK+evXkU8iYv6PvpMDzZ3iHydH2eBErFwrg1o2JqXxhhSY/eAbqxJY8xCgwZWt0oJuQT2jqrG+gJnVNzf+iJQr+n98A6frwDRZPU1pawQOlw2ZoUtuQZg3Ojr8yjy/KoACj+wIzMfiJmUNWKfhqUPdevqIi3Epd7mEwm4e4iymv4IZu9c+q1Es1PAAzFUCJDcaNGphaaBdawgO8x6oAbTCGy+3KTwdaPGbN1+Fy8uIrmlIkdzEBEzz508BUdUScsECMIgIFSXc0rw/gbehT80dzNvs1zrFIemy+dYwODkg== X-MS-TrafficTypeDiagnostic: AM4PR0101MB2210:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pqQDnMuSZHmwompEAThY5Vccls0Ef4UJrG8TER5EPbyMiS1dedYpPK/Pfw0BXw5cKRGTG9ZXXnDIfoPUPR5XmHbyS8kvfUEOntawKfWsP63LmMMeZ4gfi9kDj7VQR05MXMFA7tIV0TXTFa6iJpyKVUUcXGyMkC0qcxImPG+64W5ZIEo+u1jHIpyHVIhu4AtyfPV0Oh90W/iBwBCMEyk98GSYkmg9yTWYbKygPAJKjaXDg/r1ReiuT3fOyBljD2kSED90ntw6Lu7H3zvDfxcoCCeJ8a0+Yk2UV2EbXAzfvcI79Vg8VeUiYEthfo3+lgB0K854wLTqtsTEnHJuHjUTPMXj6BT9Bzf2Z9Bd7sXjtQSIf523EUngUetQhFal+2/CO5LE5pgvaBhEN0UZkG4TULBuxPicm3ySyOoFnsKCYF/BJzNI1BxskBKB5oGIS65yZ30WpMbfqXQQ4OsfflJHvrstk/GIUsx2j/th34tTc7YsOkSBAB+N03iKJpyyQuB9GlLJabzY2FUDybn4xFi8kr+BoOXS+LOXlcxPyunlvK28TJB1yqADQ+oK/JKh6A9wlLTEIuSpa6ZR/jZjyPIQxw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5QoqaOkb0QfyufKoY86FNsDyTI3uTAIf075uw6vhwcqIAhHM/zVV7k3j1BsHVt8KqEtB1prfRfcC1XHY9z7VgSUkvs4vj7WlzJNPqoRk6JdXGcOscUKcFpAi7AVPKK2g41eWMKIXgAGt7gbMZbXdPw5eO9oCHi+59Q7gQTeHPRiwt2xjipzu2TbZ1SdwkxP0G02QzYu3eGEj9Nk+Jf+chrz5wGlD+hBBvxFciTZskS8aH5WYwAPLgbkQDmKltL8/yRZ9fU2OSocqUoUN3NnZsyBtlKZSJvWSPm8qJSuT5clzTj++7oXDjRsXByzLVsJeyUOpYGi3xNiElXeuA55hiqL1VTnS8H2inkEvmcciUWlmijm39zTyOWg+H088wxNjH6tYTJnjs9tO1MOIkpaw7zEsCkDBWEweTYCj0rH01K53/V9kZXtftIeib/BCudSz4xD4nlATyzcfZ2GViDIfIlBD4nhK6pmndP+yRGiGZl5a145L3VQhKh/Bajh3YLtdbEdRIJ3KVF1HCclNVFFGSQlrYhQ9U5tMCi2mog6WCSNEti/NUCkecH6nNdLGQ/bX5uf34JqKeaoFFplyQlw1B470x7GLN2TBN84iecToGqyDE+B7eRx0oHrbOVZGpczFa2lB7bJwC776NSw+WK2xK1Z68pgLBDth8NFNNSTvScS8GqJI8pLj2+nUnPGiDHMSu525jqAAUClwWPzR0A0L7npbTIhxJbry8RzQPqpxfDALRj8Ou0ipJ77h3cMsauu8bKCFoKKaWhJGM/2wwlslrFC3jYjZTIDZSJXyPsJfhI4wGRgXNytW/yRMQz1SnLizuCoPVoufpklUQ4DsBa2E+/69ysHEVLhreuyKyRLas/vqsNlHi6YWW4Tp+Ydv2GNTBXx49ZyeyUA0ZASwg0fA1/Myje8qEV5GXofFTZTCwU9ZocvoBXXg3oHpOulTKQQKXFG8i9pXWSGTWQ7SSTm9gzU5utoUeeVN+4DY1nOatBqKMalSNWtxCHvSpCyaNZXu0cdLDptIiow2e5elhiqEU7uWuiYmw7TGsmvQBd7s63ONJ6kEYLc9S3WVnUVkgR5Zq3QxSQUaVIvX5vz+fsBeJ45+zNKR+LZeDZ0g+bSlcnTKgOmwwHEJzmRQToQwHJJjNhsOPiY8uuetb212zS1a0gGbHLaLASYmvEYizjT6jU8UNmvPrhXJloQzEbkQMWuGT1SUZFmw1FRRlv8UuLL89KLoqRKvf5XdrMbIAXaWeLRLlMtBFoXhGF48LX2m2iincl5fBRTNYypKLN21zBOgs6OO9EJ1nnYkqJ0KsbAVnjg9DTq3VTIKAx5uafLzYIR8PnvTXtrfqW7Ens1knrbVii6G6XFJdkbkPg8BoEZXUvQOACRfnxS4Sow+D7dyh29kcn6P6HVeLqh1xlsbTXd9s71KVLDYM5yV9gqSyhSXft6DHOxzXUpkilHnIBTVXMhLU9b4sDlH+CnqvRXavOUGSw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99645271-4542-4adc-b912-08da25acf0c2 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 04:43:13.2741 (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: AM4PR0101MB2210 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/pgxdec: Use unsigned types for unsigned values 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: kwHci9r2Z01I Both AV_PIX_FMT_GRAY8 and AV_PIX_FMT_GRAY16 use unsigned values, not signed ones. The fact that the input might be signed in some cases in the original format doesn't change this. Signed-off-by: Andreas Rheinhardt --- libavcodec/pgxdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c index 29de103167..52e2c2a36c 100644 --- a/libavcodec/pgxdec.c +++ b/libavcodec/pgxdec.c @@ -107,8 +107,8 @@ error: } \ } \ -WRITE_FRAME(8, int8_t, byte) -WRITE_FRAME(16, int16_t, be16) +WRITE_FRAME(8, uint8_t, byte) +WRITE_FRAME(16, uint16_t, be16) static int pgx_decode_frame(AVCodecContext *avctx, AVFrame *p, int *got_frame, AVPacket *avpkt) From patchwork Sun Apr 24 04:42:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1237859pzh; Sat, 23 Apr 2022 21:44:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVwEidcoOeB2GhYg+pF7I1n0QTxBdAQh6jDXe4Xze1+l2igrvf8RZVS+YrVxlLiy5XdgME X-Received: by 2002:a17:907:1690:b0:6db:325:3088 with SMTP id hc16-20020a170907169000b006db03253088mr11025097ejc.718.1650775444704; Sat, 23 Apr 2022 21:44:04 -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 f11-20020a056402068b00b0041d79899d74si7806841edy.357.2022.04.23.21.44.04; Sat, 23 Apr 2022 21:44:04 -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=TK8RAp1q; 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 4920468B46E; Sun, 24 Apr 2022 07:43:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2093.outbound.protection.outlook.com [40.92.58.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF37868B42B for ; Sun, 24 Apr 2022 07:43:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mmyTMkCrfcEYrc4vnwhvYz5W/zyI/vFyrwr3ebTXgw8EcOohySh6xyRLNDfjVmbn4qPZSD/O44UsHgGdOxoncFeyTqiwp9kk/Z3WvqDR0R6c3jVavK1qX5nifqyXNOjhs4hNbKTAYfL66rpJr8oKXasyS0tt7UkRLRnQTOWJXEsiikRbBXGHbPG0BJV3BvHHHXniScgYXiMbKAam6p8o+2J6zH7FeFxcd/NmyAZYTcMIqVoKvHGfcvf0xyypDbBNMUW4IMzsyoNumyLMxzHbkJGNHXTJnxIjjby3Dz78ie/oWDGTYEvFCm3WF864aOf7nzSPhr1CDCC0O0fH+saOXA== 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=sJ9mogFZ/qVmNidMuuiTVOikhRz1/5MIrAEun3Q0ykE=; b=Is0tR7twTVL03ITjSBKCa6EtrIWMKV2PKSg/qoaHseEHSp0hRo1D7d9Bj939Nmbwk6ildX5gTPShzRBlBkn7mDvjQfi3WBon2Pffdc+vbU2TxApYoZxrKHAVWfq5cYFY214MypSQKe0cOqrNYbqCMwcLNfkugANR6r5vN28A9LZrfgOv1iH1q5Yr3yymnU3kBrdQv2HAx7MvRzyYbCT/JSIt8ZqHJJL9R/zAdJ85iyFQLnvMHXxvGIbveciP4q1wVJIt8wQjZElnfqIEt31Hr8JjAub9tJ1WrwUzRtN1JFql+JpguMzVrqm8H9H7IBmBsCoOCmoNucHkFT2sE9E60Q== 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=sJ9mogFZ/qVmNidMuuiTVOikhRz1/5MIrAEun3Q0ykE=; b=TK8RAp1qFf6jPDwR6Cd6rnH7LG/+YMsFr9n3+R+TfcVRHZgV+rTsoPDS6WDApS9AEm3lC2lYPvy2oo55xdEaAGRCfUY9PuBw05wtKcb2AxWNlSSAc/i59P8Oq42fpxSBAfBiClgST46qcpmh4Wl26lhQkj9tCx1XY/cLBkTZEltNT6fPf8PF0mEMHoj5T56UaQTc5unM2qK/XGCIWGPnEed4ZocTYUJXd8Z0+TJCtVqudxhQYdz7soipdIS3R8jwpwBTaNGUZGsyiP2SccJc6UHeVf9m8YA/BA3NV3xTYTXbS2rUeY2bf7no0okYNDQ77nOkIWTpnLqOI19VTz6DQQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM4PR0101MB2210.eurprd01.prod.exchangelabs.com (2603:10a6:200:53::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Sun, 24 Apr 2022 04:43:14 +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 04:43:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 06:42:58 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [9AHCGqyeUiSYTlZa1yMIouN8AUp0linj] X-ClientProxiedBy: ZR0P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424044258.888081-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dcb755b3-8f31-48e3-021e-08da25acf146 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDISyHS1/7rZhs7GhKBPi0PAkE9MbnZ4ewRdglcTJw9UcyH1P1cW84zI8fuZUpO0bLUZ5PVXMpNZ7CY3o51k6wK/lqmBxMIRRrnDF8fUScrxsWhLikQyBILd2nnVTxMy11hARjRqxOTJIIOBDhcLJQxhu6P8cHVEphqAZxc0cm0c3kJMM+nhE0xQeUWeiVfbtUhZ2drAJdb0KBH/IZM3YHw6KhjcgQWzmKnUR/ijk5nWWh2BKWyE6UWClHNqchS9HJCMhybG061DEBSo4jwV2DNnODGmHzR1Q6/B9eCCJHXjhh/Uff3UhQ3Uqq6SwkDOCMBEdgrw50GqSWVJ7LnnGNkuPE3GBnqbIdvJHzi0DmXKQDar2iLJ5Q2apfrtgIEEL7lVDzi8lKW5ZlC1nC5Sc9ilY0znJzlauaTU27lyKbVKin1XLN/ZzPChrlVPWhvFmzb1EcxBccGqbq4eMeOUiwsopHqQFLZ05j6JTcftg5qzUG5fe55/YkCiOUsQ5b+o5kuRBrC5Wuzn8nNWOtE9FeJnCpzrnKoO6fttcdFFtERYpAxNA1CDs4IEb1CBE+E4vqGezecmPH7Ctcj9n53XAyt7wX/Pz6F/bm/6Zz4I+KTIiAn0HhlteSpDaclomgheS+sf0Cn/hV+//NMPIBbTN9nDhyTqNTGsU1FE4TzS4t76Ib7Gs+LhyU51I87zuRtaSLZkPuafNP2Fhqkt+XudyjHTLWXkBaFO8ctIaQehJlhEY= X-MS-TrafficTypeDiagnostic: AM4PR0101MB2210:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 733QBC/qN89gb6yfEpsuClU/uEzU7jzw/XSYRnBmcTL32Se5YiUBkMO2bs/p5ywjuT+28m8nE07hT39eXEXHeOay11WrHFuBn/MlnhOAOklWo+hzSYT1pW7F2BqzdZ/umsciMUCkMcHVPiGggTL3O1D1ePpD+yRE//RzRLnEHsinqs45dAUfIrvuLCw6j4JGHKS5HdqFdTHBPJ39J2H57aDYocuyNdvnaPvX/HRhD1TU8PGlMD2QVIt4mO/0Wkm/0OQn53hTfffoadfSSgy01Q/dSYAW/eEVFLa/NT6iM258uC2q0Jc0/G5X9EidSU73ng0ERzAasO0+6B7x67fY6vIBy3HV0KCKH6gcwlFcgECJ3L3DeIixZtDWiHyU8v7ccNe4QFXVdX02H4tACOfAwjRN9u944BCo6AV8F9D+cDmv+dS9vRLJiFF6Sr6BJz/pSEEWKygSAuLsFlAB6fug6viHrJPCgPO6I4rqrMb/OW9/rp0rpLUv5ejQEPeAnl9pdaw8v2b1k1KJayN2ZcnLBxnLcR/DLIzNTa6Tu/z51W/2WSYoXU18lO3zUvtkWkvPYnIieK13JCgebht6hhpxWw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DwIG/29An0hRerKlfvXVTcFnMaDySQUc/xHKDffRCfRXkO6+PndDasFjmGt97O57VrZrmtcNmaeCmLfqc2dT+ltdiNNiZKvDpj7pw3fkjYpNb6byuZVC9DoR1h2ui6SJb4mlBLpiC2+C4+qo2gTuRMSGFp2Jhoo5/ruG3OagT1SMefCJr1m8P/p52DYd8nurEilt9ezc0TCm/O7sEsROxH9HjNXtGBdyYke4gBPBu7iNXIr3j2OX65ltCVuiQDLWVeTI7tXVycyOx3wDvVpwQ0JS9oGf6zHhXcVJiwUB7aE7huIUVjPX54rPfQftRegTNfb02bqVRRuUIWxVtNbzo8WIqCxMdPTSTn0nCyltvqomKjMtnbX+SjtPc3klE3cqW5jQy19jg+dLM2sjBeQGX2sOn0utRazJdeqVoErp2Jw2S08I10eYcF8uDZ9cbOBvhi4jfcOYkwimcapXgX/hLDORo3lLGlgsu5dJ2t0HlL48+6m+hZAvPi4n6SiPT49c/msOaubH9s0mUFdoin+FyCcsj1pWHSQVivK0hQ+QsjAOPpO1QUHO4XMJ+l8RdIw214/MWAVB6xqv/DP9M14O5IyJ+gG+rYbOG4dNPoJW2Ic2HZ9SAtwih9OCSy5faDDp8s6F0wokwAv9wOLDIdqATFFrqurbZyo2r2RGAD/IaIHZuqwhyUDGKYi3WE8jLpCzB3M3U/P2JqhKCk0emo8hvoULWUka+biwnWEF18aARcTq1FpDSXWE2CZ7ZmYzNWl7xwPzslkDAeI9pAIfrw9r1HqWpxN5ZyBkRBJNJaQf6Fxx3mNupGp6jmby5qfuQFHkzbp1LBpql00qdZj7opf4f7e3uiAsebM1ILE/WO8qtiWX4NxFCZPuNdZu68kTQIHAaSfYKsqgacaIZS6nR0fefA4Ut62pRmu9lGs33kcSSImimEBbjivPZh9evudbL4RvXAhUPPzLq0z9aL1Eix2tmVyh/vbKu15oQpHms/RU0AOYgKpQfARNx7FKc68U069p7XYNKewtl6qr3w8B6zb7mmPqsoiLaUwuYegityoT8VEIz5eQTsD/Wl14KyltyNa2gwf3U4AzmmbQm5jx2c5IqkeNUI64TaPUFiwNzEYgAWHMA5eU73DitD/fBDsDnmjOkSmBxtGkKtAtTy1iNMIJSXtqY+eYo0V1mgiOoAXoiYaaAbRCCGyXNu9jehMlWEWI67FKJTT1eCYUMWKbWSQ+id5fE+t3aAj1KelC543z5PaV4LDoG8TfwJtcWaq38UfYyRRJFXvhibsmoh5gzBBKBk4b7UvAfRvcxXJzU4csM0/YsxRHM0OUfapffVAZ8xo1uEk0xB7IQT4qgX+KVqnAFtJbeOyt8roKACVkQ2EbX3RuycqZUEw+jQeNnM4MbzyeNC7Vup/cu1V7sutLID62mXStR4FkCFiwtOwDPVOgGr1ta+zXq/ii1lOsLq/cuEITDhM/j/6eKm+XnfWR0h4eXQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcb755b3-8f31-48e3-021e-08da25acf146 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 04:43:14.1033 (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: AM4PR0101MB2210 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/xfacedec: Add AV_CODEC_CAP_DR1 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: LSDazqhiBrV0 This decoder uses ff_get_buffer() and does nothing weird (it does not even rely on any alignment of the frame's data/linesize). Signed-off-by: Andreas Rheinhardt --- libavcodec/xfacedec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/xfacedec.c b/libavcodec/xfacedec.c index b103b5beda..f15bc2d773 100644 --- a/libavcodec/xfacedec.c +++ b/libavcodec/xfacedec.c @@ -180,6 +180,7 @@ const FFCodec ff_xface_decoder = { .p.long_name = NULL_IF_CONFIG_SMALL("X-face image"), .p.type = AVMEDIA_TYPE_VIDEO, .p.id = AV_CODEC_ID_XFACE, + .p.capabilities = AV_CODEC_CAP_DR1, .priv_data_size = sizeof(XFaceContext), .init = xface_decode_init, FF_CODEC_DECODE_CB(xface_decode_frame),