Added patches for mpv 0.38.0

other/13348.patch

@@ -0,0 +1,31 @@
+From d46d428f73c7e4511e72b5a70512348b74875e03 Mon Sep 17 00:00:00 2001
+From: Misaki Kasumi <[email protected]>
+Date: Fri, 19 Apr 2024 16:26:05 +0800
+Subject: [PATCH] Revert "ao_coreaudio: signal buffer underruns"
+
+This reverts commit 0341a6f1d39801160322d3fe16245f8387735f4b.
+Fixes #13348.
+---
+ audio/out/ao_coreaudio.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
+index ae743c90b205..b170d393c5e9 100644
+--- a/audio/out/ao_coreaudio.c
++++ b/audio/out/ao_coreaudio.c
+@@ -89,14 +89,7 @@ static OSStatus render_cb_lpcm(void *ctx, AudioUnitRenderActionFlags *aflags,
+
+     int64_t end = mp_time_ns();
+     end += p->hw_latency_ns + ca_get_latency(ts) + ca_frames_to_ns(ao, frames);
+-    int samples = ao_read_data(ao, planes, frames, end);
+-
+-    if (samples == 0)
+-        *aflags |= kAudioUnitRenderAction_OutputIsSilence;
+-
+-    for (int n = 0; n < buffer_list->mNumberBuffers; n++)
+-        buffer_list->mBuffers[n].mDataByteSize = samples * ao->sstride;
+-
++    ao_read_data(ao, planes, frames, end);
+     return noErr;
+ }
+

other/14092.patch

@@ -0,0 +1,68 @@
+From fba9cf51c9140f8debe52aa1c60fd9cdd291980b Mon Sep 17 00:00:00 2001
+From: Misaki Kasumi <[email protected]>
+Date: Thu, 9 May 2024 08:00:12 +0800
+Subject: [PATCH] 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.
+---
+ audio/out/buffer.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/audio/out/buffer.c b/audio/out/buffer.c
+index 97f7ea147ed1..32371ffb2490 100644
+--- a/audio/out/buffer.c
++++ b/audio/out/buffer.c
+@@ -60,6 +60,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
+@@ -71,7 +72,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
+@@ -387,6 +387,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.
+@@ -411,6 +412,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;
+@@ -423,6 +425,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;
+     }
+@@ -431,7 +435,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();