From patchwork Sat Sep 18 03:40:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30336 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2785955iov; Fri, 17 Sep 2021 20:41:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5SI6Y81K7LYE5EUDKunYIg6XbKChfFlasRjpd4rNZrVrWCv9M4u5pG9QkrT02qWUGJ6++ X-Received: by 2002:a05:6402:198:: with SMTP id r24mr16497096edv.93.1631936466860; Fri, 17 Sep 2021 20:41:06 -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 bc12si9207262edb.480.2021.09.17.20.41.06; Fri, 17 Sep 2021 20:41:06 -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="gUq4z0/P"; 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 0966768B186; Sat, 18 Sep 2021 06:41:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075040.outbound.protection.outlook.com [40.92.75.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A4F668A9CC for ; Sat, 18 Sep 2021 06:40:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MhUwvV+w4jONrOs2VsSjyfUfsHGlEcfbuT1jKlepXL+JiWFuIC7X+x7HP+QwSCJMoTVmgnB6nW/fb73odRVXD/X0dTQD7IbtSrJomHhu6tIrkzinGobfkEyaNY7rYkE5pHdIxUigmepGZ1xXvEPQ8wXHA2FeKzrdQDb6Hw2NVGeHsg+ROQKAzff6Swbb8IULbJVk12eaEg83oDJuugMXluDQwd6cewHM4cDUqfykXbYBBLDZdWbYmHLdYQFzYm24BXCyfRvTuVIWPL7wDP9N3KkBroEMG5PadTD6/5evpo5pSGpxcvFd/RBY1x2XnaeJmTJgHPYjY4RfZpzE1mhA2A== 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; bh=zq42JOURlrYXsuUnCmIackW/DaypqQd7GXN/SVvBx54=; b=hYdV+HnFjEPPeKtFUiI29dMr2Tr2nOZ/xZ3X09ZnfHpZp6fbic8syfSPPQvwBkHpjNXG41PWluJUTV9oRS62xoWDyeVmj/dAuoWCVN3AyVC/Bgumej0VZQTnPT6Q3LeoeDzmxoWlL3P6O8pF9JmOefNoPJmoEN40xLdQ7f+Ig/lulGibhRqdQW0ujIDQJc2asVKFEzy3jg/J2G1Nt06/ES7D8ZQ9ziIpC3ZYsySILIR7Cuz3DA32T8C5pt9KLySXxxJ/lTnGnyrs0kAT/tG3F36ZIfsX+hW7XstbjYBhjIa+hyKmaW0KorUunHuWIhkM+kdCHlWM9NYzqLnrfonsLQ== 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=zq42JOURlrYXsuUnCmIackW/DaypqQd7GXN/SVvBx54=; b=gUq4z0/PHhnCdUQ4BYtYB7mKl2Qt0o1RuwTIF8WX7WySEZlCI9RJIRafoMJddHhRTjOTmVw080DsxfvZOC8EbPzu1O3LE/vAqQc7QT0le4y6mrpA8dbXbQCdmvTrp0o0F1VBR724mG2dSpiClXBFFY5q+rpMtrJn+A8XLzHRWin1F1di0UA8nKhrLpAiW0kYkdBo7cAyB19ePATICMfLjcgkmhBID7Fd8TJ3mrJE/pstocdsv8dN+3XQ+Dh4YDq4mjLnBmzTwhI3GcpuDzVMdtjcBOGMB9eU7ywXiEQFz/rf+Mf0g/fdfwsVIdtXutrjqEDyD3s4abVyKfvjN6KqGA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3958.eurprd03.prod.outlook.com (2603:10a6:20b:23::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 18 Sep 2021 03:40:52 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.016; Sat, 18 Sep 2021 03:40:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Sep 2021 05:40:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [hKQG71XSCpvFniMqkRIdRIym48KhEivN] X-ClientProxiedBy: PR0P264CA0087.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210918034043.1325980-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0087.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Sat, 18 Sep 2021 03:40:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94fd62ca-04f1-4127-f06d-08d97a561cad X-MS-Exchange-SLBlob-MailProps: EpEO96k6Wol7u7rKrWAHjlkRuuJcqbbaYF5yvLixVDtt3UprCY5gkBB/x81UAnibeRF/aZmMTzjIdt82yyX0kI2WyXBO4CGUVahkoBxQMMbHj2ZsIuQoi6TnlYhFMkBMRxKHuLTocRJ9Vsfp+k9wz6nxiVBtqlhy0xSL6E1odz2F8AG267yT0lDciLR43KiFPvNTaPCUddu+7FnMhPS7OxlN/HwC5K/cjbPWKrUlzjRRwhOcpbuB3UugIVMeQjfgY7Wwc7xYbZx008yjP/KOhdQ1xiafYvAhSlawzw7SphYQz5bcfgBgqTNLrXyp+FdxdkO3JlR3ZI3EeLV5hytSugX8m0RLUTq68DZX74T7XaXM93ji/8i3nQJNq2YgTEg69MxH5YEO2cV1tcGA4fMAUSCp5gl8jM5T42VMFMB4GGojgCJoFojxj5uKR6+6JBCOLrEu9X7bFdDOJPgrQS81yXwyVtCh2EO4i/4eDIHLW/rZOo3btsnmj9YFw9p3gJgx168jPtHwYZxjGY8lYsclWUSSLx6HGyleDrqzBOCTmb8Qx4zupoPugAEuGk7quA1EWYonADDkuYShFZCb9oxR2a0RiH6kkV1G01Gv1wgG2G7UzOTu9BSRbE5HhFtP0H6WoBHA7FQKDclfVbdw7fbP2zExTzJKaHe/qzLTbBRjWr7i4pw2fK9oROR+nbERPp5Y46QqBL0OF04fiJNS1yFAncXkCRpe1UuP2hXruHJE3SwyidukIVM02DRAnmRnhImUhKDgWyIn9Bk= X-MS-TrafficTypeDiagnostic: AM6PR03MB3958: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OrMeEUi9ZuM3KZuLEj2ptzHVVzMTfulfucZJu3F2Fb4NKw7pBawpNNjEu58T/ugCGr1KJbvh067dsUw99/I4ahj+tWkvxO4iG2/1xstYl3VHJQqhyVhoWI4u51maK3Q2vuDhzHtDEb41+lYc5LOKQ2naw8OVCucMlF0cLmMkQnWdjC/+ZpvlDeXcV5YSLcDyIwebcJz2Cw+Fj2U7TU1+zG0JRpfv0ThCbJ40T6tWW9S2u+Pjn1OMp0arNn+JKhOdzBMcm0tosZRgwqojbalejV2qWVlqfL80h+e+PMz8MiR3CE1UkgTC4aF4qCnYi+hJHRkp+GBt2D+lMr1CPmuUKJ2mtqyr4ujxwmQHkZ+y5Kd4pD33+e7FOwAjw1YQFp4hQ2FXaeUN+rGMmMcWgWJLAA0qTBi0DNMB2G5w77QeoYPODt56oZVr5CifptUzZ/ry X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CmyX+2vhGVi3XTDPbZRHKxR5JuExQkcz7bDpDRA2daSpjfLv7I9MHLOV7hwfCjgBrIt+ITfGd7t33XAKby1M189eHS6j8Ri0sTxIJwZfoJqMkQ8SOHsx3eXxcm35xizaHxTFibuaykVwOAmru90YqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94fd62ca-04f1-4127-f06d-08d97a561cad X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2021 03:40:52.4498 (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: AM6PR03MB3958 Subject: [FFmpeg-devel] [PATCH 1/3] libswscale/options: Add parent_log_context_offset to AVClass 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: gvT6EbZPlFRb This allows to associate log messages from slice contexts to the user-visible SwsContext. Signed-off-by: Andreas Rheinhardt --- libswscale/options.c | 1 + libswscale/swscale_internal.h | 2 ++ libswscale/utils.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/libswscale/options.c b/libswscale/options.c index 4b71a23e37..f6ea9e1f9d 100644 --- a/libswscale/options.c +++ b/libswscale/options.c @@ -91,6 +91,7 @@ const AVClass ff_sws_context_class = { .class_name = "SWScaler", .item_name = sws_context_to_name, .option = swscale_options, + .parent_log_context_offset = OFFSET(parent), .category = AV_CLASS_CATEGORY_SWSCALER, .version = LIBAVUTIL_VERSION_INT, }; diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index fbfc08a89f..0d60dd2e6f 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -301,6 +301,8 @@ typedef struct SwsContext { */ const AVClass *av_class; + struct SwsContext *parent; + AVSliceThread *slicethread; struct SwsContext **slice_ctx; int *slice_err; diff --git a/libswscale/utils.c b/libswscale/utils.c index 25051ead72..84a29c4dc7 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1214,6 +1214,8 @@ static int context_init_threaded(SwsContext *c, if (!c->slice_ctx[i]) return AVERROR(ENOMEM); + c->slice_ctx[i]->parent = c; + ret = av_opt_copy((void*)c->slice_ctx[i], (void*)c); if (ret < 0) return ret;