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 7A71D475F5 for ; Mon, 12 Feb 2024 00:03:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16E6B68D1C1; Mon, 12 Feb 2024 02:02:52 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2073.outbound.protection.outlook.com [40.92.73.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99BC668D178 for ; Mon, 12 Feb 2024 02:02:50 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZcNQqRs0WTHIAuuS8rcOEI9I4Agou9oxDoeQ5yDdPxDGNui4fTlNLCR7vXP/v6pFrWpBOZq7+YAK+XBUbvtBpOirOanEbaTmOltffxfcEnpOHlgxIiuS1Ma00dtxkcfNbZ1+ntknFo9ik7v2TztCsA5rkNA3cu54Fh8MDkFJCaQBL0WDKHqoP6PcRDdatQ+5K4uW0PWltCIBk2/2oYsLzoK0aHQsjD1u6gKExqhuWEZa+e8oLyq8dWvoqS7xK+EqTVXJmXR1iyBgCaaivlwbt+KdKVOtBKys0bN416j6vcy8pOaPe8CrXFrcRnKFcvIm3eql5Jq/6co1rXcudlahbw== 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=3DiGdtESLSonVLb4p23TRwPq08Z55vS46fkRbNtQ+D8=; b=nYeIYJSykfqcdYZQMQt983MmnexKWDHkUY/cS1tIdGgFDqs9iiC4kZEZUYgXPjVqpAUvxYXPnWJdSYhFV1Nuw9df3nAteQdDhBonXwgln11RGtK5WH7w7XN5/RijeJMBmXPOMcrrGhTgq1GmgWDiZfBqTZrwHHo9O22jamKMgL2NJuthDyk5lwzBcwtxDLMoBJrxiY9MCpKT1YOjFT3oqzRVSuQSQ0hOp/TuazxSWBEwoa30P3pk7L2msjAx0z1DUdUIvmdGv1UbJTLkXWH3Jn8rNyECAXdpWhPuP9OIZhq88zYmLFVg4eltlQpq7NBeM/bFRDeNKT9IHZPUHIMtzw== 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=3DiGdtESLSonVLb4p23TRwPq08Z55vS46fkRbNtQ+D8=; b=k0SkgjtJuJM58rv6qv0ohBneiuLtjn3b4VrcmW+rpNI3mTvpaGIGO/h/2rKG/V/tPKwdToG7ncf4Fes4TKV46BcQ/PNrl9onY+sdATMfMre2nT4ibQ5H6KkUx7glzbLeH6uZOAAI6uYiqHnx2uThHIdaIjeyltdkeDKP1Qh8vS83OyL3UgJ+JGb3vBSny9txlCKkBHaxpu7tJlUF+2sxasWjNdLpLikWcL9jm5vM083lq2E6j0s+SLRbVd0rdhDhrAwqGn/1LrkWVnOEHy1XF8S6xx1yCroefj9fW0p1BwQwQ2ok3Zvoc2wJt9y300jpj3SoqTHHZNzBp+xgDumHNA== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PR3P250MB0257.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.35; Mon, 12 Feb 2024 00:02:49 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7270.036; Mon, 12 Feb 2024 00:02:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:27 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [oly+3DAYiqE9gHicNkqkRy+0d3eKfrN/tc/ojij2GDg=] X-ClientProxiedBy: FR3P281CA0146.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::18) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240212000335.27984-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PR3P250MB0257:EE_ X-MS-Office365-Filtering-Correlation-Id: 52e1687f-f2fd-4144-fa43-08dc2b5df2ee X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdl5Zlrnc8YAZMqDtUbVXlqasn6cfMx/BBt5oep8ZNiPVMHpY1yNbAfkVH9PMLikUi2QoeRpSSJKcuWRm8eJ+YL/zR6gP/xVfwPxXG76RowpMehaA+De6zC2QIMh+hPLrBmxTi8xx2pQvSNt3KthTQVSkTuDPY4/recNlCNWZaRz0javPc+MqJ+wwKW9PXhdLPE+5lY4BZWmI2qJ+eDO77n2tcKBxRJ0mrtwpLQfzrdFbEGRHJ7rUGY6zLiAPdvsTna9SK+JhSmuZbfExbPKO17kzr0/hxUjQNOcUC9dfHK3eKi3lwfkzb80nL6WhSSoK99cKATCRiezhT8eQhc3Pr2rKasqv1xFsTR2cqKbdeDWeOqa0AyVOgNw5UeOgN15ra6X6/hjKYbHvJC2nl/mGAP7iD6Neqvmj5nFhcxMrRPmbMXwOCzNzb3eaXWsOpundbWK2gd2RMkgMWUvn51Ic4kFbU/fDD0aYVt5eAhTHt38MlCSwu8XFVWDqX8tfc/QFjf93er3GE1tU99g5IcDfHwhr/wpQ1zeEO6gehI2M4UforHzsx6Fp7oLxlwA/ImAoPkka2/e0MZedd/vzO50NNN+csXtXVGYTxuytB9QKi0NhImrAfiOOAQ+AMcY3Ng1NwcS9iSsSHyTcml0g/acGqJtaR+KYX8DAdu8us8EfRz+onQ4hlrjdRM76qCs/wdQgPOgxHH8ZUx2e8lXBd69OxPBwe12xBTaZqPhOOguFqKP4XM0xxmqmJ/I= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9uy8lwnrjQN5X9EuJzwhm86RzVQimbSNjTSwnf0put8yxhYj3933wfmXUs5G5MtoHEmDIgTEjwdxYTL4WpnRsUmQlUGd0tuZocRrqlarG0z7HfhNu/BwOZlW4AU/R5Pgb83euTy3ED7IGe2rIBDcI82L7QcWRC3jJsuK/6slHDcc4aVYr5lYKqWx4rvBdVQErKuE5itfzLd2tFQ3k13Gn3gQYmsVTSszGl+QdRQNPmGNDFAeEBAvgArTBLvXbTDySIbJPObUZ9+ZZqIaP9eoDo8tcJPCM0fxPouxUuX+4ZQk1/39KAs0abSEW6V52Fr5RZqcOGZjtzRSPC6602dRaRL0w8yHt/Yq3WwVJMaH8aM6X8ZzfYFzyg/9hUTxxCRyO9ikKmuZnqFIvs60t5/zz0smsbsAX8UcNZxtjMpwEyf1XzJAvAU/Q+E+tAmfbpAZUaUoybGkp+zlP/GE8HLblACFZew/ELtpRhy6iRiUte0SD086yNma93O38UBAJMwLBYVkqtU0P4+FvSYgOMirIfwmWbvu2j1ItPAVpN9p8nXEFtjK3jfDL/hlaixCf61YMNODkE9kgKzUYlErpW7fhmb+pa+vGi3GA9cXdhDUEzw5j0WgF7XuXSuz/j8N2ROV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wj1ibNmGpvkVJiIRHwOEWsstN/6pUTxzNLY1R/7uz4SPAxfomqB3CigN5r6T?= =?us-ascii?Q?XWRBOzm2jejwDx+U27tfbWvc8LQBIuzHO490Fyvakp1LRP/EY9cRBzByGd6y?= =?us-ascii?Q?S9ZM3VeAye+oF0u4JJZMZbxy3HQAgT3gBwIwWplG1d1Mk4/ycdAUMVw+jwmP?= =?us-ascii?Q?R5s9vWjbiODMS7XhSEtlamp3bBzGRVkGRs3BDomDKJPLlw/uzXeu6NgjMjBV?= =?us-ascii?Q?vN7YH/sW1/Eh6USm+xYA6KFUEg7fcy3nIGVl5Pdy6Zs1GU5ig+3wiTW0HqaA?= =?us-ascii?Q?yYtSMnecjQn3QkLNWWaUHhpTL8h/l5rE+q95DHZP2cjJ/TtldefhaRg1MNYv?= =?us-ascii?Q?W2VGuuaSuFatV+vPic+4b3/rl46AY7QpOjpa/PyMLq9rcmArKmkz+TKgSIgo?= =?us-ascii?Q?7QMQSybQY3OW95DYoOONxDjBLSbMbK3uTiq35QNCfBZ+m8oDVIFPqcHl2O4+?= =?us-ascii?Q?c4W8njH0wi8bJxloKoPYtWmNABM917mVSQVH6t8Vo1rkPvOw7Tw44t6/2TEl?= =?us-ascii?Q?mJIwoN0omWFObCfaz97SPR0GZiK/VSGR8mRBtFrfNxCGm8lQDZArnXz/Qi7i?= =?us-ascii?Q?o8xQ/D1BoeaHmuRyA8eTS1sLuqJFiDB5z0col/vnL7X8J+BXfn2xU3xqLEWu?= =?us-ascii?Q?7W2yuC8oodmOJvd9AZ20IueywjHKs8QjGwq2IQoSEG1FYqjguKdgJRfUUlrA?= =?us-ascii?Q?qG8iGLzbFCTRjFLw6eCv78gF8leevzeh5KhCF1987rrTEMQfGhH0FHKpJqj+?= =?us-ascii?Q?a+NSGpFei09syW//kfxHGWSWGHmbnzav5t3w12I9OUZMFGe+GV78ljBQqjJv?= =?us-ascii?Q?eciVn6j2vF0Yp5/2Y6cA5vEuadSckevsZ2qkRM2to5FtKhpSVze+VM+QENMG?= =?us-ascii?Q?fOcdc5R5pJyO1z0fxMXkZH+Tb/wrbyRB1Sw8nK8jF+12n7+kxjcMxx0BhPRf?= =?us-ascii?Q?lPYUAFRLk7kbMjbtrFcKUJwoMtdP/rABSydS8AeTUdoZsxNg/nmiORORHhQd?= =?us-ascii?Q?Szwm3gpCnltAQUrJQvdl03KX0F08S/vna4X5dAQLe5lBU69CZEVJtz6kQlGm?= =?us-ascii?Q?cI69fHvFOy2UETbHV/Bs/pOl96mOuEmtTGI2pcfc9YeyKPHX8thQ8EigRS+s?= =?us-ascii?Q?GoUkHdjir/UX6G62kiZupBFRJt3xONeM2IaJ/J3Y7JG0DxMdFAoKVfa1lGOA?= =?us-ascii?Q?YymUQ44IrA3uM3qBGAdBr9k14iB1v1IPmwlqJ8su8s1eNSPDjulcXRSRnjON?= =?us-ascii?Q?Wd1031QwkKRGbVmz5i4PgvsILZLo6g8/CwFz9imjNQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52e1687f-f2fd-4144-fa43-08dc2b5df2ee X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2024 00:02:48.9255 (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: PR3P250MB0257 Subject: [FFmpeg-devel] [PATCH 15/23] avutil/hwcontext_qsv: Allocate pub and priv frames hwctx together 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: This is possible because the lifetime of both coincide. Besides reducing the number of allocations this also simplifies access to QSVFramesContext as one no longer has to go through AVHWFramesInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_qsv.c | 46 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 99d974f25f..f524a663b1 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -85,6 +85,11 @@ typedef struct QSVDeviceContext { } QSVDeviceContext; typedef struct QSVFramesContext { + /** + * The public AVQSVFramesContext. See hwcontext_qsv.h for it. + */ + AVQSVFramesContext p; + mfxSession session_download; atomic_int session_download_init; mfxSession session_upload; @@ -329,7 +334,7 @@ static int qsv_device_init(AVHWDeviceContext *ctx) static void qsv_frames_uninit(AVHWFramesContext *ctx) { - QSVFramesContext *s = ctx->internal->priv; + QSVFramesContext *s = ctx->hwctx; if (s->session_download) { MFXVideoVPP_Close(s->session_download); @@ -367,8 +372,8 @@ static void qsv_pool_release_dummy(void *opaque, uint8_t *data) static AVBufferRef *qsv_pool_alloc(void *opaque, size_t size) { AVHWFramesContext *ctx = (AVHWFramesContext*)opaque; - QSVFramesContext *s = ctx->internal->priv; - AVQSVFramesContext *hwctx = ctx->hwctx; + QSVFramesContext *s = ctx->hwctx; + AVQSVFramesContext *hwctx = &s->p; if (s->nb_surfaces_used < hwctx->nb_surfaces) { s->nb_surfaces_used++; @@ -381,9 +386,9 @@ static AVBufferRef *qsv_pool_alloc(void *opaque, size_t size) static int qsv_init_child_ctx(AVHWFramesContext *ctx) { - AVQSVFramesContext *hwctx = ctx->hwctx; - QSVFramesContext *s = ctx->internal->priv; QSVDeviceContext *device_priv = ctx->device_ctx->hwctx; + QSVFramesContext *s = ctx->hwctx; + AVQSVFramesContext *hwctx = &s->p; AVBufferRef *child_device_ref = NULL; AVBufferRef *child_frames_ref = NULL; @@ -562,8 +567,8 @@ static int qsv_init_surface(AVHWFramesContext *ctx, mfxFrameSurface1 *surf) static int qsv_init_pool(AVHWFramesContext *ctx, uint32_t fourcc) { - QSVFramesContext *s = ctx->internal->priv; - AVQSVFramesContext *frames_hwctx = ctx->hwctx; + QSVFramesContext *s = ctx->hwctx; + AVQSVFramesContext *frames_hwctx = &s->p; int i, ret = 0; @@ -615,8 +620,8 @@ static mfxStatus frame_alloc(mfxHDL pthis, mfxFrameAllocRequest *req, mfxFrameAllocResponse *resp) { AVHWFramesContext *ctx = pthis; - QSVFramesContext *s = ctx->internal->priv; - AVQSVFramesContext *hwctx = ctx->hwctx; + QSVFramesContext *s = ctx->hwctx; + AVQSVFramesContext *hwctx = &s->p; mfxFrameInfo *i = &req->Info; mfxFrameInfo *i1 = &hwctx->surfaces[0].Info; @@ -1133,7 +1138,7 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, void **loader = &hwctx->loader; #if QSV_HAVE_OPAQUE - QSVFramesContext *s = ctx->internal->priv; + QSVFramesContext *s = ctx->hwctx; opaque = !!(frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME); #endif @@ -1210,8 +1215,8 @@ fail: static int qsv_frames_init(AVHWFramesContext *ctx) { - QSVFramesContext *s = ctx->internal->priv; - AVQSVFramesContext *frames_hwctx = ctx->hwctx; + QSVFramesContext *s = ctx->hwctx; + AVQSVFramesContext *frames_hwctx = &s->p; int opaque = 0; @@ -1387,7 +1392,7 @@ static int qsv_frames_derive_from(AVHWFramesContext *dst_ctx, static int qsv_map_from(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src, int flags) { - QSVFramesContext *s = ctx->internal->priv; + QSVFramesContext *s = ctx->hwctx; mfxFrameSurface1 *surf = (mfxFrameSurface1*)src->data[3]; AVHWFramesContext *child_frames_ctx; const AVPixFmtDescriptor *desc; @@ -1490,7 +1495,7 @@ fail: static int qsv_transfer_data_child(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src) { - QSVFramesContext *s = ctx->internal->priv; + QSVFramesContext *s = ctx->hwctx; AVHWFramesContext *child_frames_ctx = (AVHWFramesContext*)s->child_frames_ref->data; int download = !!src->hw_frames_ctx; mfxFrameSurface1 *surf = (mfxFrameSurface1*)(download ? src->data[3] : dst->data[3]); @@ -1592,7 +1597,7 @@ static int map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface) static int qsv_internal_session_check_init(AVHWFramesContext *ctx, int upload) { - QSVFramesContext *s = ctx->internal->priv; + QSVFramesContext *s = ctx->hwctx; atomic_int *inited = upload ? &s->session_upload_init : &s->session_download_init; mfxSession *session = upload ? &s->session_upload : &s->session_download; int ret = 0; @@ -1619,7 +1624,7 @@ static int qsv_internal_session_check_init(AVHWFramesContext *ctx, int upload) static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src) { - QSVFramesContext *s = ctx->internal->priv; + QSVFramesContext *s = ctx->hwctx; mfxFrameSurface1 out = {{ 0 }}; mfxFrameSurface1 *in = (mfxFrameSurface1*)src->data[3]; @@ -1702,7 +1707,7 @@ static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src) { - QSVFramesContext *s = ctx->internal->priv; + QSVFramesContext *s = ctx->hwctx; mfxFrameSurface1 in = {{ 0 }}; mfxFrameSurface1 *out = (mfxFrameSurface1*)dst->data[3]; mfxFrameInfo tmp_info; @@ -1795,8 +1800,8 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, static int qsv_frames_derive_to(AVHWFramesContext *dst_ctx, AVHWFramesContext *src_ctx, int flags) { - QSVFramesContext *s = dst_ctx->internal->priv; - AVQSVFramesContext *dst_hwctx = dst_ctx->hwctx; + QSVFramesContext *s = dst_ctx->hwctx; + AVQSVFramesContext *dst_hwctx = &s->p; int i; if (src_ctx->initial_pool_size == 0) { @@ -2252,8 +2257,7 @@ const HWContextType ff_hwcontext_type_qsv = { .name = "QSV", .device_hwctx_size = sizeof(QSVDeviceContext), - .frames_hwctx_size = sizeof(AVQSVFramesContext), - .frames_priv_size = sizeof(QSVFramesContext), + .frames_hwctx_size = sizeof(QSVFramesContext), .device_create = qsv_device_create, .device_derive = qsv_device_derive, -- 2.34.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".