From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4C8B54A7E0 for ; Sat, 11 May 2024 20:51:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E27B68D431; Sat, 11 May 2024 23:51:53 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2056.outbound.protection.outlook.com [40.92.74.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90A2C68C15A for ; Sat, 11 May 2024 23:51:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bPkCAFyX2A1pNcGs/3WLOj57Qx2WpPFt2Y6Z2DuXE/tYNT5BfcHPS2CovP1NGD7pHQgswcdVm/ntFB93tBm62Fu/2kpCPqkPUGH98993iWGZj8WXKeobWLlXu64Lt0Ww9wLxyHHavfkKOVnf9oSol5KEx+89NIX3vd9yVW6H9SHuVnGT3RjnUt3V7SrhtCyVRw+zgjY25eVZXvMEZG7hsqjUcdi2eh5oiyqisvEeQ4P2WiaJb5XiMpwUbwuHjJgZCbiiCNVvx+5p8TrAO42Zrw4HA5Bw1Gcnd+tajyR5OQ8f/hweU8BBF/MY9TkUUPOsSeKUMESv55yMZsMwDnGPIA== 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=Atrsf8H1KkYRn2AJSXkvUOcvB3IeB3IGq5tMzb+K2kQ=; b=O0onya5lSz006AvcAaX7HpkVrtevxG0jRnOO245S0D9lptB5dRJnBD1PRkkN5f75fK7TW0+iSUknC3BNKZRiWhIh8bM+vMc/NgmQOcqGMuO4tCPx6ApFx8I2VU0qU51V7XVOH4imy2jcy8thdDPMViXREyw1/LT3tIUrTn8OyW3bFIY2uNNtchhxVgFubNN1ehgrT3ObVnt0UxuddBbHxLWTbUtdyj+f0B9vvGU9P/gpQ/OrQZODmHxjN1pncpFGkJLCwb7itLATyxinrdIqr7PMXxn6bf+QyfXEWTN698S1QMugAaQcrNjG2GC5JkKj6ArDlZ9X5gsYdMyL8Sjbqw== 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=Atrsf8H1KkYRn2AJSXkvUOcvB3IeB3IGq5tMzb+K2kQ=; b=gXAB1vxPBK9L6iqWZs42j9pAFjKPy8mYE1QAVNIeib2UjA3ZCGJz2NTj18GmcZ0GpIG8elOMdGE5V4HrBjCFJzeiS85FaJxR3uc8n7/nmgLERnoczOedGSHe4QJRlXUX+ASaA6OgBkOlb6S+4142izQtGYQvhq0CnMwlRDt6f+Ujl+QbHaoRMV6k+lhh+pHlkAiRTmzTKNHPE7zPfIWiUIkEC2sDSyGJJzVZcIKA6ZZT6rFvum8/dz3rvhxauSeUCNo/8Xi3ABzFZBjcuExHnuFdCkI/Fzf6YUJ5VNx7uQklN1ZS4zbj/5XHU/v+NwgfhW19HitP9JY9J3sIty0+nw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0449.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:325::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.51; Sat, 11 May 2024 20:51:44 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:51:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:26 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [JmYcqRJvccxXeH1/+ty87I0h/GC9an6olcGVJd8kLfQ=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0449:EE_ X-MS-Office365-Filtering-Correlation-Id: 74ef5247-76aa-4e81-b83d-08dc71fc29e3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: GaoK2xEEeEEJDgCrFYZLmtplABr5Qji+AZuKwuvjUVh8hCVI3pFIJcZ1xokZAsIl7DNdKL6uwiV3tnLstrE40JV4O5fn/R0P861oGUXO+RmhS3BKVxrLmFYD84d38sfeXsMQ9HJobLsA7u6VQQoZSu7SHTBMpAQZnNOuFCtNZ3OgsTPYlbNjY7JLjvJtirSDUaE1h40seGaWPaTqNvoUGVjgVqggb6LuGIJvWceMIlMMCJRNAiAUTuytloSTmmTUFKJToUgU93r/Kni4wKApZPtPTlZZcMCcJUfDpZhtIaIaRsoyQoZxjBhUuMRwgLcRMu+cdyCODilSFtIK4Z7OFydtjOb5j0TadslDpkzDoX02PyI5cozSy89EW8F+zdAm90Lt3EESIIYs4As2zquqm4F9ZejpDpA7UvhBKQGdo5QAFIoS5xhznSuFJeD0HXrJymKjX7dTmCIiF/Mcjq/+Jijue1KuaErPHcHPm4HGErrM8xiKm3XgO7VBXqKi/2LUCOQejYmbhSVWB2gpqYF4sr+++CxRuhVfLop3gWR5kunUeXfUZ7an9pb8uHH1msvUlYTyf+sOAoIA1EpNHLy7TUKw7r4uc/QnG0dKoOEoH4YOhS0FAaBih4D3OKsYZjsg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/02GjcvLTh3+LGll2tdKVTsCUct9VDVKKvuMUgUziBf0uUi1l8YXRfVdKLec?= =?us-ascii?Q?wJdRkHNegOf+M3JgndMsJaLpRQ93IHl86gGzbJr7cXh0XrcP3aQYex0J366O?= =?us-ascii?Q?mIL+VMASz//cP0NylCefNW9DKT0t09kQZnSqWzR9jPdFkuivZTlW+efyAe+4?= =?us-ascii?Q?uBPz2aaLHItUMUj9mIU1zg+JlX68E/QiCeLR3WMYz2bM8kJ8pFbPoB1zlAl6?= =?us-ascii?Q?bkO8MXLJ5wmplKiiAcmE6PTYjqjAai7B/kDlO/4v3sIwq179vULlAuiREOF9?= =?us-ascii?Q?3DC+fn0HLyyJA5/RBvc9cPtw0aK0pzKk6/3AfIuZQp6dT4M5193j89+LUSX+?= =?us-ascii?Q?SVQHIransbjriQtMy2CTvz4MGHjGkabLGvXmZYryW0jAfmDABaCo9ljA7m+T?= =?us-ascii?Q?h3z8k5QmzYnAQBvjVUAG2IhwE8F8+XG/GCXRglbEEcJSEvTKKshaPSN9romJ?= =?us-ascii?Q?xDU4Ca/pXq1E8/CQEe486J1mBvbJo3d/bkFltRaprkaUsk3oqclYjBAa/6H4?= =?us-ascii?Q?E9G2Koc/UMf65er8vwi0ttGTx2mZP3KL88t1DGsRIh7SkzG66/zH6/QeBnqC?= =?us-ascii?Q?3HOJeXqJP8FOJq448KKApldnmF4EIsZHDUsbGqWEQzSyKS4Ucjq2FeX0mAzV?= =?us-ascii?Q?5Fs0ASSWV/ozoPvi4xQ6iDQesWV2NTWSH6TF61fDuxo1y+VUZ+pVnytggQN3?= =?us-ascii?Q?pVJzTQQcwWaezKM0YUXk4WdDILsaaah4zjX6b3aLQAN5HtI32TzaO1T5kKSC?= =?us-ascii?Q?gglwxEdg5i4pIJ+gDluzLIcV+lTDbJ1I2t7bpsJlcJ1sRLnzG+fHCNcqUDxO?= =?us-ascii?Q?T+2qINEs32cW4q/AYnAVIvy9zeJ1WShjX7lu3dhn8bH6Osdw9EvXayan68nJ?= =?us-ascii?Q?dzvkUtnEUr4U/UmvG1YBXFiW2PgAN1Hb6+oY5516NxncLEvXdyi4OwbcQ0g5?= =?us-ascii?Q?hifX9pFXgBb4sexebRnQYZWcsgX3pXDInZ0uKfxWNprGHjNpKg1snC66Nk2M?= =?us-ascii?Q?eVpPxgCqLL9oA8ohF5AUL9mCoSADzxHFMzHbT5vME9bHcqdnKxADESITPE7T?= =?us-ascii?Q?Ba6TQ3pJMT29h0TlZ2EGzwvFCxvzCwEJNuyBuiNVAIKsTQIVlGVdH9LwOFzi?= =?us-ascii?Q?OpYGzWL34Kq7KCEbgCjForUM42XMZoGGJ/hoPhLFEE68ewQbadCNemjY0UR5?= =?us-ascii?Q?pqLfwmcNcis3qWwzCM27RmveGLryI9qIT9wX5wzne5sghSwGEO1+ATqxuVEU?= =?us-ascii?Q?7xPCPOei80TdGazLBi1ir2gSoaM0tq38huX6H2CMXg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74ef5247-76aa-4e81-b83d-08dc71fc29e3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:51:43.2645 (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: DB9P250MB0449 Subject: [FFmpeg-devel] [PATCH v2 02/71] avcodec/ratecontrol: Pass RCContext directly in ff_rate_control_uninit() 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 2 +- libavcodec/ratecontrol.c | 5 ++--- libavcodec/ratecontrol.h | 2 +- libavcodec/snowenc.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index b601a1a9e4..e31636d787 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -989,7 +989,7 @@ av_cold int ff_mpv_encode_end(AVCodecContext *avctx) MpegEncContext *s = avctx->priv_data; int i; - ff_rate_control_uninit(s); + ff_rate_control_uninit(&s->rc_context); ff_mpv_common_end(s); diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 27017d7976..78022d80aa 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -623,7 +623,7 @@ av_cold int ff_rate_control_init(MpegEncContext *s) } if (init_pass2(s) < 0) { - ff_rate_control_uninit(s); + ff_rate_control_uninit(rcc); return -1; } } @@ -688,9 +688,8 @@ av_cold int ff_rate_control_init(MpegEncContext *s) return 0; } -av_cold void ff_rate_control_uninit(MpegEncContext *s) +av_cold void ff_rate_control_uninit(RateControlContext *rcc) { - RateControlContext *rcc = &s->rc_context; emms_c(); av_expr_free(rcc->rc_eq_eval); diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h index 1f44b44341..a5434f5b90 100644 --- a/libavcodec/ratecontrol.h +++ b/libavcodec/ratecontrol.h @@ -87,8 +87,8 @@ struct MpegEncContext; int ff_rate_control_init(struct MpegEncContext *s); float ff_rate_estimate_qscale(struct MpegEncContext *s, int dry_run); void ff_write_pass1_stats(struct MpegEncContext *s); -void ff_rate_control_uninit(struct MpegEncContext *s); int ff_vbv_update(struct MpegEncContext *s, int frame_size); void ff_get_2pass_fcode(struct MpegEncContext *s); +void ff_rate_control_uninit(RateControlContext *rcc); #endif /* AVCODEC_RATECONTROL_H */ diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 43ca602762..b59dc04edc 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -2077,7 +2077,7 @@ static av_cold int encode_end(AVCodecContext *avctx) SnowContext *const s = &enc->com; ff_snow_common_end(s); - ff_rate_control_uninit(&enc->m); + ff_rate_control_uninit(&enc->m.rc_context); av_frame_free(&s->input_picture); for (int i = 0; i < MAX_REF_FRAMES; i++) { -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".