From patchwork Sun Oct 16 20:46: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: 38751 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1306414pzb; Sun, 16 Oct 2022 13:47:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Xkh3zT2prEVcM+95dlV5hMbQB5IlDTQY3TkoT/oe5oCQNpTvRDgu8vYGNbxaejvX/9mDe X-Received: by 2002:a17:906:30c8:b0:73c:81a9:f8e1 with SMTP id b8-20020a17090630c800b0073c81a9f8e1mr6276730ejb.649.1665953264764; Sun, 16 Oct 2022 13:47:44 -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 dn18-20020a17090794d200b00787b0b0a96esi7248364ejc.131.2022.10.16.13.47.44; Sun, 16 Oct 2022 13:47:44 -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=IDlbIiEz; 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 D9E7868BC90; Sun, 16 Oct 2022 23:47:13 +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 5AAC768BC89 for ; Sun, 16 Oct 2022 23:47:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n+Srfr3CsNWjYhbUyf8o4SVvK95WFRdnZbU86Uyze2OzMCrdaIIc8Iq1ZwPdkMzzfgxjm387h2FBNYQfuaT+TTHHuTT5b2+UmS4CpclQrFrT1mogUTy+8/eeP8MNuxJRN71XTSfCYKGyhOKvNccVcke2VWbfHx9+0hJ8SxJ68URdXJBXpz1n77Q7p03P87TUgYhZ3MHpW/kI4CUQPaVoFthCrQefES7w9/mbzuh/r/Nc3U8ia3eohIm4gDG88gITGzYWZjRPT/ucd/7FldI2qBGWOiwkNREL88GGGPyz1LPMhCCQL+8jOgfxsM2rzCm4X4qWT/7rzzMBNzey9wedcg== 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=0kKUDBw+pAOXSjC+01JnZYMyMJNON+zEzliBrI2kKAs=; b=NKewO3zeT19jbBwQh9KpPaCxvDnjmh93EHBECppevaiI5916xJE4w8qWyxM78csUgwbJHOe6H3CHdjr1u+hwh87Zr8+hdCmwnV9eZ6MGjk5NyLwX8AxVGYXhLIGlafCdE4vrqaa8EhzgmjRNeYOf5DzUb3tqpHwJy6u998apFlASr3NOtlMp2/xsM6nyHCi3AUqYiJKpHl4EuaiKtVAbjB7ZFw26jnb1YgQhAYfL+dVEnwHSjL+SWJxMUJjdHZEtZxTuv1/89km/9kanvdSNlCbnK/W7o46lSrDrLyVWutZLXFXCG0bK9evFfYcZuSgRHVnmc2fgyVX7xejp7io20Q== 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=0kKUDBw+pAOXSjC+01JnZYMyMJNON+zEzliBrI2kKAs=; b=IDlbIiEzW85aP1IzyBaHPHiKPlVtF2myerj3plmaeXstH1t5+hnKp7h4S8UCMcnfIl0fcTDmIAxFHm2YiClndlE5hHRF2CL/lKY+x7bqwbNWtiU+Wm+CspxKM8XM2J1pygHP1Bguqv/CbQAESLg5d9mjfm7NzZzFZnj1WYfNVqPWkaqLjwCKFfdXckgU4YE5coFw5e9Kj++VB33CNwQE5JDhXo9wgrq7/veZhR7IxH0A6HRWKBM4saNA0aXPB+8E9ZDmUYQt1m9e3xhndXd2W0ti3DupGLM7fQigffI+X3byWh0Nbj0pmVnKG2L6rVST86fJqTrtTZxUrtU489q03g== 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:59 +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:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Oct 2022 22:46:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KWflVosIwFjQ3FbbeKk2U8pTY7T92XeQ3bScQ7AMJ3M=] 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-7-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: e8e7dbd2-0455-4309-7f8a-08daafb79246 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmriMkceEMr8g+y2B+GCHAesLWpIlWrniRv2wXGXkX0p3InHhOqiYR956kj2vUhww1+CUuxb6gE+uz9oCMlFMRTIqDHifEmwBwaaImD2Cp4i8f6/udqLs10KgcrKiAbK2fdNb9JxdlTcW0zv3QfLkiFUBAOhoUKAuomkvPPBYm4WJa5OzegvX32j7uYANbtZRfJuDMqrRsUYl9gNU7NPl2xfB2y1IO73wuZm1jrbR2wbUb2XzoePadqaJSxSqy2R1kx2b/b/haZVvd9Do6VPqUC+4lygAEIpQMp8ZeNdOAVUBevjVG73Xz0gabx7R+w9Les3SjT7NY96zngwhItVdFw2Giiakjvfuqd8pC1YRPNb5UM/mTA6tp6dVcG+wKrTvtDzSHJ7S0MSYi9Uswu0uAKRgtoXJePidm/OOYkEJO5Rze5GIaxOiJ3eP1k82RioQT5O9IYvEjRsQ5VFyr9zM/zdj60vXNMsiHaBRANfTkUtmCdbv1pVnKtHKbl6PCc5NCFHDUAIS5fKFIkGADbnDq8953BwQmowME74Q7MZVItCki5ylR6m4rBUhLaeFkR35H/sKEHCrKgCPoKtEPVdgPf8WjQf4xXhbZp8/U5r15NLg+GFoZuoZZDXcClAMcS3bFL+OIqLmHue2aT6/6J3ngphuX0s4e4SjW7syspsPSxmSx0abrrCiYBuFqbeDXkemWDK4aE0/BJUgd1ESmJ5daedCH4yJANodl+rBo3LzkvzoFbrUgATjf3TCRDw0w64ono= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w8dA/BnPEmAt9xwh1IOgdMAlnVLRcONg25EFvKmWD1eUgoU7kwl1CyyoFSZo58ixpKDQjjY8qbYjqgUw5Fu476NpE7+Fou2PDKfwlXl5wYgXaUJG6/s1jAPNAN1t0M+zgyGLlWZu4dZ5rKJzMhD9NHL6NXlUI8jsAV4wPcS+0SsThBqnYeOdSSMPnvk5wLbH+pnHWmciBrpnbIIgxdEGbJb3qRDSWaO95v4T0kTFHlGwnmVQuw4T1gFRSQ1b/gY145y+W62W9TXlHd/oZl064KaqVJ/hH6qwaYgn9cRGlHrNWteqoCZ7aMUKYXORtVSDCaW2K/QVODdrqYPyB+BzOUpYL0ZzshED+NCnvgg1tNXe7nZbzx6sR/KW1y0vNp3+mpgRRiAk2A6WQWG9DP8fpA/lk3ISOyR21Wkwr5tu3W5DU1jwwJCuf9RdH78/lUEo03z0L4+J9mdYquA6f4jorm9eWc+oW+0DhV8xt/bHJbaWxWJwtzJb2e9h0Jr1SRpgw6UthXZv7Uy82mlBrS5EI1mMADEzKy6EEW2UGOTWjfmwAwyNTOZacxupKAJx33G6VHTUSVZ0JZhZoqoOIJhh78H3ORi5GOBtj+OlAzVwoB7PkOgG+AeiTJ/xFtykB+WWfJNqc/LQN0+iX1tH7ewNHD4fbytIIbch4zZIOhT3NgNW2ebtP/iqbshiXIU6jcBB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i5Fn0+fJCpl/kCiHOLjYEozm54odT1fQm+t049Kr0SHV77U9EtdQHfUVFMwp6MdH6IznWQjRLWD1ZJaoQUcHs38Cf5ZJZSl2Zgm3vt/h4aYk6290V3c4gr9hxs05Sgy/K92OdwkV3Nblg9NqsaX8Rp/vlTEWUqS5lajned/IrgIJ4pFUkbSLB/nnTkySkbzI8RmiAbpbDgofeVWjLflckDCCArYAqpJTDZs6C3WBqzcOwZW2IZIB8sDF7pG4IsE0iT5BQgDUbHJxeNCoo1NAJEHViD2CFlqyCDBV+lc7vjLd9CHN8X7GO5I5F7qgyY5/z974hveA96xJi8MCLSBA/IqXbiSvAOR7hHdYa2B1vIXAPQkMsA8CSlbgpwg8TwAzVwVXm4v0iqm/Q03IOh/rhWtI7i+Rf7onJXcvtb3j7mwrykVvt/BbiynoRuejsEfs3/ZbLwIOR7U1VcAnkrpUYkxlEkzTc64N6hU82tizysArsisccJ3XVVTpDfauqIc7uX0TZEo7MrEap3D0n0rUilF9/ZK64jWn3njehQJJmhIxKisG3vPgjyE4XnsVhGZIvs1cY2bAp13LLhX4BG0Yp3USh1qVTWMneHxctdWrULWXWRSRfBVCc5osFOyilRzWlQgB6krPAyxzVtATp9Accx+p3cjCBUGKutgqk9X5TI6qtPBt+cSoAw5xgovTwbTch47ENTJQaDlbDO/idWWxMPk+6heeTooPB34x/+ATmqHalshufe27WLj+XbblBE1k0CacBvn90w4MrR/4PWcy6Sg18aBbO12KueAp4eQBDHtGU1Hdp3QKF3qMyB2LscidkaCDytIWpvzmEAMY25vwmxzyNviTIrVhnPHr0r9FgwSeg5djIWhMciI7WXTuVXCLO9ATFlS8lJrOpLzLV9m438Z6IBX7+C3YneWRvmL3cosHMj5CmmvPpb5lJ2BGoIHnzzt8WYacyx8JfcuEq+uSjM03epn7CKmqzlWjKjNGzXp+9iWL/y2G62MSQlHCHg1eL+l4Q5adAd7/upz9lyEMu4ECEfJ2kDNQ/Mo2QD1/AiHwOCq1X2SZc8PGjYBg0bjKx4YpFbpPL7u9deskJYozzearpGgUnNOJABJKvFQBgxD9nZ2naD/HdzlvL/aZYn/KsY4ieVUxiFaY7qHJCb+2ZBhLse29BL5MDBNtqrbJ/2lOmv/CD2n/fpPCmbC/uv89tDWEeX5sQK3To4REAxEJV0Rzm5me5PnTHUpFQ5B4ZJUigixim2SWOgLBX3EP98LBULonX3RBLnUa4ILcZBTcGtrynXdypRB32L/6MuHSsQFXiDwDTwZPm0Re7ZVsZ2/D X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8e7dbd2-0455-4309-7f8a-08daafb79246 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:59.6346 (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 8/9] avcodec/mpegutils: Reindent after the previous 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: 3IAnwhyeZY1m Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegutils.c | 51 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c index afbb16e201..36d75b9633 100644 --- a/libavcodec/mpegutils.c +++ b/libavcodec/mpegutils.c @@ -56,7 +56,6 @@ void ff_draw_horiz_band(AVCodecContext *avctx, const int field_pic = picture_structure != PICT_FRAME; const AVFrame *src; int offset[AV_NUM_DATA_POINTERS]; - int i; if (!avctx->draw_horiz_band) return; @@ -72,34 +71,34 @@ void ff_draw_horiz_band(AVCodecContext *avctx, !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) return; - if (cur->pict_type == AV_PICTURE_TYPE_B || low_delay || - (avctx->slice_flags & SLICE_FLAG_CODED_ORDER)) - src = cur; - else if (last) - src = last; - else - return; + if (cur->pict_type == AV_PICTURE_TYPE_B || low_delay || + (avctx->slice_flags & SLICE_FLAG_CODED_ORDER)) + src = cur; + else if (last) + src = last; + else + return; - if (cur->pict_type == AV_PICTURE_TYPE_B && - picture_structure == PICT_FRAME && - avctx->codec_id != AV_CODEC_ID_SVQ3) { - for (i = 0; i < AV_NUM_DATA_POINTERS; i++) - offset[i] = 0; - } else { - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); - int vshift = desc->log2_chroma_h; - - offset[0]= y * src->linesize[0]; - offset[1]= - offset[2]= (y >> vshift) * src->linesize[1]; - for (i = 3; i < AV_NUM_DATA_POINTERS; i++) - offset[i] = 0; - } + if (cur->pict_type == AV_PICTURE_TYPE_B && + picture_structure == PICT_FRAME && + avctx->codec_id != AV_CODEC_ID_SVQ3) { + for (int i = 0; i < AV_NUM_DATA_POINTERS; i++) + offset[i] = 0; + } else { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); + int vshift = desc->log2_chroma_h; + + offset[0] = y * src->linesize[0]; + offset[1] = + offset[2] = (y >> vshift) * src->linesize[1]; + for (int i = 3; i < AV_NUM_DATA_POINTERS; i++) + offset[i] = 0; + } - emms_c(); + emms_c(); - avctx->draw_horiz_band(avctx, src, offset, - y, picture_structure, h); + avctx->draw_horiz_band(avctx, src, offset, + y, picture_structure, h); } static char get_type_mv_char(int mb_type)