From patchwork Fri Oct 6 02:46:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44177 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b1d:b0:15d:8365:d4b8 with SMTP id s29csp117138pzh; Thu, 5 Oct 2023 19:46:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGA+UaKLmXuV6HuWwNgZfpUtT9HS17czI4NwoGXQb2asfp4CGulwpsXumvuwCsWK8U8v0GP X-Received: by 2002:a17:907:77c9:b0:9b2:6d09:847c with SMTP id kz9-20020a17090777c900b009b26d09847cmr5697848ejc.10.1696560419659; Thu, 05 Oct 2023 19:46:59 -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 i26-20020a17090671da00b00997c3561696si1247653ejk.577.2023.10.05.19.46.50; Thu, 05 Oct 2023 19:46:59 -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=YuZYMzOv; 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 AAE1968CC4B; Fri, 6 Oct 2023 05:46:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2025.outbound.protection.outlook.com [40.92.65.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B65AF68CBAD for ; Fri, 6 Oct 2023 05:46:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FC2byv0eNX+oIU/ciO9wmdX6GXs4/vbTRtou7jpaoGWEaytwMGLtl4ipxfoaJE2V+gtYsHoU3vbPayM/oQGtlHYsczuF1TfhrUdLQSfZRV6FYMEHFMaZ2pO2CTwB66k8M9SYog1X97ug3rKA6QIOaQr2QUif1cLsSV8biO/dveqP+hwgra0ve7swLqSJ8TntmSIMNMTdUTnpJfgvgim4T82RNKa8eWnWmv539vJrtf/DeKSFgGyFkwGTiwkZgWTZpAc1BTI2b6Gnij7W51uM7O4uGThBzeeI/5tkGsCBTS9XJJ7SDimx4xgcA8iMGyN5Vbd02Vae6ww8C6YGo5nIQg== 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=T/xZgOPfjYUNX/nrkPfzkPhkUvu1G9no6C+7ciYFnjA=; b=M0/P6/fHdHK0EAuGYRgufupAVC987CF6R/hdQb/tIbSPOw9SgIQzeGwMtjSwNYnI4N4jjM0GqlmlhdFuemkePd6X0q3k5PoCzOfiUDXQTIoTHdi5RjvjHcwa8NVBI+ZNP2KLAfrHwqJ29zDJn7+QnaDELbwKsRxErVAN8Kwhm6SoIFuIAMiVDOSd48L5j59crdtMlpnSggclcH2ASmRUGFWXwktXNpGkzCJCS6G7n2Wdyefs8RoLKwwjVr/IoY7sUL2SuRYjMOk5RhEpjCwRBWHylyg2x7lgLBwRzeDwnOJioA0d99hwR0L+HX/L4YTNXdVR3xoB8uFhTwxKsuXwjg== 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=T/xZgOPfjYUNX/nrkPfzkPhkUvu1G9no6C+7ciYFnjA=; b=YuZYMzOvR9uSvonRw2ZzQpvf79VdTPnm+7peUj837gO90NNo8RCctz8o/LkBs5d36tncZIvMY6JLbJkfjmQtn5XmUVIc4+1juSs19Wh8W0RB1QN5jk5XXYGJEqjZCb/dLWnXGHPwr3UfFFA7dhVlEmoS/Agsfb3H72CUIUvnF3kAoopMgrozSqDofoxszWylzB7YLoL2t1WWIQgFyD9oN5bSbAg6ErSv7US2OgTcLvpMmiBcv4X5OGb3Y5SAc3VT1EEEhmBVgU3Ee9Phxn/HiFPmbzMFnaWbp7ths+u8313rGT8xA4ogRK7oX7kBvAVDiypoUjTRH5GdDSaHSbkF1g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0148.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.37; Fri, 6 Oct 2023 02:46:02 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Fri, 6 Oct 2023 02:46:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Oct 2023 04:46:33 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [v2OVCND4NSEiUw7cmWBgsS0rmxKNXjkY] X-ClientProxiedBy: FR4P281CA0094.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cb::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231006024636.1005349-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0148:EE_ X-MS-Office365-Filtering-Correlation-Id: 3114ca8c-33aa-44e5-74d2-08dbc61660c5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R0FU7Dtb6Q0oPqQLfnkTcQ2GQ7YuHCvsxGJSNxhPgzj4TZvpjd39JKQLN6JYZLpyWmhQ6OeUFBQTtFKBPmEdk/V4PlJMFZfvWB1cmokDjTsqJUugUBlocDcfIVCBdIZ6YNCeLInlfoR/zyBs/OVG7qvFrXmZ6Bq/Ko7TXRfEjka+jQ5N2Pdp6zdWgjFuxkzTDxnTAvaM8Z825C5KvnThaBS5ZDD74a0zF8GarUch5nsf8BPtAEn2YBQv4BR0PPxnf3zQYAnj7TAXAZ+OWuIZSfLMzAt/zt7OIl4GcEWL8W9jSLM0K6+2MYkBPcBzLQljz6dNfp71zozg7cjAvb1GH3Y+Hua93LZKrCErDrwEnSzBywNSxZC3Z/N7sMyC2nb8KmBnBnd+ovtRHLSe0Qs/H9GcRTi6QP+CWoq1kLf98Om+V9Pq5X10PvJh/uCc5zmkd7NXQb3a20l5wmLV1kGKBRQVLTwW4rqGnEiE7tzgXdb3WTIyWDaxQS+5Bp0JLaZRsxWXbhTfQuMXBkT5/Ua6tbkZyPunPZB4JnTxlVt8KemLNqlYRpoKBbGwMN/UIFYoRPUzASenPV7i47g84xgsRdxeNqY846vFMOi9h0toToAbHtSNX340JVWI+IU8rD5H X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZJAUddqXwJAL6R2hJBM3cpjO82awyaeOQ1m1JvC/B8VarOFxBPPewvG3Xx//GovgfnMttTM49TQaDKMkX24CMJkdluOU54Gequlzb5u1Hf0z5mvf+R4L8IUYAGK25YYUUGerR4vnaL31pWTA80giJH5785glbRp8EzWEkFYqKGp5Rvs2Ueg1Z18a6otSNGYHb/qegKYjeBPXOJKb8prsZRsrAJmzK3BEE91ZE5FaFZo9iBtiVWTmghXjy+lsL5LMa7ocy2bUc4QJurg8S5oJnJiPMZipjpcBlovvl1Bl0Emkw6Jgi305k1mi50xGW83yjRwAR9MwexXR5Or5xIxlApMxLCa4/BAab0GXzRy2YH9mHUn6KkPzE70alTSt2ttw0JRtMP8TdDmZcdnt7l1gEeVnc3WcZ3g6aqDXtfI2LjEQlPQ2hIr5XNMuCcOj/EdD0PFLRE+QDVVrw7exnje+rcVBGpvKVpSS1uj1PFOYkuf+lPuB4xL/iDCFDvtGxFuYs7bK47hukRCAVWmemiDMbqmEA288IJ+EgJCKyZAlN9BthccCg6NtgEi9PnrT+ebIWPA4m1V/9ndSZ4cpepWnCld87UYjq0mPXHWV7TKPA9PmhmNQuKbKNwLc1jcm1FfGnI5hv8ucW0+4/zLqudX3ZjkmYHoO0+mkpZ82kYNPbrmcyFF0Q4IlMFaEcmqqarkUtLc12eXVM2JFnc1zGcw2zG5pZkT0R5PFgs08WbNesY7ZvIR5ROZKBhn9aZQ1LfACpv3tK5yR+rKfP4uKR5MSJqkrsQmW4pJApVB8HlaS59Qob28tPhMZ0LLJIjAvR54F9LHNYc1S5uDvmBtxCAF64khsJqNtfPQWW6Obs7fiIdWrYwO7H5g4OS2cAqC4amMnluLUHFuIQ//c5e4YqIbW2dSsITFSc8lRHPoJV1uLfWiEZXslKDfWIMI7WL09xQX/w7IJCJRClr7r+x10qAAV2TUIznE3X3SSpGrWIE8oc6Ui4ywtEfVz7eUnainXp0IQ7SyN+a7L2hZVXmHvmob7roNcHshEunmnKx8ZsIzDbyQgqwK4dFt3JKcNSDNZvNFJ1uLeMoB+/yGSgH/sQ4Td7EtuOBqByQkFhGgi4PmZi0gitvl0nLWKN9N++Qjzf2l4Pp7G0Y/nSbAPthm1EcxoCDfjqD9DAGR0PnZnX2u0KUhiaTQFZ1GeRjkGXSvdDs6oo+P9lo1957TAUE7Ryg+9WffanQfu2oSt5rkDjoj9ah0RZ91TU+dda0IUe1ZPwFJY X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3114ca8c-33aa-44e5-74d2-08dbc61660c5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2023 02:46:02.0645 (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: DU2P250MB0148 Subject: [FFmpeg-devel] [PATCH 10/13] avcodec/mpegvideo_enc: Don't call av_frame_copy_props() 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: GD8aaHX0wYPf It is unnecessary in case of user-supplied frames, because it happens directly after a av_frame_ref() with the same src and dst. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 26a596430d..cb6b801b2a 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1168,6 +1168,11 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) ret = alloc_picture(s, pic); if (ret < 0) return ret; + ret = av_frame_copy_props(pic->f, pic_arg); + if (ret < 0) { + ff_mpeg_unref_picture(s->avctx, pic); + return ret; + } for (int i = 0; i < 3; i++) { int src_stride = pic_arg->linesize[i]; @@ -1209,11 +1214,6 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) } emms_c(); } - ret = av_frame_copy_props(pic->f, pic_arg); - if (ret < 0) { - ff_mpeg_unref_picture(s->avctx, pic); - return ret; - } pic->display_picture_number = display_picture_number; pic->f->pts = pts; // we set this here to avoid modifying pic_arg