From 72536cce62f27eb601037d589cd68be9a67762e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Fri, 1 Sep 2023 03:15:10 +0200 Subject: [PATCH] f_decoder_wrapper: change video-codec to show description or name Not both of them. Formating it as ` ()` produced arguably silly string like `hevc (HEVC (High Efficiency Video Coding))`. Unpack this to show only description if available or name otherwise. Produces way nicer results in stats.lua and similar places where this name is printed. --- DOCS/interface-changes.rst | 1 + filters/f_decoder_wrapper.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index d398ab7987..2dcf17c777 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -99,6 +99,7 @@ Interface changes - deprecate `--demuxer-cue-codepage` in favor of `--metadata-codepage` - change the default of `metadata-codepage` to `auto` - add `playlist-next-playlist` and `playlist-prev-playlist` commands + - change `video-codec` to show description or name, not both --- mpv 0.36.0 --- - add `--target-contrast` - Target luminance value is now also applied when ICC profile is used. diff --git a/filters/f_decoder_wrapper.c b/filters/f_decoder_wrapper.c index 7e51c57a92..433ba19ec7 100644 --- a/filters/f_decoder_wrapper.c +++ b/filters/f_decoder_wrapper.c @@ -450,8 +450,8 @@ static bool reinit_decoder(struct priv *p) p->decoder = driver->create(p->decf, p->codec, sel->decoder); if (p->decoder) { pthread_mutex_lock(&p->cache_lock); - p->decoder_desc = - talloc_asprintf(p, "%s (%s)", sel->decoder, sel->desc); + const char *d = sel->desc && sel->desc[0] ? sel->desc : sel->decoder; + p->decoder_desc = talloc_strdup(p, d); MP_VERBOSE(p, "Selected codec: %s\n", p->decoder_desc); pthread_mutex_unlock(&p->cache_lock); break;