annotate libao2/ao_macosx.c @ 29201:06e7728c5b34

Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
author reimar
date Sun, 03 May 2009 20:57:37 +0000
parents 9a5b8c2ed6de
children
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 /*
26962
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
2 * Mac OS X audio output driver
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
3 *
26962
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
4 * original copyright (C) Timothy J. Wood - Aug 2000
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
5 * ported to MPlayer libao2 by Dan Christiansen
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
6 *
26962
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
7 * The S/PDIF part of the code is based on the auhal audio output
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
8 * module from VideoLAN:
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
9 * Copyright (c) 2006 Derk-Jan Hartman <hartman at videolan dot org>
25476
57dc7e8e7e82 Add copyright info for s/pdif code from VideoLAN.
ulion
parents: 25290
diff changeset
10 *
26962
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
11 * This file is part of MPlayer.
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
12 *
26962
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
13 * MPlayer is free software; you can redistribute it and/or modify
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
14 * it under the terms of the GNU General Public License as published by
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
15 * the Free Software Foundation; either version 2 of the License, or
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
16 * (at your option) any later version.
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
17 *
26962
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
18 * MPlayer is distributed in the hope that it will be useful,
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
19 * but WITHOUT ANY WARRANTY; without even the implied warranty of
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
21 * GNU General Public License for more details.
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
22 *
26962
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
23 * You should have received a copy of the GNU General Public License along
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
24 * along with MPlayer; if not, write to the Free Software
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
25 * Foundation, Inc., 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
26 */
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
27
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
28 /*
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
29 * 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
30 * 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
31 * audio samples rather than having them pushed at it (which is nice
26962
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
32 * when you are wanting to do good buffering of audio).
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
33 *
26962
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
34 * AC-3 and MPEG audio passthrough is possible, but has never been tested
457f8904a5eb Use standard license header, merge changelog into license header and TODO.
diego
parents: 25477
diff changeset
35 * due to lack of a soundcard that supports it.
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
36 */
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
37
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
38 #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
39 #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
40 #include <AudioToolbox/AudioToolbox.h>
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
41 #include <stdio.h>
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
42 #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
43 #include <stdlib.h>
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
44 #include <inttypes.h>
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
45 #include <sys/types.h>
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
46 #include <unistd.h>
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
47
14479
cae0dbeb44bb af_format.h needs config.h to be included first.
reimar
parents: 14317
diff changeset
48 #include "config.h"
14123
a92101a7eb49 Make include paths consistent.
diego
parents: 13651
diff changeset
49 #include "mp_msg.h"
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
50
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
51 #include "audio_out.h"
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
52 #include "audio_out_internal.h"
14245
815f03b7cee5 removing AFMT_ dependancy
alex
parents: 14123
diff changeset
53 #include "libaf/af_format.h"
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
54 #include "osdep/timer.h"
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
55 #include "libavutil/fifo.h"
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
56
28823
9a5b8c2ed6de Make ao_info_t structs const.
reimar
parents: 26962
diff changeset
57 static const ao_info_t info =
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
58 {
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
59 "Darwin/Mac OS X native audio output",
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
60 "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
61 "Timothy J. Wood & Dan Christiansen & Chris Roccati",
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
62 ""
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 LIBAO_EXTERN(macosx)
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
66
10152
b252d1b6829e cleanup/cosmetic patch by the author :)
alex
parents: 10147
diff changeset
67 /* Prefix for all mp_msg() calls */
b252d1b6829e cleanup/cosmetic patch by the author :)
alex
parents: 10147
diff changeset
68 #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
69
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
70 typedef struct ao_macosx_s
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
71 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
72 AudioDeviceID i_selected_dev; /* Keeps DeviceID of the selected device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
73 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
74 int b_digital; /* Are we running in digital mode? */
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
75 int b_muted; /* Are we muted in digital mode? */
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
76
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
77 /* AudioUnit */
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
78 AudioUnit theOutputUnit;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
79
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
80 /* CoreAudio SPDIF mode specific */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
81 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
82 AudioStreamID i_stream_id; /* The StreamID that has a cac3 streamformat */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
83 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
84 AudioStreamBasicDescription stream_format;/* The format we changed the stream to */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
85 AudioStreamBasicDescription sfmt_revert; /* The original format of the stream */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
86 int b_revert; /* Whether we need to revert the stream format */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
87 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
88 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
89
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
90 /* 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
91 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
92 int paused;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
93
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
94 /* Ring-buffer */
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
95 AVFifoBuffer *buffer;
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
96 unsigned int buffer_len; ///< must always be num_chunks * 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
97 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
98 unsigned int chunk_size;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
99 } ao_macosx_t;
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
100
15853
6e994905f77b more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
nplourde
parents: 15722
diff changeset
101 static ao_macosx_t *ao = NULL;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
102
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
103 /**
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 * \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
105 */
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 static int write_buffer(unsigned char* data, int len){
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
107 int free = ao->buffer_len - av_fifo_size(ao->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
108 if (len > free) len = free;
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
109 return av_fifo_generic_write(ao->buffer, data, len, NULL);
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
110 }
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
111
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
112 /**
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
113 * \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
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 static int read_buffer(unsigned char* data,int len){
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
116 int buffered = av_fifo_size(ao->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
117 if (len > buffered) len = buffered;
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
118 return av_fifo_generic_read(ao->buffer, data, len, NULL);
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
119 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
120
15722
b53c4b26dc96 removes the use of AudioConverters. patch by Alexander Strange <alexander.strange@ithinksw.com>
nplourde
parents: 15646
diff changeset
121 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
122 {
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
123 int amt=av_fifo_size(ao->buffer);
15722
b53c4b26dc96 removes the use of AudioConverters. patch by Alexander Strange <alexander.strange@ithinksw.com>
nplourde
parents: 15646
diff changeset
124 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
125
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
126 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
127 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
128
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
129 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
130 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
131 else audio_pause();
15722
b53c4b26dc96 removes the use of AudioConverters. patch by Alexander Strange <alexander.strange@ithinksw.com>
nplourde
parents: 15646
diff changeset
132 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
133
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
134 return noErr;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
135 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
136
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
137 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
138 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
139 OSStatus err;
23381
300e9b7c499f Remove some unused variables, patch by timwoj ieee org.
diego
parents: 21977
diff changeset
140 Float32 vol;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
141 switch (cmd) {
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
142 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
143 control_vol = (ao_control_vol_t*)arg;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
144 if (ao->b_digital) {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
145 // Digital output has no volume adjust.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
146 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
147 }
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
148 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
149
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
150 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
151 // 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
152 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
153 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
154 }
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
155 else {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
156 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
157 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
158 }
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
159
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
160 case AOCONTROL_SET_VOLUME:
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
161 control_vol = (ao_control_vol_t*)arg;
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
162
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
163 if (ao->b_digital) {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
164 // 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
165 // 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
166 // 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
167 // will cause mplayer die.
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
168
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
169 // Although not support set volume, but at least we support mute.
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
170 // MPlayer set mute by set volume to zero, we handle it.
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
171 if (control_vol->left == 0 && control_vol->right == 0)
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
172 ao->b_muted = 1;
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
173 else
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
174 ao->b_muted = 0;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
175 return CONTROL_TRUE;
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
176 }
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
177
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
178 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
179 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
180 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
181 // 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
182 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
183 }
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
184 else {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
185 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
186 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
187 }
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
188 /* Everything is currently unimplemented */
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
189 default:
10152
b252d1b6829e cleanup/cosmetic patch by the author :)
alex
parents: 10147
diff changeset
190 return CONTROL_FALSE;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
191 }
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
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
195
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
196 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
197 uint32_t flags=(uint32_t) f->mFormatFlags;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
198 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
199 str, f->mSampleRate, f->mBitsPerChannel,
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
200 (int)(f->mFormatID & 0xff000000) >> 24,
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
201 (int)(f->mFormatID & 0x00ff0000) >> 16,
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
202 (int)(f->mFormatID & 0x0000ff00) >> 8,
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
203 (int)(f->mFormatID & 0x000000ff) >> 0,
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
204 f->mFormatFlags, f->mBytesPerPacket,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
205 f->mFramesPerPacket, f->mBytesPerFrame,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
206 f->mChannelsPerFrame,
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
207 (flags&kAudioFormatFlagIsFloat) ? "float" : "int",
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
208 (flags&kAudioFormatFlagIsBigEndian) ? "BE" : "LE",
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
209 (flags&kAudioFormatFlagIsSignedInteger) ? "S" : "U",
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
210 (flags&kAudioFormatFlagIsPacked) ? " packed" : "",
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
211 (flags&kAudioFormatFlagIsAlignedHigh) ? " aligned" : "",
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
212 (flags&kAudioFormatFlagIsNonInterleaved) ? " ni" : "" );
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
213 }
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
214
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
215
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
216 static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
217 static int AudioStreamSupportsDigital( AudioStreamID i_stream_id );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
218 static int OpenSPDIF();
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
219 static int AudioStreamChangeFormat( AudioStreamID i_stream_id, AudioStreamBasicDescription change_format );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
220 static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
221 const AudioTimeStamp * inNow,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
222 const void * inInputData,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
223 const AudioTimeStamp * inInputTime,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
224 AudioBufferList * outOutputData,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
225 const AudioTimeStamp * inOutputTime,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
226 void * threadGlobals );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
227 static OSStatus StreamListener( AudioStreamID inStream,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
228 UInt32 inChannel,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
229 AudioDevicePropertyID inPropertyID,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
230 void * inClientData );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
231 static OSStatus DeviceListener( AudioDeviceID inDevice,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
232 UInt32 inChannel,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
233 Boolean isInput,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
234 AudioDevicePropertyID inPropertyID,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
235 void* inClientData );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
236
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
237 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
238 {
23381
300e9b7c499f Remove some unused variables, patch by timwoj ieee org.
diego
parents: 21977
diff changeset
239 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
240 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
241 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
242 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
243 OSStatus err;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
244 UInt32 size, maxFrames, i_param_size;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
245 char *psz_name;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
246 AudioDeviceID devid_def = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
247 int b_alive;
14317
9b3966174684 many 10ls fixed... also better debugging
arpi
parents: 14290
diff changeset
248
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
249 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
250
25290
2502d1944968 Remove useless variable aoIsCreated since we took good care of init failure.
ulion
parents: 25265
diff changeset
251 ao = calloc(1, sizeof(ao_macosx_t));
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
252
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
253 ao->i_selected_dev = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
254 ao->b_supports_digital = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
255 ao->b_digital = 0;
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
256 ao->b_muted = 0;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
257 ao->b_stream_format_changed = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
258 ao->i_hog_pid = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
259 ao->i_stream_id = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
260 ao->i_stream_index = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
261 ao->b_revert = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
262 ao->b_changed_mixing = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
263
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
264 /* 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
265 if ((format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
266 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
267 /* Find the ID of the default Device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
268 i_param_size = sizeof(AudioDeviceID);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
269 err = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
270 &i_param_size, &devid_def);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
271 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
272 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
273 ao_msg(MSGT_AO, MSGL_WARN, "could not get default audio device: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
274 goto err_out;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
275 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
276
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
277 /* Retrieve the length of the device name. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
278 i_param_size = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
279 err = AudioDeviceGetPropertyInfo(devid_def, 0, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
280 kAudioDevicePropertyDeviceName,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
281 &i_param_size, NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
282 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
283 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
284 ao_msg(MSGT_AO, MSGL_WARN, "could not get default audio device name length: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
285 goto err_out;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
286 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
287
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
288 /* Retrieve the name of the device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
289 psz_name = (char *)malloc(i_param_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
290 err = AudioDeviceGetProperty(devid_def, 0, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
291 kAudioDevicePropertyDeviceName,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
292 &i_param_size, psz_name);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
293 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
294 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
295 ao_msg(MSGT_AO, MSGL_WARN, "could not get default audio device name: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
296 free( psz_name);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
297 goto err_out;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
298 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
299
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
300 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
301
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
302 if (AudioDeviceSupportsDigital(devid_def))
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
303 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
304 ao->b_supports_digital = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
305 ao->i_selected_dev = devid_def;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
306 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
307 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
308
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
309 free( psz_name);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
310 }
14290
488651c51aa3 rate/format matching and volume get/set support
arpi
parents: 14245
diff changeset
311
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
312 // 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
313 inDesc.mSampleRate=rate;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
314 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
315 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
316 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
317 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
318 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
319 break;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
320 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
321 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
322 break;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
323 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
324 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
325 break;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
326 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
327 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
328 break;
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
329 default:
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
330 ao_msg(MSGT_AO, MSGL_WARN, "Unsupported format (0x%08x)\n", format);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
331 goto err_out;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
332 }
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
333
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
334 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
335 // float
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
336 inDesc.mFormatFlags = kAudioFormatFlagIsFloat|kAudioFormatFlagIsPacked;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
337 }
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
338 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
339 // 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
340 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
341 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
342 else {
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
343 // 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
344 inDesc.mFormatFlags = kAudioFormatFlagIsPacked;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
345 }
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
346 if ((format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3) {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
347 // 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
348 #ifdef WORDS_BIGENDIAN
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
349 inDesc.mFormatFlags |= kAudioFormatFlagIsBigEndian;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
350 #endif
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
351 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
352 else if ((format & AF_FORMAT_END_MASK) == AF_FORMAT_BE)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
353 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
354
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
355 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
356 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
357 print_format(MSGL_V, "source:",&inDesc);
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 (ao->b_supports_digital)
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 b_alive = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
362 i_param_size = sizeof(b_alive);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
363 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
364 kAudioDevicePropertyDeviceIsAlive,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
365 &i_param_size, &b_alive);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
366 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
367 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
368 if (!b_alive)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
369 ao_msg(MSGT_AO, MSGL_WARN, "device is not alive\n" );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
370 /* S/PDIF output need device in HogMode. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
371 i_param_size = sizeof(ao->i_hog_pid);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
372 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
373 kAudioDevicePropertyHogMode,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
374 &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
375
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
376 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
377 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
378 /* 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
379 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
380 (char *)&err);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
381 ao->i_hog_pid = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
382 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
383
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
384 if (ao->i_hog_pid != -1 && ao->i_hog_pid != getpid())
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
385 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
386 ao_msg(MSGT_AO, MSGL_WARN, "Selected audio device is exclusively in use by another program.\n" );
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
387 goto err_out;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
388 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
389 ao->stream_format = inDesc;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
390 return OpenSPDIF();
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
391 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
392
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
393 /* original analog output code */
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
394 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
395 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
396 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
397 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
398 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
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 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
401 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
402 ao_msg(MSGT_AO, MSGL_WARN, "Unable to find Output Unit component\n");
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
403 goto err_out;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
404 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
405
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
406 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
407 if (err) {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
408 ao_msg(MSGT_AO, MSGL_WARN, "Unable to open Output Unit component: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
409 goto err_out;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
410 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
411
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
412 // 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
413 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
414 if (err) {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
415 ao_msg(MSGT_AO, MSGL_WARN, "Unable to initialize Output Unit component: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
416 goto err_out1;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
417 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
418
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
419 size = sizeof(AudioStreamBasicDescription);
15722
b53c4b26dc96 removes the use of AudioConverters. patch by Alexander Strange <alexander.strange@ithinksw.com>
nplourde
parents: 15646
diff changeset
420 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
421
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
422 if (err) {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
423 ao_msg(MSGT_AO, MSGL_WARN, "Unable to set the input format: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
424 goto err_out2;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
425 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
426
16014
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
427 size = sizeof(UInt32);
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
428 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
429
16014
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
430 if (err)
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
431 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
432 ao_msg(MSGT_AO,MSGL_WARN, "AudioUnitGetProperty returned [%4.4s] when getting kAudioDevicePropertyBufferSize\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
433 goto err_out2;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
434 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
435
16014
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
436 ao->chunk_size = maxFrames;//*inDesc.mBytesPerFrame;
67266a949b51 remove delay when setting audio volume
nplourde
parents: 15853
diff changeset
437
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
438 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
439 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
440 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
441 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
442 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
443
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
444 ao->num_chunks = (ao_data.bps+ao->chunk_size-1)/ao->chunk_size;
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
445 ao->buffer_len = ao->num_chunks * ao->chunk_size;
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
446 ao->buffer = av_fifo_alloc(ao->buffer_len);
15853
6e994905f77b more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
nplourde
parents: 15722
diff changeset
447
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
448 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
449
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
450 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
451 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
452 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
453 if (err) {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
454 ao_msg(MSGT_AO, MSGL_WARN, "Unable to set the render callback: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
455 goto err_out2;
15646
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
456 }
f46eae5e271b Mac OS X Audio with AudioUnits and AudioToolbox format converters, Patch by Chris Roccati<roccati@pobox.com
nplourde
parents: 15486
diff changeset
457
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
458 reset();
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
459
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
460 return CONTROL_OK;
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
461
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
462 err_out2:
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
463 AudioUnitUninitialize(ao->theOutputUnit);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
464 err_out1:
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
465 CloseComponent(ao->theOutputUnit);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
466 err_out:
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
467 av_fifo_free(ao->buffer);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
468 free(ao);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
469 ao = NULL;
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
470 return CONTROL_FALSE;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
471 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
472
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
473 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
474 * Setup a encoded digital stream (SPDIF)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
475 *****************************************************************************/
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
476 static int OpenSPDIF()
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
477 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
478 OSStatus err = noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
479 UInt32 i_param_size, b_mix = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
480 Boolean b_writeable = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
481 AudioStreamID *p_streams = NULL;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
482 int i, i_streams = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
483
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
484 /* Start doing the SPDIF setup process. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
485 ao->b_digital = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
486
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
487 /* Hog the device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
488 i_param_size = sizeof(ao->i_hog_pid);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
489 ao->i_hog_pid = getpid() ;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
490
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
491 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
492 kAudioDevicePropertyHogMode, i_param_size, &ao->i_hog_pid);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
493
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
494 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
495 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
496 ao_msg(MSGT_AO, MSGL_WARN, "failed to set hogmode: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
497 ao->i_hog_pid = -1;
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
498 goto err_out;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
499 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
500
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
501 /* Set mixable to false if we are allowed to. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
502 err = AudioDeviceGetPropertyInfo(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
503 kAudioDevicePropertySupportsMixing,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
504 &i_param_size, &b_writeable);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
505 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
506 kAudioDevicePropertySupportsMixing,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
507 &i_param_size, &b_mix);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
508 if (err != noErr && b_writeable)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
509 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
510 b_mix = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
511 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
512 kAudioDevicePropertySupportsMixing,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
513 i_param_size, &b_mix);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
514 ao->b_changed_mixing = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
515 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
516 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
517 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
518 ao_msg(MSGT_AO, MSGL_WARN, "failed to set mixmode: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
519 goto err_out;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
520 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
521
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
522 /* Get a list of all the streams on this device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
523 err = AudioDeviceGetPropertyInfo(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
524 kAudioDevicePropertyStreams,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
525 &i_param_size, NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
526 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
527 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
528 ao_msg(MSGT_AO, MSGL_WARN, "could not get number of streams: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
529 goto err_out;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
530 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
531
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
532 i_streams = i_param_size / sizeof(AudioStreamID);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
533 p_streams = (AudioStreamID *)malloc(i_param_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
534 if (p_streams == NULL)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
535 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
536 ao_msg(MSGT_AO, MSGL_WARN, "out of memory\n" );
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
537 goto err_out;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
538 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
539
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
540 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
541 kAudioDevicePropertyStreams,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
542 &i_param_size, p_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
543 if (err != noErr)
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 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
546 if (p_streams) free(p_streams);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
547 goto err_out;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
548 }
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 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
551
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
552 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
553 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
554 /* Find a stream with a cac3 stream. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
555 AudioStreamBasicDescription *p_format_list = NULL;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
556 int i_formats = 0, j = 0, b_digital = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
557
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
558 /* Retrieve all the stream formats supported by each output stream. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
559 err = AudioStreamGetPropertyInfo(p_streams[i], 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
560 kAudioStreamPropertyPhysicalFormats,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
561 &i_param_size, NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
562 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
563 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
564 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
565 continue;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
566 }
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 i_formats = i_param_size / sizeof(AudioStreamBasicDescription);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
569 p_format_list = (AudioStreamBasicDescription *)malloc(i_param_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
570 if (p_format_list == NULL)
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 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
573 continue;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
574 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
575
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
576 err = AudioStreamGetProperty(p_streams[i], 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
577 kAudioStreamPropertyPhysicalFormats,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
578 &i_param_size, p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
579 if (err != noErr)
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 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
582 if (p_format_list) free(p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
583 continue;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
584 }
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 /* Check if one of the supported formats is a digital format. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
587 for (j = 0; j < i_formats; ++j)
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 if (p_format_list[j].mFormatID == 'IAC3' ||
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
590 p_format_list[j].mFormatID == kAudioFormat60958AC3)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
591 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
592 b_digital = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
593 break;
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 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
596
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
597 if (b_digital)
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 /* If this stream supports a digital (cac3) format, then set it. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
600 int i_requested_rate_format = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
601 int i_current_rate_format = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
602 int i_backup_rate_format = -1;
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 ao->i_stream_id = p_streams[i];
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
605 ao->i_stream_index = i;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
606
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
607 if (ao->b_revert == 0)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
608 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
609 /* 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
610 i_param_size = sizeof(ao->sfmt_revert);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
611 err = AudioStreamGetProperty(ao->i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
612 kAudioStreamPropertyPhysicalFormat,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
613 &i_param_size,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
614 &ao->sfmt_revert);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
615 if (err != noErr)
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 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
618 if (p_format_list) free(p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
619 continue;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
620 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
621 ao->b_revert = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
622 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
623
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
624 for (j = 0; j < i_formats; ++j)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
625 if (p_format_list[j].mFormatID == 'IAC3' ||
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
626 p_format_list[j].mFormatID == kAudioFormat60958AC3)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
627 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
628 if (p_format_list[j].mSampleRate == ao->stream_format.mSampleRate)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
629 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
630 i_requested_rate_format = j;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
631 break;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
632 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
633 if (p_format_list[j].mSampleRate == ao->sfmt_revert.mSampleRate)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
634 i_current_rate_format = j;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
635 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
636 i_backup_rate_format = j;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
637 }
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 (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
640 ao->stream_format = p_format_list[i_requested_rate_format];
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
641 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
642 ao->stream_format = p_format_list[i_current_rate_format];
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
643 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
644 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
645 if (p_format_list) free(p_format_list);
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 (p_streams) free(p_streams);
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 (ao->i_stream_index < 0)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
650 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
651 ao_msg(MSGT_AO, MSGL_WARN, "can not find any digital output stream format when OpenSPDIF().\n");
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
652 goto err_out;
24734
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
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
655 print_format(MSGL_V, "original stream format:", &ao->sfmt_revert);
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 (!AudioStreamChangeFormat(ao->i_stream_id, ao->stream_format))
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
658 goto err_out;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
659
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
660 err = AudioDeviceAddPropertyListener(ao->i_selected_dev,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
661 kAudioPropertyWildcardChannel,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
662 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
663 kAudioDevicePropertyDeviceHasChanged,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
664 DeviceListener,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
665 NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
666 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
667 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
668
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
669
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
670 /* 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
671 /* Although there's no such case reported. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
672 #ifdef WORDS_BIGENDIAN
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
673 if (!(ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian))
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
674 #else
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
675 if (ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
676 #endif
24741
5ce7bc88eb0c bugfix for ao_macosx last dts passthrough patch, patch by Ulion, ulion2002 gmail com
nplourde
parents: 24734
diff changeset
677 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
678
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
679 /* 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
680 ao->chunk_size = ao->stream_format.mBytesPerPacket;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
681
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
682 ao_data.samplerate = ao->stream_format.mSampleRate;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
683 ao_data.channels = ao->stream_format.mChannelsPerFrame;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
684 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
685 ao_data.outburst = ao->chunk_size;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
686 ao_data.buffersize = ao_data.bps;
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 ao->num_chunks = (ao_data.bps+ao->chunk_size-1)/ao->chunk_size;
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
689 ao->buffer_len = ao->num_chunks * ao->chunk_size;
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
690 ao->buffer = av_fifo_alloc(ao->buffer_len);
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
691
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
692 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
693
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 /* Add IOProc callback. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
696 err = AudioDeviceAddIOProc(ao->i_selected_dev,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
697 (AudioDeviceIOProc)RenderCallbackSPDIF,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
698 (void *)ao);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
699 if (err != noErr)
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, "AudioDeviceAddIOProc failed: [%4.4s]\n", (char *)&err);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
702 goto err_out1;
24734
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 reset();
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 return CONTROL_TRUE;
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
708
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
709 err_out1:
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
710 if (ao->b_revert)
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
711 AudioStreamChangeFormat(ao->i_stream_id, ao->sfmt_revert);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
712 err_out:
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
713 if (ao->b_changed_mixing && ao->sfmt_revert.mFormatID != kAudioFormat60958AC3)
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
714 {
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
715 int b_mix = 1;
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
716 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE,
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
717 kAudioDevicePropertySupportsMixing,
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
718 i_param_size, &b_mix);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
719 if (err != noErr)
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
720 ao_msg(MSGT_AO, MSGL_WARN, "failed to set mixmode: [%4.4s]\n",
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
721 (char *)&err);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
722 }
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
723 if (ao->i_hog_pid == getpid())
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
724 {
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
725 ao->i_hog_pid = -1;
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
726 i_param_size = sizeof(ao->i_hog_pid);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
727 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE,
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
728 kAudioDevicePropertyHogMode,
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
729 i_param_size, &ao->i_hog_pid);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
730 if (err != noErr)
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
731 ao_msg(MSGT_AO, MSGL_WARN, "Could not release hogmode: [%4.4s]\n",
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
732 (char *)&err);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
733 }
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
734 av_fifo_free(ao->buffer);
25265
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
735 free(ao);
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
736 ao = NULL;
7055944e3ce9 Add cleanup codes for init() failure to prevent leak.
ulion
parents: 25007
diff changeset
737 return CONTROL_FALSE;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
738 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
739
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
740 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
741 * AudioDeviceSupportsDigital: Check i_dev_id for digital stream support.
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 static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id )
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 OSStatus err = noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
746 UInt32 i_param_size = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
747 AudioStreamID *p_streams = NULL;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
748 int i = 0, i_streams = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
749 int b_return = CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
750
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
751 /* Retrieve all the output streams. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
752 err = AudioDeviceGetPropertyInfo(i_dev_id, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
753 kAudioDevicePropertyStreams,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
754 &i_param_size, NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
755 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
756 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
757 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
758 return CONTROL_FALSE;
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 i_streams = i_param_size / sizeof(AudioStreamID);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
762 p_streams = (AudioStreamID *)malloc(i_param_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
763 if (p_streams == NULL)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
764 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
765 ao_msg(MSGT_AO,MSGL_V, "out of memory\n");
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
766 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
767 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
768
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
769 err = AudioDeviceGetProperty(i_dev_id, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
770 kAudioDevicePropertyStreams,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
771 &i_param_size, p_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
772
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
773 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
774 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
775 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
776 free(p_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
777 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
778 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
779
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
780 for (i = 0; i < i_streams; ++i)
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 if (AudioStreamSupportsDigital(p_streams[i]))
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
783 b_return = CONTROL_OK;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
784 }
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 free(p_streams);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
787 return b_return;
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 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
791 * AudioStreamSupportsDigital: Check i_stream_id for digital stream support.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
792 *****************************************************************************/
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
793 static int AudioStreamSupportsDigital( AudioStreamID i_stream_id )
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
794 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
795 OSStatus err = noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
796 UInt32 i_param_size;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
797 AudioStreamBasicDescription *p_format_list = NULL;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
798 int i, i_formats, b_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 /* Retrieve all the stream formats supported by each output stream. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
801 err = AudioStreamGetPropertyInfo(i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
802 kAudioStreamPropertyPhysicalFormats,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
803 &i_param_size, NULL);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
804 if (err != noErr)
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 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
807 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
808 }
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 i_formats = i_param_size / sizeof(AudioStreamBasicDescription);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
811 p_format_list = (AudioStreamBasicDescription *)malloc(i_param_size);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
812 if (p_format_list == NULL)
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 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
815 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
816 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
817
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
818 err = AudioStreamGetProperty(i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
819 kAudioStreamPropertyPhysicalFormats,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
820 &i_param_size, p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
821 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
822 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
823 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
824 free(p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
825 return CONTROL_FALSE;
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
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
828 for (i = 0; i < i_formats; ++i)
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 print_format(MSGL_V, "supported format:", &p_format_list[i]);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
831
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
832 if (p_format_list[i].mFormatID == 'IAC3' ||
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
833 p_format_list[i].mFormatID == kAudioFormat60958AC3)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
834 b_return = CONTROL_OK;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
835 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
836
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
837 free(p_format_list);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
838 return b_return;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
839 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
840
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
841 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
842 * AudioStreamChangeFormat: Change i_stream_id to change_format
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 static int AudioStreamChangeFormat( AudioStreamID i_stream_id, AudioStreamBasicDescription change_format )
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
845 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
846 OSStatus err = noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
847 UInt32 i_param_size = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
848 int i;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
849
24980
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
850 static volatile int stream_format_changed;
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
851 stream_format_changed = 0;
24734
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 print_format(MSGL_V, "setting stream format:", &change_format);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
854
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
855 /* Install the callback. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
856 err = AudioStreamAddPropertyListener(i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
857 kAudioStreamPropertyPhysicalFormat,
24980
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
858 StreamListener,
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
859 (void *)&stream_format_changed);
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
860 if (err != noErr)
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 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
863 return CONTROL_FALSE;
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
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
866 /* Change the format. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
867 err = AudioStreamSetProperty(i_stream_id, 0, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
868 kAudioStreamPropertyPhysicalFormat,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
869 sizeof(AudioStreamBasicDescription),
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
870 &change_format);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
871 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
872 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
873 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
874 return CONTROL_FALSE;
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
24980
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
877 /* The AudioStreamSetProperty is not only asynchronious,
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
878 * it is also not Atomic, in its behaviour.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
879 * Therefore we check 5 times before we really give up.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
880 * FIXME: failing isn't actually implemented yet. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
881 for (i = 0; i < 5; ++i)
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 AudioStreamBasicDescription actual_format;
24980
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
884 int j;
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
885 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
886 usec_sleep(10000);
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
887 if (stream_format_changed)
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
888 stream_format_changed = 0;
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
889 else
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
890 ao_msg(MSGT_AO, MSGL_V, "reached timeout\n" );
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
891
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
892 i_param_size = sizeof(AudioStreamBasicDescription);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
893 err = AudioStreamGetProperty(i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
894 kAudioStreamPropertyPhysicalFormat,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
895 &i_param_size,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
896 &actual_format);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
897
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
898 print_format(MSGL_V, "actual format in use:", &actual_format);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
899 if (actual_format.mSampleRate == change_format.mSampleRate &&
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
900 actual_format.mFormatID == change_format.mFormatID &&
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
901 actual_format.mFramesPerPacket == change_format.mFramesPerPacket)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
902 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
903 /* The right format is now active. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
904 break;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
905 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
906 /* We need to check again. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
907 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
908
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
909 /* Removing the property listener. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
910 err = AudioStreamRemovePropertyListener(i_stream_id, 0,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
911 kAudioStreamPropertyPhysicalFormat,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
912 StreamListener);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
913 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
914 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
915 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
916 return CONTROL_FALSE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
917 }
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 return CONTROL_TRUE;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
920 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
921
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
922 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
923 * RenderCallbackSPDIF: callback for SPDIF audio output
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
924 *****************************************************************************/
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
925 static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
926 const AudioTimeStamp * inNow,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
927 const void * inInputData,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
928 const AudioTimeStamp * inInputTime,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
929 AudioBufferList * outOutputData,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
930 const AudioTimeStamp * inOutputTime,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
931 void * threadGlobals )
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
932 {
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
933 int amt = av_fifo_size(ao->buffer);
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
934 int req = outOutputData->mBuffers[ao->i_stream_index].mDataByteSize;
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 if (amt > req)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
937 amt = req;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
938 if (amt)
24990
fd919e77c834 Support mute when passthrough to digital output.
ulion
parents: 24980
diff changeset
939 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
940
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
941 return noErr;
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
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
944
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
945 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
946 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
947 int wrote, b_digital;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
948
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
949 // Check whether we need to reset the digital output stream.
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
950 if (ao->b_digital && ao->b_stream_format_changed)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
951 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
952 ao->b_stream_format_changed = 0;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
953 b_digital = AudioStreamSupportsDigital(ao->i_stream_id);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
954 if (b_digital)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
955 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
956 /* Current stream support digital format output, let's set it. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
957 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
958
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
959 if (!AudioStreamChangeFormat(ao->i_stream_id, ao->stream_format))
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
960 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
961 ao_msg(MSGT_AO, MSGL_WARN, "restore digital output failed.\n");
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
962 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
963 else
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
964 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
965 ao_msg(MSGT_AO, MSGL_WARN, "restore digital output succeed.\n");
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
966 reset();
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
967 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
968 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
969 else
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
970 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
971 }
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 wrote=write_buffer(output_samples, num_bytes);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
974 audio_resume();
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
975 return wrote;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
976 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
977
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
978 /* set variables and buffer to initial state */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
979 static void reset(void)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
980 {
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
981 audio_pause();
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
982 av_fifo_reset(ao->buffer);
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
983 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
984
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
985
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
986 /* return available space */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
987 static int get_space(void)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
988 {
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
989 return ao->buffer_len - av_fifo_size(ao->buffer);
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
990 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
991
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
992
10152
b252d1b6829e cleanup/cosmetic patch by the author :)
alex
parents: 10147
diff changeset
993 /* return delay until audio is played */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
994 static float get_delay(void)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
995 {
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
996 // inaccurate, should also contain the data buffered e.g. by the OS
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
997 return (float)av_fifo_size(ao->buffer)/(float)ao_data.bps;
10147
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
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1000
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1001 /* unload plugin and deregister from coreaudio */
12145
99798c3cdb93 uninit immed flag
alex
parents: 10152
diff changeset
1002 static void uninit(int immed)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1003 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1004 OSStatus err = noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1005 UInt32 i_param_size = 0;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1006
19427
ada359817b61 fix buffering issues with short audio samples on macosx. patch by Chris Roccati <roccati@pobox.com>
nplourde
parents: 18915
diff changeset
1007 if (!immed) {
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
1008 long long timeleft=(1000000LL*av_fifo_size(ao->buffer))/ao_data.bps;
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
1009 ao_msg(MSGT_AO,MSGL_DBG2, "%d bytes left @%d bps (%d usec)\n", av_fifo_size(ao->buffer), 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
1010 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
1011 }
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1012
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1013 if (!ao->b_digital) {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1014 AudioOutputUnitStop(ao->theOutputUnit);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1015 AudioUnitUninitialize(ao->theOutputUnit);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1016 CloseComponent(ao->theOutputUnit);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1017 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1018 else {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1019 /* Stop device. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1020 err = AudioDeviceStop(ao->i_selected_dev,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1021 (AudioDeviceIOProc)RenderCallbackSPDIF);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1022 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1023 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
1024
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1025 /* Remove IOProc callback. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1026 err = AudioDeviceRemoveIOProc(ao->i_selected_dev,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1027 (AudioDeviceIOProc)RenderCallbackSPDIF);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1028 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1029 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
1030
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1031 if (ao->b_revert)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1032 AudioStreamChangeFormat(ao->i_stream_id, ao->sfmt_revert);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1033
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1034 if (ao->b_changed_mixing && ao->sfmt_revert.mFormatID != kAudioFormat60958AC3)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1035 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1036 int b_mix;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1037 Boolean b_writeable;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1038 /* Revert mixable to true if we are allowed to. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1039 err = AudioDeviceGetPropertyInfo(ao->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1040 &i_param_size, &b_writeable);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1041 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1042 &i_param_size, &b_mix);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1043 if (err != noErr && b_writeable)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1044 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1045 b_mix = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1046 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1047 kAudioDevicePropertySupportsMixing, i_param_size, &b_mix);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1048 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1049 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1050 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
1051 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1052 if (ao->i_hog_pid == getpid())
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1053 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1054 ao->i_hog_pid = -1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1055 i_param_size = sizeof(ao->i_hog_pid);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1056 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1057 kAudioDevicePropertyHogMode, i_param_size, &ao->i_hog_pid);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1058 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
1059 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1060 }
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1061
29201
06e7728c5b34 Use libavutil/fifo.h for macosx ao instead of its own FIFO implementation.
reimar
parents: 28823
diff changeset
1062 av_fifo_free(ao->buffer);
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1063 free(ao);
15853
6e994905f77b more general ao_macosx cleanup. Patch by Alexander Strange <astrange@ithinksw.com>
nplourde
parents: 15722
diff changeset
1064 ao = NULL;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1065 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1066
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1067
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1068 /* stop playing, keep buffers (for pause) */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
1069 static void audio_pause(void)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1070 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1071 OSErr err=noErr;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1072
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1073 /* Stop callback. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1074 if (!ao->b_digital)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1075 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1076 err=AudioOutputUnitStop(ao->theOutputUnit);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1077 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1078 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
1079 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1080 else
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1081 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1082 err = AudioDeviceStop(ao->i_selected_dev, (AudioDeviceIOProc)RenderCallbackSPDIF);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1083 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1084 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
1085 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1086 ao->paused = 1;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1087 }
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1088
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1089
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1090 /* resume playing, after audio_pause() */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
1091 static void audio_resume(void)
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1092 {
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1093 OSErr err=noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1094
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1095 if (!ao->paused)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1096 return;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1097
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1098 /* Start callback. */
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1099 if (!ao->b_digital)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1100 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1101 err = AudioOutputUnitStart(ao->theOutputUnit);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1102 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1103 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
1104 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1105 else
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1106 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1107 err = AudioDeviceStart(ao->i_selected_dev, (AudioDeviceIOProc)RenderCallbackSPDIF);
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1108 if (err != noErr)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1109 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
1110 }
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1111 ao->paused = 0;
10147
f2725d6717bd Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff changeset
1112 }
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1113
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1114 /*****************************************************************************
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1115 * StreamListener
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1116 *****************************************************************************/
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1117 static OSStatus StreamListener( AudioStreamID inStream,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1118 UInt32 inChannel,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1119 AudioDevicePropertyID inPropertyID,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1120 void * inClientData )
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1121 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1122 switch (inPropertyID)
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 case kAudioStreamPropertyPhysicalFormat:
24980
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
1125 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
1126 if (inClientData)
19e208a0296d Fix dead lock when changing and restoring stream format for digital output,
ulion
parents: 24942
diff changeset
1127 *(volatile int *)inClientData = 1;
24734
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1128 default:
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1129 break;
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 return noErr;
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
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1134 static OSStatus DeviceListener( AudioDeviceID inDevice,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1135 UInt32 inChannel,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1136 Boolean isInput,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1137 AudioDevicePropertyID inPropertyID,
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1138 void* inClientData )
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 switch (inPropertyID)
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1141 {
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1142 case kAudioDevicePropertyDeviceHasChanged:
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1143 ao_msg(MSGT_AO, MSGL_WARN, "got notify kAudioDevicePropertyDeviceHasChanged.\n");
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1144 ao->b_stream_format_changed = 1;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1145 default:
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1146 break;
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 return noErr;
09f9d0de17f1 Add support for AC-3/DTS passthrough.
nplourde
parents: 23381
diff changeset
1149 }