From patchwork Sun Oct 16 20:46:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38753 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1306460pzb; Sun, 16 Oct 2022 13:48:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4WTOQOBRRqo8bKT2Wnd1pqtDQBNNLT2uZ5bzi8zOlFFWbKg89LEV8Trlex2tZRdqY28Okc X-Received: by 2002:a17:907:2da7:b0:78e:4ea:dbf7 with SMTP id gt39-20020a1709072da700b0078e04eadbf7mr6091244ejc.616.1665953280887; Sun, 16 Oct 2022 13:48:00 -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 cs10-20020a170906dc8a00b0078b0865d469si4342185ejc.751.2022.10.16.13.48.00; Sun, 16 Oct 2022 13:48:00 -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=VJeEozkp; 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 C4DDF68BCB7; Sun, 16 Oct 2022 23:47:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2047.outbound.protection.outlook.com [40.92.89.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76F6668BCAA for ; Sun, 16 Oct 2022 23:47:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BAwuT+D4vYH865xT61tOMepiPkfRxRgI0oBKrUV8auEpIQBJbzVSgmo/B12CvdYViC7j7K2lQ2Va4uneIdHDqP/20yVFx443hOSQoJe8qadJn4RxSGY8dk6emt51PrRrg/YLHOMDlZJIZrl3dk18LqIF9v+kNGNaA5vvGESNxT8QmodNouT5pfq3SpXKYnkory1aP4YsMUuuoxqleOzYAN0Oyq6dM05TO4RQX9GuiSQDpXKwmtBLVAxDQJS0cnuV/4vZlPzBYNCxkBmCeFTqStL+21w0KPFe0RSzbBFGmLPaughTz5a6zsfej/7bQEmFEvjf/9ojT4Fr6FbrTtXk3A== 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=/W9XNAjXJxOSblMzGHLbosMP6uYPREbasaBZPjHrYsQ=; b=jHSvlKFouNEq7L4TVIkBcg4vsJg6Js5G5tPbA5Fq4g5Pql3/R/QSMJi6RW869dLGwVj37UYr7Ols6pxL4NnkXfEWvsVvFfc5MRB8j3mLEoKvLnlHPkAnmTZf+4fz3iYmaXlNM183nj312JQuqKr3yt0pmptCvCva7fCjzm4f/j/hfb1DlrJep6si1Ucq2hekyxSVXIfwocgqlzp35AqzKJU1oCBC2yZc4VLpt44i8erFY7tqRxielLvg6pSroKPS29eSz2aJT+fzJlooC2kKzrR5fNQw0zzhTcjN5s2Z5IOtYDIT6PMH9EvfAdOuP0M9SF2ICVK5EYY3wNj6gUqzcQ== 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=/W9XNAjXJxOSblMzGHLbosMP6uYPREbasaBZPjHrYsQ=; b=VJeEozkpEhk1xPIPXkeNY8zNsEJN7rVPTFolKwGuYZIVIwe/oCWfEdiE40JdNo+5haFPe271ulBORL+Cv4MpjAtBDn+xUzsFNPE0FNXhu7WqCgYoAQYXkPwJypaYTLrFNlaRwvCbJpPo8onSbTI/l9gS1/2byb16lACOM1nzRZGWTbzV8QyRJMUCEBazLB0jxJzFD41FSaB7PhLs0KLM/xazvF5Syfb4oVQuAAnDqV0cCz2RlFWpJnYAkq+pnNLrwAZIEnPTSrjLGdaArE8fYxP/N+HHLBzZuJSEy7ZmvmXiALqrrsCPUsa4N6uKg0/0cbRxWpXyCWf4SRQjacZ2LA== 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:58 +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:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Oct 2022 22:46:53 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DYLzNjbXjzDNgQ+VPuCwT50l4qAXMJnd7a6YS4j5cFE=] 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-6-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: 44026f6f-d21c-4f37-fd4e-08daafb791a8 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmriMkceEMr8g+y2B+GCHAes9PXOR/AtSPJTX/UZ7LsRisFfNulhPaQbJt6U3ZbOPdsBJ1AVvdCiTPV/andAA2pio8EgiwAf0PUIN1Fqg1nls3bUU49Rq5jJsHxAwtXMdA1BUE7JmSGrfKjCVO0yLvU0ezkS7X8NeCHI79UF3TPbeakFahiSBT4N+rmKxLb7ohQ9x5MQQnxQZ9LShF7I0NbGwvaol8VxHCIK6PT+kqMrOxX1oWd5PND1V/r6RJdTsQnQnecRRfXMMrQKA0flKHasSc4IjhPgeMYB6VR0PGxPtnlq48CD1mNdP6Qv/on3BIH2TUItZUM4VTkYT3Pi4DoDkG27p3yzflrhBOOBwplTJ+X1FhFayAQUO2XQF+NdUwWROpbWpKI8ck6ybeQEL1cX5y33dW3sulgfuAs41rvpVhQGBWTxbyuCnkcdh0dkZYL+toZ7o+WKuy0xE3Easg7UjG4q0L03UVke7GwCwchlR7bXotNGtuk9L3NnTUnzJE7Lxw9yRKLwlcsE1qfLF6xY/fu5WVP4XKxrwU7pkpv5Ek6yNb2tuQ2sPtleLMLa1relKdquuMzYeHoP8O9X7ElfqQNX+8zX0R4YRIYLL8V8YaLkJ6Frzy2f7qDjtcaiwZtottyOPXAz0VFNaCMK6eqPn6FKIU3S454OygNu/CElLA+g7lQo4yv9H8e7zNn+aujtFha4Avxb2G8hvJY7hEjL4bcRueP3JnfrUMqnEIcRrLfP8nafJNOGYUuOzoJqGJQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sAK5ZY+Rau9CQPiWeIDPpYT6O5RbT53TepCh0nhafhNr/riZA7RU/8jjYTyyysJL6rZfDfc9bmxYCWZ/0AAy8vUKE2R9IEEu5BDGeV0yOfGMXqV4DvvMG4uHqhVqajdDvzOqq/SHOF4fGNlWKqze2klEh5a2KKrhTbW49TVhQF4TyFl9E+5tbLUWcv9Cf2Wne0YBwfgm5wGFPdg7i7cVmF8xhkVhO8Xkf1nRilMPALsZnvygQz3a3Al/H/W2ncPIii37jQXPoDsQ/5rhlSi0G/dSYvsRQ8OzG5UHxVHXmLYOImKUyPSpJMAcYTuUE1Wj06Rztw8Xj1hJCSwtsncjj+sNC94ws/zg9VwKcBtWktY4K9WSKLAmzBmvulaBo4rS5cejiokrtJmbLvxAJ1M9QfI0g1GpJ9BuiSLUKs+0SD9Q4OQh1IQT0VsnWddan6iDTdnLODIgYKrwT8iwsHYwFc2h5qpLap9G+PfkRTSxgBI8DaYD5XlBROuz0UoZPnM5CUBmT+zTs4ZpLCFMH0iPXte+0OLkQtOWiJNjEketuO7we86dGRVZffIcglu7sicWDIapwNL24gMbQ6hSldOdTLDjH1xhlE0DuRqMgtRXtesibqssavR+FXtbMXPDgW4W4jhnGvreuw+n+xF0kE9raA0B52cUe66RsH3QNM4mSUfmVWZVtg3eo6S/Zy0EUMjf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OIrLOYb09jXVuEby9lkzacGI+TgVU3XZeavY2aQ5Dq3fEKxkPwgprhAzluROFKPfxiVw4MZYXvlUVUDoEmhVRzCfrrCchuYZsl/EBLyFcrLht3Nm+z8vGM8lEwLdAJ7z7vEkwF7JOb3eJbG9XrTmfSmxmI25ym5OVALzoPZbOJcYzknOJiZb6cTeaKypRYRxsUeZElPJTN4ECn67uIWkzXDJLZLdPt6ySBfrFYF4yXCRKoOx0QBTQ68VBCf9TDvMh7aos62kdGk0olq+nB/0804FdZeAlAPKK205UPei3No/x3meIzb9wwURy/4ZVogvPRsu16sofyV5tA2lBCl0NZpLM31y9YtKrMavw2y5aFQYAUJWOUq8IKJ++zMXKmrXnrUPRsKtHiPnC2i2sJjogaxV+TJ66W3aqKybzQdKawZyWOpf3GEKnlmX6Ljl9c9h3Fq7q1KyYypUHWOudjPklAn5XuzbH6jZTWc8ZBUSsmNgQ88JbsF5hZQyh/r9ZtCjRkGo7mR3U/xzYqgsOt9BIZmmyCh7toHoU+92WoJbu/YDjhyDy+4ZbrJXAJGA0FxsuRD8i8oYWkPg5ORFG/vILYgToWJLVKay6mRtp5lPnG2rJ220sAVuBp+sxVQtEtwHM+lT2tvubYikgMfOpfKI1VFQRzB4ddr2Ks2ZsTYAMvQ77/+ci8EBcZNbzFQBVrB8SS8Xpo2Uz4/QdpLFMy5T/v7S1qPAfAMJfaLq+asIRyFqlgGLAB57aL51lv50+YjzwxbwuIdml/0RgfwosZZdjE1r8nRRitRnQR4Wbxxl9NCBlKw8k4mrXxVC1KLoMMUQtNaUErsU1R3Ck1lbdT+DWY84PZ3VJPxaT3AQaYG6YfLfED4/toDyqcgH6T+rb18ZW4Ts/p5+Y/rP8NOyX15AAonV0FkJtimTszTNOGIl+fHvHUHxU09nKwey2hCKI8r8eHNkjWj762z+NVCjcyICVRU+3MPSBGhzdIWvbTpb9z73dJ0r222kEnFcMp0mxWueWG0eD+ozWHxgtrmAtqjO5faa2DM1B8n1sk8pRFACVS+zMqla3iah/gLGAizaWhxh/M64GJ2EVVah1mAAgODkX5MSJEbjJFGdlGPWadAoCZldNhuVr6ZqXkwfnaSMdGly3/OWrN3DItg0E6r07hEWzuTzoYK6aaquDkiLZvo4G/w1S70kj1XPVcWOhTeL2a0uQ6eOus2lRDITPJnoUBRZQ+9lTb1cwcR1QLeitZK+RwnbkDhxrzMUGFU7Qbecpu6RxP+fCJZX9VW7bbmSYzDBnWV8b/7Hs+DMqPovV6eh1uhcoZyNFYvUn9zLtywK5NTn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44026f6f-d21c-4f37-fd4e-08daafb791a8 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:58.6024 (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 7/9] avcodec/mpegutils: Return early in ff_draw_horiz_band() 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: oqcM9DgQW8l2 Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegutils.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c index ff9418232b..afbb16e201 100644 --- a/libavcodec/mpegutils.c +++ b/libavcodec/mpegutils.c @@ -53,9 +53,14 @@ void ff_draw_horiz_band(AVCodecContext *avctx, int y, int h, int picture_structure, int first_field, int low_delay) { - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); - int vshift = desc->log2_chroma_h; 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; + if (field_pic) { h <<= 1; y <<= 1; @@ -67,11 +72,6 @@ void ff_draw_horiz_band(AVCodecContext *avctx, !(avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) return; - if (avctx->draw_horiz_band) { - const AVFrame *src; - int offset[AV_NUM_DATA_POINTERS]; - int i; - if (cur->pict_type == AV_PICTURE_TYPE_B || low_delay || (avctx->slice_flags & SLICE_FLAG_CODED_ORDER)) src = cur; @@ -86,6 +86,9 @@ void ff_draw_horiz_band(AVCodecContext *avctx, 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]; @@ -97,7 +100,6 @@ void ff_draw_horiz_band(AVCodecContext *avctx, avctx->draw_horiz_band(avctx, src, offset, y, picture_structure, h); - } } static char get_type_mv_char(int mb_type)