From f3512686eee6c1a7650e1e769169b4018ee4466d Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 30 Sep 2017 16:07:00 +0200 Subject: vaapi: replace error macro implementation The current check_va_status() function could probably be argued to be derived from the original VAAPI's patch check_status() function, thus GPL-only. While I have my doubts that it applies to an idiom on this level, it's better to replace it. Similar idea, different expression equals no copyright association. An earlier commit message promised this, but it was forgotten. --- video/vaapi.c | 9 --------- video/vaapi.h | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'video') diff --git a/video/vaapi.c b/video/vaapi.c index 055316bb38..6bedbbaa18 100644 --- a/video/vaapi.c +++ b/video/vaapi.c @@ -30,15 +30,6 @@ #include #include -bool check_va_status(struct mp_log *log, VAStatus status, const char *msg) -{ - if (status != VA_STATUS_SUCCESS) { - mp_err(log, "%s: %s\n", msg, vaErrorStr(status)); - return false; - } - return true; -} - int va_get_colorspace_flag(enum mp_csp csp) { switch (csp) { diff --git a/video/vaapi.h b/video/vaapi.h index 2e438bebfb..41c9f7c1cb 100644 --- a/video/vaapi.h +++ b/video/vaapi.h @@ -36,9 +36,9 @@ struct mp_vaapi_ctx { void (*destroy_native_ctx)(void *native_ctx); }; -bool check_va_status(struct mp_log *log, VAStatus status, const char *msg); - -#define CHECK_VA_STATUS(ctx, msg) check_va_status((ctx)->log, status, msg) +#define CHECK_VA_STATUS(ctx, msg) \ + (status == VA_STATUS_SUCCESS ? true \ + : (MP_ERR(ctx, "%s failed (%s)\n", msg, vaErrorStr(status)), false)) int va_get_colorspace_flag(enum mp_csp csp); -- cgit v1.2.3