From b46ffaec7cf105e37263d1e32b396c3455e64f06 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 1 May 2014 18:36:52 +0200 Subject: ao_coreaudio: use description-based channel layouts CoreAudio supports 3 kinds of layouts: bitmap based, tag based, and speaker description based (using either channel labels or positional data). Previously we tried to convert everything to bitmap based channel layouts, but it turns out description based ones are the most generic and there are built-in CoreAudio APIs to perform the conversion in this direction. Moreover description based layouts support waveext extensions (like SDL and SDR), and are easier to map to mp_chmaps. --- audio/out/ao_coreaudio_utils.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'audio/out/ao_coreaudio_utils.h') diff --git a/audio/out/ao_coreaudio_utils.h b/audio/out/ao_coreaudio_utils.h index 0aca2f7c62..9218ccf00d 100644 --- a/audio/out/ao_coreaudio_utils.h +++ b/audio/out/ao_coreaudio_utils.h @@ -77,8 +77,7 @@ OSStatus ca_disable_device_listener(AudioDeviceID device, void *flag); bool ca_change_format(struct ao *ao, AudioStreamID stream, AudioStreamBasicDescription change_format); -void ca_bitmaps_from_layouts(struct ao *ao, - AudioChannelLayout *layouts, size_t n_layouts, - uint32_t **bitmaps, size_t *n_bitmaps); +bool ca_layout_to_mp_chmap(struct ao *ao, AudioChannelLayout *layout, + struct mp_chmap *chmap); #endif /* MPV_COREAUDIO_UTILS_H */ -- cgit v1.2.3