From patchwork Sat Feb 10 23:04:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46164 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp1752720pzc; Sat, 10 Feb 2024 15:03:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgSyqhr0KMckQYAHoVKKv4pVUp2TQGDQNT3MCI1MmLWEUJTaMrw2FXWwJyrCkQBI4jvJjM X-Received: by 2002:a05:6402:33a:b0:560:58f:e50d with SMTP id q26-20020a056402033a00b00560058fe50dmr1774960edw.11.1707606181340; Sat, 10 Feb 2024 15:03:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXHqYJLZgZ9dMMVKh8qBjMZeyPjS73Yt+NUAuWzy+CAHJUDrDHqd9A+Kszv6GQl/0YbZ9LJgOHmbGvI/SpVkiQtNDNDra++FN7yz5mMYRtCyuga+6qGhgc+gU2sqnCjE6oNH9pbcIw4F8ruQ5+EPrlHidbgNSLKziJ8i3uJYn0obpOaXxjDIK0aBGFSRuCF6EK8ntW8wyFRmI2x20nbvFdO1CQdFmyVGX9MMz32JgVwyE9lMdbi/qT8RV5TMOUgmtJ94sHc69+g5Pe4BxPQ5vLByu0q6HzmbxsZasVlvmM5Zg8pDdJj/593rvUD8erCzzFJ1qf+4XIKcoUKFmxRZkSjLI/t0pqRP2TbZluRTqxeqGy3e6U77Pt1TPqUTqRgZ3dAwtIxiVFB+pPGtMWyee12fH7eZ7chIEnrxf3ZE4wp9/IbhWbqfutakSe9Kp/JjZai9qq84v6ib11fz8tjkmNSoNai7UogLQLfB/CNjyWIMBSAmjLP8rRBknE90tPFUDQKrBzIDfA+4smo6U07mtqji3Yhuvv/6ysAu5zt/nMbC/4WBmD4mHRLRZlLG5chK2ADvvH11i5TYX9AbHjECc079QBa4tuNnNGGOJoIpHnCh7PQUhFV/lpEuZ02jyInMwfoU2TfB/DAgdnC5Tr3q80kDdfvCXtA2Vp9kZkQbyRBBaj+yU7kEc7NApXtoPxkyf3kEiUkpEw2TKsGoH2q5WcoGuLGsA7/znpvRL2Bs2W72u1ysu0rQMhpSxHy2d9zdIWtK8o6/3K6+CHDwPafGNFt75lNQ8ORWJ933mCdFshFZoGIfIBoc7bIT0kNySqdttRdrJ58MsnoG8I/W4OinplpKQEXDMx2+qi4B5sJjgiydSMm4e2kftV+XuOKdLmjs+po8UxB5yFAn3YI0bmtc90LitaXA9xg4KQORw6tTMC1FUt8Ys8pKDxJA/A4eVWfOf1ES6 PAZ5eB05TdPS3iTdK9YL0jE8uY0zdjhsMM55j/E7+wnxAdRNcjVSX/ErRwHL9Ofx+KMxpCAvIpi6HFO+jjeutriXfqm7dGHk3kXNrDlL5+T8d5zv3Z4tQnW7rd0GFnwXETuLFLpIoL24LeiN5V7WAAhXE56GEX0HtxGKEbFEsiki3bcrRHGc/T8WdAIBcH850A5DDAeHM8U73XT9o1BAgtiUV8PeCRZ2QhSw4HHy2VM2BSQgb8m7nk0IpBsbXhKITptU9jiZiW1i616VVsI+FcvHO3LdqSuTbnuMdGRApU6a0LxCMnip2vpj+eXKorlOlv6aF/wzHQxhKb+UCkLujFit/+gOrAosrEcXlPqbUXpxPj7TyMxUz7I/A2QLOyR1NvHJxdwrqZTGFy/ZlINxzIWHzZ2OrAYKmfEBOnQI9O4mypaqbOTdgWbjrveWNG0Be+XYlix4A+M+0RYne3hP4SFMr4qVEpGScUC/PidiGTEXXo3NL5YFyTwJ3nNS+Md0P9Nu6Ez3fA9FkU+qCMVa2w780/JGhxmv8g2xDDCf+oOT7unw4eDR/c/MHm26vdnD9m43LKovuNlobQhbSOcJth9unTMrIdc305M5E= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cy19-20020a0564021c9300b0056004e767f4si1253743edb.130.2024.02.10.15.03.00; Sat, 10 Feb 2024 15:03:01 -0800 (PST) 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=q+yRGulU; 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 9C5C268D14C; Sun, 11 Feb 2024 01:02:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2058.outbound.protection.outlook.com [40.92.73.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3CF4D68D130 for ; Sun, 11 Feb 2024 01:02:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mEZRUbci7EthtVCaHoEOxTyXOLgshyHIJXjztbX/zmm0S69ngzaBgxRWfMvcOd76W/E+TiG666vtaX3HagLzvxk7qRC1JUMZ22qrV0k/OYerBjWYVls0b0Ix/Xb8A8RMbOkKEghRkGijh6csqEa8QFzjkUkNoL6nKEPh11tooj8WyoA44FjkNeYgLZsdhKe+mBG/edoF0s4BQYtsCZI1txJL+8Bo28FoOdbyzcgLg1H7mBLgMVlsCQRgKQgXpZXEXxhthkLgphMu70fqJpVjuaO3GQRgZ4BrMn6Bb58zAw3T2tde+1VOq9KQIlcI9XImYcZZmFnO59p2BFJf1puHeQ== 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=BUiO7Zv4RMbRGpDi9mft9kiTPBJfKDGk5zOskLkkRig=; b=k+ILGdTyh7w8qk4m11AGgNaHi7/rjZzsnNeLmGhXvVNoma6rX9KrAIVW13P97PGVXNCYbRLhF7MuOQUdWG7zzWC2Mitz/8EpAvtzZ42drwHvNAHvGarmgKG9cjbTVyLPFN65leU/zFp48NHGTWG1f/0CNwUd4V9KQU75TgyldW49wK+mJ4KCM1tNWd957Gc+zT1tbwI6LHLjXo/hwe/BB6vtBwQQ86bS4sRqYP/XhfC8Y1b+pw3QCrFbNeLHc/9Sj/G8JQdGHoVNGKELBHY5nP6rHKyE5KetepCOhUwPbMn2P2E/sECt9W9ycQ5MS5DsTr/syg4381ckIcSg8DmnrA== 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=BUiO7Zv4RMbRGpDi9mft9kiTPBJfKDGk5zOskLkkRig=; b=q+yRGulU/iA2hFTrIzjkoIuE7E0iLmV5yG4ksXjOVH8tApaqLKhcUQdOHppAVLby/OwkpTBDKEQm/7HX8iQsbXrMBUK7IkbHsLnlWi4OyUoB19flfRuY0XhrRCME68IO4Leu9DJN5x4rYVh5AfEvkelZtTNGOKG9oysGTewTQSUeUqfeCQe0TaH+w4KdvheO/RN/REtofF11K1n/85BdB85IGidpD25ERRgNRIbgz5GwtGAEcvocS3cpwkGO7ab9B+k7+o0dwJwT45d53R2y1A5SyC9U5IERhyQ2pXGbxbg6pyubhFOEEx9HeV+RUNCwSaOSaMfyHpWKG9xioNPB8Q== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by AS8P250MB0037.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.33; Sat, 10 Feb 2024 23:02:38 +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.033; Sat, 10 Feb 2024 23:02:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Feb 2024 00:04:07 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125134425.374-1-jamrial@gmail.com> References: <20240125134425.374-1-jamrial@gmail.com> X-TMN: [oq5AbU6q8YF09kYxqWTxBgj6G/EyKLG50bM6xKOPBzQ=] X-ClientProxiedBy: ZR2P278CA0003.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::6) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240210230411.2616270-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|AS8P250MB0037:EE_ X-MS-Office365-Filtering-Correlation-Id: b7b333d3-eae8-4726-ce3c-08dc2a8c6017 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicCxfSlM0Mf+zc92VeVIBtN2nndbitdWGv4uJ3oe+arBiqwZUddONzLsdHA7eJmk1g9yA7MC4NKAw4KN8+2wTwv/PN/YIQwbru7uWUY2CD3neQ+KHwIA2veI80k2rhw9nTPeNxRro6rj79rueE7kO+rcAGqt2xwiJlw/wpPNvdFjsy44GbER5TYaamrWy6hiPXCErGMA3046XRDtBZuvgSxum7jwFBZ/NK95ga4fblv8PtV4I75O4i9kzvby3dhUwiDOVzzhRgNccsWR/53I1aja+UeFDBYmMeBk1nGc9MWgWXVqxDiCrBRzVPzS4radwJ49DrugM/S9BTxVZcKXrroOUOckxaPVAMksrJ5nl1+ImplBbFJXM2hFgIlDaq2eufBljuT44Tn8vX30en1rIy7QU2MH7JH4fkbsv7uVV1VTu83aVCrPf8f41+6Zak46zB3ViK9W0zRuHUOPMNF6ZX/IJqkKPh+5EdenbTASOdFQzK3w0i24m2yqldafc0gPN8Q8lDu7JkIm13vpUA4xpnhfzz3Zn5e4TplUjxG8ayjO78VIhxR3Yq6B/eAMXznS2f8zfItcCbcgk1kUEaMBjfxD2rcq/kK9JRV/toF6N/B4BoT/t/OVtRsZK1K7M+a7doYcJw2ZgFkqmSTDmskMarEoeR8qMzMvZgDv3O27wsr/BszNgUx5EQW0SKAMUl5dGiVNeOT1/cfTVi+P9umLrdbaAemAfrtvQZwB85R6NWjWmQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LxPadRcNG6Eu4yFra9cs8LimUkr5BtqBdIZiy+m6KY2BqF8hRTNaByu4o/+OUzMR/zlxGsb7XCiLqKpvNaVxlACXhkJrI7JkZHXnpUD9CgEBXtt+e/Mzn5ArWjaFH0HqCtbky7oykuFXY3vp5n42VKxAco4y2cExvSS3akuFQLqiOyw8U8iYUnY3EkZfdhMdBuaPJbHzmw1rwfr6wyeCj1vILlJX38QAxvePf7+NRz88oU6wLn/n9DV8CPXK+N7zUFUb3rysJaZTbyI1XtxjATN9tm1fQHisNOCOCHDbYz+Fh8r3vsIl8NWSfXUbxJNx+5FXEhOGfz67NoXE/BG0eEdkdefJxxVGup2Rb7r9dBLOgh4f95WuxbJCoqc3aGc7KBg18Dxfpj406gL+UzXXAoLrgDJbOHa+7m2oT49BoecjVcTr5O6eBA0GJz4/GmrKi/k0oa0fn4S40DiM/I2RfQI3GIcLWN/vhwmz3hCItf9jTG3/eLn8Q15+SsloZ3sjCYtp+Sd/sYfPTSzKAiSwcWhURwg2AIFEh19Q1uG1hiQxugoLp+lJRQd3KFDme/EMQGCaWjzWjm2MKbCYfwP43ZgSOo7JJ026pVqeRvfAjHbkILwrEf9S8cy2qhLMGKTB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eDakwhlzBuF6mGSi6py1zbJYP6DFbLfpgZldtTDxAi0YV9FMYsxQGH/KSxcn47StoQuMTPBGqzx6DgPNX9dRyU4sFmCRLUD0d7GF2q+mMUT9Uc1Qk7tiVeyS4tTOgd4ZcKxNacDcmlQbd/pB+YguKwqX3+T+O4UaKZfcOQBWOoqs1JiL4FHKsQ+kS/MZlnK0zrwvBGEvWEXV0hCmqKPxAwvxgHsyEUgkMC6y4fltUcle7Jm9Evn+Rc1wpR93PBjRLaOSDUYBmguXwgipcIYcIbzo7h8Y+40IXY1R94Zns2aKfVb9hSRe6JAZrPtcjciAWwXW77fpsaYOGJLhvidgX5QyPYhW08vxnOSiBWJJGgWCi1QhmGaBj/jNLyFui2jvrpUKokKsYekTg1ztV4Ajzgu7pW1meP+G9HiH28h0gK830mWUWqL5n7N98SfI9fyfgMYHtAU+sUK31+sAwFHvYTGjMeF1ZZlS/gOMw3LPuzTwQO8aJP0gLaWnwAIvhFBXA+BTFnCEGrbUVjv27atdptrHCkhSB+v/tFyj40wJvOkZ2Qw1QrpvJiUX2HTAquEVoD1LyfXVvDVYFZKnzShOgR1h4PPMRo0RRH7HLvfaZq0apVPBY+5RlLa6knYuGSV6Ux/CSuNHNVwb7Tt3aL1WsLm/SrEJQT0BJTnE1pPqyvMG5kloTzAeZI6Vu62CB6Aij/2n2abE5mkrhrRgHn2zHiMcuMHIgv4O5xp4Vw/V5lZMEL1XSlYg6gPrYDOHw08IJUy89sCEEUS6CERieKsv71lf+UmTgDsrFjd2M4x9R7BEXtOYMlxyDa0FljOeEBXRKvPj966wsZu8yhcpG99+6d6WLw9WdtIp5ZTWvP5KGjYWHWC+Okh4KB5t669zn+aVZM2JifWDRJm/QkQfVnPFWUFGYbI9Qm0RG+yudzMw309o5sJDn1UFPapsWYUNCYOg74aWUg+AmkpYrjVhaXf8sjpo1Lmm6XSOkcfEaOmQGxwNzX3sqs0a0lUWMaG5YXuLX3BlO5qS7GwUwNS68zwfGXvtS0gu+YUUt2QVmhxVnlvNXIODaA+GC7EdPrLmq91InpBe7gHynJJUyLENoh6HGwszRmHYEnQ2F1R+SS0IaFf+Y5ON+uWT6i+qyAsZl1nONPaGjppq7ec9/qFXZ/pqCcNr6ZCdv0JUZ0R7HtmkzMYt90no6FtXa7kngrXQE/lznBhlRh3oUorh/n7YpzO4JdEjN63BKNuCdpYjjqkk6NleGcaJOaMdESFjTFc6zjeTw0HBOB9ELfT3oI5bHYqDfw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7b333d3-eae8-4726-ce3c-08dc2a8c6017 X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2024 23:02:37.7208 (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: AS8P250MB0037 Subject: [FFmpeg-devel] [PATCH 31/35] avfilter/avfiltergraph: Avoid allocation for AVFilterGraphInternal 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: hT+N+BdLVn8w To do this, allocate AVFilterGraphInternal jointly with AVFilterGraph and rename it to FFFilterGraph in the process (similarly to AVStream/FFStream). Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 6 +++--- libavfilter/avfilter.h | 7 ------- libavfilter/avfilter_internal.h | 17 +++++++++++++---- libavfilter/avfiltergraph.c | 32 +++++++++++++++----------------- libavfilter/pthread.c | 23 ++++++++++++----------- 5 files changed, 43 insertions(+), 42 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 85e2936e6e..af46011b27 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -187,7 +187,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, av_assert0(AV_PIX_FMT_NONE == -1 && AV_SAMPLE_FMT_NONE == -1); link->format = -1; link->colorspace = AVCOL_SPC_UNSPECIFIED; - ff_framequeue_init(&link->fifo, &src->graph->internal->frame_queues); + ff_framequeue_init(&link->fifo, &fffiltergraph(src->graph)->frame_queues); return 0; } @@ -888,9 +888,9 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options) if (ctx->filter->flags & AVFILTER_FLAG_SLICE_THREADS && ctx->thread_type & ctx->graph->thread_type & AVFILTER_THREAD_SLICE && - ctx->graph->internal->thread_execute) { + fffiltergraph(ctx->graph)->thread_execute) { ctx->thread_type = AVFILTER_THREAD_SLICE; - ctxi->execute = ctx->graph->internal->thread_execute; + ctxi->execute = fffiltergraph(ctx->graph)->thread_execute; } else { ctx->thread_type = 0; } diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index a3725b1516..65034f831a 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -843,8 +843,6 @@ int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt, */ const AVClass *avfilter_get_class(void); -typedef struct AVFilterGraphInternal AVFilterGraphInternal; - /** * A function pointer passed to the @ref AVFilterGraph.execute callback to be * executed multiple times, possibly in parallel. @@ -902,11 +900,6 @@ typedef struct AVFilterGraph { */ int nb_threads; - /** - * Opaque object for libavfilter internal use. - */ - AVFilterGraphInternal *internal; - /** * Opaque user data. May be set by the caller to an arbitrary value, e.g. to * be used from callbacks like @ref AVFilterGraph.execute. diff --git a/libavfilter/avfilter_internal.h b/libavfilter/avfilter_internal.h index 3dd51fb993..9ddb82bf26 100644 --- a/libavfilter/avfilter_internal.h +++ b/libavfilter/avfilter_internal.h @@ -36,11 +36,20 @@ typedef struct AVFilterCommand { struct AVFilterCommand *next; } AVFilterCommand; -struct AVFilterGraphInternal { +typedef struct FFFilterGraph { + /** + * The public AVFilterGraph. See avfilter.h for it. + */ + AVFilterGraph p; void *thread; avfilter_execute_func *thread_execute; FFFrameQueueGlobal frame_queues; -}; +} FFFilterGraph; + +static inline FFFilterGraph *fffiltergraph(AVFilterGraph *graph) +{ + return (FFFilterGraph*)graph; +} /** * Update the position of a link in the age heap. @@ -77,8 +86,8 @@ int ff_filter_activate(AVFilterContext *filter); int ff_filter_opt_parse(void *logctx, const AVClass *priv_class, AVDictionary **options, const char *args); -int ff_graph_thread_init(AVFilterGraph *graph); +int ff_graph_thread_init(FFFilterGraph *graph); -void ff_graph_thread_free(AVFilterGraph *graph); +void ff_graph_thread_free(FFFilterGraph *graph); #endif /* AVFILTER_AVFILTER_INTERNAL_H */ diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 193fafe61c..0e2b5ee1f2 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -68,33 +68,30 @@ static const AVClass filtergraph_class = { }; #if !HAVE_THREADS -void ff_graph_thread_free(AVFilterGraph *graph) +void ff_graph_thread_free(FFFilterGraph *graph) { } -int ff_graph_thread_init(AVFilterGraph *graph) +int ff_graph_thread_init(FFFilterGraph *graph) { - graph->thread_type = 0; - graph->nb_threads = 1; + graph->p.thread_type = 0; + graph->p.nb_threads = 1; return 0; } #endif AVFilterGraph *avfilter_graph_alloc(void) { - AVFilterGraph *ret = av_mallocz(sizeof(*ret)); - if (!ret) - return NULL; + FFFilterGraph *graph = av_mallocz(sizeof(*graph)); + AVFilterGraph *ret; - ret->internal = av_mallocz(sizeof(*ret->internal)); - if (!ret->internal) { - av_freep(&ret); + if (!graph) return NULL; - } + ret = &graph->p; ret->av_class = &filtergraph_class; av_opt_set_defaults(ret); - ff_framequeue_global_init(&ret->internal->frame_queues); + ff_framequeue_global_init(&graph->frame_queues); return ret; } @@ -120,6 +117,7 @@ void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter void avfilter_graph_free(AVFilterGraph **graphp) { AVFilterGraph *graph = *graphp; + FFFilterGraph *graphi = fffiltergraph(graph); if (!graph) return; @@ -127,14 +125,13 @@ void avfilter_graph_free(AVFilterGraph **graphp) while (graph->nb_filters) avfilter_free(graph->filters[0]); - ff_graph_thread_free(graph); + ff_graph_thread_free(graphi); av_freep(&graph->sink_links); av_opt_free(graph); av_freep(&graph->filters); - av_freep(&graph->internal); av_freep(graphp); } @@ -170,12 +167,13 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph, const char *name) { AVFilterContext **filters, *s; + FFFilterGraph *graphi = fffiltergraph(graph); - if (graph->thread_type && !graph->internal->thread_execute) { + if (graph->thread_type && !graphi->thread_execute) { if (graph->execute) { - graph->internal->thread_execute = graph->execute; + graphi->thread_execute = graph->execute; } else { - int ret = ff_graph_thread_init(graph); + int ret = ff_graph_thread_init(graphi); if (ret < 0) { av_log(graph, AV_LOG_ERROR, "Error initializing threading: %s.\n", av_err2str(ret)); return NULL; diff --git a/libavfilter/pthread.c b/libavfilter/pthread.c index a0336a8e04..06590fe65a 100644 --- a/libavfilter/pthread.c +++ b/libavfilter/pthread.c @@ -58,7 +58,7 @@ static void slice_thread_uninit(ThreadContext *c) static int thread_execute(AVFilterContext *ctx, avfilter_action_func *func, void *arg, int *ret, int nb_jobs) { - ThreadContext *c = ctx->graph->internal->thread; + ThreadContext *c = fffiltergraph(ctx->graph)->thread; if (nb_jobs <= 0) return 0; @@ -79,8 +79,9 @@ static int thread_init_internal(ThreadContext *c, int nb_threads) return FFMAX(nb_threads, 1); } -int ff_graph_thread_init(AVFilterGraph *graph) +int ff_graph_thread_init(FFFilterGraph *graphi) { + AVFilterGraph *graph = &graphi->p; int ret; if (graph->nb_threads == 1) { @@ -88,27 +89,27 @@ int ff_graph_thread_init(AVFilterGraph *graph) return 0; } - graph->internal->thread = av_mallocz(sizeof(ThreadContext)); - if (!graph->internal->thread) + graphi->thread = av_mallocz(sizeof(ThreadContext)); + if (!graphi->thread) return AVERROR(ENOMEM); - ret = thread_init_internal(graph->internal->thread, graph->nb_threads); + ret = thread_init_internal(graphi->thread, graph->nb_threads); if (ret <= 1) { - av_freep(&graph->internal->thread); + av_freep(&graphi->thread); graph->thread_type = 0; graph->nb_threads = 1; return (ret < 0) ? ret : 0; } graph->nb_threads = ret; - graph->internal->thread_execute = thread_execute; + graphi->thread_execute = thread_execute; return 0; } -void ff_graph_thread_free(AVFilterGraph *graph) +void ff_graph_thread_free(FFFilterGraph *graph) { - if (graph->internal->thread) - slice_thread_uninit(graph->internal->thread); - av_freep(&graph->internal->thread); + if (graph->thread) + slice_thread_uninit(graph->thread); + av_freep(&graph->thread); }