François Cartegnie pushed to branch master at VideoLAN / VLC
Commits:
4c78f811 by François Cartegnie at 2025-10-29T14:37:16+01:00
hw: vaapi: display error value
- - - - -
9e3c37b3 by François Cartegnie at 2025-10-29T14:37:16+01:00
interop: vaapi: vaSyncSurface error is non fatal
refs #29401
- - - - -
2 changed files:
- modules/hw/vaapi/vlc_vaapi.h
- modules/video_output/opengl/interop_vaapi.c
Changes:
=====================================
modules/hw/vaapi/vlc_vaapi.h
=====================================
@@ -225,7 +225,7 @@ vlc_vaapi_ExportSurfaceHandle(vlc_object_t *o,
VAStatus s = f(args); \
if (s != VA_STATUS_SUCCESS) \
{ \
- msg_Err(o, "%s: %s", #f, vaErrorStr(s)); \
+ msg_Err(o, "%s: 0x%x %s", #f, s, vaErrorStr(s)); \
goto error; \
} \
} while (0)
=====================================
modules/video_output/opengl/interop_vaapi.c
=====================================
@@ -194,7 +194,11 @@ tc_vaegl_update(const struct vlc_gl_interop *interop,
uint32_t textures[],
unsigned num_planes = 0;
#if VA_CHECK_VERSION(1, 1, 0)
- VA_CALL(o, vaSyncSurface, priv->vadpy, vlc_vaapi_PicGetSurface(pic));
+ {
+ VAStatus s = vaSyncSurface(priv->vadpy, vlc_vaapi_PicGetSurface(pic));
+ if (s != VA_STATUS_SUCCESS) // non-fatal. ex:
VA_STATUS_ERROR_DECODING_ERROR
+ msg_Warn(o, "vaSyncSurface: 0x%x %s", s, vaErrorStr(s));
+ }
if (vlc_vaapi_ExportSurfaceHandle(o, priv->vadpy,
vlc_vaapi_PicGetSurface(pic),
VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
VA_EXPORT_SURFACE_READ_ONLY |
VA_EXPORT_SURFACE_SEPARATE_LAYERS,
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/7691f53635d726894119e21e7af4337d1dff346d...9e3c37b3a9d31786a6cbe6b5d604fafc383e05af
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/7691f53635d726894119e21e7af4337d1dff346d...9e3c37b3a9d31786a6cbe6b5d604fafc383e05af
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
