diff options
| -rw-r--r-- | NEWS | 15 | ||||
| -rw-r--r-- | src/PlayerThread.cxx | 6 | ||||
| -rw-r--r-- | src/decoder/DecoderAPI.cxx | 9 | ||||
| -rw-r--r-- | src/decoder/DecoderThread.cxx | 6 | ||||
| -rw-r--r-- | src/decoder/plugins/FfmpegDecoderPlugin.cxx | 74 | ||||
| -rw-r--r-- | src/encoder/plugins/OpusEncoderPlugin.cxx | 2 | ||||
| -rw-r--r-- | src/input/plugins/CurlInputPlugin.cxx | 2 | ||||
| -rw-r--r-- | src/input/plugins/SmbclientInputPlugin.cxx | 1 | ||||
| -rw-r--r-- | src/output/OutputControl.cxx | 3 | ||||
| -rw-r--r-- | src/storage/plugins/NfsStorage.cxx | 4 | ||||
| -rw-r--r-- | src/system/PeriodClock.hxx | 2 |
11 files changed, 108 insertions, 16 deletions
@@ -30,6 +30,21 @@ ver 0.20 (not yet released) * database - proxy: add TCP keepalive option +ver 0.19.10 (2015/06/21) +* input + - curl: fix deadlock on small responses + - smbclient: fix DFF playback +* decoder + - ffmpeg: improve seeking accuracy + - fix stuck stream tags +* encoder + - opus: fix bogus granulepos +* output + - fix failure to open device right after booting +* neighbor + - nfs: fix deadlock when connecting +* fix "single" mode breakage due to queue edits + ver 0.19.9 (2015/02/06) * decoder - dsdiff, dsf: raise ID3 tag limit to 1 MB diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx index a320e81fb..a1fd24bbe 100644 --- a/src/PlayerThread.cxx +++ b/src/PlayerThread.cxx @@ -612,6 +612,12 @@ Player::ProcessCommand() queued = true; pc.CommandFinished(); + + pc.Unlock(); + if (dc.LockIsIdle()) + StartDecoder(*new MusicPipe()); + pc.Lock(); + break; case PlayerCommand::PAUSE: diff --git a/src/decoder/DecoderAPI.cxx b/src/decoder/DecoderAPI.cxx index eb6bb1109..cc08596a2 100644 --- a/src/decoder/DecoderAPI.cxx +++ b/src/decoder/DecoderAPI.cxx @@ -433,8 +433,11 @@ update_stream_tag(Decoder &decoder, InputStream *is) /* no stream tag present - submit the song tag instead */ - decoder.song_tag = nullptr; - } + } else + /* discard the song tag; we don't need it */ + delete decoder.song_tag; + + decoder.song_tag = nullptr; delete decoder.stream_tag; decoder.stream_tag = tag; @@ -566,7 +569,7 @@ decoder_tag(Decoder &decoder, InputStream *is, /* save the tag */ delete decoder.decoder_tag; - decoder.decoder_tag = new Tag(tag); + decoder.decoder_tag = new Tag(std::move(tag)); /* check for a new stream tag */ diff --git a/src/decoder/DecoderThread.cxx b/src/decoder/DecoderThread.cxx index 98a8de540..2a7275a68 100644 --- a/src/decoder/DecoderThread.cxx +++ b/src/decoder/DecoderThread.cxx @@ -378,7 +378,11 @@ decoder_run_song(DecoderControl &dc, const DetachedSong &song, const char *uri, Path path_fs) { Decoder decoder(dc, dc.start_time.IsPositive(), - new Tag(song.GetTag())); + /* pass the song tag only if it's + authoritative, i.e. if it's a local file - + tags on "stream" songs are just remembered + from the last time we played it*/ + song.IsFile() ? new Tag(song.GetTag()) : nullptr); dc.state = DecoderState::START; diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index faff70c66..90699ef5e 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -163,8 +163,40 @@ copy_interleave_frame(const AVCodecContext &codec_context, } /** + * Convert AVPacket::pts to a stream-relative time stamp (still in + * AVStream::time_base units). Returns a negative value on error. + */ +gcc_pure +static int64_t +StreamRelativePts(const AVPacket &packet, const AVStream &stream) +{ + auto pts = packet.pts; + if (pts < 0 || pts == int64_t(AV_NOPTS_VALUE)) + return -1; + + auto start = start_time_fallback(stream); + return pts - start; +} + +/** + * Convert a non-negative stream-relative time stamp in + * AVStream::time_base units to a PCM frame number. + */ +gcc_pure +static uint64_t +PtsToPcmFrame(uint64_t pts, const AVStream &stream, + const AVCodecContext &codec_context) +{ + return av_rescale_q(pts, stream.time_base, codec_context.time_base); +} + +/** * Decode an #AVPacket and send the resulting PCM data to the decoder * API. + * + * @param min_frame skip all data before this PCM frame number; this + * is used after seeking to skip data in an AVPacket until the exact + * desired time stamp has been reached */ static DecoderCommand ffmpeg_send_packet(Decoder &decoder, InputStream &is, @@ -172,13 +204,21 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is, AVCodecContext &codec_context, const AVStream &stream, AVFrame &frame, + uint64_t min_frame, size_t pcm_frame_size, FfmpegBuffer &buffer) { - if (packet.pts >= 0 && packet.pts != (int64_t)AV_NOPTS_VALUE) { - auto start = start_time_fallback(stream); - if (packet.pts >= start) + size_t skip_bytes = 0; + + const auto pts = StreamRelativePts(packet, stream); + if (pts >= 0) { + if (min_frame > 0) { + auto cur_frame = PtsToPcmFrame(pts, stream, + codec_context); + if (cur_frame < min_frame) + skip_bytes = pcm_frame_size * (min_frame - cur_frame); + } else decoder_timestamp(decoder, - FfmpegTimeToDouble(packet.pts - start, + FfmpegTimeToDouble(pts, stream.time_base)); } @@ -212,6 +252,18 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is, return DecoderCommand::STOP; } + if (skip_bytes > 0) { + if (skip_bytes >= output_buffer.size) { + skip_bytes -= output_buffer.size; + continue; + } + + output_buffer.data = + (const uint8_t *)output_buffer.data + skip_bytes; + output_buffer.size -= skip_bytes; + skip_bytes = 0; + } + cmd = decoder_data(decoder, is, output_buffer.data, output_buffer.size, codec_context.bit_rate / 1000); @@ -489,6 +541,8 @@ FfmpegDecode(Decoder &decoder, InputStream &input, FfmpegBuffer interleaved_buffer; + uint64_t min_frame = 0; + DecoderCommand cmd; do { AVPacket packet; @@ -500,13 +554,15 @@ FfmpegDecode(Decoder &decoder, InputStream &input, FfmpegCheckTag(decoder, input, format_context, audio_stream); #endif - if (packet.stream_index == audio_stream) + if (packet.stream_index == audio_stream) { cmd = ffmpeg_send_packet(decoder, input, packet, codec_context, av_stream, *frame, + min_frame, audio_format.GetFrameSize(), interleaved_buffer); - else + min_frame = 0; + } else cmd = decoder_get_command(decoder); av_free_packet(&packet); @@ -517,11 +573,15 @@ FfmpegDecode(Decoder &decoder, InputStream &input, av_stream.time_base) + start_time_fallback(av_stream); + /* AVSEEK_FLAG_BACKWARD asks FFmpeg to seek to + the packet boundary before the seek time + stamp, not after */ if (av_seek_frame(&format_context, audio_stream, where, - AVSEEK_FLAG_ANY) < 0) + AVSEEK_FLAG_ANY|AVSEEK_FLAG_BACKWARD) < 0) decoder_seek_error(decoder); else { avcodec_flush_buffers(&codec_context); + min_frame = decoder_seek_where_frame(decoder); decoder_command_finished(decoder); } } diff --git a/src/encoder/plugins/OpusEncoderPlugin.cxx b/src/encoder/plugins/OpusEncoderPlugin.cxx index 4fd40cd50..e17cb86fd 100644 --- a/src/encoder/plugins/OpusEncoderPlugin.cxx +++ b/src/encoder/plugins/OpusEncoderPlugin.cxx @@ -66,7 +66,7 @@ struct opus_encoder { ogg_int64_t granulepos; - opus_encoder():encoder(opus_encoder_plugin) {} + opus_encoder():encoder(opus_encoder_plugin), granulepos(0) {} }; static constexpr Domain opus_encoder_domain("opus_encoder"); diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index fb5845b2b..ade8324ec 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -453,6 +453,8 @@ CurlInputStream::RequestDone(CURLcode result, long status) SeekDone(); else if (!IsReady()) SetReady(); + else + cond.broadcast(); } static void diff --git a/src/input/plugins/SmbclientInputPlugin.cxx b/src/input/plugins/SmbclientInputPlugin.cxx index 6aab556f2..ec6857c19 100644 --- a/src/input/plugins/SmbclientInputPlugin.cxx +++ b/src/input/plugins/SmbclientInputPlugin.cxx @@ -132,6 +132,7 @@ SmbclientInputStream::Read(void *ptr, size_t read_size, Error &error) nbytes = 0; } + offset += nbytes; return nbytes; } diff --git a/src/output/OutputControl.cxx b/src/output/OutputControl.cxx index 6da18e3a0..d7a114c01 100644 --- a/src/output/OutputControl.cxx +++ b/src/output/OutputControl.cxx @@ -186,7 +186,8 @@ AudioOutput::LockUpdate(const AudioFormat audio_format, const ScopeLock protect(mutex); if (enabled && really_enabled) { - if (fail_timer.Check(REOPEN_AFTER * 1000)) { + if (!fail_timer.IsDefined() || + fail_timer.Check(REOPEN_AFTER * 1000)) { return Open(audio_format, mp); } } else if (IsOpen()) diff --git a/src/storage/plugins/NfsStorage.cxx b/src/storage/plugins/NfsStorage.cxx index 6a3eeedaf..fc4fd5c07 100644 --- a/src/storage/plugins/NfsStorage.cxx +++ b/src/storage/plugins/NfsStorage.cxx @@ -177,6 +177,8 @@ private: mutex.unlock(); DeferredMonitor::Schedule(); mutex.lock(); + if (state == State::INITIAL) + cond.wait(mutex); break; case State::CONNECTING: @@ -188,8 +190,6 @@ private: error.Set(last_error); return false; } - - cond.wait(mutex); } } diff --git a/src/system/PeriodClock.hxx b/src/system/PeriodClock.hxx index c189577f5..a9db4cea0 100644 --- a/src/system/PeriodClock.hxx +++ b/src/system/PeriodClock.hxx @@ -63,7 +63,7 @@ protected: } public: - bool IsDefined() const { + constexpr bool IsDefined() const { return last != 0; } |