From patchwork Tue Jul 26 22:08:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36982 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp233304pzb; Wed, 27 Jul 2022 02:33:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vhpLJDuoGqZ38aL3WoN1HsmhJFKvSx1450on6SjqjKZdlxCelY+VgHRofXFGaLukt84ojO X-Received: by 2002:a17:907:1dda:b0:72b:31e2:905e with SMTP id og26-20020a1709071dda00b0072b31e2905emr17633879ejc.183.1658914407907; Wed, 27 Jul 2022 02:33:27 -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 o3-20020a170906974300b0072ef52514f6si20418516ejy.629.2022.07.27.02.33.24; Wed, 27 Jul 2022 02:33:27 -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=CKEmyZ8e; 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 B400F68B918; Wed, 27 Jul 2022 12:31:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2102.outbound.protection.outlook.com [40.92.90.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6197C68B59D for ; Wed, 27 Jul 2022 12:31:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dgIJ6TM14ZTpgDGXTzNCZD1jWWDWrYYJBoEdxaxMCnnRyoZ6lPmVUuKJcJF+ndnrYnulx4pnyix+ZuuvYm1XJbv4HeSuzEB79nEgGKfZdMlSuQ8Z3zuri5hEmssGtC+xrfrhu2hn+8whwhsfNbrJ7WyK2YUii8/9SFtsDIZuUUxxNr7l1OsXurK1wT2zadiUcjvjTvCnTE+sbIZ48qqJ8RkGmYg+vS34QJP6B3qAP1/6kUOb29uJwKiplwQCdQE32262iBPjo4Xe+E7NTW/mTNPGmevsACPL3xTwh46vh5NacvsN2eyYAvFtl8EZxYrWSqg1hz3xWG6KUgaPvu7quw== 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=5DVaF55QMaouVQl5komwPapTpPIOICfns9n+1zuvyr4=; b=VRQYAZ0+tGTxfw89QqD7TqXNQQW9V1dwnNJR2xR01OVlPjLQCInMiVcKrpCG7BIc3VIu7fww68yIRl8ItaLbEtdo2UctCHBh1CroHuSo0pOGzTwfrVwIXEDun+LqCZeTvuMNXiMXaz0XlN6xQHtyoUaH0raS+Q+15SoNp1AJKg8//M4TrcQd2/G9BCE07qXLtHJ5bbRwu/WkGIFlij+edT7RvHISUhfvRG9rDyxfi3qnmbhSWZYkQru7oPMORgsF7mbJ4/Lt+oovKUEiUAj454Hl3e/8sWhyK/pKAbB7oX9VLAf7horDUeNTI3WFvc8fwMzA+5O5cyEWAD2wVkkY1Q== 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=5DVaF55QMaouVQl5komwPapTpPIOICfns9n+1zuvyr4=; b=CKEmyZ8e8KmXIJdcTB7Kah7FqHMsgpWYSA4mQ62FqW/+9SYFvAjhcImeUzUa2ocO8+x2QeO7kbBOvaIXMss0mFikmoF8VJpgKzx62LhFPO25FPvaPH7L+PzfqMgrDixesO+lsRyt3mr62nN92Uix7yqoQNyUkVUYZw+SVOa+w+htvuoJAWGRpjPR7Qmus4GYcTYfY6VRhbLAqWk7qrasNOmc9pvB7pSxU/Y7bZiKfEmOmuM5aBJeyIu+mY4umr9mir5hDes4tPew1jue94w/OG37GTOgiN7baP5+eiVihL7g3+sSIV9qOlDc1LGvsBfXu6dSbtmbDRuWAmPLJ6i5hg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB9174.eurprd01.prod.exchangelabs.com (2603:10a6:10:366::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 22:09:34 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5458.025; Tue, 26 Jul 2022 22:09:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 00:08:01 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [krDiW9DNI5hQK9elnkGkZPhs2CTdziXW] X-ClientProxiedBy: FR3P281CA0157.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220726220814.695563-25-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a968a322-22e6-48c4-4b4c-08da6f5385dd X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/ULT2wyjUGO4RaZdS3jmh49t0zU3Z4G7S7QWMlbB3HsKx2t3JaimOT1wQPs9VTXrdaPx/UWqepxT5C0Qnmtx//UgIHSxQUb3arITpT8co/IFhJoi8DG51QlHb3mb3X4iXIoyu0ytNy1q+ugJRceLS1k+4y90GD171D111RDDZtBJZUW46fR/kluWDQduwAQ4mKEkyhOkudAk3VMURVHKCl7pjrprNN7fRGgz7XJSfb38tKXsUiaNCAwNovvrTAZAf49HMOhZKXB7qwsFIINQ25G8bH/Ti6HCFhJz1F2g+JFP1bruS5Ntbx9DgwjySConPwqxF/fmFPL34rzal5FpcIw9HY28eCByRTMWEnS71prkMucDwny4P6U6t6t7aGBXCPqm/TMH/zPB+bEpXaoULdhXrPwBlrOsSfipobqSyaoK98AOP3lNayWv3lRZK3zVD/dqxgxbc6wyPgAVYfRazkTg5tvfG36OpUL8VQe4RYfZDEY6KtmZeYDbUyzPyFenNGQqqBCs1K3ZfqC/64bkF1BYYWMbWeH/ZorULVhk8r6qYhXjDR/E+wukMWeonsE5VEtQm3K7Bz5489MS94Yg2V37jIIOer0X5Y6RcJArHsk8iIr2c+hs2m/AgFmJD5XJYZosuPzlWeqbxJaL8sw/iRxCORyM5z4AOkSE3QLF6rKZKEwTZdCT7oC9nE1wgsfJ/huHJi0zZf2wuA== X-MS-TrafficTypeDiagnostic: DB9PR01MB9174:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3dJzbtcwDwoVPEK0TWzB4kHOj8FR/azXH8CeNTQPs4T0RW/hj0Q8HNNQQvK+WJMRMxfP74QIRbBe61ylbUhZSdhRhp2pze/hN/JpHAlc7N/qdzI8vMrPzCz0X/tPW+1b8Rx541NAbNWvL8wNDOUzJj8fbM1u6IIKLtdK5LiSci+PR1EeKQkBiFVg7YQBdosx0X9W4Fy2vdKAXVGFyYgxMTbE5aOLkqo9LSrKe6pQSZhCVejFPIUKM6xCKBSoEJPaYn6MfjWTh/PFVvby051BDfoxSqGtpo8k+CmPf3+GfP3oNI6dQJt7XOur3GPk5OtJDpVtCt1+A35CZsB2mfX4ymHEcXag2lUupNVKvkq2rr9mNSParb/O5ZrZRwxlak6PVcGlsSS12uAJCbHqRycea/NozGybF5JYxQf7SP/7gqOPU2Cnm46NQ3BwwPPQIXvlOudGV5UkZ3pfE+NkHy4KLpzzIpbJ8WficGNMdFKTW++2KDwN0BnOzGI6EfTuwYA3au3MC5/FsagW9sBrLHnkMcyORnSbP6oyRqdg0yKLa2XdXzeL4BvjMfCeBpR5Dc82hs4xrwWMh7l/Am45yrs/EVbkxrs24TvInT8wzkILNkZr4dxXMouldNLT9T1g5pshoVm6bkKlRlc9m1UIC74qNQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VFOcCiLKulBAZrbVqD+3pMIwkNL82aONdgSJC/B7iITRn01sEGA7v6tyYRbLV5zW5bx95+mr9twTLRjYOCGXZsTVAIEJ7z0iIBc7zypBeMgM5R19B3iL7hd5wH8XSLYKUslvn2jwrdiBaBW83R+mZePZPmc+jlvJCg05QXQE+30ZCIw+87QkN59LWvVGsWBjSNMzLY9+dsctD6IguK0l4J+J8mVPMK98pJFprMviF+2Zr9KhNCsEcRk+VWqTnH+YzOggcpikTf7cVKvP3q9DN4u6xbIbnO1COItDkkCfgfUtb2O2EmojRNM102Amd/zkD2p2xSKaWugKAX/YF/8oPwEc6zupf/wXqyXysyQ5ikYc+hb13fYpYi2IDA4z8M0ZVIbk3XxGWNaJ+RTIeaw+rgAMmyg/qvEuMbENITG02O0NwqGumNpQqOnk8oipu1b8iEoBZ2JMljdW6MFi9b+46U3dG9sxcFshyXep7ApMl6uk8eNSgYCvdZzYG96fZC58ZAYB0aGoExWzMehlHiORfgD1XbAwOAKw7rvqmGNX21Tp6EIHHOqSgYc6iPKHz5r2UeYy3oyBWGR7WxDUaWRhn84xfyTi2HqHU+UDidA2K/Uc8ix0VI+zqJIN39OpTnGDNeq7APHN8EsOBrjSQ1b5HW9eTRHhTVXFpO9JEv2pb+GJwz2qACugehjU6mTq437o+ofmbYxJekQlaovZsfqtGBFXSXxcfcrmefGEdnZrPytkg6Ka150NiInyImyNEPKnCFGt+Dv1MTMK8S9+ndZUv2Pegiz++nzm1S6dwrmbv0/ystPxw57sB1fvkMsoWF1gYgpzCVvZQeR8bWpYEYoMlWAPgkmTofn0tdeHq/K7iZuqtiRFlzBKpkSOsFvLayg3y1I0E+dctpaLR0ACfbYRTr5uP6n4WYy53HnAAKZrSX7L2qlvrv861EZPc72H//QJC8RCiDGWbLZXfVgKeueS5pfqaESb4S4gj5oqhxIibW+lmLRBkP7OPHBe9T+JsI3bUiyav8YOaFMZdzZqJDfOSfqeLjInEF6Kd3VJAsndpYnXOaPRaHtL372l0DnBHQ8NS6RL9a4r+OZXy6uPVZh8gwSvr/ISayxEXAqRP4WCf4ABy+HIRadMR1GvMQYrr5pPl+8UcmUpSlyhbgZtuC4e0LyR4RzT8HZ91mG8CAIzT5UVfRBCk6Eox2kLYGT8hghKeJ1qjPD69KKHpoOhVVBKMEDKaAA2g4Pb9RvxxEsLK/anKuaCyvFYaIU1KBMdAsyTGnRwxwoAFeVnx0vFMiRqiUCz7seU2bd0CQLx8sGM3Kk= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a968a322-22e6-48c4-4b4c-08da6f5385dd X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 22:09:34.7687 (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: DB9PR01MB9174 Subject: [FFmpeg-devel] [PATCH 26/39] avcodec/pnmdec: Fix indentation 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: I/6QBuT7yrl7 Forgotten after ff1450e449f848ad4b37b3cf448315ba4581364e. Signed-off-by: Andreas Rheinhardt --- libavcodec/pnmdec.c | 139 ++++++++++++++++++++++---------------------- 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index 7cf9886ce7..130407df25 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -166,23 +166,23 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p, ptr+= linesize; } }else{ - for (i = 0; i < avctx->height; i++) { - if (!upgrade) - samplecpy(ptr, s->bytestream, n, s->maxval); - else if (upgrade == 1) { - unsigned int j, f = (255 * 128 + s->maxval / 2) / s->maxval; - for (j = 0; j < n; j++) - ptr[j] = (s->bytestream[j] * f + 64) >> 7; - } else if (upgrade == 2) { - unsigned int j, v, f = (65535 * 32768 + s->maxval / 2) / s->maxval; - for (j = 0; j < n / 2; j++) { - v = AV_RB16(s->bytestream + 2*j); - ((uint16_t *)ptr)[j] = (v * f + 16384) >> 15; + for (int i = 0; i < avctx->height; i++) { + if (!upgrade) + samplecpy(ptr, s->bytestream, n, s->maxval); + else if (upgrade == 1) { + unsigned int f = (255 * 128 + s->maxval / 2) / s->maxval; + for (unsigned j = 0; j < n; j++) + ptr[j] = (s->bytestream[j] * f + 64) >> 7; + } else if (upgrade == 2) { + unsigned int f = (65535 * 32768 + s->maxval / 2) / s->maxval; + for (unsigned j = 0; j < n / 2; j++) { + unsigned v = AV_RB16(s->bytestream + 2*j); + ((uint16_t *)ptr)[j] = (v * f + 16384) >> 15; + } } + s->bytestream += n; + ptr += linesize; } - s->bytestream += n; - ptr += linesize; - } } break; case AV_PIX_FMT_YUV420P: @@ -260,46 +260,46 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p, break; case AV_PIX_FMT_GBRPF32: if (!s->half) { - if (avctx->width * avctx->height * 12 > s->bytestream_end - s->bytestream) - return AVERROR_INVALIDDATA; - scale = 1.f / s->scale; - if (s->endian) { - float *r, *g, *b; + if (avctx->width * avctx->height * 12 > s->bytestream_end - s->bytestream) + return AVERROR_INVALIDDATA; + scale = 1.f / s->scale; + if (s->endian) { + float *r, *g, *b; - r = (float *)p->data[2]; - g = (float *)p->data[0]; - b = (float *)p->data[1]; - for (int i = 0; i < avctx->height; i++) { - for (int j = 0; j < avctx->width; j++) { - r[j] = av_int2float(AV_RL32(s->bytestream+0)) * scale; - g[j] = av_int2float(AV_RL32(s->bytestream+4)) * scale; - b[j] = av_int2float(AV_RL32(s->bytestream+8)) * scale; - s->bytestream += 12; + r = (float *)p->data[2]; + g = (float *)p->data[0]; + b = (float *)p->data[1]; + for (int i = 0; i < avctx->height; i++) { + for (int j = 0; j < avctx->width; j++) { + r[j] = av_int2float(AV_RL32(s->bytestream+0)) * scale; + g[j] = av_int2float(AV_RL32(s->bytestream+4)) * scale; + b[j] = av_int2float(AV_RL32(s->bytestream+8)) * scale; + s->bytestream += 12; + } + + r += p->linesize[2] / 4; + g += p->linesize[0] / 4; + b += p->linesize[1] / 4; } + } else { + float *r, *g, *b; - r += p->linesize[2] / 4; - g += p->linesize[0] / 4; - b += p->linesize[1] / 4; - } - } else { - float *r, *g, *b; + r = (float *)p->data[2]; + g = (float *)p->data[0]; + b = (float *)p->data[1]; + for (int i = 0; i < avctx->height; i++) { + for (int j = 0; j < avctx->width; j++) { + r[j] = av_int2float(AV_RB32(s->bytestream+0)) * scale; + g[j] = av_int2float(AV_RB32(s->bytestream+4)) * scale; + b[j] = av_int2float(AV_RB32(s->bytestream+8)) * scale; + s->bytestream += 12; + } - r = (float *)p->data[2]; - g = (float *)p->data[0]; - b = (float *)p->data[1]; - for (int i = 0; i < avctx->height; i++) { - for (int j = 0; j < avctx->width; j++) { - r[j] = av_int2float(AV_RB32(s->bytestream+0)) * scale; - g[j] = av_int2float(AV_RB32(s->bytestream+4)) * scale; - b[j] = av_int2float(AV_RB32(s->bytestream+8)) * scale; - s->bytestream += 12; + r += p->linesize[2] / 4; + g += p->linesize[0] / 4; + b += p->linesize[1] / 4; } - - r += p->linesize[2] / 4; - g += p->linesize[0] / 4; - b += p->linesize[1] / 4; } - } } else { if (avctx->width * avctx->height * 6 > s->bytestream_end - s->bytestream) return AVERROR_INVALIDDATA; @@ -358,32 +358,33 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p, g += p->linesize[0] / 4; b += p->linesize[1] / 4; } - } } + } + } break; case AV_PIX_FMT_GRAYF32: if (!s->half) { - if (avctx->width * avctx->height * 4 > s->bytestream_end - s->bytestream) - return AVERROR_INVALIDDATA; - scale = 1.f / s->scale; - if (s->endian) { - float *g = (float *)p->data[0]; - for (int i = 0; i < avctx->height; i++) { - for (int j = 0; j < avctx->width; j++) { - g[j] = av_int2float(AV_RL32(s->bytestream)) * scale; - s->bytestream += 4; + if (avctx->width * avctx->height * 4 > s->bytestream_end - s->bytestream) + return AVERROR_INVALIDDATA; + scale = 1.f / s->scale; + if (s->endian) { + float *g = (float *)p->data[0]; + for (int i = 0; i < avctx->height; i++) { + for (int j = 0; j < avctx->width; j++) { + g[j] = av_int2float(AV_RL32(s->bytestream)) * scale; + s->bytestream += 4; + } + g += p->linesize[0] / 4; } - g += p->linesize[0] / 4; - } - } else { - float *g = (float *)p->data[0]; - for (int i = 0; i < avctx->height; i++) { - for (int j = 0; j < avctx->width; j++) { - g[j] = av_int2float(AV_RB32(s->bytestream)) * scale; - s->bytestream += 4; + } else { + float *g = (float *)p->data[0]; + for (int i = 0; i < avctx->height; i++) { + for (int j = 0; j < avctx->width; j++) { + g[j] = av_int2float(AV_RB32(s->bytestream)) * scale; + s->bytestream += 4; + } + g += p->linesize[0] / 4; } - g += p->linesize[0] / 4; } - } } else { if (avctx->width * avctx->height * 2 > s->bytestream_end - s->bytestream) return AVERROR_INVALIDDATA;