fix(main/cmus): ensure the AAudio buffer is at least 80ms #22418
Conversation
This cherry-picks cmus/cmus@56f21a4 from cmus/cmus#1386.
There was a problem hiding this comment.
This PR will presumably cause the next auto-update of cmus to fail due to this patch being upstreamed by then.
- I am reserving further judgement until the PR this cherry-picks
Set the minimum requested AAudio buffer capacity cmus/cmus#1386
has been acknowledged by upstream.
Edit: Whoops, did not realize you're a frequent contributor to the upstream cmus project.
Guess I'll take a look at the patch itself now then.
Edit 2: Yep patch itself should be fine from a cursory look.
| 56f21a455bc611d879ad5384ca26c154bd59a34d # ensure the aaudio buffer is at least 80ms (cmus/cmus#1386) | ||
| ) | ||
| for sha in "${commits[@]}"; do | ||
| termux_download "https://github.com/cmus/cmus/commit/$sha.patch" "$sha.patch" "SKIP_CHECKSUM" # skip checksum since we're already referencing an exact commit hash |
There was a problem hiding this comment.
Where are we downloading this patch to anyway?
Please make sure it goes in the temp directory so it will be cleaned up properly.
| termux_download "https://github.com/cmus/cmus/commit/$sha.patch" "$sha.patch" "SKIP_CHECKSUM" # skip checksum since we're already referencing an exact commit hash | |
| termux_download "https://github.com/cmus/cmus/commit/$sha.patch" "${TERMUX_PKG_TMPDIR}/${sha}.patch" "SKIP_CHECKSUM" # skip checksum since we're already referencing an exact commit hash |
| ) | ||
| for sha in "${commits[@]}"; do | ||
| termux_download "https://github.com/cmus/cmus/commit/$sha.patch" "$sha.patch" "SKIP_CHECKSUM" # skip checksum since we're already referencing an exact commit hash | ||
| git apply "$sha.patch" |
There was a problem hiding this comment.
This one will also need to be changed accordingly.
| git apply "$sha.patch" | |
| git apply "${TERMUX_PKG_TMPDIR}/${sha}.patch" |
| TERMUX_PKG_DEPENDS="ffmpeg, libandroid-support, libflac, libiconv, libmad, libmodplug, libvorbis, libwavpack, ncurses, opusfile, pulseaudio" | ||
| TERMUX_PKG_SRCURL=https://github.com/cmus/cmus/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz | ||
| TERMUX_PKG_SHA256=44b96cd5f84b0d84c33097c48454232d5e6a19cd33b9b6503ba9c13b6686bfc7 | ||
| TERMUX_PKG_AUTO_UPDATE=true | ||
| TERMUX_PKG_BUILD_IN_SRC=true | ||
|
|
||
| termux_step_pre_configure() { | ||
| # cherry-pick patches | ||
| local sha commits=( | ||
| 56f21a455bc611d879ad5384ca26c154bd59a34d # ensure the aaudio buffer is at least 80ms (cmus/cmus#1386) |
There was a problem hiding this comment.
This is 40 characters long, so it's obviously not the full SHA256 hash.
If you're just using the short-hash for the commit the first 7 chars should be sufficient.
Either use the full commit hash or use the proper short-hash.
Please also link to the PR with a full link.
| 56f21a455bc611d879ad5384ca26c154bd59a34d # ensure the aaudio buffer is at least 80ms (cmus/cmus#1386) | |
| 56f21a455bc611d879ad5384ca26c154bd59a34d # ensure the aaudio buffer is at least 80ms (https://github.com/cmus/cmus/pull/1386) |
I also can't help but notice that this is your own upstream PR, from about an hour ago.
I'd like to hear back from upstream about their opinion on this before making any decision regarding this PR.
This fixes buffer underruns on the Pixel 9 due to the default buffer capacity and burst size being much lower than other devices (e.g., 2886/962 frames at 48000 Hz on the P9 vs 6734/3367 on the P8).
I am one of the upstream maintainers and the author of the AAudio output plugin.
See cmus/cmus#1386. This PR is a cherry-pick of the first commit (the bugfix), but not the second (a feature to allow overriding the requested buffer capacity).