* [FFmpeg-devel] [PATCH v4] lavu/hwcontext_vaapi: Use vaMapBuffer2 for mapping image buffers
@ 2023-10-27 20:25 David Rosca
2023-11-24 7:27 ` Xiang, Haihao
0 siblings, 1 reply; 4+ messages in thread
From: David Rosca @ 2023-10-27 20:25 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: David Rosca
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));
--
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH v4] lavu/hwcontext_vaapi: Use vaMapBuffer2 for mapping image buffers
2023-10-27 20:25 [FFmpeg-devel] [PATCH v4] lavu/hwcontext_vaapi: Use vaMapBuffer2 for mapping image buffers David Rosca
@ 2023-11-24 7:27 ` Xiang, Haihao
2024-04-25 7:33 ` David Rosca
0 siblings, 1 reply; 4+ messages in thread
From: Xiang, Haihao @ 2023-11-24 7:27 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: nowrep
On Vr, 2023-10-27 at 22:25 +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.
> ---
> 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));
LGTM, and will apply it when the official libva 2.21 is released.
Thanks
Haihao
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH v4] lavu/hwcontext_vaapi: Use vaMapBuffer2 for mapping image buffers
2023-11-24 7:27 ` Xiang, Haihao
@ 2024-04-25 7:33 ` David Rosca
2024-04-28 3:13 ` Xiang, Haihao
0 siblings, 1 reply; 4+ messages in thread
From: David Rosca @ 2024-04-25 7:33 UTC (permalink / raw)
To: Xiang, Haihao; +Cc: ffmpeg-devel
On Fri, Nov 24, 2023 at 8:27 AM Xiang, Haihao <haihao.xiang@intel.com> wrote:
>
> On Vr, 2023-10-27 at 22:25 +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.
> > ---
> > 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));
>
> LGTM, and will apply it when the official libva 2.21 is released.
Ping, libva 2.21 has now been released.
Thanks,
David
>
> Thanks
> Haihao
>
>
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH v4] lavu/hwcontext_vaapi: Use vaMapBuffer2 for mapping image buffers
2024-04-25 7:33 ` David Rosca
@ 2024-04-28 3:13 ` Xiang, Haihao
0 siblings, 0 replies; 4+ messages in thread
From: Xiang, Haihao @ 2024-04-28 3:13 UTC (permalink / raw)
To: nowrep; +Cc: ffmpeg-devel
On Do, 2024-04-25 at 09:33 +0200, David Rosca wrote:
> On Fri, Nov 24, 2023 at 8:27 AM Xiang, Haihao <haihao.xiang@intel.com> wrote:
> >
> > On Vr, 2023-10-27 at 22:25 +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.
> > > ---
> > > 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));
> >
> > LGTM, and will apply it when the official libva 2.21 is released.
>
> Ping, libva 2.21 has now been released.
Thanks for reminding me, will apply.
-Haihao
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-28 3:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-27 20:25 [FFmpeg-devel] [PATCH v4] lavu/hwcontext_vaapi: Use vaMapBuffer2 for mapping image buffers David Rosca
2023-11-24 7:27 ` Xiang, Haihao
2024-04-25 7:33 ` David Rosca
2024-04-28 3:13 ` Xiang, Haihao
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git