From patchwork Sat Aug 1 17:57:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21440 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1B8A344ADBC for ; Sat, 1 Aug 2020 20:57:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5BF868BB01; Sat, 1 Aug 2020 20:57:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCAAB68BAFF for ; Sat, 1 Aug 2020 20:57:37 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id k8so11961352wma.2 for ; Sat, 01 Aug 2020 10:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=UhbQwkC8hm7QlrurIsQngjhBuyFimE252sC+niOCmUw=; b=W/o5uKunLP4vNVUyUeTbEL+WpcNcW0U057ehsZudVD/U/aVK9F64Gxj2yMDNa6swmQ mQO2aKwpWZPNNSm0HiRUjg04fr/i3Vfhg14jh/774td9R7Eis4AMk1WA23nv/fWOZBSq xpcKdGxVG5rbwlgX/XFqjiLmJNQfCq1oKIffGGNWu9f8UxfraapfjKIeqFxRtjOdjVwU Yz0JnEDLvAP4AjnDas9AfgnLh6txFOQgJ4bXifdP2HuagGlQY84Kf+BapmvM1yc8mRVD iYBb94PoUIZ3GEKoW0o9cgztgGmYx8FJL5JSFshEg6emuX8mjRULCZunhtcp+dxcLY1i U6rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=UhbQwkC8hm7QlrurIsQngjhBuyFimE252sC+niOCmUw=; b=RoLbWwNlCf2y8W/DQeG/6sWoqVVS1kDZbKl9+tazMDGz+7u9SFh9PikS98AVGUbnvb ja+vXzt/v3l1FPeoLQzPx8Zw4xO3UR38mJGLvY6uS0vg4XTsTkCzqxEEJDbD+kCdhWsX DblipzUcXVm1u0skESq9E2Voda2jORBIiEVbJJIlBj/cTkjtc4yzZcjqmotk5ici7UHn VkZE+eYmRfMRHqR+9rQjRyVtrqCA3LovMZiuqt8h/bhjFZpP1GhLUq45UCw6unWRvjEn EvalSH0swHeAw7SehL2/t/LoVihhMdNbFzH3PQFWuQfYi8jojNLcLWh8PgpqSKKjAGTw nf5g== X-Gm-Message-State: AOAM530mvg8NL19Yev7rtnE80yoISJicOGsbg6K0f2jNYgEy44xiTw6C hCvdZvIxKYtWKntnvdzBAjeOUCPz4Ss= X-Google-Smtp-Source: ABdhPJzgFlw9Ykm/9RnW+uXut34Wnup3ou0KFEF/WDDIEKrgwLBchSzuSf6cY+ariXZifwjeEDEMpA== X-Received: by 2002:a1c:32c3:: with SMTP id y186mr8631922wmy.15.1596304657015; Sat, 01 Aug 2020 10:57:37 -0700 (PDT) Received: from [192.168.0.3] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 32sm20263402wrh.18.2020.08.01.10.57.36 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 01 Aug 2020 10:57:36 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org References: <20200705154946.401280-1-sw@jkqxz.net> Message-ID: Date: Sat, 1 Aug 2020 18:57:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200705154946.401280-1-sw@jkqxz.net> Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 5/5] kmsgrab: Add more supported formats 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" X2RGB10 tested on both Intel Gen9 and AMD Polaris 11. NV12 tested on Intel Gen9 only - since it has multiple planes, this requires GetFB2. Also add some comments to split the list up a bit. --- libavdevice/kmsgrab.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavdevice/kmsgrab.c b/libavdevice/kmsgrab.c index b859f202aa..59c3358f5f 100644 --- a/libavdevice/kmsgrab.c +++ b/libavdevice/kmsgrab.c @@ -362,6 +362,7 @@ static const struct { enum AVPixelFormat pixfmt; uint32_t drm_format; } kmsgrab_formats[] = { + // Monochrome. #ifdef DRM_FORMAT_R8 { AV_PIX_FMT_GRAY8, DRM_FORMAT_R8 }, #endif @@ -369,6 +370,7 @@ static const struct { { AV_PIX_FMT_GRAY16LE, DRM_FORMAT_R16 }, { AV_PIX_FMT_GRAY16BE, DRM_FORMAT_R16 | DRM_FORMAT_BIG_ENDIAN }, #endif + // <8-bit RGB. { AV_PIX_FMT_BGR8, DRM_FORMAT_BGR233 }, { AV_PIX_FMT_RGB555LE, DRM_FORMAT_XRGB1555 }, { AV_PIX_FMT_RGB555BE, DRM_FORMAT_XRGB1555 | DRM_FORMAT_BIG_ENDIAN }, @@ -378,6 +380,7 @@ static const struct { { AV_PIX_FMT_RGB565BE, DRM_FORMAT_RGB565 | DRM_FORMAT_BIG_ENDIAN }, { AV_PIX_FMT_BGR565LE, DRM_FORMAT_BGR565 }, { AV_PIX_FMT_BGR565BE, DRM_FORMAT_BGR565 | DRM_FORMAT_BIG_ENDIAN }, + // 8-bit RGB. { AV_PIX_FMT_RGB24, DRM_FORMAT_RGB888 }, { AV_PIX_FMT_BGR24, DRM_FORMAT_BGR888 }, { AV_PIX_FMT_0RGB, DRM_FORMAT_BGRX8888 }, @@ -388,6 +391,12 @@ static const struct { { AV_PIX_FMT_ABGR, DRM_FORMAT_RGBA8888 }, { AV_PIX_FMT_RGBA, DRM_FORMAT_ABGR8888 }, { AV_PIX_FMT_BGRA, DRM_FORMAT_ARGB8888 }, + // 10-bit RGB. + { AV_PIX_FMT_X2RGB10LE, DRM_FORMAT_XRGB2101010 }, + { AV_PIX_FMT_X2RGB10BE, DRM_FORMAT_XRGB2101010 | DRM_FORMAT_BIG_ENDIAN }, + // 8-bit YUV 4:2:0. + { AV_PIX_FMT_NV12, DRM_FORMAT_NV12 }, + // 8-bit YUV 4:2:2. { AV_PIX_FMT_YUYV422, DRM_FORMAT_YUYV }, { AV_PIX_FMT_YVYU422, DRM_FORMAT_YVYU }, { AV_PIX_FMT_UYVY422, DRM_FORMAT_UYVY },