diff options
| author |  wm4 <wm4@nowhere> | 2016-11-08 14:04:19 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-11-08 14:19:26 +0100 |
| commit | 8f1ec91b4502ee5bb3d0e104f9d21fb09e10d64f (patch) | |
| tree | eca25315a1ccbd454fba64d5b4719793f0fac0a2 /video | |
| parent | 8b7f23129d2e6467ec31826f46657ff7d546624c (diff) | |
mp_image: dump all mp_colorspace members in verbose logging
Also extend the default buffer size for formatting this string, because
it can get too damn long.
Diffstat (limited to 'video')
| -rw-r--r-- | video/mp_image.c | 8 | ||||
| -rw-r--r-- | video/mp_image.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/video/mp_image.c b/video/mp_image.c index 694bea1bf0..b56c9e60b3 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -513,9 +513,15 @@ char *mp_image_params_to_str_buf(char *b, size_t bs, mp_snprintf_cat(b, bs, " %s", mp_imgfmt_to_name(p->imgfmt)); if (p->hw_subfmt) mp_snprintf_cat(b, bs, "[%s]", mp_imgfmt_to_name(p->hw_subfmt)); - mp_snprintf_cat(b, bs, " %s/%s", + mp_snprintf_cat(b, bs, " %s/%s/%s/%s", m_opt_choice_str(mp_csp_names, p->color.space), + m_opt_choice_str(mp_csp_prim_names, p->color.primaries), + m_opt_choice_str(mp_csp_trc_names, p->color.gamma), m_opt_choice_str(mp_csp_levels_names, p->color.levels)); + if (p->color.nom_peak) + mp_snprintf_cat(b, bs, " NP=%f", p->color.nom_peak); + if (p->color.sig_peak) + mp_snprintf_cat(b, bs, " SP=%f", p->color.sig_peak); mp_snprintf_cat(b, bs, " CL=%s", m_opt_choice_str(mp_chroma_names, p->chroma_location)); if (p->rotate) diff --git a/video/mp_image.h b/video/mp_image.h index 13e364ae24..7c0f7bad7e 100644 --- a/video/mp_image.h +++ b/video/mp_image.h @@ -133,7 +133,7 @@ void mp_image_params_guess_csp(struct mp_image_params *params); char *mp_image_params_to_str_buf(char *b, size_t bs, const struct mp_image_params *p); -#define mp_image_params_to_str(p) mp_image_params_to_str_buf((char[80]){0}, 80, p) +#define mp_image_params_to_str(p) mp_image_params_to_str_buf((char[99]){0}, 99, p) bool mp_image_params_valid(const struct mp_image_params *p); bool mp_image_params_equal(const struct mp_image_params *p1, |