From patchwork Sat Apr 30 20: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: 35527 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1018252pzb; Sat, 30 Apr 2022 13:08:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKLJHJzBNMRK+degyE6c1vbFx2aaSHqNwKd8l5ABwLUJitF0hUVvLDCPjkr+AAFDP6B4fw X-Received: by 2002:aa7:dd87:0:b0:425:c104:71bf with SMTP id g7-20020aa7dd87000000b00425c10471bfmr5851983edv.110.1651349301693; Sat, 30 Apr 2022 13:08:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651349301; cv=none; d=google.com; s=arc-20160816; b=vag/DnjFzK9pd6ibpMoKvpPzQ22hxJosFMnpwAOnNL1feSr97oXzUCgsrOgJ8zzN2U ugnn1EWJi1AK1Wzquf3IFiuNE+aTdTyMl5znEVuQqb+5e8VZtiYaeJGAXjuPpsXDAX2t 2zXSFVX44FhrwMAArMfF01g5TMUN78po8pAe9B/lRIE6zv109gzZvgjZ8oJoG4YgCKnu av+E39kA65qTnXdJBDFA18eXPp6R2fZUehXGeGUBFDpzVwCautyF++9CSklmJawn+Bvm lBXBc5XL3Sf+raufqvuZx+nRTHu+t3SoBtIsJBqttS1/Ll6Ra4PFJQc+q3rwJSowdd1y yxKQ== 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=VectBiWTO//xcVlt2f5yCsLNQRvvQE2+tyYYahx+jbcnGLwB3qjzxHD8PGOJer6TUk nPrx+htpy5zLaf/K6si2P58m4YqBI2aKgbNdEjXvbNc/PuVFhdobh2PfFgqn+q11sYIr n9uOOZgE4bfNN2vEqUFSCfrKNH4j63bOaOiQxYPwkx26kNFWdy4LPe8W3bouAT9nUrUZ ZEwdlhswFjRIrd95X2P8mAW84l8bdeNKcjaAzWCnpHnPvtdAFSKh2t2+PGupxHPVXH/P 1gwttd7lH1iymfToWjiB4dTuEZLbCehfiJCtFofWrdfy7acZw6P8Njy0YdRDlE6g+p3B QbXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=INpjQNRk; 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 b13-20020a056402350d00b00427afba047dsi1525460edd.319.2022.04.30.13.08.21; Sat, 30 Apr 2022 13:08:21 -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=INpjQNRk; 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 173A668B367; Sat, 30 Apr 2022 23:07:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFD3B68B30A for ; Sat, 30 Apr 2022 23:07:48 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id z16so9525965pfh.3 for ; Sat, 30 Apr 2022 13:07:48 -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=INpjQNRkTPbWy0wNCq4w1f1LPuqtxLkpQ2Z1Bnl1/+GI0zwO29+aAUkfQVZDrYom7Q HBErj+v9IvmpMBNs+naZOSN0oL1G2UrT5BiXE/oNdWMr0bODlWCJcb9SylPECqBXHmPA UvCtMEUWlAjTckgCao7DqheXTDuUjLt5hl9PIpnJT1zlswiOFCKP9/Q+dd2W0q2ZDcFt g/OZpe9gdl2gBvVWFILhR/ycS0cu/MjrUxSnR5fw9r8KhfWA8znPoyFn8nG6/PT55DBa xnZl8KKSLyWjoQqDlhAe07FSqLY2UhFb50Efdv8PMwW4jN27s30Nx0ZZihWRpWHjCc/a kbdw== 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=A3wqtF/Q2t13M+vbehiLlmHiH0tGCGPIk1sSZ7wDavB/JgjEWrK4iXKeevjDt2Uc+l HBvCNuwo8o/yrSqsfNMQdvKLx5EUuYcsOv5U1gNd8cgvCqIUhNlPhwIEBBLY+ZHwKCvy q9eLAqUSGdmrcu3RSq1h7GPMFzCQCKz8s93UDQYNkg63xMrwbzZH3AT+FqDo6ewe7Sdv VP9PgsDYCWWAEedHB+bBnjFAysP6PMuGJXuFCXnIysDnIO+EqmAbWiO+x6ZUEfdkOyiW 4DfNtAkI9pomUkW2hyIaczoLJOoF+rE3gZxAk/TUuFyDRVCfFiOJ0xLyYoGySGvvncz0 lZ1Q== X-Gm-Message-State: AOAM5320PMWEhzWcApgYGrotmcHAUgaVxhcXjw/bK8tqya+9n61MfcVv oQt2lps6owQIOEguqJYvZKiYvHMQoktxyA== X-Received: by 2002:a63:f156:0:b0:3ab:ada6:b463 with SMTP id o22-20020a63f156000000b003abada6b463mr4048084pgk.462.1651349267070; Sat, 30 Apr 2022 13:07:47 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id k1-20020a63ff01000000b003c14af505f5sm8300805pgi.13.2022.04.30.13.07.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Apr 2022 13:07:46 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <023597a557377e17820a530405f799021064a7fa.1651349262.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sat, 30 Apr 2022 20:07:42 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 3/3] 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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RRGxd5BHugQ0 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);