From patchwork Mon Oct 11 04:19:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp3314138ioa; Sun, 10 Oct 2021 21:19:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZ5ZuFsUKWwTBKZ/n2cpGgXkZXa6jFLiNHs7y/cdHCx97AN8JtlQQAqmgJGRO1OPo4yH8t X-Received: by 2002:a05:6402:40d0:: with SMTP id z16mr38894152edb.220.1633925966335; Sun, 10 Oct 2021 21:19:26 -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 y8si9753102edm.73.2021.10.10.21.19.26; Sun, 10 Oct 2021 21:19:26 -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=@hotmail.com header.s=selector1 header.b=a8vEwUyZ; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 646D968A789; Mon, 11 Oct 2021 07:19:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2029.outbound.protection.outlook.com [40.92.41.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5F4C6891F1 for ; Mon, 11 Oct 2021 07:19:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mYVkwYV8yEY5uODa9UaA+fr7A29VPhyPfG9jU5bggho4EiEmzDmlO//Gl3dO6AlEZjPybqhIz8WjsiqLgz6jp1hjj2Gu5Xf1Het+oUYrLzbbgfE2QsrHBLwQsQYlcKk9KqsNE5+7t+JdagNsiS4MZ3d/zv3JkuNSFuSlL6zklVdfAUyaS6jfHtr4vdE0XYny2bPZEClhGo1sfwngYh7JFEz8OjHXPqhN/JEZp9EO4wBCMuA+bgUN690vrwCdeT0H3sRgi4jDYwuFRvE2geiTVXBDgH6pcNtKr2YKDgBzHlz0R0lFL7qxFkCaZdWXNhHtREBsddgRHaDa5VRwIFM+mQ== 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=1N950XshoAEOHXIacXfXS/YbiFAQLDJBYuDoLGkPEHg=; b=EHmMNidtwJI2Qa7+VtbTd7cb6mA3E8CZD1/nplBAJEU55vqe++LAqMP0lbONGVC7NL4dogKA98yg1ijMWNGipm+vqwOoGizUMbhYQ+lgnoAx3hidhX9RIlLbztoyfgA6IuJQYNmY+xn+LvMQR0E824GEl1RetUcZMg8S8wHSU3TdeB6O6XuNTLjb6H3voTu/5lH/mvuOUFUM5KEfrNlEHFMC+XIZxTHZiR+KrX8nVmJj1735Qt2GJvTBxYEWMeEm9Ccll2Eq0rSokDAmuEJE04C1CylpGoR95A7rNiLOgD0CHmKVg/GVK4UXjo1qPPwtYnFQROnGJNXh3SZT9Qhm5Q== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1N950XshoAEOHXIacXfXS/YbiFAQLDJBYuDoLGkPEHg=; b=a8vEwUyZe0NxO54Xw3+7cVPaK+o/PgYLFYwlqEvHE8SvW4ykGgXm45/j05g7PNJm7WALk0uSzOEllfgNbWdRjPRPkdHVycKGI/8gyE0pdCTl3OmRjmDrlHeK4OH54bWGuVIuaehR0LANJYwVv6zglFbxksWLMlSLy7RSVIPj09PV4ertKOAXd5aB5So0gddKlx/hbfGDCmUgTPsR/mV/fMXVBsWqltFNiwMHCWjF0FMJ1IZ+RpsebMXmVFohVO/PJg91NI5W4+YvEA9BOh8dQsx1XtLYus5c3zXHNK75YEChyWfjNqEnWIJakflXt1Xjg098pZpjPWZjFcfF9GjK+g== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB5566.namprd04.prod.outlook.com (2603:10b6:208:e3::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Mon, 11 Oct 2021 04:19:05 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4587.026; Mon, 11 Oct 2021 04:19:05 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v3 1/1] avutils/hwcontext: When deriving a hwdevice, search for existing device in both directions Thread-Index: AQIrZdEXveRs0pXhvJxt4faJ9+ztJgDEw3l3 Date: Mon, 11 Oct 2021 04:19:05 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [Sm65CRQIxMtoatxrc3kwygzmBbES03ZB] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f992853f-372c-4309-b0ba-08d98c6e435e x-ms-traffictypediagnostic: MN2PR04MB5566: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: f5dk0lzM1XmnwfcIUcY2i4Ug41mt1LQlj+GGkQZFC0++l2yf9E8l/pwBMSTG5fc6V0jnKWqSD5HKN5EmoAzYPPNp3uHnuvF4T+E9pgYXiaEz5NnDLSnq6AsMzKqgpoOB5SyIfAAXwMbqwk9GC0MFb8b/celc+kBIWxsYedexB8jTKZRqm5JKwOhq/opplSWgNjzIOS1jQbr9BqwUj7Gpq+9ZqoY2Z/uUlsyDWlIce9vnrxUGlR+i3CioqVn2YwYWQuM9x1yygmHem+GafUO0XFZurt2C6CLo1PDYqZP4y8h6+/2qnoy5zbL+OAblXSk7/NePThIPfW0nJ5qvPjhBTfOOBkdV0Wfy1EQesQ28ReZcwZ0AAMIo2qaXRYpZS8DdwWKixHIkP63SlUwVYs/wC/yWLHI2n6ZAVE7Sjms1Bl/PBuX4Ibjh/yfiSsDfWVCv x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: gHduMsz3z8ryJp7hDZ+WwB9DSOlUzK9JviQhy67nc8QDYseIXKsaUBn9sF17H7ntvs2+BoQwxpiDGQYiAfyOWVkip7D7gEBK98EwT3FEfP4XR5QrhaIK/gzUAHcfvpoGu/BLjsZcGGku4yaA71zNoQ== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: f992853f-372c-4309-b0ba-08d98c6e435e X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2021 04:19:05.3846 (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: MN2PR04MB5566 Subject: [FFmpeg-devel] [PATCH v3 1/1] avutils/hwcontext: When deriving a hwdevice, search for existing device in both directions 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cSeqqTSV3ICK The test /libavutil/tests/hwdevice checks that when deriving a device from a source device and then deriving back to the type of the source device, the result is matching the original source device, i.e. the derivation mechanism doesn't create a new device in this case. Previously, this test was usually passed, but only due to two different kind of flaws: 1. The test covers only a single level of derivation (and back) It derives device Y from device X and then Y back to the type of X and checks whether the result matches X. What it doesn't check for, are longer chains of derivation like: CUDA1 > OpenCL2 > CUDA3 and then back to OpenCL4 In that case, the second derivation returns the first device (CUDA3 == CUDA1), but when deriving OpenCL4, hwcontext.c was creating a new OpenCL4 context instead of returning OpenCL2, because there was no link from CUDA1 to OpenCL2 (only backwards from OpenCL2 to CUDA1) If the test would check for two levels of derivation, it would have failed. This patch fixes those (yet untested) cases by introducing forward references (derived_device) in addition to the existing back references (source_device). 2. hwcontext_qsv didn't properly set the source_device In case of QSV, hwcontext_qsv creates a source context internally (vaapi, dxva2 or d3d11va) without calling av_hwdevice_ctx_create_derived and without setting source_device. This way, the hwcontext test ran successful, but what practically happened, was that - for example - deriving vaapi from qsv didn't return the original underlying vaapi device and a new one was created instead: Exactly what the test is intended to detect and prevent. It just couldn't do so, because the original device was hidden (= not set as the source_device of the QSV device). This patch properly makes these setting and fixes all derivation scenarios. (at a later stage, /libavutil/tests/hwdevice should be extended to check longer derivation chains as well) Signed-off-by: softworkz --- v3: avoid double-release as suggested by Haihao libavutil/hwcontext.c | 38 ++++++++++++++++++++++++++++++++++ libavutil/hwcontext.h | 1 + libavutil/hwcontext_internal.h | 6 ++++++ libavutil/hwcontext_qsv.c | 16 ++++++++++---- 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 31c7840dba..1a50635018 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -122,6 +122,7 @@ static const AVClass hwdevice_ctx_class = { static void hwdevice_ctx_free(void *opaque, uint8_t *data) { AVHWDeviceContext *ctx = (AVHWDeviceContext*)data; + int i; /* uninit might still want access the hw context and the user * free() callback might destroy it, so uninit has to be called first */ @@ -132,6 +133,8 @@ static void hwdevice_ctx_free(void *opaque, uint8_t *data) ctx->free(ctx); av_buffer_unref(&ctx->internal->source_device); + for (i = 0; i < AV_HWDEVICE_TYPE_NB; i++) + av_buffer_unref(&ctx->internal->derived_devices[i]); av_freep(&ctx->hwctx); av_freep(&ctx->internal->priv); @@ -643,6 +646,26 @@ fail: return ret; } +static AVBufferRef* find_derived_hwdevice_ctx(AVBufferRef *src_ref, enum AVHWDeviceType type) +{ + AVBufferRef *tmp_ref; + AVHWDeviceContext *src_ctx; + int i; + + src_ctx = (AVHWDeviceContext*)src_ref->data; + if (src_ctx->type == type) + return src_ref; + + for (i = 0; i < AV_HWDEVICE_TYPE_NB; i++) + if (src_ctx->internal->derived_devices[i]) { + tmp_ref = find_derived_hwdevice_ctx(src_ctx->internal->derived_devices[i], type); + if (tmp_ref) + return tmp_ref; + } + + return NULL; +} + int av_hwdevice_ctx_create_derived_opts(AVBufferRef **dst_ref_ptr, enum AVHWDeviceType type, AVBufferRef *src_ref, @@ -666,6 +689,16 @@ int av_hwdevice_ctx_create_derived_opts(AVBufferRef **dst_ref_ptr, tmp_ref = tmp_ctx->internal->source_device; } + tmp_ref = find_derived_hwdevice_ctx(src_ref, type); + if (tmp_ref) { + dst_ref = av_buffer_ref(tmp_ref); + if (!dst_ref) { + ret = AVERROR(ENOMEM); + goto fail; + } + goto done; + } + dst_ref = av_hwdevice_ctx_alloc(type); if (!dst_ref) { ret = AVERROR(ENOMEM); @@ -687,6 +720,11 @@ int av_hwdevice_ctx_create_derived_opts(AVBufferRef **dst_ref_ptr, ret = AVERROR(ENOMEM); goto fail; } + tmp_ctx->internal->derived_devices[type] = av_buffer_ref(dst_ref); + if (!tmp_ctx->internal->derived_devices[type]) { + ret = AVERROR(ENOMEM); + goto fail; + } ret = av_hwdevice_ctx_init(dst_ref); if (ret < 0) goto fail; diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h index 04d19d89c2..56077963e6 100644 --- a/libavutil/hwcontext.h +++ b/libavutil/hwcontext.h @@ -37,6 +37,7 @@ enum AVHWDeviceType { AV_HWDEVICE_TYPE_OPENCL, AV_HWDEVICE_TYPE_MEDIACODEC, AV_HWDEVICE_TYPE_VULKAN, + AV_HWDEVICE_TYPE_NB, ///< number of hw device types }; typedef struct AVHWDeviceInternal AVHWDeviceInternal; diff --git a/libavutil/hwcontext_internal.h b/libavutil/hwcontext_internal.h index e6266494ac..f6fb67c491 100644 --- a/libavutil/hwcontext_internal.h +++ b/libavutil/hwcontext_internal.h @@ -109,6 +109,12 @@ struct AVHWDeviceInternal { * context it was derived from. */ AVBufferRef *source_device; + + /** + * An array of reference to device contexts which + * were derived from this device. + */ + AVBufferRef *derived_devices[AV_HWDEVICE_TYPE_NB]; }; struct AVHWFramesInternal { diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index c18747f7eb..7b559e2b47 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -223,7 +223,7 @@ static void qsv_frames_uninit(AVHWFramesContext *ctx) av_buffer_unref(&s->child_frames_ref); } -static void qsv_pool_release_dummy(void *opaque, uint8_t *data) +static void qsv_release_dummy(void *opaque, uint8_t *data) { } @@ -236,9 +236,9 @@ static AVBufferRef *qsv_pool_alloc(void *opaque, size_t size) if (s->nb_surfaces_used < hwctx->nb_surfaces) { s->nb_surfaces_used++; av_buffer_create((uint8_t*)(s->handle_pairs_internal + s->nb_surfaces_used - 1), - sizeof(*s->handle_pairs_internal), qsv_pool_release_dummy, NULL, 0); + sizeof(*s->handle_pairs_internal), qsv_release_dummy, NULL, 0); return av_buffer_create((uint8_t*)(s->surfaces_internal + s->nb_surfaces_used - 1), - sizeof(*hwctx->surfaces), qsv_pool_release_dummy, NULL, 0); + sizeof(*hwctx->surfaces), qsv_release_dummy, NULL, 0); } return NULL; @@ -1528,8 +1528,16 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device, child_device = (AVHWDeviceContext*)priv->child_device_ctx->data; impl = choose_implementation(device, child_device_type); + ret = qsv_device_derive_from_child(ctx, impl, child_device, 0); + if (ret >= 0) { + ctx->internal->source_device = av_buffer_ref(priv->child_device_ctx); + child_device->internal->derived_devices[ctx->type] = av_buffer_create((uint8_t*)ctx, sizeof(*ctx), qsv_release_dummy, ctx, 0); + if (!child_device->internal->derived_devices[ctx->type]) { + return AVERROR(ENOMEM); + } + } - return qsv_device_derive_from_child(ctx, impl, child_device, 0); + return ret; } const HWContextType ff_hwcontext_type_qsv = {