From patchwork Sat May 21 14:07:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35878 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp1081975pzb; Sat, 21 May 2022 07:08:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMV3s8qyI4xQR7XXcVCo9E+/kHxJUCjCgmR5OB4LEfaI3Dn8iQVORb38zCY9HJ7qKAuQ7w X-Received: by 2002:aa7:c849:0:b0:427:d464:e66f with SMTP id g9-20020aa7c849000000b00427d464e66fmr15810613edt.411.1653142116227; Sat, 21 May 2022 07:08:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653142116; cv=none; d=google.com; s=arc-20160816; b=RyGg8MSvPBDT16yqfIqNJI5PlJObqTmW2tcS2av/4S9OOu7Rtkk5T0v77uws6PtPR6 PPYPDCr3FspjAVyyujdveRXg3NtbblEOyq8RBHrvOqQvsNwujjJ1ET96Gtq0vbTi2cTe FBnDa32EfCnmx6owEWc0R1pQcQOfqijXdOHGZFMJjVkHO3ppXEUwKcah6RqcxSMntBTu DktOogCDvxyUEvI15V6PNTIxaLdHaYkt9LUM97DdW9vpeyok3a34sK0402m0DaNKsFpm oBEul4Wq4OSXEh/4pzpJ3LoYhIXrwUa0PQOxBDzIQcCnrgXDAG7Ld91BIc6SVt/YrFxh /vYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=mLyBavhuHet1rLscrX3VjFBii58JU/kiNsn4oR7YLSA=; b=OvoApCJcdiCk/TZqGfG6MmcalV+D59akfbuhVDd4tUWxm5MlPJFOjDMSsHx0C23inv YAiI+gSFr/YN6eUX5F+n10CiyYa+FM2i1PXCfprV7skv3ELP8wM+JgW7P5yJOQy7bmRf x66B7CJ0gvvk3zY2CpkEs8CUCSaF3tN+gNKyJB7bhZD9eEglsXTbovjRwnzerC9mOMCH LQ0NGUhTQxXVWTQ6V+gXJkQvPW40vcatoeVr0YvulvKFUum5Xp3qJvF8glVHLARh+HWu TojSv6IRwCZoNDgN/wwm3FIdDB0rFkaSjIOSMOwc6SPjpzt7A8qVrVGy/c3TApYSynvP TBJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XoqrRDRQ; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d22-20020a056402079600b00418f11819a9si9448148edy.120.2022.05.21.07.08.35; Sat, 21 May 2022 07:08:36 -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=@gmail.com header.s=20210112 header.b=XoqrRDRQ; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B77F68B4B4; Sat, 21 May 2022 17:07:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1343C68A2F6 for ; Sat, 21 May 2022 17:07:50 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id 31so9972718pgp.8 for ; Sat, 21 May 2022 07:07:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=LiwY9esjylXEwphM8sKD7BmHNam7jJI8KTt+HXBYNik=; b=XoqrRDRQ5f35P5qN102J1qVrhYJieNGKCz/oF2Ktsg+aznMTNjrrhkbjpgNV7fbB+r 1KVB1qbTKgS8Z33kYrm0e0d4eDi5sIN7dvr8z+8jwkqAcaMQtuHxBfpvT44TiNSa/kU3 pfKgzmaGrFQ7BJMRPVauEBH1Z+GJs/0/4dbDIl4dUkwJkSQTxvo9YiZbFkFUbtqXwst4 FncXp6ZWdZA/LoJCY8Q6JarxP3Ls2vUrHiRbKonEXXIG25uo2gZA6i4jNfzJoeCLotfR CRfpVBQQLz3L8E54OfJqBp4vKYKYYxrmlEzQ4Vki0BAmcU7Z1pJnnWywe7/sO5TuK6DB mX4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=LiwY9esjylXEwphM8sKD7BmHNam7jJI8KTt+HXBYNik=; b=TpkBSi+LpqR4/+bKLOrD+DagekAhEodrIbsVPPJ6YWbf4T6fsU+0sWZvaqf/RtUc5S IwOJP0w5znKZQqaNOPqeNAafCQflnSw+2YoCE4DF+nA/60ggbhHoGRHMTJ3v9OMNYc4M DnkE2iaRsluch20fRVGFGUgK56MhvdONzLX+np/HZ7PtJRxJE2xz578BALXi5g6aD2v4 mK5eoyg6658iqlAVh8mh2VWXH5QO03+2XyrwkULfP1SnXJrwGb1JKjJm2H6qCpa/9czX 3HB98R4qeNVwq+Q9ZZcYeLqZNZx1ZS7x5i3qkUy5aOvQPMkrY1bZH7qOqEOQIELdzHaW cF9w== X-Gm-Message-State: AOAM5319ELrvgZGpCazbtQnDahUbi8N/+EMx97CLfaa5DiYp0ZJCDVPg kr0xQaH9d3qmsh5DrJcVcINi1p/mbgXT5w== X-Received: by 2002:a63:854a:0:b0:3f9:ee3e:5769 with SMTP id u71-20020a63854a000000b003f9ee3e5769mr2712438pgd.450.1653142068280; Sat, 21 May 2022 07:07:48 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id g11-20020a170902e38b00b0015e8d4eb1ebsm1650619ple.53.2022.05.21.07.07.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 May 2022 07:07:47 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Sat, 21 May 2022 14:07:42 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 4/4] avfilter/hwmap, hwupload: use new av_hwdevice_ctx_get_or_create_derived method 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: Mark Thompson , softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9lu/5kOcFcab From: softworkz Signed-off-by: softworkz --- libavfilter/vf_hwmap.c | 4 ++-- libavfilter/vf_hwupload.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c index 2e03dfc1fe..b79cf6732c 100644 --- a/libavfilter/vf_hwmap.c +++ b/libavfilter/vf_hwmap.c @@ -82,8 +82,8 @@ static int hwmap_config_output(AVFilterLink *outlink) goto fail; } - err = av_hwdevice_ctx_create_derived(&device, type, - hwfc->device_ref, 0); + err = av_hwdevice_ctx_get_or_create_derived(&device, type, + hwfc->device_ref, 0); if (err < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to created derived " "device context: %d.\n", err); diff --git a/libavfilter/vf_hwupload.c b/libavfilter/vf_hwupload.c index dbc41734cc..41ee0e43c4 100644 --- a/libavfilter/vf_hwupload.c +++ b/libavfilter/vf_hwupload.c @@ -51,7 +51,7 @@ static int hwupload_query_formats(AVFilterContext *avctx) /* We already have a specified device. */ } else if (avctx->hw_device_ctx) { if (ctx->device_type) { - err = av_hwdevice_ctx_create_derived( + err = av_hwdevice_ctx_get_or_create_derived( &ctx->hwdevice_ref, av_hwdevice_find_type_by_name(ctx->device_type), avctx->hw_device_ctx, 0);