From patchwork Sun Sep 10 20:53:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5090 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp2357831jaa; Sun, 10 Sep 2017 13:55:29 -0700 (PDT) X-Received: by 10.223.195.37 with SMTP id n34mr6491857wrf.219.1505076929744; Sun, 10 Sep 2017 13:55:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505076929; cv=none; d=google.com; s=arc-20160816; b=oCB8CZD0QsUxrrPgeBeLPMs1043NVRztH8xgHDcHW0IpdobYh9L60jkQpXLtPBJPr0 q5ilgpFx5qCsv/4I0hf0Xq5CncqCw0ibesVVrQ+p+/UupS/KQzAbNCHpuy6KxKX+fn7L BK1F8gWGCxx4bca+0aOD1wcRnpk3wXNqsb13f1dsOKyeUoFqOcGfTXvDygDIQdb0KE29 SqZk/tJhXG2aahGXh9mq/rEIOVA0pgRwZb7Lp845ekkspNP4Omj/Aa916i53vdtFllSw pAYNVugRWg0JZvn0sBCFjSuLJRDphRD5hLrm/n4v+YUMiu7k5isnSI10vfxMpkh580ly rHvA== 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=WlsqNxWSF182BIuFmBDXgE2JbhmsPapFll4L9Z8KerBoa5jBzEnCT4J05sWotPKdbf lD3MLUX40YHux8YXR8uC0Hxttpw00Xz3ciUwlz5lonZNZ0FNXyVbqVKkOGHDiTK+t6T4 0/3jHo9vnNGugDJTLh0+fIxTD0gWcSA+ulrTHKUrr6neWCP6WjaCSo2ByM0fuuHvW85e AiJQ9Th66NOon4Vr/jz9U5vRzBSoY19w8eZXFIJzsp9nue73A+IopN7EiNyinC61EY46 EE47tcoUHOu5tPJbSk2/DqEIez9K8ScwkbLo/vc46MrY0M3MutUkDZWfJzPxlKueglEt f8zg== 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=U1tXU07K; 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 g28si5414796wrb.335.2017.09.10.13.55.29; Sun, 10 Sep 2017 13:55:29 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=U1tXU07K; 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 33B22689D7C; Sun, 10 Sep 2017 23:53:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC6B0689D4C for ; Sun, 10 Sep 2017 23:53:54 +0300 (EEST) Received: by mail-wm0-f45.google.com with SMTP id f199so27702301wme.0 for ; Sun, 10 Sep 2017 13:54:00 -0700 (PDT) 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=U1tXU07K5EgyiW81QrA/2Drr55lsK+i6FiK0YcvsKqt2uiLVc9tLVBQfRr9khbOIup N8oXXtKTG1yCv7LPE1IyPBPelTqwbe+NvGwSeNtPMzssnWfdItTift3L46fMSanXVRL7 cevMlJ42NYqCIZJYqcKMb+9mmLgl7v5YLUFCPQ4+sRFqWxy0FqfdOB/mJZEnk5CLobrw X0zKAq62Qg85oyZwh64hFi+BW4vnUOqRCrdUu65TYpPYTNjv07MeRX+S64okTnsELpBG lOXAPVImneho4F+GTY/R4X0j3y9xmpOq2WIpnt5y75gSjxQXUGYeFpI51rBQlbz8Zj70 n3Qg== 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=XY378eEv03GDGMoYC22sPI3nIk24p2x4weckkeYBrq7DuQV2ByZSUGY8nr44Ax5rWe yp2XCs2VNnfhC8UHlls8yZ8Oe0ptE1SZmPbVbaOUVDnZtBRJQTzUFyLhnSYTVbr8KOKO yFwWLKHHVznCSyji2mu4lCOrcC0+cJDSpHpTjXztbRGEKp6DEqD0jrL++nqN10xlxGOm d66A10PQxD3r/iunUCjM0jEP4xiMbXprF/iT6djJhktNPxyhCRQIu49r76OBipfBVOM4 FccqqNceAVi1DGaIU3ldE3Rsxh/ZYUd1EGf1V0cOtuZdNLtyKtvC9NFNfvhgYsMByBG+ +kug== X-Gm-Message-State: AHPjjUggPKJ2+m1i+pgqwOI8GpBHzdo3M9bLSyBmqDWMt2RyOnYIfpYa 3ur2T60kENmW2F6qJeI= X-Google-Smtp-Source: AOwi7QBDUs4engaGwFHziseHnvZR0nE+IpL3pAr8B0BJDlrtPgBc2yNSBx8rpGypi7JIGWdp7R9pUQ== X-Received: by 10.28.217.134 with SMTP id q128mr6889580wmg.116.1505076839498; Sun, 10 Sep 2017 13:53:59 -0700 (PDT) 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 z51sm8742868wrz.80.2017.09.10.13.53.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Sep 2017 13:53:58 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2017 21:53:37 +0100 Message-Id: <20170910205338.29687-14-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170910205338.29687-1-sw@jkqxz.net> References: <20170910205338.29687-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 13/14] 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);