From patchwork Tue Aug 9 18:34:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37202 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp426350pzi; Tue, 9 Aug 2022 11:35:58 -0700 (PDT) X-Google-Smtp-Source: AA6agR7vdVxRCp5PjezLqndu6YOE34elncHv1MSOyejSNGBjDOE0BnXX2yxbb5cWel2NcqcVDzbL X-Received: by 2002:a17:907:1df1:b0:730:b058:ef95 with SMTP id og49-20020a1709071df100b00730b058ef95mr17732972ejc.600.1660070158766; Tue, 09 Aug 2022 11:35:58 -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 b9-20020a056402084900b004408eb05e0csi8106032edz.167.2022.08.09.11.35.58; Tue, 09 Aug 2022 11:35:58 -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="Pwo/4mLH"; 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 F40DB68B8A2; Tue, 9 Aug 2022 21:35:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 586AA68B844 for ; Tue, 9 Aug 2022 21:35:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G0Wr4CPVbuqgH86+c59sfIn6gzGTmfua3hxWzQ2NMy6+Nr6SL/STOkNA/dsXXORv1DNG5EXkZ89NX+XKxJmFvkYSlL7v5pzS70O4PFzvtRELQx/5MWeGQDZNhBT8HsWo+Jm8dBuTYpca+FyW6sDhlAv4D5lZ4CJhwkjWhe3+j2rCPn57ogL/tyNkaKmK3OfRoVj5GEP7PUiLmqIuj+IPpBKkMc1xP035BFTkXGDFKIMj1NZjz5yONP02X2v/SxJgJ3KNvnyY0YYY9TgWYcbkz6PI43lKyHDwqUl/x+kMGktNKGfazKNrHkrmcjFXUsW9dSpJANePi6WgbXA2eP73QQ== 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=ka0b8jKBg4EE0puHCPbYA0lzBtJPraFrTZAKWmI/BA0=; b=RlwUaqJpoifsiEqh9F5JLEYmEyrD9oTHltYJyeXEyP+r6p8VaUr2f8SCwOEhlyLJfqTDIw63AI7BSxJ4Tikh0sQkvjRRt4+tbcGohP5O2Oc9zUjjdvFqLe1EYa8k6iMYKOKCwN4HuwWw6uUb4D39TuZuUy1/zYBEcBOUrDPtN/DIUTPCoQNwU2FlX41A1jG6ybRtZyXtMzBxqy8PPTEv9eqbsg4/yZjg/tuFislGsYLNdtlGCsLa7yRAzFx5oorFITxkLcULsiExmDYpwceyycuy0ARJdSarIITIJ84MaF03FtWoBn4ZnLsivcaTiAkAII7LFDZnLV5o6hQoiZSz6A== 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=ka0b8jKBg4EE0puHCPbYA0lzBtJPraFrTZAKWmI/BA0=; b=Pwo/4mLHtu/lNcePcrJNhXRD25fq+juqpG5tXFuKSERDvz/VOG98mHKxhEooAmYMnfiTooU130cGouwc2RJl/O0/jOYM9Ux8xcZboHaTQSSatPrElWfSp/cludkmq5VXxnCDT70Y7bd+udPTPFs9i+jBMHG+naQEEDzVGl39zi0bAnGjU3l7Eyt4JegcbJD00jl2ARLbqIXHIqL+iaj4M2yIgFr8UbnC13ekiP0zyjM+iVeJfKHx/4iXidjRoYd2jUg4mvlF51sNN18E0TKhrdA6QV94r6E5y1x4CkLMVur0ALQyZVza8fBrx17W+lwNad3RKw3gdXM3liZg+Fd09Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:14 +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.5504.020; Tue, 9 Aug 2022 18:35:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:51 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DuYt8qfjcB12x5T3gJ0A3VTvJS1hGAGN] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: afc132f4-0e0c-453c-3ce0-08da7a35e638 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXow4yDQWpczRUJbygObe2vbp2W7EnD0O4rq+QffmGgEJNWSTw3Nc8TDx3jFissE6XbMgmOBwLJ9AdNoQU+6CwBon9/BNJIfipTDE1xKUxIBNd9pP0U5bdDXovhi70u/fZJfbxXscBJp3pM2lPTwF2PHZPpIX3Mv8LesnIaKyan46luugoPGsaLakZ9K3o2rSuNA1RLnR+H37v0hKilm8Zd8V1GtaFpAnc+zad80LtlTkx0pOskmH4vuvVcwpnfmcTdK2VbI5MnlzIAx2cVBmbdeJum06Qtv4sVxxX2dU66vXil6PDmOKrYdRXxqLMDSzgF6H2ACQCsaiGhZbxUkv8w6hrs/R57xDToHHtIlHT2qiMd2G6vekfqwxabSktgfL+8JRZ/lLDHOWuwFxskWO4ehSgRhOlcVdtl5Upu+Vx9Ctth9OPbK3BQZ5v3nbWQ+F2CqRZeycaZoWkCcbyYs18vFPn7PUk+6DGJCCFPBBF86RqqEQDGYFx9xda3qHF2zoFQE0BPvmofA74FdetsDH7nlW6DlaQrTkBCG6gxFq5sC9q6r310yPcZcT8ZRG9eSxZdWX2qRKHtvmXkeaUirw+fdTSRySAXG6ZXnFKvh01PBf9njIv47cs25HOv4DcnB0o4MPOGcNBaKbqCp4bzEjGeQV7il7TsY37qf06iyRYT6XhIoVy3D4FAeIUNFEGzHoBl+Hf8F+rOVY6pRebWp6EoMmpJWUQFVww= X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mwdp2UuWkEr23htr2qCw4FK05EeWeoUOpCzaSAnWodvwnesNUHMFThNk24/6ThPOSsdeBihFkbNbEeZEYhfyOoq2AqQZe77SGKvdCQcctOo9cfEzFfkx9/jOCjwe+Wff/bwV2WUpxJBpGEOs/QxixCCZnI3XnlMJk8d5DcaXQ1WcbSu6VPBn0c8Lngch8gUdiI5V5pgNXFDI/QD4tTlx6+6D0qdqJ7iWwJfGAOKVfPqEmsnND0WO4Oa69CInrrYpUr0/ZmIRWJVAsDn+u83qSWDT82j8dSVdnBTNqa0068wRRFDh9Ov/FgIYtiXOo6RXlnNHxDNb2o8sm5wUkJyGYTlM04c8QBV4jCtposGUhqxGv83H9XDKZlnm+WF5Nq2Y9wic/2h6LMOOLgU+j4EndTuywtdh/EHvkLs2NuwHhe+3lxSsJG+RED2FP9iCkZFAyYRvKX72du5ADAOkxGxa7Q40v0SwOxHEdlQ2mJPTkIIMOgGtEq10kem1AJD6TFRIU3rdUtiEY4Ntk35tLczY5KIg7rz5WD/ZZi03lvBZ4VcGqMks1WqfdVnCzwmt6V40x1f6qcCWAqLyebZoxbgwns0q/Gqw6icTQtfXs6KBbhVDk0qLZsTO0fLCXHFGSnAJ1XajGidNRCT4+ZFboyt0IQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RgydhHTJl8beuldSbzYflXI3U8UdpN42wpHw25HKZWrTHsH22nHGCN8+ZtDnOIXqeGoinPniAJbjiTXPSKMA09muBmCDV7s92QmWM/A4ZXHK+y4JqrFKrJqpT0wBHqs0RFo5LVkFSlFnQQjB4c8+hU1MkDt7DAM7zTFxMaRfgxq660upu0YnNx70jAJq3ZijnZACzv6/io+c1Y2vye/Bs8zPRKwgdKE7d/8tB6faDOD8+miC/x6AGLcwQ74LHKvBsdrDk612yhEULGIZzCUhamEZLRi8wMD71+NKTBZ2oYGGPVDckCEB0ieNq5ZA+A0gYG3Xc0WOHUVVSkNoWQlxHcMvqI4k+50rfid2HLIEHq1dNGUO/RKhOj3NDKRe7+nLU9bd3Z/24DRR/FygRVx57lVmCP8D5ThZ5pcEXs4dAQxHvu2NkUzIFqyRXSj4SNYFm4XVeX7oMl/2GPSBte8yIhETrHXaNG35eEvGtmTErfPA4RXPKp+rzjZIncPfp+tCl5KzDB/TxtFBxgahcHId2g/HyCBx0vKbHxGuQPLBgcCvxijbYkDUNXPGLnu0pFTRGkVOzGxp83pSFH4Z1eZ1k9VTFF2cqjDCBdloVNyTdDqsXFQLVedwzM5FEXZ6ba0Ta4V4+DMG0vxIzK6WQKaT5jTf077v1O5Hj2YvtpNYRwDgXdxmBtpYpMcbbkgisDgrdfHID0DOwvtGyqZGFWC1K933IwGXXAD1t8JPTVeoQavGLZ8bsi090gxI16aJY05ba892UCGqhxH3pYwnZ59ElLkF4CEfMiKqWi8BBCWuSyYhB1Qj1KzFxaQ2N/hHS0JxNrpoq3OEUIp5xTEPwIlFq+Rz9/uJJglKb8pIz5vsRUx8GNROews5/OAWSVUzCCy8rJBr7Q9K3PeVKHWjAHL6qt5pfJBPrH6A02bcQIQ1BHHb5d69SSQS5qCeMK2QoDR1T29nfRYO4vCe8jeZXlFbDDLWgZ7qoVMRrKoIy1uv7F5sVRi/wFUVYa6ZkCd1IdKoXbCxY/oxvzKfYeyQ6IW0595H4+Wvbl5hn3XDCv7KjOFTGuU+iyuZqipk6wWO8qfUZ44Sxui2YgPpJgX/bcyAWnvaNSwRb459yKbwspH0a3/vePX76KkafO85BFo3NC+Q8PRVNPeIUB51RhZblsEc0pLhV0MLm0DTU2rNbTF6fEV0LdCpmklyXpnIcfFqNjhWpS9847n67sTUlOe2juEnGOtRDKzQLqSX64lGMQqYHnOv7Ndl+lph3S5iw+MH80qUQiRG5I2QcSMhlRsKDSiftSvkfvg/0J/1Da5/2Mi0+YM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: afc132f4-0e0c-453c-3ce0-08da7a35e638 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:14.2990 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 7/9] avcodec/mpegvideo_enc: Don't copy Picture unnecessarily 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: ZEC6oFCYfCWJ Also add const where possible. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d45e15a039..2cd4db27bc 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1249,15 +1249,14 @@ static int estimate_best_b_count(MpegEncContext *s) FF_LAMBDA_SHIFT; for (i = 0; i < s->max_b_frames + 2; i++) { - Picture pre_input, *pre_input_ptr = i ? s->input_picture[i - 1] : - s->next_picture_ptr; - uint8_t *data[4]; + const Picture *pre_input_ptr = i ? s->input_picture[i - 1] : + s->next_picture_ptr; if (pre_input_ptr && (!i || s->input_picture[i - 1])) { - pre_input = *pre_input_ptr; + const uint8_t *data[4]; memcpy(data, pre_input_ptr->f->data, sizeof(data)); - if (!pre_input.shared && i) { + if (!pre_input_ptr->shared && i) { data[0] += INPLACE_OFFSET; data[1] += INPLACE_OFFSET; data[2] += INPLACE_OFFSET; @@ -1266,17 +1265,17 @@ static int estimate_best_b_count(MpegEncContext *s) s->mpvencdsp.shrink[scale](s->tmp_frames[i]->data[0], s->tmp_frames[i]->linesize[0], data[0], - pre_input.f->linesize[0], + pre_input_ptr->f->linesize[0], width, height); s->mpvencdsp.shrink[scale](s->tmp_frames[i]->data[1], s->tmp_frames[i]->linesize[1], data[1], - pre_input.f->linesize[1], + pre_input_ptr->f->linesize[1], width >> 1, height >> 1); s->mpvencdsp.shrink[scale](s->tmp_frames[i]->data[2], s->tmp_frames[i]->linesize[2], data[2], - pre_input.f->linesize[2], + pre_input_ptr->f->linesize[2], width >> 1, height >> 1); } }