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 27C0348204 for ; Mon, 12 Feb 2024 00:03:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8FAAD68D196; Mon, 12 Feb 2024 02:02:47 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2051.outbound.protection.outlook.com [40.92.73.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0746B68D179 for ; Mon, 12 Feb 2024 02:02:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fX2H8c1dzbQOKzYrdazdvl4PxTJ/zJ+2y9fPhAAkKj4mWyfZP5O8/SvSyiM3lpCt8UYBTzpxEzaI4xKcl98/f+LSZhMAmNdqTjkSevKyyP+KB7T15A+CEC9o4io4kYIFVJPVk1UMOmuWHeWsXIT28enzTNaLB4tThnn05QqOaH3s0qBDjrTNlVHM+HHIgVxn8+Fk/ZXfkTPbRqsXL+y1OdpU9Y+XlKak9ipFEJ081SQbZ4t46wje7G+A4Q8G8kQEhaSGJGnLmX8Bn1DnPd/BpLxAYlltbVpVw5fc+/7HFgAdW+HRi0yuwDITBe2f+8LvrNRg2Eejn6kM+6BVaowmRA== 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=nM8+0l+qLTZdshHnAJ+9Sel/ZeCtTCqf1NgmZM/aH4o=; b=OPO7/HHOYsLBJYLi+V0gfy9BMOjEhQdkHOL0m7Sxahc9T5s9j2wNo18IglA8vdseZpV+uRJcgstHlMRrcfk2zcC+y01jkC2FeEGxqTzx+E46LHBfS723iXz6vfdPWH2a/SZTh8I2iGFg0HPvMoTvnf/HZh42zlc1q+HpX7GqAFrahGDWlkLCzURab0fUsJMlmKu1/Evd9ZNeL9CPRvdaf4njqBZWQH4MkyM+Bv6u6BcJYT2QL3OViekl0eqF1EoQOKJ2MR4ZcSNj5OAwS8cDgPvtmbRy4mzwWionD0zbn0MKGGZc/zfsqmMKzC3ApJbLsKvmHasaGYBO+schwx2WhA== 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=nM8+0l+qLTZdshHnAJ+9Sel/ZeCtTCqf1NgmZM/aH4o=; b=WTIkX3KHxmoDJvnU9JlJRsZVzbLUM2JeJqtj4ZpqvOCZTFzXW0PuTX+IyYhPGlrlrOB8z20ea0yLaaUR4prryLfVOtd/g91G5TQYsQbrOn16Qq+F7nQKvEi6gVRkpdjR1I881yV3onG9EIDMyA3csbogtiQl29k8rW2cP8hVDFXIUgXiwl92ZzwOmzy7sjpVtApfuWwcb3zBOKc/oUOi0pdOccT39a+o2FMj/4Rb4FkkUwsaaV1TVSEI7LBrIezkbKFPEmWAQKtVJF8oWg4ZnXzTRNWwOukXo92CQwZwNXbf60vticdjP6T+yfYciFwmReRM+2oTEwrvl9JQhLatSw== 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:44 +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:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 01:03:25 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [I4W+tQxnnxdF4acEY5xWCEAdI2NL7C1oWK2xZNYb9Ak=] 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-12-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: 0db76461-aa21-4408-24be-08dc2b5df027 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicARn8Y3S+OnDYbPol7RUrVJMTWUhJdZ0Yt8VDefcS9j4nCtqyzUZqIz++aqSIoAel5FVkCXIuttnUZPQ88qCNgjfI+zt1s2f+4pMmmSTGaASJTHf8+KA+umyEbBuCuujD6qLwERHWgAnVxj1QU0OKfV53kAwMBngjWXmczJ3pY8hUa+cfJqxM4UUNIWjsjjRJG2KUvHCg1Ctn/T80MvVRTBxSSjiECEWiroIpbZZavCqQCW+5gkQousF7D6tLL/iLc8OFf7sqIIaXFnk8RgM/JDRm2mzOpTKy249GObPi87H4ox+L6wrgT9r9ErW52MZzq0lsbLCg6O0ehhoiHkdhYW2NJ2an97CeU8SK/SGvpwUjA8qXQA61/nG0yHAaAKudvcw4GqruNNHjhCqqqb74hFKxB1+9231pjd4wBvWF0eDomKnh+OEePa4KDLdeXXiLpbikFuIqdnftCVLqUvNXOG8e6GxNsh3x7lhIJcVa/F1JUZIpN7tm6uLV4zkV2k6i+KHPehCJddUVY38PRBksat5LOhexoWWsUnmUyBgf4Dgi6+3B1YKL05933455LoKMmj77estpp43hc0Jb6sqlS6SYOTBqB1yx5mbYyJpLFxGk+WGXI728HoO7YbkFWh9B8nJ+g5HEaSINm4fxqelvX4XXfKYQQamLOLG3ytFerPXKjA8EEPlOyz4qwMyFHfBl8jLGHKikljztm8P0yDAJQ3W6RfT5bRCzmYey2Afyn+tA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CegZLwihQ0FomkMJzjQx9NkCeiSd+Z4ie7lfZs4Yeouc3UHO12K3AQ3xSdSIFnAJQVTe2QFcCXIpoIuka/vcVe3/mEZrPqIEE5UzGLfpeWJMXg3BTb/FGVpXbf9PO+2df2dKH2W78wvgA/Q7vfS0G6jBlTvEIjY8xEsB84MUHPJ19WuvkQui2Y4khXhIvNP5xBRyCoOv7DM70ptNF8iw4/eoDK6Gjtmb526c8AVcsKvTt1/YUGhEVAptt+krB4mkjuYCbzfVOT1fzX/3NLUUzvYoZ0H3t2oFu6BPuR3oJpRqHPdI1kpxdYxJPYnHkJtQGAGZhdPh6f9SVAieSxwj2UhsqqspmGB07MIymOsBwcD0U/EWLi+grjQI/MJ2eLTCVCFK+QB8LP0+gTHJv8zHPQBSi9KKgKllw2xBsEptwo+dqN27TD054VE6GUhlji6TE0Mlz72BkgxTUiOdbV55Zi2WfZcJmWL9vQydV6859f2uV0l/0j8wTIPRgjIEIfMcPcnK21rAmb3FMO7fEOGNJKdLGoR2BFH2npBpuHYa6GhQ3kVoS2GUNJ++OXmozW5a3Slfr+Hr2tRD11XF+XAuRf+jmH916tjB72jXiSUR/zooQR6hI0kvvuZH2NvmeXRY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3TobUK5VezYD4VpMAX0oOzNmnkuXYHz9g8uxDVE8/5OHh8OvJWHkcDBNXifk?= =?us-ascii?Q?EPLumLczWCrQCKjoaacGu+SgIDd74uWDoUvi5yNymzH2gA7kbNwB2s+U/SIF?= =?us-ascii?Q?W2EpH62opYA0J9er17Pz322n0Ho5OdAAV6eiI2TBBTbw+OQVMrVqdBr8mBdE?= =?us-ascii?Q?dSlXV9JbJZjafSlryytjp4AWGx8jLtKFN21OLO+NzrjKc9mDHfVtgR5A0vqy?= =?us-ascii?Q?lPscb3LxyNKo8cOWWI4J7d8Ne9+NleatdtBH647J2wcpKjq4TdfpkHV/+hnz?= =?us-ascii?Q?rU3koxgrXQpxec5nngCqo0XS756NlrEBvnPmXFuyzFNcImjPB2lxeg0rwXh+?= =?us-ascii?Q?+4xMM/sFbWbDtAp+Ah2Nd0DDCo7ngM/xr0HpJL38QAeeM8GGQKAREYWywGsN?= =?us-ascii?Q?HUbKjYFzRJphwqjb+78BZADJmJQlYSDxJ449SNYqlGlRQ/BvfmgvTxUUXpu+?= =?us-ascii?Q?GSahHZg37EZx8/Q4uAukNXc8vzfRpxRITUsyyDRO8JdH6WtjhLrlcujbAleu?= =?us-ascii?Q?VrfGBfVgBNPELzxVUIkm6dZ977ENRG7Mvg1jFtFIWmJz/91F39bVGz+MN9Nx?= =?us-ascii?Q?WB7uKr3AbgofaGUoXTcfzLVj3TUQnqmdVsmhiZM3jtZJ7jI7LN2MiqwXIrqY?= =?us-ascii?Q?j/+cuttRDrtp6T1mZSnprKjrnM/EUEyOeUFnmmcaeD24woUxZzYkv9r3uaAs?= =?us-ascii?Q?oxDIiKRr3PlVH2pWHTeINtWso4U0nXC5Hdg48g1dL5ESMfEgUFF994Vv45Js?= =?us-ascii?Q?NyKAl5iHisLViowXkcLqlJOxdenYIrSAJjG1yLAFUCuUZHEri6ADc5o/95If?= =?us-ascii?Q?pnzLlMj1es0MIQ0zvF/yUTEhlvlWKcpYC6YF5/k327Y4ASOpbz8eetASAOly?= =?us-ascii?Q?l0Oj+lywx1qKTvn51Yw8TbgIDk2ar16626+A62xDCvscztks+NaRyJ2EzUT/?= =?us-ascii?Q?03/a/3a+Gz3gQdsOOqM7UBxMhPV7n30yvR3eULR2iT6kohJx8KauXN9EreXV?= =?us-ascii?Q?ksk00MmzTXQ1Bc0sGJ8FAoljD5lSINLrhpo9JtdnFiUK2KUrN+RVgI1WIwPp?= =?us-ascii?Q?CUfvra3aXs+QOjDuMK7JyDS/XBhn/fWvBtaV8+5l9O+tUXKQiZkbzmgP3A+W?= =?us-ascii?Q?5J3rqQyMwxSXCCYdo3M8zdKySxNsBuJshlk2Zli1I31U5K4mTYeyAM6udy8N?= =?us-ascii?Q?PL0PlilwhCLljprAtquLUfoQQwT8iKGK3nwLdx99K4lJCBu+uYfLc9UH7lIl?= =?us-ascii?Q?fKA20GADswM0dqOPL4vmT1avshlVrFAEc8FqnL/seA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0db76461-aa21-4408-24be-08dc2b5df027 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:44.3883 (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 13/23] avutil/hwcontext_videotoolbox: 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 VTFramesContext as one no longer has to go through AVHWFramesInternal. Signed-off-by: Andreas Rheinhardt --- libavutil/hwcontext_videotoolbox.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index fe469dc161..823cf9a8ee 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -34,6 +34,10 @@ #include "pixdesc.h" typedef struct VTFramesContext { + /** + * The public AVVTFramesContext. See hwcontext_videotoolbox.h for it. + */ + AVVTFramesContext p; CVPixelBufferPoolRef pool; } VTFramesContext; @@ -176,12 +180,12 @@ uint32_t av_map_videotoolbox_format_from_pixfmt2(enum AVPixelFormat pix_fmt, boo static int vt_pool_alloc(AVHWFramesContext *ctx) { - VTFramesContext *fctx = ctx->internal->priv; + VTFramesContext *fctx = ctx->hwctx; + AVVTFramesContext *hw_ctx = &fctx->p; CVReturn err; CFNumberRef w, h, pixfmt; uint32_t cv_pixfmt; CFMutableDictionaryRef attributes, iosurface_properties; - AVVTFramesContext *hw_ctx = ctx->hwctx; attributes = CFDictionaryCreateMutable( NULL, @@ -237,7 +241,7 @@ static AVBufferRef *vt_pool_alloc_buffer(void *opaque, size_t size) AVBufferRef *buf; CVReturn err; AVHWFramesContext *ctx = opaque; - VTFramesContext *fctx = ctx->internal->priv; + VTFramesContext *fctx = ctx->hwctx; err = CVPixelBufferPoolCreatePixelBuffer( NULL, @@ -260,7 +264,7 @@ static AVBufferRef *vt_pool_alloc_buffer(void *opaque, size_t size) static void vt_frames_uninit(AVHWFramesContext *ctx) { - VTFramesContext *fctx = ctx->internal->priv; + VTFramesContext *fctx = ctx->hwctx; if (fctx->pool) { CVPixelBufferPoolRelease(fctx->pool); fctx->pool = NULL; @@ -763,10 +767,9 @@ const HWContextType ff_hwcontext_type_videotoolbox = { .type = AV_HWDEVICE_TYPE_VIDEOTOOLBOX, .name = "videotoolbox", - .frames_priv_size = sizeof(VTFramesContext), + .frames_hwctx_size = sizeof(VTFramesContext), .device_create = vt_device_create, - .frames_hwctx_size = sizeof(AVVTFramesContext), .frames_init = vt_frames_init, .frames_get_buffer = vt_get_buffer, .frames_get_constraints = vt_frames_get_constraints, -- 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".