From patchwork Thu Aug 25 16:34:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37487 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp452795pzh; Thu, 25 Aug 2022 09:37:50 -0700 (PDT) X-Google-Smtp-Source: AA6agR5EJcnpoB6Nc7S3WEaxp9osMFOvEt2fNv46O5k8j2M35r68mFv3U+GTrOSUlUxWRbm17gsv X-Received: by 2002:a17:906:7309:b0:731:5c2:a9a6 with SMTP id di9-20020a170906730900b0073105c2a9a6mr3044634ejc.486.1661445470027; Thu, 25 Aug 2022 09:37:50 -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 my7-20020a1709065a4700b00730bc26e631si4291281ejc.739.2022.08.25.09.37.48; Thu, 25 Aug 2022 09:37:50 -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=YreMAxnT; 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 0B42E68B9F2; Thu, 25 Aug 2022 19:37:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2075.outbound.protection.outlook.com [40.92.91.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82E8068B9C3 for ; Thu, 25 Aug 2022 19:37:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a2C5BFZG005rNO/TGJ5lCDT1n5sTtxYfJUrc8Ryj0wmyHpN90v3GeJ4xbqTySbsg+VnaD7418z4woSqgaC6QWpQar/wHVbVv0RRmPP92XMjWs4LhgMDph+r8SA6Fhzg9OA0A7w5qhkdwExVVStYLM4BTUqaQp9h1i91RUDUOpYzgj0fKDehwwwRnfCKZB5jT+WzDoyQNLYKNJ5MCtC+8+TN63VHtQxaS9rcE6b249q2iM6HSZDz4kgalPKnfR1rvhhHi0PkYZ9CfdK5NdLiQQkvCyGUJcP9gvdsZF7nJwQBui5WGushZXcCuHJ2/5tBanB4FX3qn9KfhkpKzSuNJWg== 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=Vm3RFHQ/YIKGW4Yd+twmH+V+KH8svoLUIc/l3S6qr8I=; b=VUWx+aNDGhDqLvwLgDduwOK50X0lSBAcIpt+ltp6yOwmR+cTVu8I2/Q9/gu8/rvBMbIfEQkBvxw6VkE8+gR9PjbC6wYCqpUfMSNcLcR7SsDzbIVONHvooOiooe6m1mkDBPl6ntjonSlNsCf5S7uRbCNYHwxkRVeeP7TEHt39IV/zfxsB1SudT71r0e3EoEwyfjjWPLhjgNwaNgFJf8FdNGI0FqmMHe8rxZSIX9rB7qqN8HG1Y38GsgbJ+3AbvxXVxEu5vZfx9K5tVWbnFO5p0PIHmAZJ2QyqV4T1C7+QISKz6gCg7Nnm+Sn2gOA/bU+k9agVd5qKLbHvNZdaq/FWIw== 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=Vm3RFHQ/YIKGW4Yd+twmH+V+KH8svoLUIc/l3S6qr8I=; b=YreMAxnTPu7cACZTue+aRFhfk5BjJsYPwbX/AloLDGCIWaCV9xBgX8F5IzlDAt7vsRLydG3JAJQyZXzDFQEKV9NUQZh6eEwu+kugYCNFQLj7T9g67c5+oK6WpsZYjjqRnQ0VUMUfxXw2QEnLGl835aiqi7AlITu1qOhRHqSgp5CmRlwueJrVZfGL3fTvl7EEJpA/ClkPbJJxCjPXw6ueqYczQDedO2jGBM8TabyWjNSrIfLa2pCUZaRD+OVskOB/GM1irQVs3K2D5Zl1uNZhjl/1q6WTZpT6RkM68TSRZ9ytv85gtHL3btx9RdN+dLWAtxNqM/mjJICNRmDWE8PMcQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PR3PR01MB7017.eurprd01.prod.exchangelabs.com (2603:10a6:102:79::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.16; Thu, 25 Aug 2022 16:37:42 +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.5546.022; Thu, 25 Aug 2022 16:37:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Aug 2022 18:34:00 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [sId/3prjPZBXI6GXOVJRxInJVfk1/Dnc] X-ClientProxiedBy: ZR0P278CA0051.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::20) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220825163400.420541-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ed36144-3370-49a1-4856-08da86b8219b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWxJUMtMcNsrDd7vkjDy+zOLsLexs1GJ3Ca7guuFGsSctbdBk0KqM6wV1D9Cmvj2YoTXOCzA4u3Zihjp0OH+iJ0bC/PMszSySAP03s824L3nLEEWe89xoz63HgqYK3luMr76RPZxTyDWEM4OggnPVn8h3CrjrIJl2JH+9zUOOJCSvBxBW3qtFQmGucccKu5f92SjNfPAPW7WHyPchZJLBq8BCddgpuw3XWNErmYj55CnzOnXZ8l3W+WJglKqt3KVrp3svWQe/NYzuTtoqPIJtOANKAnbJ8VSpKFWCBg8awQk81ic2zlp0Hgxz+5pYYC0Wtz6m1vSuibgMggbCcVF5WF0vjpGd3jqohMK5JeCatUf7X6c+FFPF0PPWMj5EPryhRN5ad3jdi+kKHhSpWmhGEM5pEQSm/w5kEf339oxRXXXHqoOLEXWoUyjJLtU81K83PJneE68cyY4zhCgSOt+C1g+qlEiwsnyGf8OZDYZxy9yu1mii4UoCFFBql8ZIoy3uPtKrLJdG5nZiUKeQ8ckSllbJVNwSI4gPhut9bZjFFys6n4Im4HK2cqYjOb49BAs1H8dymQjpUu+n+NTIy9bantfR9QBB87SJpRgneuaJtQOS57Xd2uiU3NBzLTlfYmqfR6XQOtkrpgxpMzyi8AUtcHJACmTYIqLjw1kD+GyETQ2U+FssWWChppfKkjQHcJrbp/CHtCNkxAZjcH1moCii8uWOCcV0NR+F0= X-MS-TrafficTypeDiagnostic: PR3PR01MB7017:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +AcEZkE+g/Bi4FFrRWdedlpgl8XO1lJv2ogUIcY03HBRo3A+mNZquuM5BcxBJmYGma37+2JqyGIGURhSoB/pr9xslrTI6kau07CMBizmyzdPAx+9YSCQba1PzJFcUClukyPSLlGCR4rjVTwrViK+Ip+lx8bg6gdT9vnofAGv4p+tMMbnJvDHCKAdh2TCfr9Hz0kyt2XUgBKpqChKlZJsDeOcnaPlAp1woHPob/0p5QLbvxR5OXvPR2l9sdXiXw6TotoFc+qRWxndsuDk4HRHsn64K9lxaRmfsVYLWt0FzvjWl3C/9oGlWIfChHktQ8OaoOnfeHp6eLKif/bVyJBAByHDwwUYqj5/vfzlUSR9k7lTx6skDJhFny243XiIm3Bd9866N5hCExO6JqxHDuLWtEj3Zu8hD14uY4i9ITYSqVrAPRMzEZ5i2+M4BHRof0H8dcApUV8RVOUiXmWrBTyMmDnpFvaCBhMVHjI8q+qBQ2ZN4sg2XyRgAKPIg9GXGz8LRPub8JmfM6pPT5D6xSMdxFsdfJwQs7ktLs+eEje8WQturtPC7j7E69kFv1TTyQa72Q2RJP3+j1KNnCJZ3UcYOB4FmJ9UBJ7YRxaOgryuRsDitjwcMY208mm/ZSSoXR/uHsQSgd4sv2pYgH/ZPzL10Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MzyOly+7fvTwJLKb3N5vrMuRSveXhdXLrPEGKpDDLFXpplTj6YZ1FfOK/dQLE9App/zjZBwSPj+PbEsTEPobXqujAERTblwC6LM7ZWHh7GRplLEko7tJKOkWl/HLEW39TnFTRfCcAjuoZEL/6Vq15y7CCToztOcFDzovKAHLUsKDnGSGay0/NqGuQy1vPJqFnfR07FcoMP+j6zEl29QrIB+yNg4Kw016V61hAgkAWpFKLn4R7TwwH2EVq54yPcIqHcArglwwq5uL1eGMoAxwWfmZknKfy8yvNODzTMHZLgF56tkqqGsKl6upSF686oR7J/j8U3JoyScPsN8n1dZkFxT+1jxpF6I9TXhmB01N++3Fvou3o/4+7lV/hnPQvOC9YO+ed58TIuFbwjFdf8lUUtYRsRThfCcm8f0Fj30Y3Ky8fcGVGxxTDWV3t+oJrdVZyT+dczvtxKhpbv9mriJSvcTtjYiJbewC71bl5e/6Ru0h77gGQFWtbVcrLxhyFigZCa6ctv9x9YZqWnOiiWeTDsoT9X1svNd1rsTW3KbZrA2MidxvFH+9AkaKbDvobkmrXuFvka4clFGeA/cUZEriUoGMumQIOTZwAd74rsAHMUDFs+y8S1FEBV7Rrgp55z1fQrJ24z9yUqLRirIGrnThKaF4WH/vpM0OlY3ztkqQYzi7aEJhWRnAio3hVsYMY8VBnIbPu3Kqu7dZFlski3Q2EO8f5OMH1dJH3PUgveb1rmf9CRFz0uMXfto71FDwjgYMfp+BZ/lcbfK2zpOsat9a1qDD4fzLTbksmI4nRT1TanPgaFJ2H8Befjxl4zTHy8lza56omOGFQK6tKEu7+a3Bo9nGvUFbqnh86n6t4C3/N77yWnw/QI+4UxrzE4UqM9THckFQdgRGMtoRDLYCqKhHlRnihMaHdJvf70FrXwJAf27zf+6xA7UOK5oV/tvIfNxGjtL9C+0rvCr5MkaOa651EbiTakk+tM9v22iu9nng2bWcKKKcp9wNQoJjwoYmHUXUF59e8fTqiGiJVXW1iIL71k9sbag0X0nc4PoloVs2QH2VDx78MkwP0EnWy7peH873zVlZW36Ge9qa48KEB/ed0knlOwKYeMlOXsMW/Y2R/201ZgOC5h6ZFd2yMY76P8UEU7uJDUrdvY5afynaO8ybZuBtzTbZp121zyW6mzfzPx5xRfouGRIpuLAbbdwTnN9Dl7DXTy0cdxQhuUpwgNUNtHIDnuXzQtSp1HufxBFOzEmDEwqjH/6ojDmdQGOajw6eCZjQZDq3KwWPtTjUfo1zlpUJGJz07Sh7XIPFbntnFUw= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ed36144-3370-49a1-4856-08da86b8219b X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2022 16:37:42.5087 (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: PR3PR01MB7017 Subject: [FFmpeg-devel] [PATCH 21/21] avcodec/targa: 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: iqCJumnZpM2G Forgotten after 1e85a698c01133a7f8d35502d5901e3b65fa3317. Signed-off-by: Andreas Rheinhardt --- libavcodec/targa.c | 75 +++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/libavcodec/targa.c b/libavcodec/targa.c index bbf4f6ca19..daade89e28 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -253,49 +253,48 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p, } } - if (compr & TGA_RLE) { - int res = targa_decode_rle(avctx, s, dst, w, h, stride, bpp, interleave); - if (res < 0) - return res; - } else { - uint8_t *line; - if (bytestream2_get_bytes_left(&s->gb) < img_size * h) { - av_log(avctx, AV_LOG_ERROR, - "Not enough data available for image\n"); - return AVERROR_INVALIDDATA; - } - - line = dst; - y = 0; - do { - bytestream2_get_buffer(&s->gb, line, img_size); - line = advance_line(dst, line, stride, &y, h, interleave); - } while (line); + if (compr & TGA_RLE) { + int res = targa_decode_rle(avctx, s, dst, w, h, stride, bpp, interleave); + if (res < 0) + return res; + } else { + uint8_t *line; + if (bytestream2_get_bytes_left(&s->gb) < img_size * h) { + av_log(avctx, AV_LOG_ERROR, + "Not enough data available for image\n"); + return AVERROR_INVALIDDATA; } - if (flags & TGA_RIGHTTOLEFT) { // right-to-left, needs horizontal flip - int x; - for (y = 0; y < h; y++) { - void *line = &p->data[0][y * p->linesize[0]]; - for (x = 0; x < w >> 1; x++) { - switch (bpp) { - case 32: - FFSWAP(uint32_t, ((uint32_t *)line)[x], ((uint32_t *)line)[w - x - 1]); - break; - case 24: - FFSWAP(uint8_t, ((uint8_t *)line)[3 * x ], ((uint8_t *)line)[3 * w - 3 * x - 3]); - FFSWAP(uint8_t, ((uint8_t *)line)[3 * x + 1], ((uint8_t *)line)[3 * w - 3 * x - 2]); - FFSWAP(uint8_t, ((uint8_t *)line)[3 * x + 2], ((uint8_t *)line)[3 * w - 3 * x - 1]); - break; - case 16: - FFSWAP(uint16_t, ((uint16_t *)line)[x], ((uint16_t *)line)[w - x - 1]); - break; - case 8: - FFSWAP(uint8_t, ((uint8_t *)line)[x], ((uint8_t *)line)[w - x - 1]); - } + line = dst; + y = 0; + do { + bytestream2_get_buffer(&s->gb, line, img_size); + line = advance_line(dst, line, stride, &y, h, interleave); + } while (line); + } + + if (flags & TGA_RIGHTTOLEFT) { // right-to-left, needs horizontal flip + for (int y = 0; y < h; y++) { + void *line = &p->data[0][y * p->linesize[0]]; + for (int x = 0; x < w >> 1; x++) { + switch (bpp) { + case 32: + FFSWAP(uint32_t, ((uint32_t *)line)[x], ((uint32_t *)line)[w - x - 1]); + break; + case 24: + FFSWAP(uint8_t, ((uint8_t *)line)[3 * x ], ((uint8_t *)line)[3 * w - 3 * x - 3]); + FFSWAP(uint8_t, ((uint8_t *)line)[3 * x + 1], ((uint8_t *)line)[3 * w - 3 * x - 2]); + FFSWAP(uint8_t, ((uint8_t *)line)[3 * x + 2], ((uint8_t *)line)[3 * w - 3 * x - 1]); + break; + case 16: + FFSWAP(uint16_t, ((uint16_t *)line)[x], ((uint16_t *)line)[w - x - 1]); + break; + case 8: + FFSWAP(uint8_t, ((uint8_t *)line)[x], ((uint8_t *)line)[w - x - 1]); } } } + } *got_frame = 1;