From patchwork Sun Oct 16 20:46:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38748 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1306336pzb; Sun, 16 Oct 2022 13:47:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6ghGca6gBzCMwJ+go8Jq0n0XHmxUhTbGqyPcZxng2Tnh8HIRIt5BMRtvJOO1l9eP4efw9E X-Received: by 2002:a17:906:8a64:b0:78d:b00d:fe with SMTP id hy4-20020a1709068a6400b0078db00d00femr6469422ejc.32.1665953239967; Sun, 16 Oct 2022 13:47: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 r15-20020a17090638cf00b0078e11e92257si6502105ejd.333.2022.10.16.13.47.19; Sun, 16 Oct 2022 13:47: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=tG21b2r4; 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 7986268BC7C; Sun, 16 Oct 2022 23:47:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075074.outbound.protection.outlook.com [40.92.75.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E6F868BC72 for ; Sun, 16 Oct 2022 23:47:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m4wYy6jPQRscx+kSKJ0SqZKy51zLsN5MJs0QqVvdbfBwmheR7Mf8IxlWMEaCkW4hAJwvRBNs6lk3lvqfrX66Ek8Zq+qnRgRHE5hO16l5YaE6wSdt0IshP1UXIVB6plkM2X6OHNB7MdCQk3CvHY+9Q8GfGWUpC1Br3jyw8fr/l+rpagDAz/rX6NhzFCWoYFf6F8KhVDcxc0G0NQD/ROwXKUtyRQHnXpESF8cXNIF2AmnlFuGOYbPyIWnsz2zX444xeECRmIV8dO8RHD8I/kaIO2nFh/Su6C2j1bdqW4przOCxitNJpZgiMf+ny2qDRrP+tTQkSzukILaNJ+YSOeIjIQ== 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=iISBC3y+Sht+LMrqgW21a+6dhJbXY6nWzb/G7vDeqHw=; b=Ly1Lgk0RZRZq4203BArjoWKif3/7emsFMcZOrl5hsY3cUelKAMR6GV4KCtItGM+Kecc7YkEpDmUOEphpnoqEULRgLYSQaNbcIuqEm6Hy5vol+GYG3OVRvQ1qhfk61DlIg7zkpd4y4gSbCsNKmrGysW3DEo5+ZnrjVKCnd28NXwOmyrl1BeuY9zwhU6Qv2nJzDJa0GMOp9/TG2w6uEdMjKknw7fB3Whs+feX9f+vlgArOjnZ2tMEpwDUVDtllXdRano2iekeKU9S4zsCuFLDjPOZdUzP0dZrnqmP/o46Zv6xLzXXlyfOY/uTlR/hsZKwt23VYqabf0D2VYgz3qthQiQ== 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=iISBC3y+Sht+LMrqgW21a+6dhJbXY6nWzb/G7vDeqHw=; b=tG21b2r41R8+8ilp+zxpW+Kbf1JDQ+CSvejLcrNJy0IuA1QzI7VRc7Hi7ASeOfzwiztfzOWY2zx42C9HyRd+5quOEE3ESYQXhOPdAvUA0ZtWvPkxGGHAKAr9x38KkGTnQlWy1ZCgUK+yh6eUtZoI/zoafK9oiFdOw4dOAqW4UvDaPngww7qY3ZmZHajDybTKdmK/y/GGPpusu8we7yqv81/whs0EZwym7wHovPSz1SDyDRUBuJdGWaSs9ck3aYHRqeA8tndUCNlMfQuzQnB6V+cAnhMcREOhdz9oy/6g7W8UGqRQxtKpbhOK49hA9CPQ1PCp/S23JcuzKxjCmJorVA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0090.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Sun, 16 Oct 2022 20:46:55 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::20c0:9c9e:87f:79f]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::20c0:9c9e:87f:79f%2]) with mapi id 15.20.5723.033; Sun, 16 Oct 2022 20:46:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Oct 2022 22:46:50 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [huBrIV982uZsrZZ0uNgCTEAwJdk8XX0NWHfPA1cTUVI=] X-ClientProxiedBy: AM6PR08CA0035.eurprd08.prod.outlook.com (2603:10a6:20b:c0::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221016204655.605202-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0090:EE_ X-MS-Office365-Filtering-Correlation-Id: a4e81c5f-438d-4543-bd1b-08daafb78f7f X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmriMkceEMr8g+y2B+GCHAesWGbqWWI/pEa2fs+/f+yRRVjKDzWRMuPoiMxD3bImCS7OKXC6+gRC5pLH1+gHwIdKzQ8ZhEznZVeYeMloFGKSqKVdFRastNyBXso2G/1qvg47I+T7Z0MiqjQVzWEa2vnCHRyx9cv5BE+yf5IJvSllZQ4FJOrzVIOkBJYwdZkh4Thnbbxxt+QIDuaS/0RjCTi+DdA1GlKHHMUaaOw3zRuApgHxBtQJuXioGQu1Xf8vgowKu1e1ej32pBJ8pPSlivKFtXfV/JvcG32UdQBjD3llau6Sz8MpuQ84C6wEYGhatDThvKGHrIUm8+n0OR4/GOeJvwM1AbHhGGh6Q0I0voeXj5aYEEYVqrAoyx5cz976AxvrQ68vb0YH1E87PlajGd5HNtd1mBYue84wZCO1bI2WobAV4gv1YkpGLMgOYPzla3CymadSOydpzZITALdJidJDetgAiSVv9jatKSahShcVUa4BLI02Yd7vM9FiuE1X8RTh1enjlEDqxgY34PjuZGdnNvBr10n7fl02hm+A388+4/P8Ie+qIN3ALVj52l5IcCfUG9+k4KmYNWnxC784s7WT6oEtysKsIapJPK0epEkbXSLmOsHdB3wXPHc9x93CiRtAWeXYBci09OKLD7VF4PywZhKX/JMxkX27PjAOhofceXEEC2hlD+qrNicn8PFRKpiEXObrN/pfMYTmE8+NXW7ZTJ3lnUieoKBXjFeSc/CyaB1x1eZwFs2gNqWyHpWpDkA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CwCoF/xdGHp021P+ivHp9MMHU0H1fVb1z/fJru+1jdPNvh/0i9dtN5yj++0QGSPWQHRQ73z7RXzd5h3IbO0yvkZrkxTkpOVALZzhIUql1+UE3L6Ujnod/FHPzDgKuQCnax/wIxGfaWZZvFcUOnqOhQp0Cjrj6By8zPN+q+TgsZMrE7oi6YQW0mcCjhKSlOsYbIdfsqqNgKyllqAGApAWKPlhsPGbeBHTwcW9BXwL5jB25d0Z5kj/qpl0/W43KVu+oWcMRxJLtj/NLM5bgZmR/6hFcEGhEOkCLtlwlMl08pAz0yLW6tEw2Sc3ow+TndcDRemeUqtACyNumfb1Qvru4Mb2GHLL4eOByTnqUYEVVFLfPZASyJ9+D/bQYnGRn8SARveVpDHffEJjf+aBPFdfWr9TF7FRs8whNhwuvr1ABm1PCf7bbYeHqX1FFIIMe6tUNkVMf9W/2BtZU1DqVw5otHLiE55erBVSuMi+KDE1YcvcwpqggKzqzcBQHl3aDRLLmBDPT/12XKZdbm8LgULsrQ+woBoTzvrq4wT7MuTKRGxn3qfFbND1+SWKfiAy+fn2yNydyteS5r630p6ft7e255BirjYRPIdDC1TXUSHHlNGXH+jnnkQLuZda6ptcaVfUkLcLynZ6qJ/lhnZMbSyqyY3vlV5iDK6T+6va9fkNxAlQ8GwRku3bwDAPU/T/A4vT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5R3W47q/qNRecMNHWkircBNGOW5/g43Pqb4bsBycgzwGHsqo5pW1Y8myUObMZSE71dY5TmNnWYZTAt5kKrDMhhISm+Adnld+NOhnWc2gwY26m9AlUgFSE2d3/TeFbnmRdNS2VrL5WI70L0fFff0ue4cu+x67pJ0vyPtutnPItf/MylkvhktwfHPlBFOW7JEnk7d5Tb+NY0eFU5mfzb7bZ+YFy4421N+l61KJBEzPQ8db3gl7HFH0kQS6yNHnq3L1+xtlmEyIObesz9Dw5VV4amK9VmwLtqYl0iSuSIKbN9tGvAOmTEnvI7z0bjPG2Ff+Eo5KzrkhAL1ALVEGJBXsegvg5sYOJMrrX3ok+OxCBluaYG6A9hqG2+vX72RLGhceAsXbzEhjZztmkMdZoAsTXQMf90UV/+1QxLbV8dNm4+BHeEqczoCSd/gD0v67J0R3WCDXTr2KOn+DC/baNG5IptI/36bHhbPXhuxDsg3XEtJmIT3ljRHPyEQEj0dwRNokF9eZyfBFPBNiJmIS3AC7WMlcLr+ibVQY5TmdAR0lk4kY+KKAzyCoj7zrye/rfyaURF4VNkqHwUpiBNVs9Ybnu4jZS/EpiYPHD/ip4WxBT1U+QjXe5cZiSrTllGFxfoAqfqwvpWwU8Aaxxa4zVup7YfF3wSdSMvHMEmCX6mKxlbCe9IpWyr96qvklp2/M/445n8ILYBX4dSrbAtcjfwlMxV9TPCdnYds0dyq1JSXAZFGLKaegB5bCVuVgsRccGb4xx9tkgMrTloBFYzznjWK2GuUqjGsQpcdC/ofLeRg/3eqxwFolVbTzK5YalYwSFP2d34GHFKhM2L0DHhVbv9Fv5TC+SYjhs3Ws72H3GI6gT349M6g8eUNv6KIsKXgLVGOmKxh4GElLtRRQh43LZEkXyvQ24P9zH+DXx14DPwcRRQp7V6bG3E6t1SM8kJ8TMw45jJvMFPLULH9scTBCpGUyyKPeahdSLk56AQ2B2SiUzIA9TXx1X4z28E9XgHk0ywliimxO4JLOOsSj6kQLK0dFmTjuVn17eeJY7AvZoz8KG4vdRYa2uWn4qd4iVsBv574BGe81u8W54cl65p8kTABKhFpikearVeUU777k21Bh0PGOJWLlcc+jNS2DqPA0fqrrrLw9BS7s/7V/p9ZkXb1KNM8hjRnev3Zpvqib4JobaTThIRaYwmzL6UZ2LJC/AJDJ0APrNNETfPWICdBFqHYwXmXLbpzuHh91fXUoj4BZQFxmCnB0+5V/vxImzYVdcD4mRQrf57Z5ajLXcf387/D0uV1+JPu3iJudisJMl880IfR2p0OkcGiUyfut+xA2GJjo X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4e81c5f-438d-4543-bd1b-08daafb78f7f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2022 20:46:55.0092 (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: AM8P250MB0090 Subject: [FFmpeg-devel] [PATCH 4/9] avcodec/mpegvideo: Reindent after the last commit 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: p/eHOEEI9PjF Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ad13832fff..87dae1b098 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1584,16 +1584,16 @@ void ff_init_block_index(MpegEncContext *s){ //FIXME maybe rename s->dest[1] = s->current_picture.f->data[1] + (int)((s->mb_x - 1U) << (width_of_mb - s->chroma_x_shift)); s->dest[2] = s->current_picture.f->data[2] + (int)((s->mb_x - 1U) << (width_of_mb - s->chroma_x_shift)); - if(s->picture_structure==PICT_FRAME){ + if (s->picture_structure == PICT_FRAME) { s->dest[0] += s->mb_y * linesize << height_of_mb; s->dest[1] += s->mb_y * uvlinesize << (height_of_mb - s->chroma_y_shift); s->dest[2] += s->mb_y * uvlinesize << (height_of_mb - s->chroma_y_shift); - }else{ - s->dest[0] += (s->mb_y>>1) * linesize << height_of_mb; - s->dest[1] += (s->mb_y>>1) * uvlinesize << (height_of_mb - s->chroma_y_shift); - s->dest[2] += (s->mb_y>>1) * uvlinesize << (height_of_mb - s->chroma_y_shift); - av_assert1((s->mb_y&1) == (s->picture_structure == PICT_BOTTOM_FIELD)); - } + } else { + s->dest[0] += (s->mb_y>>1) * linesize << height_of_mb; + s->dest[1] += (s->mb_y>>1) * uvlinesize << (height_of_mb - s->chroma_y_shift); + s->dest[2] += (s->mb_y>>1) * uvlinesize << (height_of_mb - s->chroma_y_shift); + av_assert1((s->mb_y&1) == (s->picture_structure == PICT_BOTTOM_FIELD)); + } } /**