From patchwork Tue Nov 3 23:17:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bas Nieuwenhuizen X-Patchwork-Id: 23377 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 A57FB4485C2 for ; Wed, 4 Nov 2020 01:38:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81CAC68B6A3; Wed, 4 Nov 2020 01:38:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4228968B411 for ; Wed, 4 Nov 2020 01:38:46 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id n15so20239908wrq.2 for ; Tue, 03 Nov 2020 15:38:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xErI7Akz4kAMMd7euP5kYvuKczotZSMlaZaxJIuWnhE=; b=JOeC3H7wHuHbHnWqgvWVKsxCbn93o1SPfwEMUB58HQE1vDiZ+s0vQkXBoX2Roofexn WhBqJ1v1ADzvAwzHrEeg9GryNTL2xWRZ5jyWOjYFTIrwCKDtfqp8tqij22ktpvamw4Qd PAjG2WM1w8yrtvrhDSTgTcz+6UZ3c0GObpE7/mIxLBBrTwGZlDWWUBhpev2Yuf6j3Rs/ XVw04M/g1dCZNRb737o97rkLONnGdPFBIH90wkoTZx+Px8kzGmOkcb+sgO1z9LNa4dT0 zRNPf+/1VRbN9Lte21qiktNn6xGM2ApIA2On00fMkwBTanyk0vRW7moZARDTjb+jNnuA y4Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xErI7Akz4kAMMd7euP5kYvuKczotZSMlaZaxJIuWnhE=; b=rWPRUyiA8SSAkb/kx9fuodTEo96jEj+J+cYphFIGheBB5T054f2zVxja8X/zPaQdsC qjk3aIBv7YbDEsRhgGBWiKt6bb88Xh9VIma9PRw0mwopmobddAIF1sQKkMSmPH1oRziz oT4QGpdpxFvLxA8ZOfKDSbHWoOStWYhmm7c0XjtiD2T7QY9QTuSnh+NrZN+VpdZhG/v9 1kUvB8yqRIIBeAdbS4jD3wQr86UbyAODBOxo3ozVvpV2EiauCufPnu5gCdLW2uABsVTq d2Wwjm++DGGwxE7CjHBNgSBRuH8k5XTLmAHDCLkj1Njhmn/A/fDK8bup2RMWV4EPysL0 IH1w== X-Gm-Message-State: AOAM533RbFMN/vC0i8vrX6Ln4AUnxIfolKiVMizfCkL6zi2ppwTCIhUf vziPEXu0ZRIC8TpzRjh3NJOLoMPwwqT3zH9u X-Google-Smtp-Source: ABdhPJy/YKzZgvR2NLt96QLIj6X7KZGErc+ysRWTl70l6TWy5C+ApLQvqPqhNOZA7xN/wcD7+EoHoQ== X-Received: by 2002:aa7:d404:: with SMTP id z4mr24546808edq.334.1604445450104; Tue, 03 Nov 2020 15:17:30 -0800 (PST) Received: from localhost.localdomain ([2a02:aa12:a77f:2000:4cea:81e7:5fd4:93f7]) by smtp.gmail.com with ESMTPSA id f23sm113482eds.41.2020.11.03.15.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 15:17:29 -0800 (PST) From: Bas Nieuwenhuizen To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Nov 2020 00:17:32 +0100 Message-Id: <20201103231734.154984-1-bas@basnieuwenhuizen.nl> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] kmsgrab: Use invalid modifier if modifiers weren't used. 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 Cc: sw@jkqxz.net, Bas Nieuwenhuizen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The kernel defaults to initializing the field to 0 when modifiers are not used and this happens to be linear. If we end up actually passing the modifier to a driver, tiling issues happen. So if the kernel doesn't return a modifier set it explicitly to INVALID. That way later processing knows there is no explicit modifier. --- libavdevice/kmsgrab.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/libavdevice/kmsgrab.c b/libavdevice/kmsgrab.c index a0aa9dc22f..2a03ba4122 100644 --- a/libavdevice/kmsgrab.c +++ b/libavdevice/kmsgrab.c @@ -160,6 +160,7 @@ static int kmsgrab_get_fb2(AVFormatContext *avctx, KMSGrabContext *ctx = avctx->priv_data; drmModeFB2 *fb; int err, i, nb_objects; + uint64_t modifier = DRM_FORMAT_MOD_INVALID; fb = drmModeGetFB2(ctx->hwctx->fd, plane->fb_id); if (!fb) { @@ -195,6 +196,9 @@ static int kmsgrab_get_fb2(AVFormatContext *avctx, goto fail; } + if (fb->flags & DRM_MODE_FB_MODIFIERS) + modifier = fb->modifier; + *desc = (AVDRMFrameDescriptor) { .nb_layers = 1, .layers[0] = { @@ -243,7 +247,7 @@ static int kmsgrab_get_fb2(AVFormatContext *avctx, desc->objects[obj] = (AVDRMObjectDescriptor) { .fd = fd, .size = size, - .format_modifier = fb->modifier, + .format_modifier = modifier, }; desc->layers[0].planes[i] = (AVDRMPlaneDescriptor) { .object_index = obj, @@ -519,6 +523,8 @@ static av_cold int kmsgrab_read_header(AVFormatContext *avctx) err = AVERROR(err); goto fail; } else { + uint64_t modifier = DRM_FORMAT_MOD_INVALID; + av_log(avctx, AV_LOG_INFO, "Template framebuffer is " "%"PRIu32": %"PRIu32"x%"PRIu32" " "format %"PRIx32" modifier %"PRIx64" flags %"PRIx32".\n", @@ -557,15 +563,19 @@ static av_cold int kmsgrab_read_header(AVFormatContext *avctx) err = AVERROR(EINVAL); goto fail; } + + if (fb2->flags & DRM_MODE_FB_MODIFIERS) + modifier = fb2->modifier; + if (ctx->drm_format_modifier != DRM_FORMAT_MOD_INVALID && - ctx->drm_format_modifier != fb2->modifier) { + ctx->drm_format_modifier != modifier) { av_log(avctx, AV_LOG_ERROR, "Framebuffer format modifier " "%"PRIx64" does not match expected modifier.\n", - fb2->modifier); + modifier); err = AVERROR(EINVAL); goto fail; } else { - ctx->drm_format_modifier = fb2->modifier; + ctx->drm_format_modifier = modifier; } av_log(avctx, AV_LOG_VERBOSE, "Format is %s, from " "DRM format %"PRIx32" modifier %"PRIx64".\n", @@ -609,6 +619,7 @@ static av_cold int kmsgrab_read_header(AVFormatContext *avctx) ctx->width = fb->width; ctx->height = fb->height; + ctx->drm_format_modifier = DRM_FORMAT_MOD_INVALID; if (!fb->handle) { av_log(avctx, AV_LOG_ERROR, "No handle set on framebuffer: " From patchwork Tue Nov 3 23:17:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bas Nieuwenhuizen X-Patchwork-Id: 23376 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 CA45344AC6C for ; Wed, 4 Nov 2020 01:24:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A78B68B66D; Wed, 4 Nov 2020 01:24:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCF1068AE53 for ; Wed, 4 Nov 2020 01:24:34 +0200 (EET) Received: by mail-lf1-f67.google.com with SMTP id 126so24570612lfi.8 for ; Tue, 03 Nov 2020 15:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f2KHC06NGEQwfBcigPQd1qGXtxuWFnM5vtCYzINGxGY=; b=VvmNxnrmFSaB0cZ8PRD2zKss4zwDWilkCj1k77IB0ATekuKRVg93oajWssR9X+BSJV Ch1+O0wPGIvjPrPw3ReAiSjoEbe19JjsDBtAwdHZpAxrJmzBkh9NvpxZS72FPp9t80J4 HpzaWG3U4xo3nqvbf5BUEscjFSsNVCg3xc9F+8q0dQ5aS551CgTFHK9+uHajMuKmg8tO CPR70JFF6hxn5Eonr55APFtJLXC7QfeXsaiRm9ME4kQoUtOs885P0+kpQuM6ewGDmx5E sVgSQJvtr9/36E9bZd9TQkOhtHUqo1jkUFjrr2jnu/eymJ1r0kia7zPFeBfgciga6iaR byTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f2KHC06NGEQwfBcigPQd1qGXtxuWFnM5vtCYzINGxGY=; b=C2E19cGgW6b8/v+r9VTZ6VLwgZmWSv3BUBWn/x0Ic6pXKzX5NaMV11CFTRsKEaydtd lZl8UqqGFDGbGQd7IU5/Ea3cSDsJgeVWuWrCazg9ygjeETIuOuDuSyV93GOwB+WRP45o QIBVFFXl2/fIchJIqESYylFHMmTOnOtHwG8kbiq1LoQCNkVGFs3TyGOjONzb1V5hxu6Q y1xBJcHFkZrO9ASR0PN+mZRGSJonqa9DB7dzqpjzuq8kQ1MP0rC4fDgYPC3dEEQacl6F TdcwNruvDr3u9399bPalnpZPqqfydOc6McPlbgD/R6ucr48FAbpmPES9wYvpE0Sb9bf2 9H4Q== X-Gm-Message-State: AOAM531GDzIGHLRhbmvTmJGKqp9DrYWafo06JiMcrNMQBhO6i5EUK97E eoWt87CmY3SWGTmCePfPYhIh62rgP1z+E5PZ X-Google-Smtp-Source: ABdhPJzR2nndOfFe9AW687Cvv1g465LdlCsnfcuP63lT7WZSs9IAYm65FarG1Pw7dP7mGxahKeLypA== X-Received: by 2002:a17:906:4c57:: with SMTP id d23mr21513957ejw.321.1604445450969; Tue, 03 Nov 2020 15:17:30 -0800 (PST) Received: from localhost.localdomain ([2a02:aa12:a77f:2000:4cea:81e7:5fd4:93f7]) by smtp.gmail.com with ESMTPSA id f23sm113482eds.41.2020.11.03.15.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 15:17:30 -0800 (PST) From: Bas Nieuwenhuizen To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Nov 2020 00:17:33 +0100 Message-Id: <20201103231734.154984-2-bas@basnieuwenhuizen.nl> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103231734.154984-1-bas@basnieuwenhuizen.nl> References: <20201103231734.154984-1-bas@basnieuwenhuizen.nl> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] kmsgrab: Do not require the modifier to stay constant. 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 Cc: sw@jkqxz.net, Bas Nieuwenhuizen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" As we get a new set of objects each frame anyway, we do not gain anything by keeping the modifier constant. This helps with capturing when switching your setup a bit, e.g. from ingame to desktop or from X11 to wayland. --- libavdevice/kmsgrab.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavdevice/kmsgrab.c b/libavdevice/kmsgrab.c index 2a03ba4122..8b698b7f30 100644 --- a/libavdevice/kmsgrab.c +++ b/libavdevice/kmsgrab.c @@ -176,13 +176,6 @@ static int kmsgrab_get_fb2(AVFormatContext *avctx, err = AVERROR(EIO); goto fail; } - if (fb->modifier != ctx->drm_format_modifier) { - av_log(avctx, AV_LOG_ERROR, "Plane %"PRIu32" framebuffer " - "format modifier changed: now %"PRIx64".\n", - ctx->plane_id, fb->modifier); - err = AVERROR(EIO); - goto fail; - } if (fb->width != ctx->width || fb->height != ctx->height) { av_log(avctx, AV_LOG_ERROR, "Plane %"PRIu32" framebuffer " "dimensions changed: now %"PRIu32"x%"PRIu32".\n", From patchwork Tue Nov 3 23:17:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bas Nieuwenhuizen X-Patchwork-Id: 23378 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 1B9A04401F6 for ; Wed, 4 Nov 2020 01:41:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DAFCF68B6EB; Wed, 4 Nov 2020 01:41:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C0AD68B483 for ; Wed, 4 Nov 2020 01:41:00 +0200 (EET) Received: by mail-ed1-f67.google.com with SMTP id o20so2289317eds.3 for ; Tue, 03 Nov 2020 15:41:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MsJtAJD2ZhJ5Sl7M+oeEfLfMPfAJRyMAkM3Nd6TGeVs=; b=QtaWt46vGb5PY7Ld24PGTDADSLyHM4wyaIRViDfDhav55rlGFcNzg60MwXfW4oVp7L AiPBHb5ztMgWIaSTVL3eu20m3QqxyKeeLl70GSLsx1SVXxy5Y7S+eWJVAUmr2XVD1QNs TTM1Z88iCQmtIIm5a2v8U6wjSYxX1QteTHxfNY6R8/6vfvVKakDOSreP9U2g2acdCxKe nYuhM1mdotA7BF8h74Ql/6z6ZyBt1EmELEZIz4TBaqIydJeEfj4dT5cwhEgJ7o9kyLaK HkT0DkuaSnCQZyw51fwKEx/DnA+mzx3o/LdGW0xljTmXtchyxvyBEz4ug0NITTCu5TVM m6vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MsJtAJD2ZhJ5Sl7M+oeEfLfMPfAJRyMAkM3Nd6TGeVs=; b=kMTDzX00Z3uwKGw/A9XH1ouc+yERqb5mNBMDmjRSj326STbIrQUPwtARRY2fGNMJqu /Z5N6/pz3B2Z2Ge1iUbpIKx5BMCglr1Nt+bEnxRf8BkO7xjNXn6SrSobPhZsc1ikRqIb fO/2U6HNdIMhKW8NmWByUCaUOBNV6kNr/68IRuW6SZvLhWOnto0DmcfVxX0ZabS7mYjj OHuxH8ZcUZYf+q7coiLd8JVSrz0goINhMITMvx7EzAa/w0DO7uY2hxlUZnO5njEVxlz5 /QmUzn0vAqr/HTU/XAI1Ne6M0kiaB0Wtq2GjQoIr8ym4cJWeR5BwGiMwNPsVrFibTP8c 94Gg== X-Gm-Message-State: AOAM531D5FS+p43EeX6HSarqrjXVPyKpz3tW9SZ3/d1MHniFT0/89vDv 2Br355RjyE2JvzhzG7hmUdH49O5B6ug1pgE0 X-Google-Smtp-Source: ABdhPJxwNyvnjh1+sQr0T6H++YJUXsb4MgFL6qPj8ZQElIFyaoViD9zxhZVvIVT1+dg2dv+zXkOIyg== X-Received: by 2002:a17:906:1183:: with SMTP id n3mr21983631eja.188.1604445452069; Tue, 03 Nov 2020 15:17:32 -0800 (PST) Received: from localhost.localdomain ([2a02:aa12:a77f:2000:4cea:81e7:5fd4:93f7]) by smtp.gmail.com with ESMTPSA id f23sm113482eds.41.2020.11.03.15.17.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 15:17:31 -0800 (PST) From: Bas Nieuwenhuizen To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Nov 2020 00:17:34 +0100 Message-Id: <20201103231734.154984-3-bas@basnieuwenhuizen.nl> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103231734.154984-1-bas@basnieuwenhuizen.nl> References: <20201103231734.154984-1-bas@basnieuwenhuizen.nl> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] hwcontext_vaapi: Use PRIME_2 memory type for modifiers. 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 Cc: sw@jkqxz.net, Bas Nieuwenhuizen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This way we can pass explicit modifiers in. Sometimes the modifier matters for the number of memory planes that libva accepts, in particular when dealing with driver-compressed textures. Furthermore the driver might not actually be able to determine the implicit modifier if all the buffer-passing has used explicit modifier. All these issues should be resolved by passing in the modifier, and for that we switch to using the PRIME_2 memory type. Tested with experimental radeonsi patches for modifiers and kmsgrab. Also tested with radeonsi without the patches to double-check it works without PRIME_2 support. --- libavutil/hwcontext_vaapi.c | 118 +++++++++++++++++++++++++++--------- 1 file changed, 90 insertions(+), 28 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 2227d6ed69..3ef4bf5bed 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1030,22 +1030,21 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, VASurfaceID surface_id; VAStatus vas; uint32_t va_fourcc; - int err, i, j, k; + int err, i, j; - unsigned long buffer_handle; - VASurfaceAttribExternalBuffers buffer_desc; - VASurfaceAttrib attrs[2] = { + VADRMPRIMESurfaceDescriptor prime_desc; + VASurfaceAttrib prime_attrs[2] = { { .type = VASurfaceAttribMemoryType, .flags = VA_SURFACE_ATTRIB_SETTABLE, .value.type = VAGenericValueTypeInteger, - .value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME, + .value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2, }, { .type = VASurfaceAttribExternalBufferDescriptor, .flags = VA_SURFACE_ATTRIB_SETTABLE, .value.type = VAGenericValueTypePointer, - .value.value.p = &buffer_desc, + .value.value.p = &prime_desc, } }; @@ -1083,35 +1082,98 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, format_desc = vaapi_format_from_fourcc(va_fourcc); av_assert0(format_desc); - buffer_handle = desc->objects[0].fd; - buffer_desc.pixel_format = va_fourcc; - buffer_desc.width = src_fc->width; - buffer_desc.height = src_fc->height; - buffer_desc.data_size = desc->objects[0].size; - buffer_desc.buffers = &buffer_handle; - buffer_desc.num_buffers = 1; - buffer_desc.flags = 0; - - k = 0; - for (i = 0; i < desc->nb_layers; i++) { - for (j = 0; j < desc->layers[i].nb_planes; j++) { - buffer_desc.pitches[k] = desc->layers[i].planes[j].pitch; - buffer_desc.offsets[k] = desc->layers[i].planes[j].offset; - ++k; - } + + prime_desc.fourcc = va_fourcc; + prime_desc.width = src_fc->width; + prime_desc.height = src_fc->height; + prime_desc.num_objects = desc->nb_objects; + for (i = 0; i < desc->nb_objects; ++i) { + prime_desc.objects[i].fd = desc->objects[i].fd; + prime_desc.objects[i].size = desc->objects[i].size; + prime_desc.objects[i].drm_format_modifier = + desc->objects[i].format_modifier; } - buffer_desc.num_planes = k; - if (format_desc->chroma_planes_swapped && - buffer_desc.num_planes == 3) { - FFSWAP(uint32_t, buffer_desc.pitches[1], buffer_desc.pitches[2]); - FFSWAP(uint32_t, buffer_desc.offsets[1], buffer_desc.offsets[2]); + prime_desc.num_layers = desc->nb_layers; + for (i = 0; i < desc->nb_layers; ++i) { + prime_desc.layers[i].drm_format = desc->layers[i].format; + prime_desc.layers[i].num_planes = desc->layers[i].nb_planes; + for (j = 0; j < desc->layers[i].nb_planes; ++j) { + prime_desc.layers[i].object_index[j] = + desc->layers[i].planes[j].object_index; + prime_desc.layers[i].offset[j] = desc->layers[i].planes[j].offset; + prime_desc.layers[i].pitch[j] = desc->layers[i].planes[j].pitch; + } + + if (format_desc->chroma_planes_swapped && + desc->layers[i].nb_planes == 3) { + FFSWAP(uint32_t, prime_desc.layers[i].pitch[1], + prime_desc.layers[i].pitch[2]); + FFSWAP(uint32_t, prime_desc.layers[i].offset[1], + prime_desc.layers[i].offset[2]); + } } + /* + * We can query for PRIME_2 support with vaQuerySurfaceAttributes, but that + * needs the config_id which we don't have here ... Both Intel and Gallium + * seem to do the correct error checks, so lets just try the PRIME_2 import + * first. + */ vas = vaCreateSurfaces(dst_dev->display, format_desc->rt_format, src->width, src->height, &surface_id, 1, - attrs, FF_ARRAY_ELEMS(attrs)); + prime_attrs, FF_ARRAY_ELEMS(prime_attrs)); + + if (vas != VA_STATUS_SUCCESS) { + int k; + unsigned long buffer_handle; + VASurfaceAttribExternalBuffers buffer_desc; + VASurfaceAttrib buffer_attrs[2] = { + { + .type = VASurfaceAttribMemoryType, + .flags = VA_SURFACE_ATTRIB_SETTABLE, + .value.type = VAGenericValueTypeInteger, + .value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME, + }, + { + .type = VASurfaceAttribExternalBufferDescriptor, + .flags = VA_SURFACE_ATTRIB_SETTABLE, + .value.type = VAGenericValueTypePointer, + .value.value.p = &buffer_desc, + } + }; + + buffer_handle = desc->objects[0].fd; + buffer_desc.pixel_format = va_fourcc; + buffer_desc.width = src_fc->width; + buffer_desc.height = src_fc->height; + buffer_desc.data_size = desc->objects[0].size; + buffer_desc.buffers = &buffer_handle; + buffer_desc.num_buffers = 1; + buffer_desc.flags = 0; + + k = 0; + for (i = 0; i < desc->nb_layers; i++) { + for (j = 0; j < desc->layers[i].nb_planes; j++) { + buffer_desc.pitches[k] = desc->layers[i].planes[j].pitch; + buffer_desc.offsets[k] = desc->layers[i].planes[j].offset; + ++k; + } + } + buffer_desc.num_planes = k; + + if (format_desc->chroma_planes_swapped && + buffer_desc.num_planes == 3) { + FFSWAP(uint32_t, buffer_desc.pitches[1], buffer_desc.pitches[2]); + FFSWAP(uint32_t, buffer_desc.offsets[1], buffer_desc.offsets[2]); + } + + vas = vaCreateSurfaces(dst_dev->display, format_desc->rt_format, + src->width, src->height, + &surface_id, 1, + buffer_attrs, FF_ARRAY_ELEMS(buffer_attrs)); + } if (vas != VA_STATUS_SUCCESS) { av_log(dst_fc, AV_LOG_ERROR, "Failed to create surface from DRM " "object: %d (%s).\n", vas, vaErrorStr(vas));