From dda16ee1fbe681ad747210aaea7727a3378c9af2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 21 Oct 2015 18:54:48 +0200 Subject: ao_coreaudio_exclusive: deal with devices return different channel count If the device returns an unexpected number of channels instead of the requested count on init, don't immediately error out. Instead, look if there's a channel map with the given number of channels. If there isn't, still error out, because we don't want to guess the channel layout. --- audio/out/ao_coreaudio_exclusive.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'audio/out/ao_coreaudio_exclusive.c') diff --git a/audio/out/ao_coreaudio_exclusive.c b/audio/out/ao_coreaudio_exclusive.c index f8aba87188..c998ee825c 100644 --- a/audio/out/ao_coreaudio_exclusive.c +++ b/audio/out/ao_coreaudio_exclusive.c @@ -315,7 +315,10 @@ static int init(struct ao *ao) ao->samplerate = p->stream_asbd.mSampleRate; if (ao->channels.num != p->stream_asbd.mChannelsPerFrame) { - // We really expect that ca_init_chmap() fixes the layout to the HW's. + ca_active_chmap(ao, p->device, p->stream_asbd.mChannelsPerFrame, + &ao->channels); + } + if (!ao->channels.num) { MP_ERR(ao, "number of channels changed, and unknown channel layout!\n"); goto coreaudio_error; } -- cgit v1.2.3