ao: not start AO when receiving EOF data. #13243
Open
+8
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When mpv resumes audio from underrun state, if the first audio data contains EOF. mpv may get stuck in an infinite loop. `ao->buffer_state->playing` is true and does not change anymore, repeat `blocked, waiting for old audio to play` on the function fill_audio_out_buffers(). Pulse Audio continues to request data and calls stream_request_cb(). pa_stream_writable_size() continues to increase. mpv hangs and cannot play video, until `Failed to allocate buffer`. buffer.c: To resolve this issue, not start AO when receiving EOF data. Fixes: mpv-player#13242
sfan5
reviewed
Jan 8, 2024
| p->streaming = true; | ||
| state.playing = true; | ||
| if (got_eof) { | ||
| MP_WARN(ao, "Error starting AO with EOF data.\n"); |
There was a problem hiding this comment.
I'm not sure this makes sense.
Where exactly is the error in this case? Since the user is informed, what can he do to resolve it?
| ao->driver->start(ao); | ||
| p->streaming = true; | ||
| state.playing = true; | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Thinking about this further you can see that this code only runs if there are samples to play.
But if the AO is not started then the samples would be lost.
What I think might be broken is the logic that calls ao_drain or ao_reset when appropriate. (In your log it seems it is never called.)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When mpv resumes audio from underrun state, if the first audio data contains EOF. mpv may get stuck in an infinite loop.
ao->buffer_state->playingis true and does not change anymore, repeatblocked, waiting for old audio to playon the function fill_audio_out_buffers().Pulse Audio continues to request data and calls stream_request_cb(). pa_stream_writable_size() continues to increase. mpv hangs and cannot play video, until
Failed to allocate buffer.buffer.c: To resolve this issue, not start AO when receiving EOF data.
Fixes: #13242
Read this before you submit this pull request:
https://github.com/mpv-player/mpv/blob/master/DOCS/contribute.md
Reading this link and following the rules will get your pull request reviewed
and merged faster. Nobody wants lazy pull requests.