Joren/qbz
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(player): honour seek during active CMAF streaming

Browse Source 
The audio thread's Seek handler bailed on `current_audio_data.is_none()`
with a warning and returned. That field is intentionally None during
streaming playback — the bytes live inside current_streaming_source's
Arc<BufferedMediaSource>. Effect: every seek on a streaming track with
the CMAF download still in progress was silently dropped; the UI sent
the command, the player ignored it, and the seekbar snapped back to
whatever position the playback timer had reached (issue #335).

Branch the handler on the live source kind. Streaming: build a fresh
IncrementalStreamingSource from the shared buffered_source (new reader
at byte 0, same downloaded bytes — no re-download), then skip_duration
to the target. Non-streaming path unchanged.

Within-watermark seeks now work. Past-watermark seeks currently block
the audio thread while the decoder waits for more bytes; the clamp to
prevent that lands in the next commit.

cc
This commit is contained in:
vicrodh committed 2026-04-20 20:28:48 -06:00
1 parent 927fabbd78
commit 7d9a847a87
1 file changed
+48 -12
Download Patch File Download Diff File Expand all files Collapse all files
crates/qbz-player/src/player/mod.rs
+48 -12
View File
@@ -2123,10 +2123,24 @@ impl Player {
*gapless_request_armed = false;
thread_state.set_gapless_ready(false);
thread_state.set_gapless_next_track_id(0);
let Some(ref audio_data) = *current_audio_data else {
log::warn!("Audio thread: cannot seek - no audio data available");
// Two source kinds reach this handler: full-file
// playback (current_audio_data holds the complete
// bytes) and CMAF streaming (bytes live inside
// Arc<BufferedMediaSource> so current_audio_data
// is None). Previously the handler early-returned
// on None, so every seek during active streaming
// silently dropped and the UI snapped back
// (issue #335). Now it branches on whichever
// source is live.
if current_audio_data.is_none()
&& current_streaming_source.is_none()
{
log::warn!(
"Audio thread: cannot seek - no audio data available"
);
return;
};
}
let Some(ref stream) = *stream_opt else {
log::error!(
@@ -2171,17 +2185,39 @@ impl Player {
let volume = thread_state.volume.load(Ordering::SeqCst) as f32 / 100.0;
engine.set_volume(volume);
let source = match decode_with_fallback(audio_data) {
Ok(s) => s,
Err(e) => {
log::error!("Failed to decode audio for seek: {}", e);
return;
}
};
// Build the decoded source for the seek. Streaming:
// create a fresh IncrementalStreamingSource on the
// shared BufferedMediaSource — new reader at byte 0,
// same downloaded bytes (no re-download). Non-streaming:
// decode the in-RAM full file as before.
let skip_duration = Duration::from_secs(position_secs);
let skipped_source: Box<dyn Source<Item = f32> + Send> =
Box::new(source.skip_duration(skip_duration));
if let Some(ref stream_src) = *current_streaming_source {
match IncrementalStreamingSource::new(stream_src.clone()) {
Ok(s) => Box::new(s.skip_duration(skip_duration)),
Err(e) => {
log::error!(
"Failed to create streaming source for seek: {}",
e
);
return;
}
}
} else {
let audio_data = current_audio_data
.as_ref()
.expect("current_audio_data was checked Some above");
match decode_with_fallback(audio_data) {
Ok(s) => Box::new(s.skip_duration(skip_duration)),
Err(e) => {
log::error!(
"Failed to decode audio for seek: {}",
e
);
return;
}
}
};
// Send Reset to analyzer (seek invalidates accumulated samples)
let _ = analyzer_tx.try_send(AnalyzerMessage::Reset);