scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 02:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

CoreAudio cap.: check sample rate

Browse Source 
On incorrect device index, the further call succeeds but rate returned
is 0, resulting in wrong assert in ring_buffer_init().

+ s/MODULE_NAME/MOD_NAME for convenience (usual in other code)
This commit is contained in:
Martin Pulec
2023-05-30 15:08:19 +02:00
parent 9abd64ff5b
commit 0f546e1f4d
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/audio/capture/coreaudio.m
View File

@@ -57,7 +57,7 @@
#include "lib_common.h"
#include "utils/ring_buffer.h"
#define MODULE_NAME "[CoreAudio] "
#define MOD_NAME "[CoreAudio] "
struct state_ca_capture {
#ifndef __MAC_10_6
@@ -182,7 +182,7 @@ static void audio_cap_ca_help()
#define CA_STRINGIFY(A) #A
#define CHECK_OK(cmd, msg, action_failed) do { OSErr ret = cmd; if (ret != noErr) {\
log_msg(strlen(CA_STRINGIFY(action_failed)) == 0 ? LOG_LEVEL_WARNING : LOG_LEVEL_ERROR, MODULE_NAME "%s: %d\n", (msg), ret);\
log_msg(strlen(CA_STRINGIFY(action_failed)) == 0 ? LOG_LEVEL_WARNING : LOG_LEVEL_ERROR, MOD_NAME "%s: %d\n", (msg), ret);\
action_failed;\
}\
} while(0)
@@ -240,7 +240,7 @@ static void * audio_cap_ca_init(struct module *parent, const char *cfg)
AVAuthorizationStatus authorization_status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio];
if (authorization_status == AVAuthorizationStatusRestricted ||
authorization_status == AVAuthorizationStatusDenied) {
log_msg(LOG_LEVEL_ERROR, MODULE_NAME "Application is not authorized to capture audio input!\n");
log_msg(LOG_LEVEL_ERROR, MOD_NAME "Application is not authorized to capture audio input!\n");
return NULL;
}
if (authorization_status == AVAuthorizationStatusNotDetermined) {
@@ -248,6 +248,21 @@ static void * audio_cap_ca_init(struct module *parent, const char *cfg)
}
#endif // defined __MAC_10_14
double rate = 0.0;
size = sizeof(double);
AudioObjectPropertyAddress propertyAddress;
propertyAddress.mSelector = kAudioDevicePropertyNominalSampleRate;
propertyAddress.mScope = kAudioDevicePropertyScopeInput;
propertyAddress.mElement = kAudioObjectPropertyElementMaster;
ret = AudioObjectGetPropertyData(device, &propertyAddress, 0, NULL, &size, &rate);
if (rate == 0.0) {
log_msg(LOG_LEVEL_ERROR, MOD_NAME "Sample rate 0.0 returned. Wrong device index?\n");
return NULL;
}
if (ret != noErr || (audio_capture_sample_rate != 0 && audio_capture_sample_rate != rate)) {
log_msg(LOG_LEVEL_WARNING, MOD_NAME "Requested sample rate %u, got %lf!\n", audio_capture_sample_rate, rate);
}
struct state_ca_capture *s = (struct state_ca_capture *) calloc(1, sizeof(struct state_ca_capture));
pthread_mutex_init(&s->lock, NULL);
pthread_cond_init(&s->cv, NULL);
@@ -256,18 +271,7 @@ static void * audio_cap_ca_init(struct module *parent, const char *cfg)
s->frame.bps = audio_capture_bps ? audio_capture_bps : 2;
s->frame.ch_count = audio_capture_channels > 0 ? audio_capture_channels : DEFAULT_AUDIO_CAPTURE_CHANNELS;
double rate = 0.0;
size = sizeof(double);
AudioObjectPropertyAddress propertyAddress;
propertyAddress.mSelector = kAudioDevicePropertyNominalSampleRate;
propertyAddress.mScope = kAudioDevicePropertyScopeInput;
propertyAddress.mElement = kAudioObjectPropertyElementMaster;
ret = AudioObjectGetPropertyData(device, &propertyAddress, 0, NULL, &size, &rate);
s->frame.sample_rate = rate;
if (ret != noErr || (audio_capture_sample_rate != 0 && audio_capture_sample_rate != rate)) {
log_msg(LOG_LEVEL_WARNING, MODULE_NAME "Requested sample rate %u, got %lf!\n", audio_capture_sample_rate, rate);
}
s->frame.max_size = s->frame.bps * s->frame.ch_count * s->frame.sample_rate;
int nonres_channel_size = s->frame.bps * s->frame.sample_rate;