| Message ID | 20231027202849.221052-3-nowrep@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v4] lavu/hwcontext_vaapi: Use vaMapBuffer2 for mapping image buffers | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
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
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 > >
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
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));