From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5D6DE47DC1 for ; Fri, 27 Oct 2023 09:16:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 353B868CC29; Fri, 27 Oct 2023 12:16:27 +0300 (EEST) 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-Google-Smtp-Source: AGHT+IHVP3BGgv4MArHpKDo9BZ9g76UXSUd71wJzE0G63QC8Q6nE54g6GnL7OQXecWmfJSAokd/LAQ== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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)); -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".