RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ao: don't call driver->set_paused after reset 

This commit adds a state `hw_paused` for pull-based AO.
`driver->set_paused(false)` is only called if `hw_paused` is true.
`hw_paused` is cleared after `ao_reset`, so `set_paused` will
not be called after a reset; instead, `driver->start()` will
be called, which properly starts the AO.
This commit is contained in:
Misaki Kasumi 2024-05-09 08:00:12 +08:00 committed by Kacper Michajłow
parent d31543a7e6
commit 4d03efb4b0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/out/buffer.c
View File

@ -59,6 +59,7 @@ struct buffer_state {
bool streaming; // AO streaming active
bool playing; // logically playing audio from buffer
bool paused; // logically paused
bool hw_paused; // driver->set_pause() was used successfully
int64_t end_time_ns; // absolute output time of last played sample
int64_t queued_time_ns; // duration of samples that have been queued to
@ -70,7 +71,6 @@ struct buffer_state {
bool initial_unblocked;
// "Push" AOs only (AOs with driver->write).
bool hw_paused; // driver->set_pause() was used successfully
bool recover_pause; // non-hw_paused: needs to recover delay
struct mp_pcm_state prepause_state;
mp_thread thread; // thread shoveling data to AO
@ -386,6 +386,7 @@ void ao_set_paused(struct ao *ao, bool paused, bool eof)
struct buffer_state *p = ao->buffer_state;
bool wakeup = false;
bool do_change_state = false;
bool is_hw_paused;
// If we are going to pause on eof and ao is still playing,
// be sure to drain the ao first for gapless.
@ -410,6 +411,7 @@ void ao_set_paused(struct ao *ao, bool paused, bool eof)
// See ao_reset() why this is done outside of the lock.
do_change_state = true;
p->streaming = false;
is_hw_paused = p->hw_paused = !!ao->driver->set_pause;
}
}
wakeup = true;
@ -422,6 +424,8 @@ void ao_set_paused(struct ao *ao, bool paused, bool eof)
if (!p->streaming)
do_change_state = true;
p->streaming = true;
is_hw_paused = p->hw_paused;
p->hw_paused = false;
}
wakeup = true;
}
@ -430,7 +434,7 @@ void ao_set_paused(struct ao *ao, bool paused, bool eof)
mp_mutex_unlock(&p->lock);
if (do_change_state) {
if (ao->driver->set_pause) {
if (is_hw_paused) {
if (paused) {
ao->driver->set_pause(ao, true);
p->queued_time_ns = p->end_time_ns - mp_time_ns();