[FFmpeg-devel] [PATCH v1] lavu/hwcontext_vaapi: sync surface before export its DRM handle

[FFmpeg-devel] [PATCH v1] lavu/hwcontext_vaapi: sync surface before export its DRM handle

[Fei Wang]

According to description of vaExportSurfaceHandle in libva, vaSyncSurface
must be called if the contents of the surface will be read.

Fixes ticket #9967.

Signed-off-by: Fei Wang <fei.w.wang@intel.com>
---
 libavutil/hwcontext_vaapi.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index 938bd5447d..90c2c191d9 100644
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -1319,8 +1319,17 @@ static int vaapi_map_to_drm_esh(AVHWFramesContext *hwfc, AVFrame *dst,
     surface_id = (VASurfaceID)(uintptr_t)src->data[3];
 
     export_flags = VA_EXPORT_SURFACE_SEPARATE_LAYERS;
-    if (flags & AV_HWFRAME_MAP_READ)
+    if (flags & AV_HWFRAME_MAP_READ) {
         export_flags |= VA_EXPORT_SURFACE_READ_ONLY;
+
+        vas = vaSyncSurface(hwctx->display, surface_id);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(hwfc, AV_LOG_ERROR, "Failed to sync surface "
+                   "%#x: %d (%s).\n", surface_id, vas, vaErrorStr(vas));
+            return AVERROR(EIO);
+        }
+    }
+
     if (flags & AV_HWFRAME_MAP_WRITE)
         export_flags |= VA_EXPORT_SURFACE_WRITE_ONLY;
 
-- 
2.25.1

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH v1] lavu/hwcontext_vaapi: sync surface before export its DRM handle

["zhilizhao(赵志立)"]

> On Feb 24, 2023, at 13:45, Fei Wang <fei.w.wang-at-intel.com@ffmpeg.org> wrote:
> 
> According to description of vaExportSurfaceHandle in libva, vaSyncSurface
> must be called if the contents of the surface will be read.
> 
> Fixes ticket #9967.
> 
> Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> ---
> libavutil/hwcontext_vaapi.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
> index 938bd5447d..90c2c191d9 100644
> --- a/libavutil/hwcontext_vaapi.c
> +++ b/libavutil/hwcontext_vaapi.c
> @@ -1319,8 +1319,17 @@ static int vaapi_map_to_drm_esh(AVHWFramesContext *hwfc, AVFrame *dst,
>     surface_id = (VASurfaceID)(uintptr_t)src->data[3];
> 
>     export_flags = VA_EXPORT_SURFACE_SEPARATE_LAYERS;
> -    if (flags & AV_HWFRAME_MAP_READ)
> +    if (flags & AV_HWFRAME_MAP_READ) {
>         export_flags |= VA_EXPORT_SURFACE_READ_ONLY;
> +
> +        vas = vaSyncSurface(hwctx->display, surface_id);
> +        if (vas != VA_STATUS_SUCCESS) {
> +            av_log(hwfc, AV_LOG_ERROR, "Failed to sync surface "
> +                   "%#x: %d (%s).\n", surface_id, vas, vaErrorStr(vas));
> +            return AVERROR(EIO);
> +        }
> +    }
> +
>     if (flags & AV_HWFRAME_MAP_WRITE)
>         export_flags |= VA_EXPORT_SURFACE_WRITE_ONLY;

LGTM.

> 
> -- 
> 2.25.1
> 
> _______________________________________________
> 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".

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH v1] lavu/hwcontext_vaapi: sync surface before export its DRM handle

[Xiang, Haihao]

On Vr, 2023-02-24 at 14:47 +0800, zhilizhao(赵志立) wrote:
> 
> 
> > On Feb 24, 2023, at 13:45, Fei Wang <fei.w.wang-at-intel.com@ffmpeg.org>
> > wrote:
> > 
> > According to description of vaExportSurfaceHandle in libva, vaSyncSurface
> > must be called if the contents of the surface will be read.
> > 
> > Fixes ticket #9967.
> > 
> > Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> > ---
> > libavutil/hwcontext_vaapi.c | 11 ++++++++++-
> > 1 file changed, 10 insertions(+), 1 deletion(-)
> > 
> > diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
> > index 938bd5447d..90c2c191d9 100644
> > --- a/libavutil/hwcontext_vaapi.c
> > +++ b/libavutil/hwcontext_vaapi.c
> > @@ -1319,8 +1319,17 @@ static int vaapi_map_to_drm_esh(AVHWFramesContext
> > *hwfc, AVFrame *dst,
> >     surface_id = (VASurfaceID)(uintptr_t)src->data[3];
> > 
> >     export_flags = VA_EXPORT_SURFACE_SEPARATE_LAYERS;
> > -    if (flags & AV_HWFRAME_MAP_READ)
> > +    if (flags & AV_HWFRAME_MAP_READ) {
> >         export_flags |= VA_EXPORT_SURFACE_READ_ONLY;
> > +
> > +        vas = vaSyncSurface(hwctx->display, surface_id);
> > +        if (vas != VA_STATUS_SUCCESS) {
> > +            av_log(hwfc, AV_LOG_ERROR, "Failed to sync surface "
> > +                   "%#x: %d (%s).\n", surface_id, vas, vaErrorStr(vas));
> > +            return AVERROR(EIO);
> > +        }
> > +    }
> > +
> >     if (flags & AV_HWFRAME_MAP_WRITE)
> >         export_flags |= VA_EXPORT_SURFACE_WRITE_ONLY;
> 
> LGTM.

Applied, thx

- 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".