Skip to content

Commit

Permalink
loadfile,select.lua: print only one bitrate
Browse files Browse the repository at this point in the history
Print demux-bitrate if available, else hls-bitrate, not both (as
demux-bitrate is generally more reliable). This avoids printing "HLS
kbps" which looks weird.

Fixes
#14453 (comment)
  • Loading branch information
guidocella authored and sfan5 committed Aug 2, 2024
1 parent 11ed012 commit 5f768a6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
7 changes: 4 additions & 3 deletions player/loadfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,11 @@ static void print_stream(struct MPContext *mpctx, struct track *t, bool indent)
if (s && s->codec->samplerate)
APPEND(b, " %d Hz", s->codec->samplerate);
}
if (s && s->codec->bitrate)
if (s && s->codec->bitrate) {
APPEND(b, " %d kbps", (s->codec->bitrate + 500) / 1000);
if (s && s->hls_bitrate)
APPEND(b, " %d HLS kbps", (s->hls_bitrate + 500) / 1000);
} else if (s && s->hls_bitrate) {
APPEND(b, " %d kbps", (s->hls_bitrate + 500) / 1000);
}
APPEND(b, ")");

bool first = true;
Expand Down
8 changes: 4 additions & 4 deletions player/lua/select.lua
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ local function format_flags(track)
end

local function format_track(track)
local bitrate = track["demux-bitrate"] or track["hls-bitrate"]

return (track.selected and "" or "") ..
(track.title and " " .. track.title or "") ..
" (" .. (
Expand All @@ -98,10 +100,8 @@ local function format_track(track)
and track["codec-profile"] .. " " or "") ..
(track["demux-samplerate"] and track["demux-samplerate"] / 1000 ..
" kHz " or "") ..
(track["demux-bitrate"] and string.format("%.0f", track["demux-bitrate"] / 1000)
.. " kbps " or "") ..
(track["hls-bitrate"] and string.format("%.0f", track["hls-bitrate"] / 1000)
.. " HLS kbps " or "")
(bitrate and string.format("%.0f", bitrate / 1000) ..
" kbps " or "")
):sub(1, -2) .. ")" .. format_flags(track)
end

Expand Down

0 comments on commit 5f768a6

Please sign in to comment.