ryujinx/libsoundio
1
0
Fork 0
mirror of https://github.com/Ryujinx/libsoundio.git synced 2024-12-22 23:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

CoreAudio: pass the latency test

Browse source 
See #2
This commit is contained in:
Andrew Kelley 2015-09-03 10:47:38 -07:00
parent f422fcddf3
commit b55a225b9c
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/coreaudio.cpp
View file

@ -730,6 +730,16 @@ static int refresh_devices(struct SoundIoPrivate *si) {
rd.device->software_latency_min = avr.mMinimum / use_sample_rate; rd.device->software_latency_min = avr.mMinimum / use_sample_rate;
rd.device->software_latency_max = avr.mMaximum / use_sample_rate; rd.device->software_latency_max = avr.mMaximum / use_sample_rate;
prop_address.mSelector = kAudioDevicePropertyLatency;
prop_address.mScope = aim_to_scope(aim);
prop_address.mElement = kAudioObjectPropertyElementMaster;
io_size = sizeof(UInt32);
if ((os_err = AudioObjectGetPropertyData(device_id, &prop_address, 0, nullptr,
&io_size, &dca->latency_frames)))
{
deinit_refresh_devices(&rd);
return SoundIoErrorOpeningDevice;
}
SoundIoList<SoundIoDevice *> *device_list; SoundIoList<SoundIoDevice *> *device_list;
if (rd.device->aim == SoundIoDeviceAimOutput) { if (rd.device->aim == SoundIoDeviceAimOutput) {
@ -992,6 +1002,8 @@ static int outstream_open_ca(struct SoundIoPrivate *si, struct SoundIoOutStreamP
return SoundIoErrorOpeningDevice; return SoundIoErrorOpeningDevice;
} }
osca->hardware_latency = dca->latency_frames / (double)outstream->sample_rate;
return 0; return 0;
} }
@ -1055,7 +1067,9 @@ static int outstream_clear_buffer_ca(struct SoundIoPrivate *si, struct SoundIoOu
static int outstream_get_latency_ca(struct SoundIoPrivate *si, struct SoundIoOutStreamPrivate *os, static int outstream_get_latency_ca(struct SoundIoPrivate *si, struct SoundIoOutStreamPrivate *os,
double *out_latency) double *out_latency)
{ {
soundio_panic("TODO"); SoundIoOutStreamCoreAudio *osca = &os->backend_data.coreaudio;
*out_latency = osca->hardware_latency;
return 0;
} }
static OSStatus on_instream_device_overload(AudioObjectID in_object_id, UInt32 in_number_addresses, static OSStatus on_instream_device_overload(AudioObjectID in_object_id, UInt32 in_number_addresses,
@ -1268,6 +1282,8 @@ static int instream_open_ca(struct SoundIoPrivate *si, struct SoundIoInStreamPri
return SoundIoErrorOpeningDevice; return SoundIoErrorOpeningDevice;
} }
isca->hardware_latency = dca->latency_frames / (double)instream->sample_rate;
return 0; return 0;
} }
@ -1313,7 +1329,9 @@ static int instream_end_read_ca(struct SoundIoPrivate *si, struct SoundIoInStrea
static int instream_get_latency_ca(struct SoundIoPrivate *si, struct SoundIoInStreamPrivate *is, static int instream_get_latency_ca(struct SoundIoPrivate *si, struct SoundIoInStreamPrivate *is,
double *out_latency) double *out_latency)
{ {
soundio_panic("TODO"); SoundIoInStreamCoreAudio *isca = &is->backend_data.coreaudio;
*out_latency = isca->hardware_latency;
return 0;
} }

3
src/coreaudio.hpp
View file

@ -20,6 +20,7 @@ int soundio_coreaudio_init(struct SoundIoPrivate *si);
struct SoundIoDeviceCoreAudio { struct SoundIoDeviceCoreAudio {
AudioDeviceID device_id; AudioDeviceID device_id;
UInt32 latency_frames;
}; };
struct SoundIoCoreAudio { struct SoundIoCoreAudio {
@ -47,6 +48,7 @@ struct SoundIoOutStreamCoreAudio {
int buffer_index; int buffer_index;
int frames_left; int frames_left;
int write_frame_count; int write_frame_count;
double hardware_latency;
SoundIoChannelArea areas[SOUNDIO_MAX_CHANNELS]; SoundIoChannelArea areas[SOUNDIO_MAX_CHANNELS];
}; };
@ -54,6 +56,7 @@ struct SoundIoInStreamCoreAudio {
AudioComponentInstance instance; AudioComponentInstance instance;
AudioBufferList *buffer_list; AudioBufferList *buffer_list;
int frames_left; int frames_left;
double hardware_latency;
SoundIoChannelArea areas[SOUNDIO_MAX_CHANNELS]; SoundIoChannelArea areas[SOUNDIO_MAX_CHANNELS];
}; };