sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libpulseaudio: avoid some assertion failures due to race condition

Browse Source
This commit is contained in:
Tom Yan 2018-07-26 06:18:15 +08:00 committed by Fredrik Fornwall
parent 36c4ffb4bf
commit 9006223783
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/libpulseaudio/module-sles-sink.c
View File

@ -126,17 +126,20 @@ static void process_render(BufferQueueItf bq, void *context) {
//pa_log_debug("Unrefed\n"); //pa_log_debug("Unrefed\n");
} }
if (PA_UNLIKELY(u->sink->thread_info.rewind_requested)) { if (PA_SINK_IS_LINKED(u->sink->thread_info.state) &&
PA_UNLIKELY(u->sink->thread_info.rewind_requested)) {
//pa_log_debug("Rewinded\n"); //pa_log_debug("Rewinded\n");
pa_sink_process_rewind(u->sink, 0); pa_sink_process_rewind(u->sink, 0);
} }
if (PA_SINK_IS_LINKED(u->sink->thread_info.state)) {
pa_sink_render(u->sink, u->sink->thread_info.max_request, &u->memchunk); pa_sink_render(u->sink, u->sink->thread_info.max_request, &u->memchunk);
p = pa_memblock_acquire_chunk(&u->memchunk); p = pa_memblock_acquire_chunk(&u->memchunk);
(*bq)->Enqueue(bq, p, u->memchunk.length); (*bq)->Enqueue(bq, p, u->memchunk.length);
//pa_log_debug("Written: %zu\n", u->memchunk.length); //pa_log_debug("Written: %zu\n", u->memchunk.length);
pa_memblock_release(u->memchunk.memblock); pa_memblock_release(u->memchunk.memblock);
} }
}
#define CHK(stmt) { \ #define CHK(stmt) { \
SLresult res = stmt; \ SLresult res = stmt; \
@ -229,7 +232,7 @@ static void thread_func(void *userdata) {
int ret; int ret;
/* Render some data and drop it immediately */ /* Render some data and drop it immediately */
if (PA_SINK_IS_OPENED(u->sink->thread_info.state)) { if (PA_SINK_IS_LINKED(u->sink->thread_info.state)) {
process_render(u->bqPlayerBufferQueue, u); process_render(u->bqPlayerBufferQueue, u);
break; break;
} }