From patchwork Fri Oct 27 10:00:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rosca X-Patchwork-Id: 44380 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf16:b0:15d:8365:d4b8 with SMTP id gc22csp1248806pzb; Fri, 27 Oct 2023 03:01:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5+q0Uq8Kwd8OJFw2TbG0+cdWTGz3JBOVkY+9aT29g4iDNcpakW9XN8cuH+N6KUJNWPMpW X-Received: by 2002:a17:906:9c88:b0:9d0:92b5:8f4b with SMTP id fj8-20020a1709069c8800b009d092b58f4bmr490467ejc.24.1698400893035; Fri, 27 Oct 2023 03:01:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698400893; cv=none; d=google.com; s=arc-20160816; b=oIy64myVYsuGA3pDCCaxryvyBisx5IzA4f0x1/cNgNT3PxCo/3T7O2Nt+VkwMvzsGT M107gnAmoGdX/4ZNOA19MJ/gxDa243p14qtcB1RTVIWlb53BHdC/SMXcUDeOfRhi9ZTT mESbwVhRSiMrYyquY75O5K1k6qkvixtvqPorVa0I/hQGSeVDQloqFWFw/T8jGUiVGEHJ FBvvgVP4KiTty/rGCCVYkLNaoWLSDsQSyaDt/uHXWlpSQ/8HoyfpZokCUXwAv3EcXfM+ tfPutFD8ge8fEemWYNb/cVX+z3NRxXuASU1nLxOuVeSL20g4IjmGtbBYn2IQMK43YFW1 6E6Q== 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=siYX5AprPaSU9tq+hzG4UllI/nhr8Vfdce2/DQU6XmI=; fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; b=QsltEv4N26HZ8yIMlD1bPl6MADxDbhGQGo9V3Y/ML3b4JnbXexi3IZLI9fN0QqciyK QUAvCspayiNwcpSVpE9V+PS6OPkmQ+TU7r1mO2ucSABJHMAeixYyq2dfVOHvuTzlRXGX Iv+GDKBTNs009EQXjazUQiSZC5BYWhhNnsp3sFjNso9Sy9YQ9LQSNpC6ghuaUOzk1uv5 TZvPdHq48alqy9hzKCcmynjbto8YNOTADRp0C/fRGcoq22KDbhXmmqJl4vp961N+yKHU fiNzJm6HhInrcJaMLgW/Mv0rQpceJI3cj65GzRoL0R5MdVHoY7CORoGTpd69toyjNwqa bIzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=L4WfqfiT; 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 z26-20020a17090674da00b009be5c079196si626454ejl.461.2023.10.27.03.01.24; Fri, 27 Oct 2023 03:01:33 -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=L4WfqfiT; 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 CB27768CAEB; Fri, 27 Oct 2023 13:01:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 147F268C844 for ; Fri, 27 Oct 2023 13:01:10 +0300 (EEST) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-9bdf5829000so302931266b.0 for ; Fri, 27 Oct 2023 03:01:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698400869; x=1699005669; 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=bnD3BiODbIk6DLwO/Sjf4DysJVmDk5KrTv53A7wBKmg=; b=L4WfqfiTAmvfV2ly4M5okwQn1FKLHJzq2kVZkC42GnmqX/viiv3RFt+6dVROd+uqBv IqQ+cFrHAfhWqNfwblPtOs0+2Y8dMcFb/IRvG6PEodPIkL7p2O852bBxxO6dO8IoyDIq XpDsn/+9EL8PW1RhoSpeHgr6ThLa82no4ORQmQLaarLe8fkTWDxShyhqRJzZ+gqejvkI oSefpvLgf2imxAFynUWcjulN1Bial8dCB2jf7qiyfUReY50jl4eJnyl4xcq+D+TXu2NR CwmiYYCOCMxReIWd7WmqsbGhMwnKoLWMq1fTIoYWNB+fojVwX4YzKDlu6hDNzLLN1dgM s12g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698400869; x=1699005669; 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=bnD3BiODbIk6DLwO/Sjf4DysJVmDk5KrTv53A7wBKmg=; b=Q5aDtyJlRN9lBZ+O/AbvZA2Y77Z3OqbCr52rYAxsTapYr9aMgj0fVBzEEfqdSNjF0/ yNMsZsGqE4Eve+stAUebThsjoGqiOZ+QD0um6PVPZk9ObcUJykgteCqnuzTY0+KkmGxX J2doBuybnLhY+4UGYcVE8eClzINKkTPSKnIUVS+xUo3+xar3OBEJPt9ozWf74pz7SCer YuId1eWZNWlQ+50wm4SQz89R7ToSWdzLiGdIWRFPJ7GklmLgR0NDzB4B7sTDRdFjbKP2 tvqqeih4MB/euwx/0y2seLOLFWQO/ybXbnoHCEHXc6aVCTT75Bc6cUf++BFPd4BFtyVv 92IQ== X-Gm-Message-State: AOJu0YzP95OJ6Km1QDNYkmyJ8yPRH4v+bfAmf6JXg0YnOlA+/zMpMMO8 Tm7vWlfIQscrEL8/wSC6YEC46+joIpI= X-Received: by 2002:a17:907:1c0f:b0:9bf:2f84:5de7 with SMTP id nc15-20020a1709071c0f00b009bf2f845de7mr1913643ejc.4.1698400868781; Fri, 27 Oct 2023 03:01:08 -0700 (PDT) Received: from mitsuki.. (ip-62-245-76-195.bb.vodafone.cz. [62.245.76.195]) by smtp.gmail.com with ESMTPSA id lx21-20020a170906af1500b0099bd1a78ef5sm943183ejb.74.2023.10.27.03.01.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 03:01:07 -0700 (PDT) From: David Rosca To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2023 12:00:10 +0200 Message-ID: <20231027100038.108316-2-nowrep@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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: XQJ/mzHuTnR+ This allows some optimizations in driver, such as not having to read back the data if write-only mapping is requested. --- v3: Fix another warning libavutil/hwcontext_vaapi.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 558fed94c6..86b0852c12 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,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));