Commit a92aa0be authored by Max Kellermann's avatar Max Kellermann

output/alsa: use IsCleared() instead of IsDrained() in DrainInternal()

Really drain all data from the period_buffer in any case.
parent d66f5a85
...@@ -78,14 +78,6 @@ public: ...@@ -78,14 +78,6 @@ public:
} }
/** /**
* Has some data already been consumed at the buffer's head in
* this period?
*/
bool WasConsumed() const noexcept {
return head > 0;
}
/**
* Has all data for the current period been drained? If not, * Has all data for the current period been drained? If not,
* then there is pending data. This ignores the partial frame * then there is pending data. This ignores the partial frame
* which may have been postponed by FillWithSilence(). * which may have been postponed by FillWithSilence().
......
...@@ -747,26 +747,30 @@ AlsaOutput::DrainInternal() ...@@ -747,26 +747,30 @@ AlsaOutput::DrainInternal()
/* drain ring_buffer */ /* drain ring_buffer */
CopyRingToPeriodBuffer(); CopyRingToPeriodBuffer();
if (period_buffer.WasConsumed() && !period_buffer.IsFull())
/* generate some silence to finish the partial
period */
period_buffer.FillWithSilence(silence, out_frame_size);
/* drain period_buffer */ /* drain period_buffer */
if (!period_buffer.IsDrained()) { if (!period_buffer.IsCleared()) {
auto frames_written = WriteFromPeriodBuffer(); if (!period_buffer.IsFull())
if (frames_written < 0) { /* generate some silence to finish the partial
if (frames_written == -EAGAIN) period */
return false; period_buffer.FillWithSilence(silence, out_frame_size);
/* drain period_buffer */
if (!period_buffer.IsDrained()) {
auto frames_written = WriteFromPeriodBuffer();
if (frames_written < 0) {
if (frames_written == -EAGAIN)
return false;
throw FormatRuntimeError("snd_pcm_writei() failed: %s",
snd_strerror(-frames_written));
}
throw FormatRuntimeError("snd_pcm_writei() failed: %s", /* need to call CopyRingToPeriodBuffer() and
snd_strerror(-frames_written)); WriteFromPeriodBuffer() again in the next
iteration, so don't finish the drain just
yet */
return false;
} }
/* need to call CopyRingToPeriodBuffer() and
WriteFromPeriodBuffer() again in the next
iteration, so don't finish the drain just yet */
return false;
} }
if (!written) if (!written)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment