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 132214793C for ; Fri, 27 Oct 2023 16:50:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7358968CB3F; Fri, 27 Oct 2023 19:50:17 +0300 (EEST) Received: from mail.overt.org (mail.overt.org [72.14.183.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA31E68C97F for ; Fri, 27 Oct 2023 19:50:10 +0300 (EEST) Received: from authenticated-user (mail.overt.org [72.14.183.176]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id 84CC2605D4 for ; Fri, 27 Oct 2023 11:50:09 -0500 (CDT) Date: Fri, 27 Oct 2023 09:50:08 -0700 To: ffmpeg-devel@ffmpeg.org Message-ID: <20231027095008.555c8255@fido7> In-Reply-To: <20231027100038.108316-2-nowrep@gmail.com> References: <20231027100038.108316-2-nowrep@gmail.com> MIME-Version: 1.0 Subject: Re: [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: , From: Philip Langdale via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Philip Langdale 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: On Fri, 27 Oct 2023 12:00:10 +0200 David Rosca wrote: > 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)); LGTM. Thanks. --phil _______________________________________________ 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".