From patchwork Fri Sep 15 20:51:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5160 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1046779jaa; Fri, 15 Sep 2017 13:51:28 -0700 (PDT) X-Received: by 10.223.198.202 with SMTP id c10mr22100063wrh.230.1505508687925; Fri, 15 Sep 2017 13:51:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505508687; cv=none; d=google.com; s=arc-20160816; b=pqAuR5GMG9J3AEz5QL6bph9AUOW7qxVEFz1aDJvaaYNq64vNVjISGepRaK2xxqadHa GsJd8+mb6jNpboNZPOtbSgabzbIveQLkUj4HPmUl9DM5yPe87530HhOjBBJPJYXohmOf QAnJ+vGD9/0VATHnItIBYfNIwsecaYKZiPhGIKhBBvz0Tq5D5drfN0qZZKfT81+J8ETu 3PGTkNbCOCKi0kn7mk+/3DY2nh9e9G/73DqOhNFU8SNfq31EI1NS9w4z+zdCGx+zzqXK Ans2giWPz821qHRZAzAQ8xQCsQd0/Ob90JIHX72wXa5QlKBgtvQMAWO+35R8rtuPtChb yXYA== 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=U885cvRbke0eJjSrgMJs8aFZIc2fScjKswPrXUTNspg=; b=1KoSmacertEezeU/pn/7k8pP+tgKp+m6vABC2OH1u/becSMVQeqifR9MG/9YDuecmf dJpS3uSoOokP9PHwaZd5/+bD74TwkpVHG7v+bBcNLoCOq7FSXJvKtfolIncA3LhiNdcV JhBqhMnqHMZCHANP4o4sEf3OaWzL0nJEpV4sYY2o75Yv/gBwjS7k85k5avdOU2ovI7O1 KyOnzTAUdZUp2WtBwHPqJouPtkoc8d8H91H4nbLmWu1MHGrE/jfregMdxr2wUeEch4Tu wiLLy9qjtJYc5LQvxAYNT51lBs1ba6fETR142O5hABfTGx3t0v9IqbcxVWPqxkLMNZWv 7Bzw== 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=OjtS74pm; 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 l25si1372549wra.435.2017.09.15.13.51.27; Fri, 15 Sep 2017 13:51:27 -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=OjtS74pm; 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 07D4068A08F; Fri, 15 Sep 2017 23:51:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE82768A077 for ; Fri, 15 Sep 2017 23:51:07 +0300 (EEST) Received: by mail-wm0-f51.google.com with SMTP id r68so11105521wmg.3 for ; Fri, 15 Sep 2017 13:51:15 -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=p5H/B9lWJlJv32o/9+hRTVN/QWitsC/5h3MzviiQa3s=; b=OjtS74pm2ejoANnq6JtvWmTQFxfzIHnZYUgmefkdXylNFn0ZPNG4EaSWvo56OpatXN k0mRWIJ9M3E6McdpbnqWjrgChxlZNE+q0seb1FxsVCcUT+AMeEGOwVt7arl8HhMOtS9w bFhN+6x99xCm+yA8qUZSWXY9+TWXrZXtv1haY9rO4k1LhjgTgy5IO4ycBiheL7j3L/ms 4QLJ/gEvy09oaWzGaEYWqBdLdzRWz6Vp67nrcA2vW+AL8gNcX45bcZPWizJBuvKa9kjd FA1pEEVNFLkW/rIzUN/GbcgBM4Kuq+Nmk3wZV64P7eXjub/1WB17kJNFtOLCCmhaUV57 scYA== 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=p5H/B9lWJlJv32o/9+hRTVN/QWitsC/5h3MzviiQa3s=; b=Bc7Fwzovf7QLZPBp1thQaxxJv7qs7A2PdN2pYfeU3oZdWOaqsSsVbtD3CSdwy6tvHH dQv0mvxTsBiNsOmgBS3CbvDAptPIB0/uF55OsOT+LgvmTLVFiWR7tPZYC806O707Tosr PASaEHIBDSu08ZOv5N7yvT3FrDNVQQy50S61AS0LXGHq4N0W0kaWxAmGvsUW5yeEBmnw VHtwfVLS+eAFWGaVxBOVMq9uFc2/K8kgdk2N1CAEPiFBreMd/ZRk5uMxMYtxgmmPn7eI GCkSxen8TaPy6XDh0Ex7bzpLahwo9Hs/yDc5AO1sgeS7VE9ZtFAraC2N1sULnHFyAc59 b9hA== X-Gm-Message-State: AHPjjUj8ZaVabvxrIkyEAZPENcpN129ocOu9DVujDpO0jZ8idHJP1bJw c6SYZl0NmbLoy+Lgqtz2tfWbnjzG X-Google-Smtp-Source: AOwi7QAZc9X2JALzBOMBjLka4X6GkA4Cem+z9opkPgRUpHYuNjzK8KCOgnbSYqSZb3SaSD0kWk1W6A== X-Received: by 10.28.212.140 with SMTP id l134mr3436991wmg.1.1505508674575; Fri, 15 Sep 2017 13:51:14 -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 k9sm2274977wrk.27.2017.09.15.13.51.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 13:51:13 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Sep 2017 21:51:07 +0100 Message-Id: <20170915205108.14049-3-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170915205108.14049-1-sw@jkqxz.net> References: <47b1dffe-f2df-d4d0-0bed-ccc6de2c76d0@jkqxz.net> <20170915205108.14049-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 3/4] hwcontext_vaapi: Fix DRM format mapping 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 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 852f0abda2..c4473a229f 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -925,16 +925,16 @@ static const struct { #if defined(VA_FOURCC_P010) && defined(DRM_FORMAT_R16) DRM_MAP(P010, 2, DRM_FORMAT_R16, DRM_FORMAT_RG1616), #endif - DRM_MAP(BGRA, 1, DRM_FORMAT_BGRA8888), - DRM_MAP(BGRX, 1, DRM_FORMAT_BGRX8888), - DRM_MAP(RGBA, 1, DRM_FORMAT_RGBA8888), - DRM_MAP(RGBX, 1, DRM_FORMAT_RGBX8888), + DRM_MAP(BGRA, 1, DRM_FORMAT_ARGB8888), + DRM_MAP(BGRX, 1, DRM_FORMAT_XRGB8888), + DRM_MAP(RGBA, 1, DRM_FORMAT_ABGR8888), + DRM_MAP(RGBX, 1, DRM_FORMAT_XBGR8888), #ifdef VA_FOURCC_ABGR - DRM_MAP(ABGR, 1, DRM_FORMAT_ABGR8888), - DRM_MAP(XBGR, 1, DRM_FORMAT_XBGR8888), + DRM_MAP(ABGR, 1, DRM_FORMAT_RGBA8888), + DRM_MAP(XBGR, 1, DRM_FORMAT_RGBX8888), #endif - DRM_MAP(ARGB, 1, DRM_FORMAT_ARGB8888), - DRM_MAP(XRGB, 1, DRM_FORMAT_XRGB8888), + DRM_MAP(ARGB, 1, DRM_FORMAT_BGRA8888), + DRM_MAP(XRGB, 1, DRM_FORMAT_BGRX8888), }; #undef DRM_MAP