From patchwork Thu Sep 14 00:34:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 5136 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp157192jaa; Wed, 13 Sep 2017 17:34:22 -0700 (PDT) X-Received: by 10.223.171.93 with SMTP id r29mr16874879wrc.217.1505349262604; Wed, 13 Sep 2017 17:34:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505349262; cv=none; d=google.com; s=arc-20160816; b=07yKouNJ9RSxwzSQuZxkcuQVHr70wKlL9MFgeTx4CJlSP7B/TQrBkR1Oglq1fUwk/r WAyqUTMp/3V6XDqfNV4iKmuFaX+3+BuTJjrSL5TZLttDnfnXqIaLqtPZt6bquwy3tJ4b 0x6M7FYR4w068b6BcrTmh/LuskLyqBU0sZDs68UHP1lUJHwB7OrbweIfO0goVnXymYfY k0XrZtYE47ll4/Yb0Ief3d0VVUPW5WM34ZrbAUrWMmWXsAXczTr0gO/G3QiE1W8zp3ND SPWCxTQ7YP1ojz1p9gLAnl8b9nqwaCPOtKysjapi8bTlKQz6a6UvB7Z2SMBpdrgMU+Fb crJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=oESCK2Vct5BPzh335X6vYBruVVNbZkB9R5DhLo1ayOE=; b=UlWmsqvZxG/2wLH/FMCYS1RZIy0O1ocC6MHaXTp48fO3UUY+tEkPAvPAzDMRDg0O/9 IFwNW704zCW3Ynj1GbVp2IEZNOaRao9jAhBbdd0Uz0QmMIJ5vetBqQ+s97s+lSU9vc8K xCpQ/rYI8DtYlu4NKOJ7itm8EdM8J02F7I6ezF32baqtMC4uWwBZBaHJ1/26pdvhrwrb HAHflQHMdnl+xEaRe0ro7ejRkcKvNX/8c9TFk/4xH7rXWGF8bot+FLkeSAnvjSYfJIAx EWn6aMuIeSjD3li3jgaQHI6MDpnVDlaijrvU9D+cTdaG33RcqwT5lLwUoUkEah1otuTg 7YEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ZbbmKgAe; 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=NONE 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 d15si11351325wre.17.2017.09.13.17.34.21; Wed, 13 Sep 2017 17:34:22 -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=20161025 header.b=ZbbmKgAe; 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=NONE 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 7C981689C85; Thu, 14 Sep 2017 03:34:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3E72689B29 for ; Thu, 14 Sep 2017 03:34:06 +0300 (EEST) Received: by mail-pf0-f173.google.com with SMTP id e199so2663335pfh.3 for ; Wed, 13 Sep 2017 17:34:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=9Jnaa5Cb92AWxHUkgdSs2vuMYBTBo/ZnlMM/6X/jdr0=; b=ZbbmKgAerWhGnf+QZ0oFv2jq/zCy3mkrc9qq8bAy6mAArYSwdGMpvo8rBaP6Qgc8Ul actY2dejZ+GyBu8P+CLuv2zcWgPG3k6/IuGveH54TqQcXQCCiB0Xh4h/krtIbaEDbIBT /mvGDnnEqHOXQ4z0JpXicLNevuVmM3IfiTmf3OhNXFmC+t2USY7tFy8bD17bWRyAApoF n0SB1A7HanEegCGqWSo6OQRF5LJ0n/6+UT8g7ccgNJfVcjBVRjSg8XYq27WVx1bv2HNr j6yKNkXxZt5/u3NZHf0KAZFpZDMSzG1Xo+zyJdUV4/LL9l5jji2QMnIVKxVt6emoX/U2 w8Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=9Jnaa5Cb92AWxHUkgdSs2vuMYBTBo/ZnlMM/6X/jdr0=; b=I/XyZB3SH3EKIhZxBFvBKC9nnWKWRkZZLqiJzWk4AU9u4Of5EJ+C45M5BQTqq/uMmY GZ6YeG1qeGOkbfHWhhxVBDk/m/RWha9iHY2K1t/MdqLZyid76+51jXfS1yYqGLiodDLL dwuwzKsrNM8loMbMa27x5mhENNmd0GSkUNmar1lYHdOP8cXHJKsCCVNwklCmqKGtORx0 vN0Amw3E1mJY7l2uPTbsJgW3AAASSu1mljvd2s0704S8cN81If3kP8r+0BqRL5Xyf2Z/ R75q9znZOpXeTU+tFw0nVoGhjY5keAqPsAfiNDbPZx8mVDyrxayhr/3UgKF1MM9TSUVi OsKw== X-Gm-Message-State: AHPjjUjuFdFIM0EXg5amLJmRy6gRrAJVBiW3b3TMb0bEoU46HzTw5M4y V6ppWom50q1+kjl6kPQ= X-Google-Smtp-Source: ADKCNb62I1UXsqTA3+yZSYtVNdQFhrN1wxa3/fM7Oh0STtQLCcLPCwKMtd0pihFmM8MMDdCGH22guw== X-Received: by 10.98.158.201 with SMTP id f70mr20344139pfk.162.1505349251915; Wed, 13 Sep 2017 17:34:11 -0700 (PDT) Received: from [10.67.68.20] ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id z26sm15248589pfa.49.2017.09.13.17.34.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Sep 2017 17:34:10 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <81962f71-7fdc-6330-dab2-793cfb1987ad@gmail.com> Date: Thu, 14 Sep 2017 08:34:05 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] kmsgrab: fix build error when use old libdrm 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 8c7ddfcabf686f213aa59544d90055d20bdac0f7 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Wed, 13 Sep 2017 20:21:38 -0400 Subject: [PATCH] kmsgrab: fix build error when use old libdrm DRM_FORMAT_R16 adding from libdrm 2.4.82, fix the build error when libdrm < 2.4.82. Signed-off-by: Jun Zhao --- libavdevice/kmsgrab.c | 2 ++ libavutil/hwcontext_vaapi.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavdevice/kmsgrab.c b/libavdevice/kmsgrab.c index d0b9cf5001..49eb44f6f2 100644 --- a/libavdevice/kmsgrab.c +++ b/libavdevice/kmsgrab.c @@ -203,7 +203,9 @@ static const struct { uint32_t drm_format; } kmsgrab_formats[] = { { AV_PIX_FMT_GRAY8, DRM_FORMAT_R8 }, +#ifdef DRM_FORMAT_R16 { AV_PIX_FMT_GRAY16LE, DRM_FORMAT_R16 }, +#endif { AV_PIX_FMT_RGB24, DRM_FORMAT_RGB888 }, { AV_PIX_FMT_BGR24, DRM_FORMAT_BGR888 }, { AV_PIX_FMT_0RGB, DRM_FORMAT_XRGB8888 }, diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 2cc6f26715..837b79da11 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -920,7 +920,7 @@ static const struct { } vaapi_drm_format_map[] = { DRM_MAP(NV12, 2, DRM_FORMAT_R8, DRM_FORMAT_RG88), DRM_MAP(NV12, 1, DRM_FORMAT_NV12), -#ifdef VA_FOURCC_P010 +#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),