From patchwork Tue Nov 14 19:47:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 6063 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3722135jah; Tue, 14 Nov 2017 11:49:27 -0800 (PST) X-Google-Smtp-Source: AGs4zMaWfzXu2itAvyhTLG0aOuV/D4M7Al/fBREutmUl9T14p13vcvZ8M+8bkUErEVShwP9jA9Qb X-Received: by 10.28.134.73 with SMTP id i70mr9347293wmd.107.1510688967353; Tue, 14 Nov 2017 11:49:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510688967; cv=none; d=google.com; s=arc-20160816; b=wHnaKW6FL8P0L2vWBOy6zUL/VRzpk93pJh9fEUQJak3yMSWUDuoCm/EBWiCv/S3jBQ Gg00ivPHs8JYKPqFd0D5ItzbJGnssxA2GUybupc4yagFy8597YdGXJezM28PQ5JJa9yk u4bNXPVWp3VV8J3yAEayvb7rlLgBfV2o0Meubg3AoeCnaw6Ua3AIv0ZHYv9pw6ZMJcqA mo6gG2Snkrhl5AMwBjO+OVhF24atBIhyh8Uv86DOGjoNsiS/W+Spy1P/PuuAz/tpWzrN Z7Gz/OagZh8XV9WLKnHSxa06O7eqHj+mIPQlWE2gYVHNOGuWi0KawxXliltX/PJvBCmf tmyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=EItq23QN3gq8PnulEJeLKleEzHsiTdpXz3KOymZokPU=; b=p1f0vgognncaNJvbxrTHyE4CJFvSHq2MRjp7d+AX1Rxwt6G73cIElo0yuibrWxfOoW 3IoGffWbSPukvSAY5BDkZ63fIFcdI5Y79K/ERmRgBpG/DD+nKq6ZqI/P5VOoCmYqlk1w JZnFBIF5JnWgjL303fZ3IZNqZ6QyV9HvUAAMxsXAqFv2a9g8kdFfZyyk68l0DQShItaG 1ie7DhEjYCRKiYBGIO6NS8tvsDKFPLdz1tJzgSL6L8sJeoKJ0lDBQz+QN+T/UK4LzRFH 4IkNSiUlHAugPcOhl3tJUBdMidVKK8PaYE/+7VpzBGCh1bJYQWmerDHCVwrB8v3bzCmL 7bsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=VqJGZs/1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s1si2422343wra.57.2017.11.14.11.49.26; Tue, 14 Nov 2017 11:49:27 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=VqJGZs/1; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F90768A1B9; Tue, 14 Nov 2017 21:47:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1E1168A15D for ; Tue, 14 Nov 2017 21:47:32 +0200 (EET) Received: by mail-wr0-f195.google.com with SMTP id u40so18488244wrf.10 for ; Tue, 14 Nov 2017 11:47:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=pRhJBsLTdp2/J7DUCE7D+3Fbkzmrc+hscFteS8O27o4=; b=VqJGZs/1oNW+9fmAMNBdmKgkuUnYBJsqy4c+HcFiIFLUembPgkzh64u3v7FZM6q6sL LbuMg8TRyjSxU5bjWupscvzwTL9kO+2G64ZE8qhra7QC78BN+3r8PEr93PGWgw/r3QtJ WFbAahmiex91NhfqsmDDYgjZ0NZ9LCRdlomus56EDdOtiW38AhqJH56Kd2fPiR7pmRwx atKG4UcRlq7MkCel050SzjEX7aM66xHaQbfDBnjtMSQObhkfS+iiCNuG+E2tAIpwvxZQ D0m3j1SvMUygzTOXejxpjw/DcUPPzilTP6ZiTkG5b0b1hAoAxnEpz5lsShiKEmzKBvnQ dTvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pRhJBsLTdp2/J7DUCE7D+3Fbkzmrc+hscFteS8O27o4=; b=LZWWAEDIu1WsQDRi2k9hrXysMK3+qk3UFebu7W/heIrVBzYWZgftDlrAemzHKZaMCA 4ak+8NyuwFMUDYT10MK/kAPcB9wNj/ObaPjxqmN1Z29cjvld7HmMiHkh8EPFkkwcqxLX hUY6/r+FgSOc8ui8FoqZWqDXV1XvO1FTCE1PpZ2QqCYDtxrGepx7YMkq9Mgq7YaDghAb OrtdngoEXYVGiU05ehgHyP4ktjG5wzlve594HiZD6mqgz/QVUNu8+Qtmtz/CFfGOyiZC lw5tTORi3jhh8FQjBEpbEPd01KAhnWKLGgALcqKFNrKH8hdub3XfbsraZlFuRbhgrV29 swFQ== X-Gm-Message-State: AJaThX67jZxtloPrG2RrlczAHN351QltSvj81coJx+PoJtEK9ti418U6 2I1e5Fg64uaoriTasGbmywHZB+Ua X-Received: by 10.223.157.137 with SMTP id p9mr11645192wre.92.1510688867277; Tue, 14 Nov 2017 11:47:47 -0800 (PST) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id v35sm38938226wrc.13.2017.11.14.11.47.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Nov 2017 11:47:46 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Nov 2017 19:47:28 +0000 Message-Id: <20171114194730.11052-14-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171114194730.11052-1-sw@jkqxz.net> References: <20171114194730.11052-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 13/15] vf_hwmap: Pass mapping mode when deriving frames context on an existing device X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" To match creation on a newly-derived device. (This was missed earlier because the mode is only used in some cases.) --- libavfilter/vf_hwmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c index 8277241dc4..d5fc3c46e6 100644 --- a/libavfilter/vf_hwmap.c +++ b/libavfilter/vf_hwmap.c @@ -114,7 +114,8 @@ static int hwmap_config_output(AVFilterLink *outlink) err = av_hwframe_ctx_create_derived(&ctx->hwframes_ref, outlink->format, device, - inlink->hw_frames_ctx, 0); + inlink->hw_frames_ctx, + ctx->mode); if (err < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to create derived " "frames context: %d.\n", err);