annotate libao2/ao_macosx.c @ 24990:fd919e77c834

Support mute when passthrough to digital output.
author ulion
date Sun, 11 Nov 2007 02:54:57 +0000
parents 19e208a0296d
children 72bc6377fb28
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1 /*
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
2 *
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
3 * ao_macosx.c
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
4 *
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
5 * Original Copyright (C) Timothy J. Wood - Aug 2000
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
6 *
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
7 * This file is part of libao, a cross-platform library. See
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
8 * README for a history of this source code.
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
9 *
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
10 * libao is free software; you can redistribute it and/or modify
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
11 * it under the terms of the GNU General Public License as published by
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
12 * the Free Software Foundation; either version 2, or (at your option)
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
13 * any later version.
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
14 *
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
15 * libao is distributed in the hope that it will be useful,
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
18 * GNU General Public License for more details.
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
19 *
21977
cea0eb833758 Fix FSF address and otherwise broken license headers.
diego
parents: 21352
diff changeset
20 * You should have received a copy of the GNU General Public License along
cea0eb833758 Fix FSF address and otherwise broken license headers.
diego
parents: 21352
diff changeset
21 * with libao; if not, write to the Free Software Foundation, Inc.,
cea0eb833758 Fix FSF address and otherwise broken license headers.
diego
parents: 21352
diff changeset
22 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
23 */
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
24
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
25 /*
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
26 * The MacOS X CoreAudio framework doesn't mesh as simply as some
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
27 * simpler frameworks do. This is due to the fact that CoreAudio pulls
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
28 * audio samples rather than having them pushed at it (which is nice
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
29 * when you are wanting to do good buffering of audio).
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
30 */
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
31
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
32 /* Change log:
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
33 *
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
34 * 14/5-2003: Ported to MPlayer libao2 by Dan Christiansen
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
35 *
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
36 * AC-3 and MPEG audio passthrough is possible, but I don't have
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
37 * access to a sound card that supports it.
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
38 */
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
39
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
40 #include <CoreServices/CoreServices.h>
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
41 #include <AudioUnit/AudioUnit.h>
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
42 #include <AudioToolbox/AudioToolbox.h>
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
43 #include <stdio.h>
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
44 #include <string.h>
14903
21f44596f356 do not always request little-endian despite the actual sound format. by Alexander Strange - astrange@ithinksw.com
nplourde
parents: 14769
diff changeset
45 #include <stdlib.h>
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
46 #include <inttypes.h>
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
47 #include <sys/types.h>
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
48 #include <unistd.h>
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
49
14479
cae0dbeb44bb af_format.h needs config.h to be included first.
reimar
parents: 14317
diff changeset
50 #include "config.h"
14123
a92101a7eb49 Make include paths consistent.
diego
parents: 13651
diff changeset
51 #include "mp_msg.h"
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
52
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
53 #include "audio_out.h"
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
54 #include "audio_out_internal.h"
14245
815f03b7cee5 removing AFMT_ dependancy
alex
parents: 14123
diff changeset
55 #include "libaf/af_format.h"
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
56 #include "osdep/timer.h"
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
57
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
58 static ao_info_t info =
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
59 {
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
60 "Darwin/Mac OS X native audio output",
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
61 "macosx",
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
62 "Timothy J. Wood & Dan Christiansen & Chris Roccati",
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
63 ""
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
64 };
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
65
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
66 LIBAO_EXTERN(macosx)
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
67
10152
b252d1b6829e cleanup/cosmetic patch by the author :)
alex
parents: 10147
diff changeset
68 /* Prefix for all mp_msg() calls */
b252d1b6829e cleanup/cosmetic patch by the author :)
alex
parents: 10147
diff changeset
69 #define ao_msg(a, b, c...) mp_msg(a, b, "AO: [macosx] " c)
b252d1b6829e cleanup/cosmetic patch by the author :)
alex
parents: 10147
diff changeset
70
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
71 /* This is large, but best (maybe it should be even larger).
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
72 * CoreAudio supposedly has an internal latency in the order of 2ms */
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
73 #define NUM_BUFS 32
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
74
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
75 typedef struct ao_macosx_s
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
76 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
77 AudioDeviceID i_selected_dev; /* Keeps DeviceID of the selected device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
78 int b_supports_digital; /* Does the currently selected device support digital mode? */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
79 int b_digital; /* Are we running in digital mode? */
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
80 int b_muted; /* Are we muted in digital mode? */
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
81
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
82 /* AudioUnit */
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
83 AudioUnit theOutputUnit;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
84
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
85 /* CoreAudio SPDIF mode specific */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
86 pid_t i_hog_pid; /* Keeps the pid of our hog status. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
87 AudioStreamID i_stream_id; /* The StreamID that has a cac3 streamformat */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
88 int i_stream_index; /* The index of i_stream_id in an AudioBufferList */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
89 AudioStreamBasicDescription stream_format;/* The format we changed the stream to */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
90 AudioStreamBasicDescription sfmt_revert; /* The original format of the stream */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
91 int b_revert; /* Whether we need to revert the stream format */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
92 int b_changed_mixing; /* Whether we need to set the mixing mode back */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
93 int b_stream_format_changed; /* Flag for main thread to reset stream's format to digital and reset buffer */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
94
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
95 /* Original common part */
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
96 int packetSize;
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
97 int paused;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
98
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
99 /* Ring-buffer */
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
100 /* does not need explicit synchronization, but needs to allocate
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
101 * (num_chunks + 1) * chunk_size memory to store num_chunks * chunk_size
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
102 * data */
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
103 unsigned char *buffer;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
104 unsigned int buffer_len; ///< must always be (num_chunks + 1) * chunk_size
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
105 unsigned int num_chunks;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
106 unsigned int chunk_size;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
107
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
108 unsigned int buf_read_pos;
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
109 unsigned int buf_write_pos;
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
110 } ao_macosx_t;
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
111
15853
6e994905f77b more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
nplourde
parents: 15722
diff changeset
112 static ao_macosx_t *ao = NULL;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
113
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
114 /**
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
115 * \brief return number of free bytes in the buffer
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
116 * may only be called by mplayer's thread
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
117 * \return minimum number of free bytes in buffer, value may change between
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
118 * two immediately following calls, and the real number of free bytes
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
119 * might actually be larger!
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
120 */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
121 static int buf_free(void) {
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
122 int free = ao->buf_read_pos - ao->buf_write_pos - ao->chunk_size;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
123 if (free < 0) free += ao->buffer_len;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
124 return free;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
125 }
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
126
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
127 /**
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
128 * \brief return number of buffered bytes
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
129 * may only be called by playback thread
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
130 * \return minimum number of buffered bytes, value may change between
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
131 * two immediately following calls, and the real number of buffered bytes
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
132 * might actually be larger!
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
133 */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
134 static int buf_used(void) {
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
135 int used = ao->buf_write_pos - ao->buf_read_pos;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
136 if (used < 0) used += ao->buffer_len;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
137 return used;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
138 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
139
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
140 /**
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
141 * \brief add data to ringbuffer
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
142 */
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
143 static int write_buffer(unsigned char* data, int len){
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
144 int first_len = ao->buffer_len - ao->buf_write_pos;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
145 int free = buf_free();
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
146 if (len > free) len = free;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
147 if (first_len > len) first_len = len;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
148 // till end of buffer
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
149 memcpy (&ao->buffer[ao->buf_write_pos], data, first_len);
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
150 if (len > first_len) { // we have to wrap around
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
151 // remaining part from beginning of buffer
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
152 memcpy (ao->buffer, &data[first_len], len - first_len);
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
153 }
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
154 ao->buf_write_pos = (ao->buf_write_pos + len) % ao->buffer_len;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
155 return len;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
156 }
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
157
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
158 /**
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
159 * \brief remove data from ringbuffer
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
160 */
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
161 static int read_buffer(unsigned char* data,int len){
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
162 int first_len = ao->buffer_len - ao->buf_read_pos;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
163 int buffered = buf_used();
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
164 if (len > buffered) len = buffered;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
165 if (first_len > len) first_len = len;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
166 // till end of buffer
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
167 if (data) {
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
168 memcpy (data, &ao->buffer[ao->buf_read_pos], first_len);
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
169 if (len > first_len) { // we have to wrap around
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
170 // remaining part from beginning of buffer
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
171 memcpy (&data[first_len], ao->buffer, len - first_len);
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
172 }
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
173 }
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
174 ao->buf_read_pos = (ao->buf_read_pos + len) % ao->buffer_len;
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
175 return len;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
176 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
177
15722
b53c4b26dc96 removes the use of AudioConverters. patch by Alexander Strange <alexander.strange@ithinksw.com>
nplourde
parents: 15646
diff changeset
178 OSStatus theRenderProc(void *inRefCon, AudioUnitRenderActionFlags *inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumFrames, AudioBufferList *ioData)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
179 {
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
180 int amt=buf_used();
15722
b53c4b26dc96 removes the use of AudioConverters. patch by Alexander Strange <alexander.strange@ithinksw.com>
nplourde
parents: 15646
diff changeset
181 int req=(inNumFrames)*ao->packetSize;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
182
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
183 if(amt>req)
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
184 amt=req;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
185
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
186 if(amt)
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
187 read_buffer((unsigned char *)ioData->mBuffers[0].mData, amt);
15853
6e994905f77b more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
nplourde
parents: 15722
diff changeset
188 else audio_pause();
15722
b53c4b26dc96 removes the use of AudioConverters. patch by Alexander Strange <alexander.strange@ithinksw.com>
nplourde
parents: 15646
diff changeset
189 ioData->mBuffers[0].mDataByteSize = amt;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
190
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
191 return noErr;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
192 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
193
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
194 static int control(int cmd,void *arg){
21352
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
195 ao_control_vol_t *control_vol;
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
196 OSStatus err;
23381
300e9b7c499f Remove some unused variables, patch by timwoj ieee org.
diego
parents: 21977
diff changeset
197 Float32 vol;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
198 switch (cmd) {
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
199 case AOCONTROL_GET_VOLUME:
21352
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
200 control_vol = (ao_control_vol_t*)arg;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
201 if (ao->b_digital) {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
202 // Digital output has no volume adjust.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
203 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
204 }
21352
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
205 err = AudioUnitGetParameter(ao->theOutputUnit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, &vol);
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
206
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
207 if(err==0) {
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
208 // printf("GET VOL=%f\n", vol);
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
209 control_vol->left=control_vol->right=vol*100.0/4.0;
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
210 return CONTROL_TRUE;
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
211 }
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
212 else {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
213 ao_msg(MSGT_AO, MSGL_WARN, "could not get HAL output volume: [%4.4s]\n", (char *)&err);
21352
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
214 return CONTROL_FALSE;
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
215 }
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
216
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
217 case AOCONTROL_SET_VOLUME:
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
218 control_vol = (ao_control_vol_t*)arg;
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
219
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
220 if (ao->b_digital) {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
221 // Digital output can not set volume. Here we have to return true
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
222 // to make mixer forget it. Else mixer will add a soft filter,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
223 // that's not we expected and the filter not support ac3 stream
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
224 // will cause mplayer die.
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
225
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
226 // Although not support set volume, but at least we support mute.
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
227 // MPlayer set mute by set volume to zero, we handle it.
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
228 if (control_vol->left == 0 && control_vol->right == 0)
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
229 ao->b_muted = 1;
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
230 else
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
231 ao->b_muted = 0;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
232 return CONTROL_TRUE;
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
233 }
21352
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
234
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
235 vol=(control_vol->left+control_vol->right)*4.0/200.0;
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
236 err = AudioUnitSetParameter(ao->theOutputUnit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, vol, 0);
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
237 if(err==0) {
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
238 // printf("SET VOL=%f\n", vol);
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
239 return CONTROL_TRUE;
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
240 }
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
241 else {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
242 ao_msg(MSGT_AO, MSGL_WARN, "could not set HAL output volume: [%4.4s]\n", (char *)&err);
21352
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
243 return CONTROL_FALSE;
2d786b7625d7 adds support for AOCONTROL_GET_VOLUME/AOCONTROL_SET_VOLUME in ao_macosx, patcg by Crhis Roccati<roccati@pobox.com>
nplourde
parents: 19427
diff changeset
244 }
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
245 /* Everything is currently unimplemented */
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
246 default:
10152
b252d1b6829e cleanup/cosmetic patch by the author :)
alex
parents: 10147
diff changeset
247 return CONTROL_FALSE;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
248 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
249
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
250 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
251
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
252
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
253 static void print_format(int lev, const char* str, const AudioStreamBasicDescription *f){
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
254 uint32_t flags=(uint32_t) f->mFormatFlags;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
255 ao_msg(MSGT_AO,lev, "%s %7.1fHz %lubit [%c%c%c%c][%lu][%lu][%lu][%lu][%lu] %s %s %s%s%s%s\n",
14317
9b3966174684 many 10ls fixed... also better debugging
arpi
parents: 14290
diff changeset
256 str, f->mSampleRate, f->mBitsPerChannel,
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
257 (int)(f->mFormatID & 0xff000000) >> 24,
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
258 (int)(f->mFormatID & 0x00ff0000) >> 16,
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
259 (int)(f->mFormatID & 0x0000ff00) >> 8,
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
260 (int)(f->mFormatID & 0x000000ff) >> 0,
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
261 f->mFormatFlags, f->mBytesPerPacket,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
262 f->mFramesPerPacket, f->mBytesPerFrame,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
263 f->mChannelsPerFrame,
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
264 (flags&kAudioFormatFlagIsFloat) ? "float" : "int",
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
265 (flags&kAudioFormatFlagIsBigEndian) ? "BE" : "LE",
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
266 (flags&kAudioFormatFlagIsSignedInteger) ? "S" : "U",
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
267 (flags&kAudioFormatFlagIsPacked) ? " packed" : "",
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
268 (flags&kAudioFormatFlagIsAlignedHigh) ? " aligned" : "",
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
269 (flags&kAudioFormatFlagIsNonInterleaved) ? " ni" : "" );
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
270 }
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
271
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
272
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
273 static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
274 static int AudioStreamSupportsDigital( AudioStreamID i_stream_id );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
275 static int OpenSPDIF();
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
276 static int AudioStreamChangeFormat( AudioStreamID i_stream_id, AudioStreamBasicDescription change_format );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
277 static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
278 const AudioTimeStamp * inNow,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
279 const void * inInputData,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
280 const AudioTimeStamp * inInputTime,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
281 AudioBufferList * outOutputData,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
282 const AudioTimeStamp * inOutputTime,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
283 void * threadGlobals );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
284 static OSStatus StreamListener( AudioStreamID inStream,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
285 UInt32 inChannel,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
286 AudioDevicePropertyID inPropertyID,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
287 void * inClientData );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
288 static OSStatus DeviceListener( AudioDeviceID inDevice,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
289 UInt32 inChannel,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
290 Boolean isInput,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
291 AudioDevicePropertyID inPropertyID,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
292 void* inClientData );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
293
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
294 static int init(int rate,int channels,int format,int flags)
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
295 {
23381
300e9b7c499f Remove some unused variables, patch by timwoj ieee org.
diego
parents: 21977
diff changeset
296 AudioStreamBasicDescription inDesc;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
297 ComponentDescription desc;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
298 Component comp;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
299 AURenderCallbackStruct renderCallback;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
300 OSStatus err;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
301 UInt32 size, maxFrames, i_param_size;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
302 char *psz_name;
15853
6e994905f77b more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
nplourde
parents: 15722
diff changeset
303 int aoIsCreated = ao != NULL;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
304 AudioDeviceID devid_def = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
305 int b_alive;
14317
9b3966174684 many 10ls fixed... also better debugging
arpi
parents: 14290
diff changeset
306
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
307 ao_msg(MSGT_AO,MSGL_V, "init([%dHz][%dch][%s][%d])\n", rate, channels, af_fmt2str_short(format), flags);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
308
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
309 if (!aoIsCreated) { ao = malloc(sizeof(ao_macosx_t)); ao->buffer = NULL;}
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
310
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
311 ao->i_selected_dev = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
312 ao->b_supports_digital = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
313 ao->b_digital = 0;
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
314 ao->b_muted = 0;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
315 ao->b_stream_format_changed = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
316 ao->i_hog_pid = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
317 ao->i_stream_id = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
318 ao->i_stream_index = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
319 ao->b_revert = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
320 ao->b_changed_mixing = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
321
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
322 /* Probe whether device support S/PDIF stream output if input is AC3 stream. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
323 if ((format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
324 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
325 /* Find the ID of the default Device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
326 i_param_size = sizeof(AudioDeviceID);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
327 err = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
328 &i_param_size, &devid_def);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
329 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
330 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
331 ao_msg(MSGT_AO, MSGL_WARN, "could not get default audio device: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
332 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
333 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
334
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
335 /* Retrieve the length of the device name. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
336 i_param_size = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
337 err = AudioDeviceGetPropertyInfo(devid_def, 0, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
338 kAudioDevicePropertyDeviceName,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
339 &i_param_size, NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
340 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
341 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
342 ao_msg(MSGT_AO, MSGL_WARN, "could not get default audio device name length: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
343 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
344 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
345
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
346 /* Retrieve the name of the device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
347 psz_name = (char *)malloc(i_param_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
348 err = AudioDeviceGetProperty(devid_def, 0, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
349 kAudioDevicePropertyDeviceName,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
350 &i_param_size, psz_name);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
351 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
352 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
353 ao_msg(MSGT_AO, MSGL_WARN, "could not get default audio device name: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
354 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
355 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
356
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
357 ao_msg(MSGT_AO,MSGL_V, "got default audio output device ID: %#lx Name: %s\n", devid_def, psz_name );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
358
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
359 if (AudioDeviceSupportsDigital(devid_def))
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
360 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
361 ao->b_supports_digital = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
362 ao->i_selected_dev = devid_def;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
363 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
364 ao_msg(MSGT_AO,MSGL_V, "probe default audio output device whether support digital s/pdif output:%d\n", ao->b_supports_digital );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
365
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
366 free( psz_name);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
367 }
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
368
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
369 // Build Description for the input format
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
370 inDesc.mSampleRate=rate;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
371 inDesc.mFormatID=ao->b_supports_digital ? kAudioFormat60958AC3 : kAudioFormatLinearPCM;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
372 inDesc.mChannelsPerFrame=channels;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
373 switch(format&AF_FORMAT_BITS_MASK){
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
374 case AF_FORMAT_8BIT:
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
375 inDesc.mBitsPerChannel=8;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
376 break;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
377 case AF_FORMAT_16BIT:
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
378 inDesc.mBitsPerChannel=16;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
379 break;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
380 case AF_FORMAT_24BIT:
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
381 inDesc.mBitsPerChannel=24;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
382 break;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
383 case AF_FORMAT_32BIT:
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
384 inDesc.mBitsPerChannel=32;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
385 break;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
386 default:
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
387 ao_msg(MSGT_AO, MSGL_WARN, "Unsupported format (0x%08x)\n", format);
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
388 return CONTROL_FALSE;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
389 break;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
390 }
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
391
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
392 if((format&AF_FORMAT_POINT_MASK)==AF_FORMAT_F) {
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
393 // float
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
394 inDesc.mFormatFlags = kAudioFormatFlagIsFloat|kAudioFormatFlagIsPacked;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
395 }
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
396 else if((format&AF_FORMAT_SIGN_MASK)==AF_FORMAT_SI) {
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
397 // signed int
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
398 inDesc.mFormatFlags = kAudioFormatFlagIsSignedInteger|kAudioFormatFlagIsPacked;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
399 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
400 else {
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
401 // unsigned int
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
402 inDesc.mFormatFlags = kAudioFormatFlagIsPacked;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
403 }
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
404 if ((format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3) {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
405 // Currently ac3 input (comes from hwac3) is always in native byte-order.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
406 #ifdef WORDS_BIGENDIAN
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
407 inDesc.mFormatFlags |= kAudioFormatFlagIsBigEndian;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
408 #endif
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
409 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
410 else if ((format & AF_FORMAT_END_MASK) == AF_FORMAT_BE)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
411 inDesc.mFormatFlags |= kAudioFormatFlagIsBigEndian;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
412
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
413 inDesc.mFramesPerPacket = 1;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
414 ao->packetSize = inDesc.mBytesPerPacket = inDesc.mBytesPerFrame = inDesc.mFramesPerPacket*channels*(inDesc.mBitsPerChannel/8);
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
415 print_format(MSGL_V, "source:",&inDesc);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
416
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
417 if (ao->b_supports_digital)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
418 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
419 b_alive = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
420 i_param_size = sizeof(b_alive);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
421 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
422 kAudioDevicePropertyDeviceIsAlive,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
423 &i_param_size, &b_alive);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
424 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
425 ao_msg(MSGT_AO, MSGL_WARN, "could not check whether device is alive: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
426 if (!b_alive)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
427 ao_msg(MSGT_AO, MSGL_WARN, "device is not alive\n" );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
428 /* S/PDIF output need device in HogMode. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
429 i_param_size = sizeof(ao->i_hog_pid);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
430 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
431 kAudioDevicePropertyHogMode,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
432 &i_param_size, &ao->i_hog_pid);
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
433
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
434 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
435 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
436 /* This is not a fatal error. Some drivers simply don't support this property. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
437 ao_msg(MSGT_AO, MSGL_WARN, "could not check whether device is hogged: [%4.4s]\n",
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
438 (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
439 ao->i_hog_pid = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
440 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
441
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
442 if (ao->i_hog_pid != -1 && ao->i_hog_pid != getpid())
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
443 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
444 ao_msg(MSGT_AO, MSGL_WARN, "Selected audio device is exclusively in use by another program.\n" );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
445 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
446 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
447 ao->stream_format = inDesc;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
448 return OpenSPDIF();
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
449 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
450
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
451 /* original analog output code */
15853
6e994905f77b more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
nplourde
parents: 15722
diff changeset
452 if (!aoIsCreated) {
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
453 desc.componentType = kAudioUnitType_Output;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
454 desc.componentSubType = kAudioUnitSubType_DefaultOutput;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
455 desc.componentManufacturer = kAudioUnitManufacturer_Apple;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
456 desc.componentFlags = 0;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
457 desc.componentFlagsMask = 0;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
458
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
459 comp = FindNextComponent(NULL, &desc); //Finds an component that meets the desc spec's
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
460 if (comp == NULL) {
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
461 ao_msg(MSGT_AO, MSGL_WARN, "Unable to find Output Unit component\n");
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
462 return CONTROL_FALSE;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
463 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
464
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
465 err = OpenAComponent(comp, &(ao->theOutputUnit)); //gains access to the services provided by the component
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
466 if (err) {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
467 ao_msg(MSGT_AO, MSGL_WARN, "Unable to open Output Unit component: [%4.4s]\n", (char *)&err);
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
468 return CONTROL_FALSE;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
469 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
470
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
471 // Initialize AudioUnit
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
472 err = AudioUnitInitialize(ao->theOutputUnit);
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
473 if (err) {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
474 ao_msg(MSGT_AO, MSGL_WARN, "Unable to initialize Output Unit component: [%4.4s]\n", (char *)&err);
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
475 return CONTROL_FALSE;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
476 }
15853
6e994905f77b more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
nplourde
parents: 15722
diff changeset
477 }
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
478
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
479 size = sizeof(AudioStreamBasicDescription);
15722
b53c4b26dc96 removes the use of AudioConverters. patch by Alexander Strange <alexander.strange@ithinksw.com>
nplourde
parents: 15646
diff changeset
480 err = AudioUnitSetProperty(ao->theOutputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &inDesc, size);
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
481
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
482 if (err) {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
483 ao_msg(MSGT_AO, MSGL_WARN, "Unable to set the input format: [%4.4s]\n", (char *)&err);
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
484 return CONTROL_FALSE;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
485 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
486
16014
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
487 size = sizeof(UInt32);
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
488 err = AudioUnitGetProperty(ao->theOutputUnit, kAudioDevicePropertyBufferSize, kAudioUnitScope_Input, 0, &maxFrames, &size);
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
489
16014
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
490 if (err)
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
491 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
492 ao_msg(MSGT_AO,MSGL_WARN, "AudioUnitGetProperty returned [%4.4s] when getting kAudioDevicePropertyBufferSize\n", (char *)&err);
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
493 return CONTROL_FALSE;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
494 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
495
16014
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
496 ao->chunk_size = maxFrames;//*inDesc.mBytesPerFrame;
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
497
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
498 ao_data.samplerate = inDesc.mSampleRate;
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
499 ao_data.channels = inDesc.mChannelsPerFrame;
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
500 ao_data.bps = ao_data.samplerate * inDesc.mBytesPerFrame;
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
501 ao_data.outburst = ao->chunk_size;
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
502 ao_data.buffersize = ao_data.bps;
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
503
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
504 ao->num_chunks = (ao_data.bps+ao->chunk_size-1)/ao->chunk_size;
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
505 ao->buffer_len = (ao->num_chunks + 1) * ao->chunk_size;
18885
5c8acc972551 rm unnecesary casts from void* - part 4
reynaldo
parents: 16014
diff changeset
506 ao->buffer = aoIsCreated ? realloc(ao->buffer,(ao->num_chunks + 1)*ao->chunk_size)
5c8acc972551 rm unnecesary casts from void* - part 4
reynaldo
parents: 16014
diff changeset
507 : calloc(ao->num_chunks + 1, ao->chunk_size);
15853
6e994905f77b more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
nplourde
parents: 15722
diff changeset
508
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
509 ao_msg(MSGT_AO,MSGL_V, "using %5d chunks of %d bytes (buffer len %d bytes)\n", (int)ao->num_chunks, (int)ao->chunk_size, (int)ao->buffer_len);
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
510
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
511 renderCallback.inputProc = theRenderProc;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
512 renderCallback.inputProcRefCon = 0;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
513 err = AudioUnitSetProperty(ao->theOutputUnit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, &renderCallback, sizeof(AURenderCallbackStruct));
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
514 if (err) {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
515 ao_msg(MSGT_AO, MSGL_WARN, "Unable to set the render callback: [%4.4s]\n", (char *)&err);
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
516 return CONTROL_FALSE;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
517 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
518
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
519 reset();
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
520
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
521 return CONTROL_OK;
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
522 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
523
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
524 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
525 * Setup a encoded digital stream (SPDIF)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
526 *****************************************************************************/
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
527 static int OpenSPDIF()
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
528 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
529 OSStatus err = noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
530 UInt32 i_param_size, b_mix = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
531 Boolean b_writeable = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
532 AudioStreamID *p_streams = NULL;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
533 int i, i_streams = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
534
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
535 /* Start doing the SPDIF setup process. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
536 ao->b_digital = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
537
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
538 /* Hog the device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
539 i_param_size = sizeof(ao->i_hog_pid);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
540 ao->i_hog_pid = getpid() ;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
541
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
542 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
543 kAudioDevicePropertyHogMode, i_param_size, &ao->i_hog_pid);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
544
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
545 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
546 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
547 ao_msg(MSGT_AO, MSGL_WARN, "failed to set hogmode: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
548 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
549 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
550
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
551 /* Set mixable to false if we are allowed to. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
552 err = AudioDeviceGetPropertyInfo(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
553 kAudioDevicePropertySupportsMixing,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
554 &i_param_size, &b_writeable);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
555 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
556 kAudioDevicePropertySupportsMixing,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
557 &i_param_size, &b_mix);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
558 if (err != noErr && b_writeable)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
559 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
560 b_mix = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
561 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
562 kAudioDevicePropertySupportsMixing,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
563 i_param_size, &b_mix);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
564 ao->b_changed_mixing = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
565 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
566 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
567 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
568 ao_msg(MSGT_AO, MSGL_WARN, "failed to set mixmode: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
569 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
570 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
571
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
572 /* Get a list of all the streams on this device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
573 err = AudioDeviceGetPropertyInfo(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
574 kAudioDevicePropertyStreams,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
575 &i_param_size, NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
576 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
577 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
578 ao_msg(MSGT_AO, MSGL_WARN, "could not get number of streams: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
579 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
580 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
581
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
582 i_streams = i_param_size / sizeof(AudioStreamID);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
583 p_streams = (AudioStreamID *)malloc(i_param_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
584 if (p_streams == NULL)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
585 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
586 ao_msg(MSGT_AO, MSGL_WARN, "out of memory\n" );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
587 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
588 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
589
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
590 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
591 kAudioDevicePropertyStreams,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
592 &i_param_size, p_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
593 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
594 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
595 ao_msg(MSGT_AO, MSGL_WARN, "could not get number of streams: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
596 if (p_streams) free(p_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
597 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
598 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
599
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
600 ao_msg(MSGT_AO, MSGL_V, "current device stream number: %d\n", i_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
601
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
602 for (i = 0; i < i_streams && ao->i_stream_index < 0; ++i)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
603 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
604 /* Find a stream with a cac3 stream. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
605 AudioStreamBasicDescription *p_format_list = NULL;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
606 int i_formats = 0, j = 0, b_digital = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
607
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
608 /* Retrieve all the stream formats supported by each output stream. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
609 err = AudioStreamGetPropertyInfo(p_streams[i], 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
610 kAudioStreamPropertyPhysicalFormats,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
611 &i_param_size, NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
612 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
613 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
614 ao_msg(MSGT_AO, MSGL_WARN, "could not get number of streamformats: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
615 continue;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
616 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
617
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
618 i_formats = i_param_size / sizeof(AudioStreamBasicDescription);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
619 p_format_list = (AudioStreamBasicDescription *)malloc(i_param_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
620 if (p_format_list == NULL)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
621 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
622 ao_msg(MSGT_AO, MSGL_WARN, "could not malloc the memory\n" );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
623 continue;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
624 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
625
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
626 err = AudioStreamGetProperty(p_streams[i], 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
627 kAudioStreamPropertyPhysicalFormats,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
628 &i_param_size, p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
629 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
630 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
631 ao_msg(MSGT_AO, MSGL_WARN, "could not get the list of streamformats: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
632 if (p_format_list) free(p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
633 continue;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
634 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
635
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
636 /* Check if one of the supported formats is a digital format. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
637 for (j = 0; j < i_formats; ++j)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
638 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
639 if (p_format_list[j].mFormatID == 'IAC3' ||
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
640 p_format_list[j].mFormatID == kAudioFormat60958AC3)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
641 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
642 b_digital = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
643 break;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
644 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
645 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
646
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
647 if (b_digital)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
648 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
649 /* If this stream supports a digital (cac3) format, then set it. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
650 int i_requested_rate_format = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
651 int i_current_rate_format = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
652 int i_backup_rate_format = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
653
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
654 ao->i_stream_id = p_streams[i];
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
655 ao->i_stream_index = i;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
656
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
657 if (ao->b_revert == 0)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
658 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
659 /* Retrieve the original format of this stream first if not done so already. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
660 i_param_size = sizeof(ao->sfmt_revert);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
661 err = AudioStreamGetProperty(ao->i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
662 kAudioStreamPropertyPhysicalFormat,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
663 &i_param_size,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
664 &ao->sfmt_revert);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
665 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
666 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
667 ao_msg(MSGT_AO, MSGL_WARN, "could not retrieve the original streamformat: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
668 if (p_format_list) free(p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
669 continue;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
670 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
671 ao->b_revert = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
672 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
673
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
674 for (j = 0; j < i_formats; ++j)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
675 if (p_format_list[j].mFormatID == 'IAC3' ||
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
676 p_format_list[j].mFormatID == kAudioFormat60958AC3)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
677 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
678 if (p_format_list[j].mSampleRate == ao->stream_format.mSampleRate)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
679 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
680 i_requested_rate_format = j;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
681 break;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
682 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
683 if (p_format_list[j].mSampleRate == ao->sfmt_revert.mSampleRate)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
684 i_current_rate_format = j;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
685 else if (i_backup_rate_format < 0 || p_format_list[j].mSampleRate > p_format_list[i_backup_rate_format].mSampleRate)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
686 i_backup_rate_format = j;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
687 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
688
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
689 if (i_requested_rate_format >= 0) /* We prefer to output at the samplerate of the original audio. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
690 ao->stream_format = p_format_list[i_requested_rate_format];
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
691 else if (i_current_rate_format >= 0) /* If not possible, we will try to use the current samplerate of the device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
692 ao->stream_format = p_format_list[i_current_rate_format];
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
693 else ao->stream_format = p_format_list[i_backup_rate_format]; /* And if we have to, any digital format will be just fine (highest rate possible). */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
694 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
695 if (p_format_list) free(p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
696 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
697 if (p_streams) free(p_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
698
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
699 if (ao->i_stream_index < 0)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
700 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
701 ao_msg(MSGT_AO, MSGL_WARN, "can not find any digital output stream format when OpenSPDIF().\n");
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
702 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
703 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
704
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
705 print_format(MSGL_V, "original stream format:", &ao->sfmt_revert);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
706
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
707 if (!AudioStreamChangeFormat(ao->i_stream_id, ao->stream_format))
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
708 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
709
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
710 err = AudioDeviceAddPropertyListener(ao->i_selected_dev,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
711 kAudioPropertyWildcardChannel,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
712 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
713 kAudioDevicePropertyDeviceHasChanged,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
714 DeviceListener,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
715 NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
716 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
717 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceAddPropertyListener for kAudioDevicePropertyDeviceHasChanged failed: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
718
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
719
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
720 /* FIXME: If output stream is not native byte-order, we need change endian somewhere. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
721 /* Although there's no such case reported. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
722 #ifdef WORDS_BIGENDIAN
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
723 if (!(ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian))
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
724 #else
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
725 if (ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
726 #endif
24741
5ce7bc88eb0c bugfix for ao_macosx last dts passthrough patch, patch by Ulion, ulion2002 gmail com
nplourde
parents: 24734
diff changeset
727 ao_msg(MSGT_AO, MSGL_WARN, "output stream has a no-native byte-order, digital output may failed.\n");
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
728
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
729 /* For ac3/dts, just use packet size 6144 bytes as chunk size. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
730 ao->chunk_size = ao->stream_format.mBytesPerPacket;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
731
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
732 ao_data.samplerate = ao->stream_format.mSampleRate;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
733 ao_data.channels = ao->stream_format.mChannelsPerFrame;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
734 ao_data.bps = ao_data.samplerate * (ao->stream_format.mBytesPerPacket/ao->stream_format.mFramesPerPacket);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
735 ao_data.outburst = ao->chunk_size;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
736 ao_data.buffersize = ao_data.bps;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
737
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
738 ao->num_chunks = (ao_data.bps+ao->chunk_size-1)/ao->chunk_size;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
739 ao->buffer_len = (ao->num_chunks + 1) * ao->chunk_size;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
740 ao->buffer = NULL!=ao->buffer ? realloc(ao->buffer,(ao->num_chunks + 1)*ao->chunk_size)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
741 : calloc(ao->num_chunks + 1, ao->chunk_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
742
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
743 ao_msg(MSGT_AO,MSGL_V, "using %5d chunks of %d bytes (buffer len %d bytes)\n", (int)ao->num_chunks, (int)ao->chunk_size, (int)ao->buffer_len);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
744
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
745
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
746 /* Add IOProc callback. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
747 err = AudioDeviceAddIOProc(ao->i_selected_dev,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
748 (AudioDeviceIOProc)RenderCallbackSPDIF,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
749 (void *)ao);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
750 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
751 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
752 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceAddIOProc failed: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
753 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
754 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
755
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
756 reset();
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
757
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
758 return CONTROL_TRUE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
759 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
760
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
761 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
762 * AudioDeviceSupportsDigital: Check i_dev_id for digital stream support.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
763 *****************************************************************************/
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
764 static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id )
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
765 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
766 OSStatus err = noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
767 UInt32 i_param_size = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
768 AudioStreamID *p_streams = NULL;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
769 int i = 0, i_streams = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
770 int b_return = CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
771
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
772 /* Retrieve all the output streams. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
773 err = AudioDeviceGetPropertyInfo(i_dev_id, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
774 kAudioDevicePropertyStreams,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
775 &i_param_size, NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
776 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
777 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
778 ao_msg(MSGT_AO,MSGL_V, "could not get number of streams: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
779 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
780 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
781
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
782 i_streams = i_param_size / sizeof(AudioStreamID);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
783 p_streams = (AudioStreamID *)malloc(i_param_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
784 if (p_streams == NULL)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
785 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
786 ao_msg(MSGT_AO,MSGL_V, "out of memory\n");
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
787 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
788 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
789
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
790 err = AudioDeviceGetProperty(i_dev_id, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
791 kAudioDevicePropertyStreams,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
792 &i_param_size, p_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
793
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
794 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
795 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
796 ao_msg(MSGT_AO,MSGL_V, "could not get number of streams: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
797 free(p_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
798 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
799 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
800
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
801 for (i = 0; i < i_streams; ++i)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
802 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
803 if (AudioStreamSupportsDigital(p_streams[i]))
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
804 b_return = CONTROL_OK;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
805 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
806
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
807 free(p_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
808 return b_return;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
809 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
810
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
811 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
812 * AudioStreamSupportsDigital: Check i_stream_id for digital stream support.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
813 *****************************************************************************/
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
814 static int AudioStreamSupportsDigital( AudioStreamID i_stream_id )
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
815 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
816 OSStatus err = noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
817 UInt32 i_param_size;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
818 AudioStreamBasicDescription *p_format_list = NULL;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
819 int i, i_formats, b_return = CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
820
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
821 /* Retrieve all the stream formats supported by each output stream. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
822 err = AudioStreamGetPropertyInfo(i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
823 kAudioStreamPropertyPhysicalFormats,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
824 &i_param_size, NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
825 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
826 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
827 ao_msg(MSGT_AO,MSGL_V, "could not get number of streamformats: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
828 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
829 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
830
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
831 i_formats = i_param_size / sizeof(AudioStreamBasicDescription);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
832 p_format_list = (AudioStreamBasicDescription *)malloc(i_param_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
833 if (p_format_list == NULL)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
834 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
835 ao_msg(MSGT_AO,MSGL_V, "could not malloc the memory\n" );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
836 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
837 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
838
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
839 err = AudioStreamGetProperty(i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
840 kAudioStreamPropertyPhysicalFormats,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
841 &i_param_size, p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
842 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
843 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
844 ao_msg(MSGT_AO,MSGL_V, "could not get the list of streamformats: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
845 free(p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
846 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
847 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
848
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
849 for (i = 0; i < i_formats; ++i)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
850 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
851 print_format(MSGL_V, "supported format:", &p_format_list[i]);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
852
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
853 if (p_format_list[i].mFormatID == 'IAC3' ||
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
854 p_format_list[i].mFormatID == kAudioFormat60958AC3)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
855 b_return = CONTROL_OK;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
856 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
857
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
858 free(p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
859 return b_return;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
860 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
861
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
862 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
863 * AudioStreamChangeFormat: Change i_stream_id to change_format
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
864 *****************************************************************************/
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
865 static int AudioStreamChangeFormat( AudioStreamID i_stream_id, AudioStreamBasicDescription change_format )
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
866 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
867 OSStatus err = noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
868 UInt32 i_param_size = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
869 int i;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
870
24980
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
871 static volatile int stream_format_changed;
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
872 stream_format_changed = 0;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
873
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
874 print_format(MSGL_V, "setting stream format:", &change_format);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
875
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
876 /* Install the callback. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
877 err = AudioStreamAddPropertyListener(i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
878 kAudioStreamPropertyPhysicalFormat,
24980
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
879 StreamListener,
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
880 (void *)&stream_format_changed);
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
881 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
882 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
883 ao_msg(MSGT_AO, MSGL_WARN, "AudioStreamAddPropertyListener failed: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
884 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
885 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
886
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
887 /* Change the format. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
888 err = AudioStreamSetProperty(i_stream_id, 0, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
889 kAudioStreamPropertyPhysicalFormat,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
890 sizeof(AudioStreamBasicDescription),
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
891 &change_format);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
892 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
893 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
894 ao_msg(MSGT_AO, MSGL_WARN, "could not set the stream format: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
895 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
896 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
897
24980
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
898 /* The AudioStreamSetProperty is not only asynchronious,
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
899 * it is also not Atomic, in its behaviour.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
900 * Therefore we check 5 times before we really give up.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
901 * FIXME: failing isn't actually implemented yet. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
902 for (i = 0; i < 5; ++i)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
903 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
904 AudioStreamBasicDescription actual_format;
24980
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
905 int j;
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
906 for (j = 0; !stream_format_changed && j < 50; ++j)
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
907 usec_sleep(10000);
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
908 if (stream_format_changed)
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
909 stream_format_changed = 0;
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
910 else
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
911 ao_msg(MSGT_AO, MSGL_V, "reached timeout\n" );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
912
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
913 i_param_size = sizeof(AudioStreamBasicDescription);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
914 err = AudioStreamGetProperty(i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
915 kAudioStreamPropertyPhysicalFormat,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
916 &i_param_size,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
917 &actual_format);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
918
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
919 print_format(MSGL_V, "actual format in use:", &actual_format);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
920 if (actual_format.mSampleRate == change_format.mSampleRate &&
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
921 actual_format.mFormatID == change_format.mFormatID &&
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
922 actual_format.mFramesPerPacket == change_format.mFramesPerPacket)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
923 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
924 /* The right format is now active. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
925 break;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
926 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
927 /* We need to check again. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
928 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
929
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
930 /* Removing the property listener. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
931 err = AudioStreamRemovePropertyListener(i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
932 kAudioStreamPropertyPhysicalFormat,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
933 StreamListener);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
934 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
935 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
936 ao_msg(MSGT_AO, MSGL_WARN, "AudioStreamRemovePropertyListener failed: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
937 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
938 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
939
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
940 return CONTROL_TRUE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
941 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
942
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
943 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
944 * RenderCallbackSPDIF: callback for SPDIF audio output
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
945 *****************************************************************************/
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
946 static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
947 const AudioTimeStamp * inNow,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
948 const void * inInputData,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
949 const AudioTimeStamp * inInputTime,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
950 AudioBufferList * outOutputData,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
951 const AudioTimeStamp * inOutputTime,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
952 void * threadGlobals )
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
953 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
954 int amt = buf_used();
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
955 int req = outOutputData->mBuffers[ao->i_stream_index].mDataByteSize;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
956
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
957 if (amt > req)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
958 amt = req;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
959 if (amt)
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
960 read_buffer(ao->b_muted ? NULL : (unsigned char *)outOutputData->mBuffers[ao->i_stream_index].mData, amt);
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
961
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
962 return noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
963 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
964
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
965
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
966 static int play(void* output_samples,int num_bytes,int flags)
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
967 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
968 int wrote, b_digital;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
969
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
970 // Check whether we need to reset the digital output stream.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
971 if (ao->b_digital && ao->b_stream_format_changed)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
972 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
973 ao->b_stream_format_changed = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
974 b_digital = AudioStreamSupportsDigital(ao->i_stream_id);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
975 if (b_digital)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
976 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
977 /* Current stream support digital format output, let's set it. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
978 ao_msg(MSGT_AO, MSGL_V, "detected current stream support digital, try to restore digital output...\n");
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
979
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
980 if (!AudioStreamChangeFormat(ao->i_stream_id, ao->stream_format))
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
981 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
982 ao_msg(MSGT_AO, MSGL_WARN, "restore digital output failed.\n");
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
983 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
984 else
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
985 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
986 ao_msg(MSGT_AO, MSGL_WARN, "restore digital output succeed.\n");
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
987 reset();
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
988 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
989 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
990 else
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
991 ao_msg(MSGT_AO, MSGL_V, "detected current stream do not support digital.\n");
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
992 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
993
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
994 wrote=write_buffer(output_samples, num_bytes);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
995 audio_resume();
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
996 return wrote;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
997 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
998
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
999 /* set variables and buffer to initial state */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
1000 static void reset(void)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1001 {
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
1002 audio_pause();
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1003 /* reset ring-buffer state */
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1004 ao->buf_read_pos=0;
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1005 ao->buf_write_pos=0;
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1006
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1007 return;
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1008 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1009
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1010
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1011 /* return available space */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
1012 static int get_space(void)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1013 {
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
1014 return buf_free();
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1015 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1016
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1017
10152
b252d1b6829e cleanup/cosmetic patch by the author :)
alex
parents: 10147
diff changeset
1018 /* return delay until audio is played */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
1019 static float get_delay(void)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1020 {
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
1021 int buffered = ao->buffer_len - ao->chunk_size - buf_free(); // could be less
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
1022 // inaccurate, should also contain the data buffered e.g. by the OS
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
1023 return (float)(buffered)/(float)ao_data.bps;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1024 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1025
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1026
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1027 /* unload plugin and deregister from coreaudio */
12145
99798c3cdb93 uninit immed flag
alex
parents: 10152
diff changeset
1028 static void uninit(int immed)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1029 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1030 OSStatus err = noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1031 UInt32 i_param_size = 0;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1032
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
1033 if (!immed) {
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
1034 long long timeleft=(1000000LL*buf_used())/ao_data.bps;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1035 ao_msg(MSGT_AO,MSGL_DBG2, "%d bytes left @%d bps (%d usec)\n", buf_used(), ao_data.bps, (int)timeleft);
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
1036 usec_sleep((int)timeleft);
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
1037 }
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1038
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1039 if (!ao->b_digital) {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1040 AudioOutputUnitStop(ao->theOutputUnit);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1041 AudioUnitUninitialize(ao->theOutputUnit);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1042 CloseComponent(ao->theOutputUnit);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1043 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1044 else {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1045 /* Stop device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1046 err = AudioDeviceStop(ao->i_selected_dev,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1047 (AudioDeviceIOProc)RenderCallbackSPDIF);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1048 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1049 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceStop failed: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1050
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1051 /* Remove IOProc callback. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1052 err = AudioDeviceRemoveIOProc(ao->i_selected_dev,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1053 (AudioDeviceIOProc)RenderCallbackSPDIF);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1054 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1055 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceRemoveIOProc failed: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1056
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1057 if (ao->b_revert)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1058 AudioStreamChangeFormat(ao->i_stream_id, ao->sfmt_revert);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1059
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1060 if (ao->b_changed_mixing && ao->sfmt_revert.mFormatID != kAudioFormat60958AC3)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1061 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1062 int b_mix;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1063 Boolean b_writeable;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1064 /* Revert mixable to true if we are allowed to. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1065 err = AudioDeviceGetPropertyInfo(ao->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1066 &i_param_size, &b_writeable);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1067 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1068 &i_param_size, &b_mix);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1069 if (err != noErr && b_writeable)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1070 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1071 b_mix = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1072 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1073 kAudioDevicePropertySupportsMixing, i_param_size, &b_mix);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1074 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1075 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1076 ao_msg(MSGT_AO, MSGL_WARN, "failed to set mixmode: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1077 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1078 if (ao->i_hog_pid == getpid())
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1079 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1080 ao->i_hog_pid = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1081 i_param_size = sizeof(ao->i_hog_pid);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1082 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1083 kAudioDevicePropertyHogMode, i_param_size, &ao->i_hog_pid);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1084 if (err != noErr) ao_msg(MSGT_AO, MSGL_WARN, "Could not release hogmode: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1085 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1086 }
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1087
14769
e701873aa8ca rids ao_macosx of the buffer mutex by using the same buffering scheme as ao_sdl - Patch by Reimar Doffinger
nplourde
parents: 14642
diff changeset
1088 free(ao->buffer);
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1089 free(ao);
15853
6e994905f77b more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
nplourde
parents: 15722
diff changeset
1090 ao = NULL;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1091 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1092
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1093
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1094 /* stop playing, keep buffers (for pause) */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
1095 static void audio_pause(void)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1096 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1097 OSErr err=noErr;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1098
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1099 /* Stop callback. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1100 if (!ao->b_digital)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1101 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1102 err=AudioOutputUnitStop(ao->theOutputUnit);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1103 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1104 ao_msg(MSGT_AO,MSGL_WARN, "AudioOutputUnitStop returned [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1105 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1106 else
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1107 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1108 err = AudioDeviceStop(ao->i_selected_dev, (AudioDeviceIOProc)RenderCallbackSPDIF);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1109 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1110 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceStop failed: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1111 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1112 ao->paused = 1;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1113 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1114
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1115
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1116 /* resume playing, after audio_pause() */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
1117 static void audio_resume(void)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1118 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1119 OSErr err=noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1120
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1121 if (!ao->paused)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1122 return;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1123
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1124 /* Start callback. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1125 if (!ao->b_digital)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1126 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1127 err = AudioOutputUnitStart(ao->theOutputUnit);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1128 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1129 ao_msg(MSGT_AO,MSGL_WARN, "AudioOutputUnitStart returned [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1130 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1131 else
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1132 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1133 err = AudioDeviceStart(ao->i_selected_dev, (AudioDeviceIOProc)RenderCallbackSPDIF);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1134 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1135 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceStart failed: [%4.4s]\n", (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1136 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1137 ao->paused = 0;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1138 }
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1139
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1140 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1141 * StreamListener
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1142 *****************************************************************************/
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1143 static OSStatus StreamListener( AudioStreamID inStream,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1144 UInt32 inChannel,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1145 AudioDevicePropertyID inPropertyID,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1146 void * inClientData )
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1147 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1148 switch (inPropertyID)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1149 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1150 case kAudioStreamPropertyPhysicalFormat:
24980
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
1151 ao_msg(MSGT_AO, MSGL_V, "got notify kAudioStreamPropertyPhysicalFormat changed.\n");
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
1152 if (inClientData)
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
1153 *(volatile int *)inClientData = 1;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1154 default:
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1155 break;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1156 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1157 return noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1158 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1159
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1160 static OSStatus DeviceListener( AudioDeviceID inDevice,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1161 UInt32 inChannel,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1162 Boolean isInput,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1163 AudioDevicePropertyID inPropertyID,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1164 void* inClientData )
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1165 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1166 switch (inPropertyID)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1167 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1168 case kAudioDevicePropertyDeviceHasChanged:
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1169 ao_msg(MSGT_AO, MSGL_WARN, "got notify kAudioDevicePropertyDeviceHasChanged.\n");
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1170 ao->b_stream_format_changed = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1171 default:
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1172 break;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1173 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1174 return noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1175 }