From patchwork Tue Mar 12 14:49:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1915458pzb; Tue, 12 Mar 2024 07:50:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXkL34SZUPcsqF2a1OiKah6n4Ooml0TCYBPtD1p3FRnvKm016LFzDreO4mGuP35ySzWL+6yBguEpi4zQI7L6DaNN0TVhzdZk7etPw== X-Google-Smtp-Source: AGHT+IHYFM7afwa0bJwYvgQ76kdlEJ9EQQkc3F3cUoi7sb5q/envUjI5LFNMg+uTyYNOev9YSplS X-Received: by 2002:a17:906:6986:b0:a46:35cb:cc89 with SMTP id i6-20020a170906698600b00a4635cbcc89mr423145ejr.22.1710255009904; Tue, 12 Mar 2024 07:50:09 -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 q12-20020a170906360c00b00a463b06772bsi923869ejb.229.2024.03.12.07.50.08; Tue, 12 Mar 2024 07:50:09 -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=dcVq8MGH; 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 0D0C668D15F; Tue, 12 Mar 2024 16:50:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2065.outbound.protection.outlook.com [40.92.50.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8448368CD53 for ; Tue, 12 Mar 2024 16:49:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rjn482PQfXZfPrlCoNrm+0k7uFnWFgFJaUFwUoyGpBhb0EtZ0aVIv1Eif4dZOVauiozeMEa3TTc6Fm18DrxZFTx16rLqSJs0ET+uTdQuUk0GNl6naNR6g+epyrVUPhaMwlkdDCU1b5tAmxHbVwm3yLpGgjz9hhEcT/uPlV22fxodCCe2U4uaVrAreulBk3nIb1VjEqjN47DXcciYjBqpBhxoWyxYPouzD+xydFWq8aVwyr64zIQPLF/fYk4IRdM3MHaZMjnvtlFMg1DTummcvmsTILJOXdtv5oYke19kWzOCIlGT0aCJzMY2UgZ8fmcaWm15w+VTcYkQGrkpIAjivw== 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=JfyK8peJRWeysgE5v/vDnilIPuMy377uH5QUoJzkjJ0=; b=EraIMwGXQipuOac68jMY/yp+qagbJtwd4DMhKYh5t4JB02lq39Jfk8GxnlO93fBI/YG5GV0LZCOe35NbZVwX6lMvlB0aUOsTA7saTiWuQFcYgqmEoBKFI7/pfQiHRGZWvEW3/Daay5ClHBLde1c6i3di0oUUuHKMlLenKHzgbfwYD7b/r9qG676wHZPQOteowiWJk6v+GKMz9hRKf8cIDFKmd8iUWNvSAh6+LhkkdvwG2GWxH/UWCSYnCCZLFJsworahotlY1pr1H5wNRsbRm85ZquCY3Z6O3nt9LsfehIbocoEzZ89YYuDJIeodhpn8DdlFr/fqvfWA+yvU0v7hCw== 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=JfyK8peJRWeysgE5v/vDnilIPuMy377uH5QUoJzkjJ0=; b=dcVq8MGHdh6Tb2Q+X7YLinsI1I0FiOyJ/CFlNkBeLdCgWUlnpfo2TsAtthAKVMG5iIDZJeypF6o/sVj/nqceAhlkfuPqQM2MOb8flGtJnfO3KJIZ0ketAiJhmuilXSKovHWpCkBaAfH/uYZayHHhLJk2E7WLm5MJYie4kSNsSeiBw/IvQe4zrBeASX4JxIpvtYDIwKpJcTgQW1MTMg389IfDLQ7QghS7BudN8YBqZFopI2NF0hbE9UPVut1Q4Go9TSYyPxOrxq/yarpllsljRm3zX9G0+jPZIMYcCcB+NT25yHHXAz0WewyfAXDfCELGD4MAO364MVw+//gLh4pcnA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0355.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Tue, 12 Mar 2024 14:49:54 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Tue, 12 Mar 2024 14:49:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Mar 2024 15:49:45 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [sEJBvrAw29KdZHb8r3+Cd/HxwKCyW9KUpZay4v/aRNA=] X-ClientProxiedBy: ZR0P278CA0040.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240312144945.882598-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0355:EE_ X-MS-Office365-Filtering-Correlation-Id: 82ff9c63-3416-4c23-f47b-08dc42a3acbd X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicBi+y9zgxldSw2nfkqY5gTooLE3ThzSLpV3ANUZHzyT4hxvUv41t6gMSNJQupM607j83Ee1fPFKTvrlngeHbZ2N2SFbMc53GOWjQr5SGGY/wK3KpQuNpoXLDw1emou4KE6+J2st6mORcU6U/RT50Kl+wJX3uQ4smv8I/gF8Nrt9Sqx5rmkXwSFu6+cYSNjgNivp+y7729nNPYPPK6hdhkR3O5GZEDAU/zLKAvw5PSTd8VxifmTXTYm74I3fmTcLhu5BL+f/mNtt6wid39+bxVItLiRTyvmff3PrMJC3cElTXXAjzH7NpdZmAFtVnExxZ3hxmhzDqAFAp1bmZCEMfp6ousBIv7y/4mHNOsSEqGS3ySp7SOvD2sHY1AAgEo2GqT6b68hy1wC2EKE3VbQA2XEA7Yo3NbPw+kOFmvRqNf2/PvwE5ac4fBUYp5AvAEtXcjNgUPRXlkaFsZwabbKqMLzfu27RX9SUy4NNacpawdJM3IGqB/WWQ3IM8cgvFLTeObClcLqvDRIMvjLPLRDaVHvXFmHKZvjXkaVJOo+kL5+QAn1z2Aq37p624ujiX+QVVAdPMfSVGTtbvtpN9X1JGZR+zpvoDMFZf1TiTvRae2yMScuVUzPSG84HXX7vEmhNuGwHPJM7P5xS9IRReU2SpMKUzxmE2gSPrpaO2mfLghG1RmIVxWRNGf6MKRWNulIoRabJtDjQCfIhIb+490vuuJWFzZe8klEqhgVpxwmdPrh89A== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1VM1jDJ8yrvuEeFcJy0dR2vC+/5cwwB1V7fTBnMNdzAoO9CoJ0wihWRfbkHrAhgqIwFdFKCBmMgwGAsygvJUzYAxmhZCWS13K3s6bpyzWpHl02rYoIbgAxARlnzBxsUB4h3RctDn+GaQXHU/Roh3o9erJoAAEzS8vTh1yqm1qZYF0ROvWfbCsqm0TTbb7orwSWZ2cSqkOMUO/0iVY9ui9Cd5rSGa2gDUxkqcM0gPP1S6nMQlCXPqnELySziz3iTMGS3aR6h5nD+H59R9NdfKXKFL+BDpFQHxmzMkKtJgMUeB5NMpsCxoTjxsQ5QXzyDNFC+ufAJBsctm367ltmgKR4wqSxHR38dCS5w7OFgXkZBXhRtqMhSag+2TMFYrb/WXZo/yDjC++EyaHjayLZUW6N5y+kbuM4iAVtOvrCaQfGoHiQj9wX+zmRgIkRUtLKTqec4RlxXPiRQxo16qEnD4qunv2SwYmAl5SneD+XKBZ99VYr35SZLd0Gxe0dFHDMEY59kn/ZIQPEVwqoLIQOFiTdeXrL3KoUzkJuW+oc9ouGoKz0p+cJDodJQQw6DUPoyEj6zii5Wh0+yoZqO7SvBuR1iwFHerfZujGVQuMDsI0TKiQlM5U89odC1ZrLx7xWdK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yppttTa9f/u1uPEeYmJ07JjIjg1SNLsqTZHuPUKNMSUOb9cevSCAEnSfCyEo9Sctwfwdcm6UYeGVvcsIClPMH6niyEDS1aj88h4TFcXpaTd3xWCqSXEZltB1CMU2sOO+ozN/voOED5tmPljB21TVkSjlXlEecf9sq8vfvQqJ6o9LhVpn1mTpqPmK2e0yokATO6I7Fa48Zxu5lvp+QB4dLstvlUq3+mMVdWbeKzCerK4RA1WrLdxeBfSLvwpKQUFcNr40z6jdkmaingcEj8yxty/T3Tt8bb9w/Ia1i9ewS91mLE7EWVUfZ7/pUjxnUoBg3khMrhZqp7/j953Ecuzn2k/IfuEd3jqNEaM1lbl7Bu2A8uUaYphsp+486/faDgtieBM0XgxgrOw8+4cFkiXMIr4TMJIUR5CDVpJpoJlXnesc8jaH5OoowBlzm1FzdjaFFYoThiQY7zdbfxYFAEhymlyWKGC1xcgZ4z/WuSUvKtotJtW+5PiznYD3jNiBq0w5vMXgRmUcC/N5P+dtHxGJ61BAKz73Pn33k2hTo6Urb9Bj5pKlgqzfd0+0FhE7eEgFD+J96lh9hV10eRietlTF3QOuXYh2UAKck3IppokYNbYIo8qT3SyXUCJiY3aJpwxldqaSqWJQLwJ/1lBI3Ha0IKFHZEjXDYHpK3FLAwJWx0hx8IWdDMxEZJtSNdxrnsu1pO03/SduFhOd2WwUHS0yCuWJlSQzT2CgSCW3he/jQKox9LZPt/5UK/4D1mqNFSPOwWa1/PoxQwzqLM8fcF/TOphdhmQwicQhYMcAN7wIzgVtLx9ew+6fS1JadloGRDmkmMF5nvSac6AO00s9QI6ebKsRGq+uyJGqsu/6cneF/IlYzN8WhSedviIMGcjgecOj/eD0ZE79M814CdxsGfeNUtNVwd2keDqcFF8kknPqKcRpmAZ/bsv1YUDQTlSwn1MHevmuHwBtfpOPUnuX1AnW8Iv0Saa8c4xmNfiabJhVTZ8fnNpvADfoaahQm7Y5+NVWY8ptDiQ3Q8pnz/Ek2xU4ASp3fQrafbZXQryhy+8i+SLl4kY/8Ctww5lUGTLYEzvBR+ZvGO3dfTaTWXZMoqZdakUUOcAI09GAx0tC5YBCOOgq57mxy+aoGhAahrEHPVFY36v2pan47BVW9/zRtCzzoPL4dk1lQbuASfSS45PqnH7/r4x9QdnFrKFVtGpmBt4bEkeYaP3EpyVIX22LIA39ktKo4xJAC3npAgGT1ttQehtRM6UZCdNXGFM0TzE3hTAabEzbIwmV+5ibYPnJVu/ZRQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82ff9c63-3416-4c23-f47b-08dc42a3acbd X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2024 14:49:53.0076 (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: PR3P250MB0355 Subject: [FFmpeg-devel] [PATCH] avcodec/tiff: Use ff_tget_long() where appropriate 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: V3yjMoS5PhBC No need to use the generic ff_tget() when we know the type. Signed-off-by: Andreas Rheinhardt --- libavcodec/tiff.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 8f278bfd12..3238b208d8 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1269,8 +1269,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) value = ff_tget(&s->gb, type, s->le); break; case TIFF_RATIONAL: - value = ff_tget(&s->gb, TIFF_LONG, s->le); - value2 = ff_tget(&s->gb, TIFF_LONG, s->le); + value = ff_tget_long(&s->gb, s->le); + value2 = ff_tget_long(&s->gb, s->le); if (!value2) { av_log(s->avctx, AV_LOG_WARNING, "Invalid denominator in rational\n"); value2 = 1; @@ -1437,7 +1437,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) if (count == 1) s->sub_ifd = value; else if (count > 1) - s->sub_ifd = ff_tget(&s->gb, TIFF_LONG, s->le); /** Only get the first SubIFD */ + s->sub_ifd = ff_tget_long(&s->gb, s->le); /** Only get the first SubIFD */ break; case TIFF_GRAY_RESPONSE_CURVE: case DNG_LINEARIZATION_TABLE: @@ -1453,8 +1453,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) s->black_level[0] = value / (float)value2; for (int i = 0; i < count && count > 1; i++) { if (type == TIFF_RATIONAL) { - value = ff_tget(&s->gb, TIFF_LONG, s->le); - value2 = ff_tget(&s->gb, TIFF_LONG, s->le); + value = ff_tget_long(&s->gb, s->le); + value2 = ff_tget_long(&s->gb, s->le); if (!value2) { av_log(s->avctx, AV_LOG_WARNING, "Invalid denominator\n"); value2 = 1; @@ -1462,8 +1462,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) s->black_level[i] = value / (float)value2; } else if (type == TIFF_SRATIONAL) { - int value = ff_tget(&s->gb, TIFF_LONG, s->le); - int value2 = ff_tget(&s->gb, TIFF_LONG, s->le); + int value = ff_tget_long(&s->gb, s->le); + int value2 = ff_tget_long(&s->gb, s->le); if (!value2) { av_log(s->avctx, AV_LOG_WARNING, "Invalid denominator\n"); value2 = 1; @@ -1740,7 +1740,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) // need to seek back to re-read the page number bytestream2_seek(&s->gb, -count * sizeof(uint16_t), SEEK_CUR); // read the page number - s->cur_page = ff_tget(&s->gb, TIFF_SHORT, s->le); + s->cur_page = ff_tget_short(&s->gb, s->le); // get back to where we were before the previous seek bytestream2_seek(&s->gb, count * sizeof(uint16_t) - sizeof(uint16_t), SEEK_CUR); break; @@ -1766,8 +1766,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) break; for (int i = 0; i < 3; i++) { - value = ff_tget(&s->gb, TIFF_LONG, s->le); - value2 = ff_tget(&s->gb, TIFF_LONG, s->le); + value = ff_tget_long(&s->gb, s->le); + value2 = ff_tget_long(&s->gb, s->le); if (!value2) { av_log(s->avctx, AV_LOG_WARNING, "Invalid denominator\n"); value2 = 1; @@ -1781,8 +1781,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) break; for (int i = 0; i < 3; i++) { - value = ff_tget(&s->gb, TIFF_LONG, s->le); - value2 = ff_tget(&s->gb, TIFF_LONG, s->le); + value = ff_tget_long(&s->gb, s->le); + value2 = ff_tget_long(&s->gb, s->le); if (!value2) { av_log(s->avctx, AV_LOG_WARNING, "Invalid denominator\n"); value2 = 1; @@ -1796,8 +1796,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) break; for (int i = 0; i < 2; i++) { - value = ff_tget(&s->gb, TIFF_LONG, s->le); - value2 = ff_tget(&s->gb, TIFF_LONG, s->le); + value = ff_tget_long(&s->gb, s->le); + value2 = ff_tget_long(&s->gb, s->le); if (!value2) { av_log(s->avctx, AV_LOG_WARNING, "Invalid denominator\n"); value2 = 1; @@ -1814,8 +1814,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) case DNG_COLOR_MATRIX2: for (int i = 0; i < 3; i++) { for (int j = 0; j < 3; j++) { - int value = ff_tget(&s->gb, TIFF_LONG, s->le); - int value2 = ff_tget(&s->gb, TIFF_LONG, s->le); + int value = ff_tget_long(&s->gb, s->le); + int value2 = ff_tget_long(&s->gb, s->le); if (!value2) { av_log(s->avctx, AV_LOG_WARNING, "Invalid denominator\n"); value2 = 1; @@ -1829,8 +1829,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) case DNG_CAMERA_CALIBRATION2: for (int i = 0; i < 3; i++) { for (int j = 0; j < 3; j++) { - int value = ff_tget(&s->gb, TIFF_LONG, s->le); - int value2 = ff_tget(&s->gb, TIFF_LONG, s->le); + int value = ff_tget_long(&s->gb, s->le); + int value2 = ff_tget_long(&s->gb, s->le); if (!value2) { av_log(s->avctx, AV_LOG_WARNING, "Invalid denominator\n"); value2 = 1;