summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-02-19 16:26:22 +0100
committerwm4 <wm4@nowhere>2020-02-19 16:26:22 +0100
commitb8f80b3854a2f1f4270df5804b0f02eec1ee7514 (patch)
treed723071edf007e921532915d40bf42e6b65cbc53
parent2567997ecfcb164bb1467543a30350eca9a3e512 (diff)
downloadmpv-b8f80b3854a2f1f4270df5804b0f02eec1ee7514.tar.bz2
mpv-b8f80b3854a2f1f4270df5804b0f02eec1ee7514.tar.xz
player: print manifest per-stream bitrate information to terminal
Aka hls-bitrate. In turn, remove the demux_lavf.c hack, which made the track title use this.
-rw-r--r--demux/demux_lavf.c2
-rw-r--r--player/loadfile.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index f4bbfc5739..62fecde8ea 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -796,8 +796,6 @@ static void handle_new_stream(demuxer_t *demuxer, int i)
if (lang && lang->value && strcmp(lang->value, "und") != 0)
sh->lang = talloc_strdup(sh, lang->value);
sh->hls_bitrate = dict_get_decimal(st->metadata, "variant_bitrate", 0);
- if (!sh->title && sh->hls_bitrate > 0)
- sh->title = talloc_asprintf(sh, "bitrate %d", sh->hls_bitrate);
sh->missing_timestamps = !!(priv->avif_flags & AVFMT_NOTIMESTAMPS);
mp_tags_copy_from_av_dictionary(sh->tags, st->metadata);
demux_add_sh_stream(demuxer, sh);
diff --git a/player/loadfile.c b/player/loadfile.c
index f9dac4684d..b0e3167ae6 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -284,6 +284,8 @@ static void print_stream(struct MPContext *mpctx, struct track *t)
APPEND(b, " %dHz", s->codec->samplerate);
}
APPEND(b, ")");
+ if (s->hls_bitrate > 0)
+ APPEND(b, " (%d KB/s)", s->hls_bitrate / 8 / 1024);
if (t->is_external)
APPEND(b, " (external)");
MP_INFO(mpctx, "%s\n", b);