From patchwork Wed Mar 21 23:12:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8082 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp154377jad; Wed, 21 Mar 2018 16:18:20 -0700 (PDT) X-Google-Smtp-Source: AG47ELv0M6LYlu5MmvTjCa1IiKL75K8fbwtwsm9P/RnwPTgyexcj4opLJg382k/yHxgn82uG1G7N X-Received: by 10.28.133.193 with SMTP id h184mr456311wmd.36.1521674300460; Wed, 21 Mar 2018 16:18:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521674300; cv=none; d=google.com; s=arc-20160816; b=017OopvyN4t5JTEOqkyA1aN9pGR4eXqX40cJR5xjkpPwRCVCGi2IbPxHLvnvTNhCsI x+R21/GwanKe6blNOx1XwfkA4jGRPsiTuzYERgpbrxRFPWGqSuCY1U0nU0Ak6CsMkfwA v0aYFry3EiF+rStVK7+cHj/8dcOvOtl+6YP1uEkLt/RJWtnVAzpH3Ux1GSTV0Jh9sQsZ JenahDhcZx6L9N/HzxNuiOqN+isoBATtUv2sMAL/M9tvD4QMvJ8QZNJ7H8EHmWO1GWzj t1hkoM2SkR3+rkH1ZOwnuGRDE3JZb1EwQdIZC9Vjjoh4H6LaBbaAH+K8QPQmu8Tg6lII Gn8w== 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=GKTS0ujoadzFwtWNyFi3Ntw4fVmFG3mtSFk0YbJ/veI=; b=kC+66RNE8PQNY2w50FzENGRlCuNcxgxwLjyUpShZc3kyuYHE+Z/CxOK1pwxOJvqnp2 MiYQN9O0nj81gY9tMjwzkmNZfINHWc48A/zgUV4AklUkGWxslGwwIJx0DG/HT47c927e 2otFKbFbmh4HtdFdcpLRIMVkzJAQQljDPVvRie3pO9r1V4q4Fn7lXwn6dqpsHuXHOhwG LrtI5MUdd5WyD2YUlwb4VMeIKGX5WK68Ffn3TrFuslGCusbJM2eSof0UDNN5/1igddk9 37zH8LHwmKgBj3GtErptbCe4n6+z2jK48tzSlZJ85ObwrZw8zvWynnEtXD0TXN/P3Vao OjJw== 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=eWKyo/Mv; 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 k44si3887776wre.107.2018.03.21.16.18.19; Wed, 21 Mar 2018 16:18:20 -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=eWKyo/Mv; 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 BD6AD689950; Thu, 22 Mar 2018 01:18:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2F84689B17 for ; Thu, 22 Mar 2018 01:17:57 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id z12so6869886wrg.4 for ; Wed, 21 Mar 2018 16:18:12 -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=v5DnkGNyAThHWG0w+BwMdNTFkJJE6qyh7Ac8tAUnxbc=; b=eWKyo/MvLPtattEsmFqoWActyFFBPeOTFSc7kEE2Pc26Dao5igO/9XAOU/slNO7DGF pEbUvcU5mEUODAaIVkJl1AeGkhwfVAhSVIzCFLhey91bQhHHPKSQGq8Zht+jAn/GuQkM mo/ZkIS+B3Ee6Ikj55Mx5n9zldIndwZ4FjHnwkHlMQrXBaECIQfLD4K4EU+gbXmZrWlS DpXEwilEkgjgqxf9SLNUwPTAUNauDPBQEQt4fvhGtuyEBg37aekHxzvz8PupxzuOaAQZ pGVAWiUjqAweNghMX3uN7/yzXJdy3qaackOCjAbnH9PtgcyQv4MxVwMZpnU/vZvTu2cM iWFQ== 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=v5DnkGNyAThHWG0w+BwMdNTFkJJE6qyh7Ac8tAUnxbc=; b=MV0lcCbLpijENbCHp0jtChSL7YHcm3+HwxXOKIYP5yxOuy5CpENvb6LL3mfab5Hmoi L515R/SPySsdYLp2hv/HBC8i8gc6JO7D6+tlaLp+I6aZhtARk3BTaaQqSC4NyC2+gjOY 8paPdvwO4n26CNjsKtYOMw/e/C2YfJRkaPH7MEeOUnYJwlcpjwxY1f5GIV5ibQsjTDJ3 ONXN8zcewCmlkzQn0MelH4La59tygNVYrlJ3YzHfIcugEwAIDRhaAJsCFz9/BNMbp763 B0RTRASBkYXkrQ72x11HCqV1UNTXd5QASSFKSqmqcApZd5Go3XEELrQMLsmx2iicZJgK fWCg== X-Gm-Message-State: AElRT7E7+1u36LcuDDHyVGyvCHoLmfGaQuWe3ZCM4jkYqFRiJqtPJNYS I4Pt0G+A2EqOxm7DhD6ohJI+5bbk X-Received: by 10.223.151.193 with SMTP id t1mr7770227wrb.206.1521673962740; Wed, 21 Mar 2018 16:12:42 -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 11sm5218741wmd.1.2018.03.21.16.12.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 16:12:41 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Mar 2018 23:12:32 +0000 Message-Id: <20180321231236.3024-3-sw@jkqxz.net> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180321231236.3024-1-sw@jkqxz.net> References: <20180321231236.3024-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 3/7] hwcontext_vaapi: Pass correct read/write flags when exporting surfaces 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" --- libavutil/hwcontext_vaapi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 998e954c44..53a5b02822 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1095,15 +1095,20 @@ static int vaapi_map_to_drm_esh(AVHWFramesContext *hwfc, AVFrame *dst, VAStatus vas; VADRMPRIMESurfaceDescriptor va_desc; AVDRMFrameDescriptor *drm_desc = NULL; + uint32_t export_flags; int err, i, j; surface_id = (VASurfaceID)(uintptr_t)src->data[3]; + export_flags = VA_EXPORT_SURFACE_SEPARATE_LAYERS; + if (flags & AV_HWFRAME_MAP_READ) + export_flags |= VA_EXPORT_SURFACE_READ_ONLY; + if (flags & AV_HWFRAME_MAP_WRITE) + export_flags |= VA_EXPORT_SURFACE_WRITE_ONLY; + vas = vaExportSurfaceHandle(hwctx->display, surface_id, VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2, - VA_EXPORT_SURFACE_READ_ONLY | - VA_EXPORT_SURFACE_SEPARATE_LAYERS, - &va_desc); + export_flags, &va_desc); if (vas != VA_STATUS_SUCCESS) { if (vas == VA_STATUS_ERROR_UNIMPLEMENTED) return AVERROR(ENOSYS);