From patchwork Fri Oct 27 20:25:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rosca X-Patchwork-Id: 44397 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp101039pzb; Fri, 27 Oct 2023 13:32:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFuH/h9S2C7xdZFtE9z4qsAe95YjZ59h0q1u1K7uRJus+VWTFZkh/OMWmG5QT8ZtNTdB8Fl X-Received: by 2002:a05:6402:792:b0:53f:ba1a:800d with SMTP id d18-20020a056402079200b0053fba1a800dmr3120357edy.14.1698438759171; Fri, 27 Oct 2023 13:32:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698438759; cv=none; d=google.com; s=arc-20160816; b=0pbIIepEL2SfEruDaQJj0j3Kal6cBA8hcQ8c50ybI09PFZg9Xw/X19Q94/O9c0lTJo tQtnhSv2aXVkBZes0xzDYVUSel/TO/Sm+QFgqmw7VEa81qojs2e9XNcnZ5UrdRbYdk3b 8opPnR2gQalcI4jk/CrUHUzLDpulnQ3FD4s23hKFbXazMN2sbTGkbLUMnRYM04V9Wp6L o3PUH0pegXt1T1c1ZMR+xuxK6vxdYM/QCQlQehvqhdBbOHLsfA2VrY8NMD+Fw8mYHN82 62LoH6KD5pyZBpv9Cl5Imk9lJo4CDXVFAZ/KjgK/ZBHZkUlokvaAEcjKkgNdoeDXaqzj fWRA== 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=BLIbrzWChpNMFjvWJN7/HoJP4fUHT6NPT8DCpYuOQYo=; fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; b=NBtVlQijTflgZuZQYMLGyfzdWPewgza7wBF7/2YEAgOpA5qnTA+A3/t3PuwojEnv6G sKvOxc68e2/IUAbuxP/4u4v2IItyhBKTk1FvRvYJ2ihCRxdk80jE+29c4mOSUx4Y+0Uv FJXW3VkiEAqQA/LFdJUibhoCxscKhxmrg1bmk829z8tiYE4n6h2LxbFdcqHfjiqIO9v7 ojNGtZOSkX4CrIhczdJGhyplC244Jl9bhOzu4HCywJC2igWi3l7Qt4PINP39hINrKUOC AThj3KpV/z/qvjpEiXt8tiU8yVzelwOq1SzXpbv/zfDnh7marqIwHEqnhrNUTr3Wr2XK VYyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=KOKcmY9E; 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 cf4-20020a0564020b8400b0053e0249c25csi1130092edb.3.2023.10.27.13.32.38; Fri, 27 Oct 2023 13:32:39 -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=KOKcmY9E; 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 A8ECB68CB7C; Fri, 27 Oct 2023 23:32:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F41768C924 for ; Fri, 27 Oct 2023 23:32:29 +0300 (EEST) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-9bdf5829000so407042766b.0 for ; Fri, 27 Oct 2023 13:32:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698438748; x=1699043548; 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=ejW661nDE4BrGJkDamLDzfmHLyQIHAgESd2Y4hsGopo=; b=KOKcmY9EFxsqhf7GB+B1VJL7yPdQomvs3RNImQoWkNggb8bL/+lq08RP3vG+qsrvNG nR3uPqHbv9DXGj/ahgou+VtOHvWefeWitsxiD6UYOIlHqAfbtnsX0RUopo9Ii80NE8Ix Zz8EGK7phn5WLnOGwUHQLM40gtTTDXJG5+dJXjZZWAtjpBa8dWDay+wPtyztfmF28oTx lDPQvkUXRBoToOXmiG8b+HQHYrqcgZe30NHFyc4vFx0ZfU4zqh2rvTmnxGiaqFJujOr2 hS6iwNFu4EbYQzns79DXmdXykhObtFZpXTlpzy/rDw4O2oXf1RvfigoEOMQ9e5JUAVrO H2gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698438748; x=1699043548; 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=ejW661nDE4BrGJkDamLDzfmHLyQIHAgESd2Y4hsGopo=; b=hNAWWDd1e074AaE/PdM26X/k7DbtRb9YAOq03mz7IjJeZUJhMgszr93aVGp3HtaXVb P4R19fxIkjiAIZocFZnUEm0E4reGpsYbGvylszOx9wyYY5dQnrbtu8uKAeH7820ZDtBh 3KSHleqMqFf1dmDMvoKHx1ValPt8xy/jOzoPTXBtSoILz3W8Yz/VW6m4Z1YQ1Yqf1+Nd sBisqTQzxpr/pgCXVswP0NQ02t92ZJJCU05+OHHGXPHLVw52z3RfaH262x6Q1ghkWz+p jjGSd+9kYG4lzAoWqdIiSx6Eqk0yjdOtHSKH69isGLa9um8JuUQntigsLphw2E+iMnUb FzAQ== X-Gm-Message-State: AOJu0YwXk/f2GiBI528PSpVl8rOJPHUeuRSL8gYVC40lxDW0wDqYOTNO vhcZCyALWyIbrydRfGxYY1TvMP2o4bE= X-Received: by 2002:a17:906:d552:b0:9be:77cd:4c2c with SMTP id cr18-20020a170906d55200b009be77cd4c2cmr2801003ejc.28.1698438747867; Fri, 27 Oct 2023 13:32:27 -0700 (PDT) Received: from mitsuki.. (ip-62-245-76-195.bb.vodafone.cz. [62.245.76.195]) by smtp.gmail.com with ESMTPSA id lz21-20020a170906fb1500b009887f4e0291sm1690631ejb.27.2023.10.27.13.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 13:32:27 -0700 (PDT) From: David Rosca To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2023 22:25:50 +0200 Message-ID: <20231027202849.221052-3-nowrep@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4] 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: bszEHVQZw9el This allows some optimizations in driver, such as not having to read back the data if write-only mapping is requested. --- v4: overwrite + note about vaMapBuffer libva fallback libavutil/hwcontext_vaapi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 558fed94c6..435f10a7f3 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -799,6 +799,9 @@ static int vaapi_map_frame(AVHWFramesContext *hwfc, VAStatus vas; void *address = NULL; int err, i; +#if VA_CHECK_VERSION(1, 21, 0) + uint32_t vaflags = 0; +#endif surface_id = (VASurfaceID)(uintptr_t)src->data[3]; av_log(hwfc, AV_LOG_DEBUG, "Map surface %#x.\n", surface_id); @@ -882,7 +885,16 @@ static int vaapi_map_frame(AVHWFramesContext *hwfc, } } +#if VA_CHECK_VERSION(1, 21, 0) + if (flags & AV_HWFRAME_MAP_READ) + vaflags |= VA_MAPBUFFER_FLAG_READ; + if (flags & AV_HWFRAME_MAP_WRITE) + vaflags |= VA_MAPBUFFER_FLAG_WRITE; + // On drivers not implementing vaMapBuffer2 libva calls vaMapBuffer instead. + 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));