Skip to content

Commit bda5532

Browse files
committed
acap/coreaudio: fix outputting empty frames
a race condition Prior to e511f898 (2024-11-14) and still in the stable branch, it produces: [Audio decompress] 2 empty channel(s) returned!
1 parent 98e298c commit bda5532

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

FIXES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
#### 1.9.10
2+
3+
* fix macOS >= 15.4 init crashes (LC_RPATH dups)
4+
* build fixes (XIMEA, PCP)
5+
* fix manual port assignment with send+recv over lo in single process
6+
* few other less important fixes
7+
18
#### 1.9.9
29

310
* build fixes: switch to U22, PCP

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Process this file with autoconf to produce a configure script.
22

3-
AC_INIT([UltraGrid],[1.9.9],[[email protected]])
3+
AC_INIT([UltraGrid],[1.9.10],[[email protected]])
44
configure_flags="$*"
55
AC_CANONICAL_TARGET
66
AM_INIT_AUTOMAKE([1.10])

src/audio/capture/coreaudio.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,13 +409,13 @@ static void (^cb)(BOOL) = ^void(BOOL granted) {
409409
pthread_mutex_lock(&s->lock);
410410
ret = ring_buffer_read(s->buffer, s->frame.data, s->frame.max_size);
411411
if(!ret) {
412+
s->data_ready = FALSE;
412413
s->boss_waiting = TRUE;
413414
while(!s->data_ready) {
414415
pthread_cond_wait(&s->cv, &s->lock);
415416
}
416417
s->boss_waiting = FALSE;
417418
ret = ring_buffer_read(s->buffer, s->frame.data, s->frame.max_size);
418-
s->data_ready = FALSE;
419419
}
420420
pthread_mutex_unlock(&s->lock);
421421

0 commit comments

Comments
 (0)