From aea2328906fc754c0d0cdea57c60d71522ae99a5 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 5 Apr 2013 23:06:22 +0200
Subject: audio/out: switch to channel map

This actually breaks audio for 5/6/8 channels. There's no reordering
done yet. The actual reordering will be done inside of af_lavrresample
and has to be made part of the format negotiation.
---
 audio/out/ao_coreaudio.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'audio/out/ao_coreaudio.c')

diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c
index 7993eac910..98b9f9adeb 100644
--- a/audio/out/ao_coreaudio.c
+++ b/audio/out/ao_coreaudio.c
@@ -412,7 +412,7 @@ static void print_help(void)
     free(devids);
 }
 
-static int init(int rate,int channels,int format,int flags)
+static int init(int rate,const struct mp_chmap *channels,int format,int flags)
 {
 AudioStreamBasicDescription inDesc;
 AudioComponentDescription desc;
@@ -439,7 +439,7 @@ int device_id, display_help = 0;
             return 0;
     }
 
-    ao_msg(MSGT_AO,MSGL_V, "init([%dHz][%dch][%s][%d])\n", rate, channels, af_fmt2str_short(format), flags);
+    ao_msg(MSGT_AO,MSGL_V, "init([%dHz][%dch][%s][%d])\n", rate, ao_data.channels.num, af_fmt2str_short(format), flags);
 
     ao = calloc(1, sizeof(ao_coreaudio_t));
 
@@ -502,7 +502,7 @@ int device_id, display_help = 0;
 	// Build Description for the input format
 	inDesc.mSampleRate=rate;
 	inDesc.mFormatID=ao->b_supports_digital ? kAudioFormat60958AC3 : kAudioFormatLinearPCM;
-	inDesc.mChannelsPerFrame=channels;
+	inDesc.mChannelsPerFrame=ao_data.channels.num;
 	inDesc.mBitsPerChannel=af_fmt2bits(format);
 
     if((format&AF_FORMAT_POINT_MASK)==AF_FORMAT_F) {
@@ -521,7 +521,7 @@ int device_id, display_help = 0;
         inDesc.mFormatFlags |= kAudioFormatFlagIsBigEndian;
 
     inDesc.mFramesPerPacket = 1;
-    ao->packetSize = inDesc.mBytesPerPacket = inDesc.mBytesPerFrame = inDesc.mFramesPerPacket*channels*(inDesc.mBitsPerChannel/8);
+    ao->packetSize = inDesc.mBytesPerPacket = inDesc.mBytesPerFrame = inDesc.mFramesPerPacket*ao_data.channels.num*(inDesc.mBitsPerChannel/8);
     print_format(MSGL_V, "source:",&inDesc);
 
     if (ao->b_supports_digital)
@@ -605,7 +605,9 @@ int device_id, display_help = 0;
 	ao->chunk_size = maxFrames;//*inDesc.mBytesPerFrame;
 
 	ao_data.samplerate = inDesc.mSampleRate;
-	ao_data.channels = inDesc.mChannelsPerFrame;
+        mp_chmap_from_channels(&ao_data.channels, inDesc.mChannelsPerFrame);
+        // Most likely wrong, but that's what it has been set to.
+        mp_chmap_reorder_to_alsa(&ao_data.channels);
     ao_data.bps = ao_data.samplerate * inDesc.mBytesPerFrame;
     ao_data.outburst = ao->chunk_size;
 	ao_data.buffersize = ao_data.bps;
@@ -837,7 +839,8 @@ static int OpenSPDIF(void)
     ao->chunk_size = ao->stream_format.mBytesPerPacket;
 
     ao_data.samplerate = ao->stream_format.mSampleRate;
-    ao_data.channels = ao->stream_format.mChannelsPerFrame;
+    // Applies default ordering; ok becazse AC3 data is always in mpv internal channel order
+    mp_chmap_from_channels(&ao_data.channels, ao->stream_format.mChannelsPerFrame);
     ao_data.bps = ao_data.samplerate * (ao->stream_format.mBytesPerPacket/ao->stream_format.mFramesPerPacket);
     ao_data.outburst = ao->chunk_size;
     ao_data.buffersize = ao_data.bps;
-- 
cgit v1.2.3