From patchwork Fri Oct 27 09:14:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rosca X-Patchwork-Id: 44379 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf16:b0:15d:8365:d4b8 with SMTP id gc22csp1230410pzb; Fri, 27 Oct 2023 02:16:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFlfoM/xd5LS8qqDU7v6tLoqa8zUXp6C+9eW6VzNvmfCf/6v3by1uEjTGux6reI+ag6dfEW X-Received: by 2002:a17:907:7da4:b0:9ae:2f35:442a with SMTP id oz36-20020a1709077da400b009ae2f35442amr1542419ejc.5.1698398190823; Fri, 27 Oct 2023 02:16:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698398190; cv=none; d=google.com; s=arc-20160816; b=O/nTnagkGRGRqYV8yed2pU/q39LZkiul5poTEM3opUAACiKxU0Fng9OZ/tYParCBfD KxEGa4L/30haOTE1cHKZ1x2fOwHSupONQ7UJeJPl54lErAnDXOkWmB8tR05Sbw/1oLP6 CbTZA/LpVljm8JL16tgYlQit8P8xTzSoFYqLb4xIvZKs3sbthECJGrLHI/k66KH9eCry RVv/s5THkQI+oIEly2qrPBs9timd6ohtY9yqcbtQLzeOsG8GZBMyv6kwriHPw5Z/7UMy Q6um8jUYkgZWOSOXG84gTV+UJeZJLdIUbFBf4/Tjl1130aGmjNE8BhwhBn/3OKQPhY84 /CpA== 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=StFgNWnyt33kwUX0iSRfyDc0Uu6uq0DZBAHwGu2UGns=; fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; b=JA6pGQKQ4VzuInrUDvFn97xnoAUpEXpUBNl0MIzzBcyLBCG9CL2/jKYnLLeW5XeOk8 e+hxUslm2SMo9dh0cGuNIr1w4YTaZyY0aISh6EUWnWN7Mm4f2FkZj+yfCAvHr975xctB KgiognbnyEGAFsfl7nA4UWBovjYS9UpgCkPEJ1S/sq3mh5SamQgdXDllod7pEQX9e4g6 CZ8MQ6OW/RJvNMQNTDQb7uWJYDSw6fz9cs70TkFbdx1zFhC4rpey1wJIpsXHiae33YMD 1Fe2uLlN5OYjpjvJrCBzx5vct/NAxdf1UppOfxNobN/X1JLOXePFyD56bl01yGdScpTF g1+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Bm+nuTnk; 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 do3-20020a170906c10300b009ad869ac653si631554ejc.1011.2023.10.27.02.16.30; Fri, 27 Oct 2023 02:16:30 -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=Bm+nuTnk; 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 6A75068CC2B; Fri, 27 Oct 2023 12:16:27 +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 892C268CB27 for ; Fri, 27 Oct 2023 12:16:21 +0300 (EEST) Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso293310766b.1 for ; Fri, 27 Oct 2023 02:16:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698398180; x=1699002980; 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=8iQ2S0FiKBwEFAlxhno9e8V1Qdi4dGEDU/kKq6+yquo=; b=Bm+nuTnktlsCX/i538GN9Nkjfwm4Ou1c0udlPqSgEmzzBhL+Z1Cox0xXfWgIvCVoJD YZ8VZrk6+QwT3ZqhLUuLHVd/VUVmh+Sg7DUuvYlRjcJAGrOPSz1ngzmGLmjLKXFzJTgi kkj11N7UpCEGnjRP/dTO3geilH7d0uvdB2Peo8bmia65GB6Yu9s+imAJg2Sflx6lsyu+ vYe8Pn78SPNdA0LCVYoQ2iU4DXS1LEXJPHahOsGXxWWL+i/h42Y6VjfUF0dFuMbxm6vs 2PJ8xBKLP/77ftaIIp2LnNuNh0vSE1uj9sqFJjJZCO/bcBBhBHgdqlcOQ3ycXIna1JNX rgGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698398180; x=1699002980; 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=8iQ2S0FiKBwEFAlxhno9e8V1Qdi4dGEDU/kKq6+yquo=; b=nI45qunKdbLPagWTKzYWfozqvyIZXpEWUOTTIfeeAV6P5yIsCYL3jWMAudCOgLOSnC +ovSRg3tcUH+wOr8eLz0O07flxJDXyeoxcITKYbBUGjFPKGV9049hT85g1ukn3uLjitU rJzPNvzEKhNt1y0W+/ewlYf+v1jKmGPm8IOsagQChAqJau2/dwVPO2qLSar8aMe8qS4Z 54zgA6v/F4X7f13twh6UN0Jz0RsUNkH61XFheByN7hmXx2VPdlbToAK6gsh96o+FPW9w vwyy1uSOYzTB3pdPBfmlycgCcWtshEkeYJP4d/+q7y37pLHkk2cIb66lVyuNU6MejjNA tXhA== X-Gm-Message-State: AOJu0YySRAcfMFDQROBVv5asWRKH025ZD7NkBUBsbmLifnZGEybhn7L0 6jdWrzYbl9ByTR995ZfppyMEFq3EgJI= X-Received: by 2002:a17:907:9621:b0:9c7:5651:9018 with SMTP id gb33-20020a170907962100b009c756519018mr1823055ejc.68.1698398180316; Fri, 27 Oct 2023 02:16:20 -0700 (PDT) Received: from mitsuki.. (ip-62-245-76-195.bb.vodafone.cz. [62.245.76.195]) by smtp.gmail.com with ESMTPSA id lx22-20020a170906af1600b009c6a4a5ac80sm872285ejb.169.2023.10.27.02.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 02:16:19 -0700 (PDT) From: David Rosca To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2023 11:14:13 +0200 Message-ID: <20231027091550.94017-2-nowrep@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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: TIjlvwGnHZMw This allows some optimizations in driver, such as not having to read back the data if write-only mapping is requested. --- v2: Fix warning libavutil/hwcontext_vaapi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 558fed94c6..0d16699f66 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -799,6 +799,7 @@ static int vaapi_map_frame(AVHWFramesContext *hwfc, VAStatus vas; void *address = NULL; int err, i; + uint32_t vaflags = 0; surface_id = (VASurfaceID)(uintptr_t)src->data[3]; av_log(hwfc, AV_LOG_DEBUG, "Map surface %#x.\n", surface_id); @@ -882,7 +883,15 @@ static int vaapi_map_frame(AVHWFramesContext *hwfc, } } +#if VA_CHECK_VERSION(1, 21, 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));