fix(cast): guard DLNA STOPPED against premature ends without wedging the queue
A bare DLNA STOPPED is ambiguous — strict renderers hiccup mid-track — so end-of-track now requires the max observed position (RelTime resets to 0 on STOP; the instantaneous value is useless) to reach within 5 s of the duration. Two escape valves keep the guard from ever blocking a genuine end, which review flagged as the regression risk: renderers whose RelTime never moves (position signal unreliable — common, and duration nearly always resolves via the catalog fallback, so the `duration <= 0` hatch alone never fires) skip the guard entirely, and a STOPPED persisting 4 consecutive polls advances anyway (~4 s late beats a queue stuck forever). Premature stops are logged with a counter and recover on PLAYING. Based on the end-of-track guard contributed in PR #547, reworked per review findings. cc
This commit is contained in:
1 file changed
+86
-2
@@ -33,6 +33,25 @@ type Runtime = Arc<AppRuntime<SlintAdapter>>;
|
|||||||
/// Cast position poll cadence (mirrors Tauri's `POSITION_POLL_INTERVAL_MS`).
|
/// Cast position poll cadence (mirrors Tauri's `POSITION_POLL_INTERVAL_MS`).
|
||||||
const POSITION_POLL_INTERVAL_MS: u64 = 1000;
|
const POSITION_POLL_INTERVAL_MS: u64 = 1000;
|
||||||
|
|
||||||
|
/// How close (in seconds) the renderer must get to a track's end before a DLNA
|
||||||
|
/// `STOPPED`/`NO_MEDIA_PRESENT` counts as genuine end-of-track. A stop while the
|
||||||
|
/// max observed position is further than this from the end is treated as a
|
||||||
|
/// renderer hiccup (logged, no auto-advance) rather than a track end.
|
||||||
|
const CAST_END_GUARD_SECS: f64 = 5.0;
|
||||||
|
|
||||||
|
/// Below this observed max position the renderer's RelTime is considered
|
||||||
|
/// unreliable (plenty of renderers never implement GetPositionInfo and report
|
||||||
|
/// 0 forever, while `duration` still resolves from the catalog fallback) and
|
||||||
|
/// the near-end guard is skipped — otherwise those renderers would never
|
||||||
|
/// auto-advance again.
|
||||||
|
const CAST_POSITION_SIGNAL_MIN_SECS: f64 = 1.0;
|
||||||
|
|
||||||
|
/// A guard must never wedge the queue: after this many consecutive polls in
|
||||||
|
/// STOPPED that the near-end guard classified as premature, the stop is
|
||||||
|
/// honored anyway (~4 s late advance beats a queue stuck forever on a
|
||||||
|
/// renderer that under-reports position or trims trailing silence).
|
||||||
|
const CAST_PREMATURE_STOP_POLLS_MAX: u32 = 4;
|
||||||
|
|
||||||
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
|
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
|
||||||
enum CastProtocol {
|
enum CastProtocol {
|
||||||
Chromecast,
|
Chromecast,
|
||||||
@@ -92,6 +111,14 @@ struct CastInner {
|
|||||||
is_playing: bool,
|
is_playing: bool,
|
||||||
// Track-end one-shot latch (reset on PLAYING).
|
// Track-end one-shot latch (reset on PLAYING).
|
||||||
track_end_detected: bool,
|
track_end_detected: bool,
|
||||||
|
// DLNA track-end guard: whether we've seen PLAYING for the current track,
|
||||||
|
// and the max position observed while playing. Many renderers reset RelTime
|
||||||
|
// to 0 on STOP, so the instantaneous position at the STOPPED poll is
|
||||||
|
// unreliable — track the max instead. All three reset per new track.
|
||||||
|
cast_saw_playing: bool,
|
||||||
|
cast_max_position: f64,
|
||||||
|
// Consecutive STOPPED polls the guard called premature (anti-wedge latch).
|
||||||
|
cast_premature_stop_polls: u32,
|
||||||
// QConnect coexistence: remember whether QConnect was on before casting.
|
// QConnect coexistence: remember whether QConnect was on before casting.
|
||||||
qconnect_was_on_before_cast: bool,
|
qconnect_was_on_before_cast: bool,
|
||||||
// Position-poll task; aborted on disconnect.
|
// Position-poll task; aborted on disconnect.
|
||||||
@@ -243,6 +270,9 @@ impl SlintCastService {
|
|||||||
inner.protocol = Some(proto);
|
inner.protocol = Some(proto);
|
||||||
inner.connected_device_ip = Some(device_ip);
|
inner.connected_device_ip = Some(device_ip);
|
||||||
inner.track_end_detected = false;
|
inner.track_end_detected = false;
|
||||||
|
inner.cast_saw_playing = false;
|
||||||
|
inner.cast_max_position = 0.0;
|
||||||
|
inner.cast_premature_stop_polls = 0;
|
||||||
}
|
}
|
||||||
self.push_connection_state().await;
|
self.push_connection_state().await;
|
||||||
self.start_position_poll();
|
self.start_position_poll();
|
||||||
@@ -422,6 +452,9 @@ impl SlintCastService {
|
|||||||
inner.current_track_id = Some(track.id);
|
inner.current_track_id = Some(track.id);
|
||||||
inner.is_playing = true;
|
inner.is_playing = true;
|
||||||
inner.track_end_detected = false;
|
inner.track_end_detected = false;
|
||||||
|
inner.cast_saw_playing = false;
|
||||||
|
inner.cast_max_position = 0.0;
|
||||||
|
inner.cast_premature_stop_polls = 0;
|
||||||
}
|
}
|
||||||
// Quality label comes from the track's catalog metadata (always present,
|
// Quality label comes from the track's catalog metadata (always present,
|
||||||
// no network call) so it's the same whether bytes came from cache,
|
// no network call) so it's the same whether bytes came from cache,
|
||||||
@@ -743,13 +776,56 @@ impl SlintCastService {
|
|||||||
// Track-end detection (mirrors castStore): Chromecast {PLAYING,BUFFERING}
|
// Track-end detection (mirrors castStore): Chromecast {PLAYING,BUFFERING}
|
||||||
// -> IDLE; DLNA PLAYING -> {STOPPED, NO_MEDIA_PRESENT}. One-shot latch,
|
// -> IDLE; DLNA PLAYING -> {STOPPED, NO_MEDIA_PRESENT}. One-shot latch,
|
||||||
// reset on PLAYING.
|
// reset on PLAYING.
|
||||||
|
//
|
||||||
|
// For DLNA a bare STOPPED is ambiguous: a strict renderer that hiccups
|
||||||
|
// mid-track also reports STOPPED. We only treat it as end-of-track when
|
||||||
|
// the track actually reached (near) its end — guarded by the max
|
||||||
|
// position observed while PLAYING. A premature STOPPED is logged and
|
||||||
|
// NOT advanced, and is not latched so a resume to PLAYING recovers.
|
||||||
|
let max_position;
|
||||||
let ended = {
|
let ended = {
|
||||||
let mut inner = self.inner.lock().await;
|
let mut inner = self.inner.lock().await;
|
||||||
inner.is_playing = playing;
|
inner.is_playing = playing;
|
||||||
|
if state == "PLAYING" {
|
||||||
|
inner.cast_saw_playing = true;
|
||||||
|
inner.cast_max_position = inner.cast_max_position.max(position);
|
||||||
|
}
|
||||||
|
max_position = inner.cast_max_position;
|
||||||
let ended = match proto {
|
let ended = match proto {
|
||||||
CastProtocol::Chromecast => state == "IDLE" && !inner.track_end_detected,
|
CastProtocol::Chromecast => state == "IDLE" && !inner.track_end_detected,
|
||||||
CastProtocol::Dlna => {
|
CastProtocol::Dlna => {
|
||||||
matches!(state.as_str(), "STOPPED" | "NO_MEDIA_PRESENT")
|
let stopped =
|
||||||
|
matches!(state.as_str(), "STOPPED" | "NO_MEDIA_PRESENT");
|
||||||
|
// The guard only makes sense when the position signal is
|
||||||
|
// usable. `duration` almost always resolves (catalog
|
||||||
|
// fallback), so the real escape hatches are: renderers
|
||||||
|
// whose RelTime never moves (max stays ~0 — honor STOPPED
|
||||||
|
// like pre-guard behavior) and the anti-wedge latch below.
|
||||||
|
let position_reliable =
|
||||||
|
inner.cast_max_position > CAST_POSITION_SIGNAL_MIN_SECS;
|
||||||
|
let near_end = duration <= 0.0
|
||||||
|
|| !position_reliable
|
||||||
|
|| max_position >= duration - CAST_END_GUARD_SECS;
|
||||||
|
if stopped && inner.cast_saw_playing && !near_end {
|
||||||
|
inner.cast_premature_stop_polls += 1;
|
||||||
|
log::warn!(
|
||||||
|
"[Cast] premature STOPPED {}/{} — not advancing yet \
|
||||||
|
(state={state}, max_position={max_position:.1}, \
|
||||||
|
duration={duration:.1})",
|
||||||
|
inner.cast_premature_stop_polls,
|
||||||
|
CAST_PREMATURE_STOP_POLLS_MAX
|
||||||
|
);
|
||||||
|
} else if !stopped {
|
||||||
|
inner.cast_premature_stop_polls = 0;
|
||||||
|
}
|
||||||
|
// A guard must never wedge the queue: a STOPPED that
|
||||||
|
// persists across the latch window is honored even when
|
||||||
|
// the position math says "premature".
|
||||||
|
let persistent_stop =
|
||||||
|
inner.cast_premature_stop_polls >= CAST_PREMATURE_STOP_POLLS_MAX;
|
||||||
|
stopped
|
||||||
|
&& inner.cast_saw_playing
|
||||||
|
&& (near_end || persistent_stop)
|
||||||
&& !inner.track_end_detected
|
&& !inner.track_end_detected
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -761,6 +837,11 @@ impl SlintCastService {
|
|||||||
ended
|
ended
|
||||||
};
|
};
|
||||||
|
|
||||||
|
log::debug!(
|
||||||
|
"[Cast] poll: state={state} position={position:.1} duration={duration:.1} \
|
||||||
|
max_position={max_position:.1}"
|
||||||
|
);
|
||||||
|
|
||||||
// Feed the lyrics engine our position so it auto-follows while casting
|
// Feed the lyrics engine our position so it auto-follows while casting
|
||||||
// (the local poll is skipped, so it can't drive lyrics). The 30Hz sync
|
// (the local poll is skipped, so it can't drive lyrics). The 30Hz sync
|
||||||
// engine extrapolates between these 1s ticks, same as the QConnect path.
|
// engine extrapolates between these 1s ticks, same as the QConnect path.
|
||||||
@@ -794,7 +875,10 @@ impl SlintCastService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if ended {
|
if ended {
|
||||||
log::info!("[Cast] track ended (state={state}); auto-advancing");
|
log::info!(
|
||||||
|
"[Cast] track ended (state={state}, position={position:.1}, \
|
||||||
|
duration={duration:.1}, max_position={max_position:.1}); auto-advancing"
|
||||||
|
);
|
||||||
// Run the SAME local advance the next button uses: it moves the
|
// Run the SAME local advance the next button uses: it moves the
|
||||||
// core cursor, refreshes the card + queue, and play_audible casts
|
// core cursor, refreshes the card + queue, and play_audible casts
|
||||||
// the new current track. Keeps the UI and renderer in sync.
|
// the new current track. Keeps the UI and renderer in sync.
|
||||||
|
|||||||
Reference in new issue
Block a user