From 88c6c84b64f91bd1f532a62770ebf4615bda098e Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Thu, 3 Feb 2022 16:20:18 +0100 Subject: libplacebo: update log helpers Use the pl_log APIs introduced in libplacebo v4, replacing the deprecated pl_context concept. --- video/out/placebo/utils.c | 19 ++++++++++++------- video/out/placebo/utils.h | 3 ++- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'video/out/placebo') diff --git a/video/out/placebo/utils.c b/video/out/placebo/utils.c index f9f90ca1a1..dd873160c3 100644 --- a/video/out/placebo/utils.c +++ b/video/out/placebo/utils.c @@ -48,17 +48,22 @@ static void log_cb_probing(void *priv, enum pl_log_level level, const char *msg) mp_msg(log, pl_log_to_msg_lev[probing_map(level)], "%s\n", msg); } -void mppl_ctx_set_log(struct pl_context *ctx, struct mp_log *log, bool probing) +pl_log mppl_log_create(struct mp_log *log) { - assert(log); - - pl_context_update(ctx, &(struct pl_context_params) { - .log_cb = probing ? log_cb_probing : log_cb, - .log_level = msg_lev_to_pl_log[mp_msg_level(log)], - .log_priv = log, + return pl_log_create(PL_API_VER, &(struct pl_log_params) { + .log_cb = log_cb, + .log_level = msg_lev_to_pl_log[mp_msg_level(log)], + .log_priv = log, }); } +void mppl_log_set_probing(pl_log log, bool probing) +{ + struct pl_log_params params = log->params; + params.log_cb = probing ? log_cb_probing : log_cb; + pl_log_update(log, ¶ms); +} + enum pl_color_primaries mp_prim_to_pl(enum mp_csp_prim prim) { switch (prim) { diff --git a/video/out/placebo/utils.h b/video/out/placebo/utils.h index 258f25086e..b00fe9cbd9 100644 --- a/video/out/placebo/utils.h +++ b/video/out/placebo/utils.h @@ -8,7 +8,8 @@ #include #include -void mppl_ctx_set_log(struct pl_context *ctx, struct mp_log *log, bool probing); +pl_log mppl_log_create(struct mp_log *log); +void mppl_log_set_probing(pl_log log, bool probing); static inline struct pl_rect2d mp_rect2d_to_pl(struct mp_rect rc) { -- cgit v1.2.3