oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'fix-hls-seeking' of https://github.com/burrocargado/MPD into v0.23.x

This commit is contained in:
Max Kellermann 2022-05-09 22:44:10 +02:00
parent c3d393f214 11d1f56062
commit 112fcd206d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -2,6 +2,7 @@ ver 0.23.7 (not yet released)
* database * database
- upnp: support pupnp 1.14 - upnp: support pupnp 1.14
* decoder * decoder
- ffmpeg: fix HLS seeking
- opus: fix missing song length on high-latency files - opus: fix missing song length on high-latency files
* output * output
- shout: require at least libshout 2.4.0 - shout: require at least libshout 2.4.0

7
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -471,7 +471,7 @@ static bool
IsSeekable(const AVFormatContext &format_context) noexcept IsSeekable(const AVFormatContext &format_context) noexcept
{ {
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 6, 100) #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 6, 100)
return (format_context.ctx_flags & AVFMTCTX_UNSEEKABLE) != 0; return (format_context.ctx_flags & AVFMTCTX_UNSEEKABLE) == 0;
#else #else
(void)format_context; (void)format_context;
return false; return false;
@ -533,9 +533,8 @@ FfmpegDecode(DecoderClient &client, InputStream *input,
: FromFfmpegTimeChecked(format_context.duration, AV_TIME_BASE_Q); : FromFfmpegTimeChecked(format_context.duration, AV_TIME_BASE_Q);
client.Ready(audio_format, client.Ready(audio_format,
input (input ? input->IsSeekable() : false)
? input->IsSeekable() || IsSeekable(format_context),
: IsSeekable(format_context),
total_time); total_time);
FfmpegParseMetaData(client, format_context, audio_stream); FfmpegParseMetaData(client, format_context, audio_stream);