From patchwork Fri Oct 27 08:39:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rosca X-Patchwork-Id: 44378 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf16:b0:15d:8365:d4b8 with SMTP id gc22csp1216229pzb; Fri, 27 Oct 2023 01:43:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGqebQK+tqspcyWrmFMWP6ypEZFpjdEpG7nYBceVnvP8zwNuVAhPOAaxGWnOuFN3jl+u9zk X-Received: by 2002:a17:906:4787:b0:9b2:b786:5e9c with SMTP id cw7-20020a170906478700b009b2b7865e9cmr1475695ejc.28.1698396232205; Fri, 27 Oct 2023 01:43:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698396232; cv=none; d=google.com; s=arc-20160816; b=D+iwV5j/T7w1NVqcdnEEa9tbL+5SHQEe7ParbaJixG52m+WV6WODUkSJ1w77iEYqkg 8Ik1/OQ1WUGPcx5dfV0vuDWez7foy3c05GQuMLDOXU6UWseHxGAoqJ4ROMdE7kIiM+rf V0GYWTFjtGAyNq/eReZgvLJwFTud3qdEQY0bLA+ng3QewzLtRmvq/GfFkZXpwFM3M7+p Ue3NrZKTem4bWbAypK7Pz7XMgny5QurvgXmb2NmCX4wc29YnvPRRIku5Qcfxaem7eXUZ KBJb9pGbF/llbBMhexEm9DBg+fMPfP2m1wOCx4vy7mrVtOpsq2aFzXbLO8JRMDXJhmFc fPjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=RYYCddv9a/haKqJh8BiL3f4J5nhWFYbRp9/rI/XMzoI=; fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; b=eRgDH+xLmkzw1UHBNj+/+IqY/E85yhLMicJ5cyTBDiz4gZKQZRObLNhYA6Pr5j8b4g +kyCsLlOG2/kq2zPJ/+ezNn2oBb9587aeMqPzCDNk2AxQ+xGIz62li8w4ONRN1iQCWIM RqwAwco2dpKOCO9+ozJoR/DTre0vnfmWni8u5KKc98sWV2zZXz5T6Z3NlCp2wD/bJSiG 55uXeVppi4AAvb4ZNuwIp/0DdJaQaPxtV3aglKAUCEsB9+09m7fb9yk+isYwZUsSBB7p bamOymY8iwyCjooQYtkUHbCHzB0zoyPuxhMSYoaXCR37rSHG9sQSEqkATu9L2L2iXzYD gqXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jBZq6uIs; 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=QUARANTINE 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 wu11-20020a170906eecb00b0096f65c97148si619054ejb.714.2023.10.27.01.43.49; Fri, 27 Oct 2023 01:43:52 -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=20230601 header.b=jBZq6uIs; 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=QUARANTINE 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 23F7668CC1F; Fri, 27 Oct 2023 11:43:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D0DC68C784 for ; Fri, 27 Oct 2023 11:43:39 +0300 (EEST) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-9ba081173a3so284132166b.1 for ; Fri, 27 Oct 2023 01:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698396218; x=1699001018; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JuUSxjvoFsfEqHgGgBui/G+OUruGuVHJyV5F5YHehww=; b=jBZq6uIs56PzgRgU14WHz64lc01H+8GaldhBxqHpF76uvUZj0YmJWwUK3Igbpp95mu FzgaifXXXEq8oKty7NfzFbTHWlQRl3pgjbLhCbAu232mp3SvY37iZjf5hlf2QRxXtcny ABXM0VMQjHMKf5VmKdCDp/FNGhd50G5wnWoLUN2qbKuC8GbDirVLfYNRCMzVbTI5Dl89 CBdbuCy/4KYRxuVaFvjKJWHpnytRL51wEcr6hfOpa5jq0r+TAgGhdvEiqWo4RIpH7HEi pJu8fomKK9TCs1SzRBgxxjkW+Nny34QeAdidJlfFR7LYpVEIZpez5kU4PjpUfXFs301b dazw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698396218; x=1699001018; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JuUSxjvoFsfEqHgGgBui/G+OUruGuVHJyV5F5YHehww=; b=r4o4fgVDmjKPqR5TVjS63PjOxCZBdbwItJ0qOpUBCxot4ZfTVJmzNw9BGJu9GwZiut gCmB32Q5JXD0D/nJVsoGK/YBUE0eWiJstAtZo1/S8/wYZMeRqOJJ61BCgtmGFJIi3+Y2 AtKzPH4VN3Sz29E4TZqMglUwatKVAqrDw/hDrwixCQ4vD5UJ+loEOacruF7Lg/eKqKNK Y+mQxDqArnqo4Vvi16u/Sytrm2G5zzFRKuw5h7+UWL/11Ewv8fP440oCXo/ac04tzuMn YjJ+iyQoqonEy+ct9ZYp1MWmR7BIGKYqeystSPf/2Vpudg7aqxTOQ1uBNW2N8Js8BOuK 88Og== X-Gm-Message-State: AOJu0YziGrwNZll0gl++3UVmDBfmwp067+W0Vbp1DpN1pXR5nfzxf3Ji xN5ijZRui+XjXDtlyoskq+xssXa0n6Q= X-Received: by 2002:a17:907:a0a:b0:9c7:db3:8b31 with SMTP id bb10-20020a1709070a0a00b009c70db38b31mr1902821ejc.59.1698396217525; Fri, 27 Oct 2023 01:43:37 -0700 (PDT) Received: from mitsuki.. (ip-62-245-76-195.bb.vodafone.cz. [62.245.76.195]) by smtp.gmail.com with ESMTPSA id cw23-20020a170906c79700b009c3828fec06sm832706ejb.81.2023.10.27.01.43.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 01:43:36 -0700 (PDT) From: David Rosca To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2023 10:39:02 +0200 Message-ID: <20231027083929.85403-3-nowrep@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu/hwcontext_vaapi: Use vaMapBuffer2 for mapping image buffers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: David Rosca Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dVIIqYVTMDgO This allows some optimizations in driver, such as not having to read back the data if write-only mapping is requested. --- libavutil/hwcontext_vaapi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 558fed94c6..c3ecd90077 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -882,7 +882,16 @@ static int vaapi_map_frame(AVHWFramesContext *hwfc, } } +#if VA_CHECK_VERSION(1, 21, 0) + uint32_t vaflags = 0; + if (flags & AV_HWFRAME_MAP_READ || !(flags & AV_HWFRAME_MAP_OVERWRITE)) + vaflags |= VA_MAPBUFFER_FLAG_READ; + if (flags & AV_HWFRAME_MAP_WRITE) + vaflags |= VA_MAPBUFFER_FLAG_WRITE; + vas = vaMapBuffer2(hwctx->display, map->image.buf, &address, vaflags); +#else vas = vaMapBuffer(hwctx->display, map->image.buf, &address); +#endif if (vas != VA_STATUS_SUCCESS) { av_log(hwfc, AV_LOG_ERROR, "Failed to map image from surface " "%#x: %d (%s).\n", surface_id, vas, vaErrorStr(vas));