Mercurial > mplayer.hg
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 |
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 | 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 | 45 #include <sys/types.h> |
46 #include <unistd.h> | |
10147
f2725d6717bd
Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff
changeset
|
47 |
14479 | 48 #include "config.h" |
14123 | 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 | 53 #include "libaf/af_format.h" |
24734 | 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 | 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 | 67 /* Prefix for all mp_msg() calls */ |
68 #define ao_msg(a, b, c...) mp_msg(a, b, "AO: [macosx] " c) | |
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 | 72 AudioDeviceID i_selected_dev; /* Keeps DeviceID of the selected device. */ |
73 int b_supports_digital; /* Does the currently selected device support digital mode? */ | |
74 int b_digital; /* Are we running in digital mode? */ | |
24990 | 75 int b_muted; /* Are we muted in digital mode? */ |
24734 | 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 | 79 |
80 /* CoreAudio SPDIF mode specific */ | |
81 pid_t i_hog_pid; /* Keeps the pid of our hog status. */ | |
82 AudioStreamID i_stream_id; /* The StreamID that has a cac3 streamformat */ | |
83 int i_stream_index; /* The index of i_stream_id in an AudioBufferList */ | |
84 AudioStreamBasicDescription stream_format;/* The format we changed the stream to */ | |
85 AudioStreamBasicDescription sfmt_revert; /* The original format of the stream */ | |
86 int b_revert; /* Whether we need to revert the stream format */ | |
87 int b_changed_mixing; /* Whether we need to set the mixing mode back */ | |
88 int b_stream_format_changed; /* Flag for main thread to reset stream's format to digital and reset buffer */ | |
89 | |
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 | 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 | 144 if (ao->b_digital) { |
145 // Digital output has no volume adjust. | |
146 return CONTROL_FALSE; | |
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 | 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 | 160 case AOCONTROL_SET_VOLUME: |
24990 | 161 control_vol = (ao_control_vol_t*)arg; |
162 | |
163 if (ao->b_digital) { | |
24734 | 164 // Digital output can not set volume. Here we have to return true |
165 // to make mixer forget it. Else mixer will add a soft filter, | |
166 // that's not we expected and the filter not support ac3 stream | |
167 // will cause mplayer die. | |
24990 | 168 |
169 // Although not support set volume, but at least we support mute. | |
170 // MPlayer set mute by set volume to zero, we handle it. | |
171 if (control_vol->left == 0 && control_vol->right == 0) | |
172 ao->b_muted = 1; | |
173 else | |
174 ao->b_muted = 0; | |
24734 | 175 return CONTROL_TRUE; |
24990 | 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 | 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 | 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 | 196 static void print_format(int lev, const char* str, const AudioStreamBasicDescription *f){ |
14290 | 197 uint32_t flags=(uint32_t) f->mFormatFlags; |
24734 | 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 | 199 str, f->mSampleRate, f->mBitsPerChannel, |
14290 | 200 (int)(f->mFormatID & 0xff000000) >> 24, |
201 (int)(f->mFormatID & 0x00ff0000) >> 16, | |
202 (int)(f->mFormatID & 0x0000ff00) >> 8, | |
203 (int)(f->mFormatID & 0x000000ff) >> 0, | |
24734 | 204 f->mFormatFlags, f->mBytesPerPacket, |
205 f->mFramesPerPacket, f->mBytesPerFrame, | |
206 f->mChannelsPerFrame, | |
14290 | 207 (flags&kAudioFormatFlagIsFloat) ? "float" : "int", |
208 (flags&kAudioFormatFlagIsBigEndian) ? "BE" : "LE", | |
209 (flags&kAudioFormatFlagIsSignedInteger) ? "S" : "U", | |
210 (flags&kAudioFormatFlagIsPacked) ? " packed" : "", | |
211 (flags&kAudioFormatFlagIsAlignedHigh) ? " aligned" : "", | |
212 (flags&kAudioFormatFlagIsNonInterleaved) ? " ni" : "" ); | |
213 } | |
214 | |
215 | |
24734 | 216 static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id ); |
217 static int AudioStreamSupportsDigital( AudioStreamID i_stream_id ); | |
218 static int OpenSPDIF(); | |
219 static int AudioStreamChangeFormat( AudioStreamID i_stream_id, AudioStreamBasicDescription change_format ); | |
220 static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice, | |
221 const AudioTimeStamp * inNow, | |
222 const void * inInputData, | |
223 const AudioTimeStamp * inInputTime, | |
224 AudioBufferList * outOutputData, | |
225 const AudioTimeStamp * inOutputTime, | |
226 void * threadGlobals ); | |
227 static OSStatus StreamListener( AudioStreamID inStream, | |
228 UInt32 inChannel, | |
229 AudioDevicePropertyID inPropertyID, | |
230 void * inClientData ); | |
231 static OSStatus DeviceListener( AudioDeviceID inDevice, | |
232 UInt32 inChannel, | |
233 Boolean isInput, | |
234 AudioDevicePropertyID inPropertyID, | |
235 void* inClientData ); | |
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 | 244 UInt32 size, maxFrames, i_param_size; |
245 char *psz_name; | |
246 AudioDeviceID devid_def = 0; | |
247 int b_alive; | |
14317 | 248 |
24734 | 249 ao_msg(MSGT_AO,MSGL_V, "init([%dHz][%dch][%s][%d])\n", rate, channels, af_fmt2str_short(format), flags); |
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 | 252 |
253 ao->i_selected_dev = 0; | |
254 ao->b_supports_digital = 0; | |
255 ao->b_digital = 0; | |
24990 | 256 ao->b_muted = 0; |
24734 | 257 ao->b_stream_format_changed = 0; |
258 ao->i_hog_pid = -1; | |
259 ao->i_stream_id = 0; | |
260 ao->i_stream_index = -1; | |
261 ao->b_revert = 0; | |
262 ao->b_changed_mixing = 0; | |
263 | |
264 /* Probe whether device support S/PDIF stream output if input is AC3 stream. */ | |
265 if ((format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3) | |
266 { | |
267 /* Find the ID of the default Device. */ | |
268 i_param_size = sizeof(AudioDeviceID); | |
269 err = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, | |
270 &i_param_size, &devid_def); | |
271 if (err != noErr) | |
272 { | |
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 | 275 } |
276 | |
277 /* Retrieve the length of the device name. */ | |
278 i_param_size = 0; | |
279 err = AudioDeviceGetPropertyInfo(devid_def, 0, 0, | |
280 kAudioDevicePropertyDeviceName, | |
281 &i_param_size, NULL); | |
282 if (err != noErr) | |
283 { | |
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 | 286 } |
287 | |
288 /* Retrieve the name of the device. */ | |
289 psz_name = (char *)malloc(i_param_size); | |
290 err = AudioDeviceGetProperty(devid_def, 0, 0, | |
291 kAudioDevicePropertyDeviceName, | |
292 &i_param_size, psz_name); | |
293 if (err != noErr) | |
294 { | |
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 | 298 } |
299 | |
300 ao_msg(MSGT_AO,MSGL_V, "got default audio output device ID: %#lx Name: %s\n", devid_def, psz_name ); | |
301 | |
302 if (AudioDeviceSupportsDigital(devid_def)) | |
303 { | |
304 ao->b_supports_digital = 1; | |
305 ao->i_selected_dev = devid_def; | |
306 } | |
307 ao_msg(MSGT_AO,MSGL_V, "probe default audio output device whether support digital s/pdif output:%d\n", ao->b_supports_digital ); | |
308 | |
309 free( psz_name); | |
310 } | |
14290 | 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 | 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 | 346 if ((format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3) { |
347 // Currently ac3 input (comes from hwac3) is always in native byte-order. | |
348 #ifdef WORDS_BIGENDIAN | |
349 inDesc.mFormatFlags |= kAudioFormatFlagIsBigEndian; | |
350 #endif | |
351 } | |
352 else if ((format & AF_FORMAT_END_MASK) == AF_FORMAT_BE) | |
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 | 357 print_format(MSGL_V, "source:",&inDesc); |
358 | |
359 if (ao->b_supports_digital) | |
360 { | |
361 b_alive = 1; | |
362 i_param_size = sizeof(b_alive); | |
363 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE, | |
364 kAudioDevicePropertyDeviceIsAlive, | |
365 &i_param_size, &b_alive); | |
366 if (err != noErr) | |
367 ao_msg(MSGT_AO, MSGL_WARN, "could not check whether device is alive: [%4.4s]\n", (char *)&err); | |
368 if (!b_alive) | |
369 ao_msg(MSGT_AO, MSGL_WARN, "device is not alive\n" ); | |
370 /* S/PDIF output need device in HogMode. */ | |
371 i_param_size = sizeof(ao->i_hog_pid); | |
372 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE, | |
373 kAudioDevicePropertyHogMode, | |
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 | 376 if (err != noErr) |
377 { | |
378 /* This is not a fatal error. Some drivers simply don't support this property. */ | |
379 ao_msg(MSGT_AO, MSGL_WARN, "could not check whether device is hogged: [%4.4s]\n", | |
380 (char *)&err); | |
381 ao->i_hog_pid = -1; | |
382 } | |
383 | |
384 if (ao->i_hog_pid != -1 && ao->i_hog_pid != getpid()) | |
385 { | |
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 | 388 } |
389 ao->stream_format = inDesc; | |
390 return OpenSPDIF(); | |
391 } | |
392 | |
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 | 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 | 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 | 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 | 427 size = sizeof(UInt32); |
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 | 430 if (err) |
431 { | |
24734 | 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 | 436 ao->chunk_size = maxFrames;//*inDesc.mBytesPerFrame; |
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 | 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 | 473 /***************************************************************************** |
474 * Setup a encoded digital stream (SPDIF) | |
475 *****************************************************************************/ | |
476 static int OpenSPDIF() | |
477 { | |
478 OSStatus err = noErr; | |
479 UInt32 i_param_size, b_mix = 0; | |
480 Boolean b_writeable = 0; | |
481 AudioStreamID *p_streams = NULL; | |
482 int i, i_streams = 0; | |
483 | |
484 /* Start doing the SPDIF setup process. */ | |
485 ao->b_digital = 1; | |
486 | |
487 /* Hog the device. */ | |
488 i_param_size = sizeof(ao->i_hog_pid); | |
489 ao->i_hog_pid = getpid() ; | |
490 | |
491 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE, | |
492 kAudioDevicePropertyHogMode, i_param_size, &ao->i_hog_pid); | |
493 | |
494 if (err != noErr) | |
495 { | |
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 | 499 } |
500 | |
501 /* Set mixable to false if we are allowed to. */ | |
502 err = AudioDeviceGetPropertyInfo(ao->i_selected_dev, 0, FALSE, | |
503 kAudioDevicePropertySupportsMixing, | |
504 &i_param_size, &b_writeable); | |
505 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE, | |
506 kAudioDevicePropertySupportsMixing, | |
507 &i_param_size, &b_mix); | |
508 if (err != noErr && b_writeable) | |
509 { | |
510 b_mix = 0; | |
511 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE, | |
512 kAudioDevicePropertySupportsMixing, | |
513 i_param_size, &b_mix); | |
514 ao->b_changed_mixing = 1; | |
515 } | |
516 if (err != noErr) | |
517 { | |
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 | 520 } |
521 | |
522 /* Get a list of all the streams on this device. */ | |
523 err = AudioDeviceGetPropertyInfo(ao->i_selected_dev, 0, FALSE, | |
524 kAudioDevicePropertyStreams, | |
525 &i_param_size, NULL); | |
526 if (err != noErr) | |
527 { | |
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 | 530 } |
531 | |
532 i_streams = i_param_size / sizeof(AudioStreamID); | |
533 p_streams = (AudioStreamID *)malloc(i_param_size); | |
534 if (p_streams == NULL) | |
535 { | |
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 | 538 } |
539 | |
540 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE, | |
541 kAudioDevicePropertyStreams, | |
542 &i_param_size, p_streams); | |
543 if (err != noErr) | |
544 { | |
545 ao_msg(MSGT_AO, MSGL_WARN, "could not get number of streams: [%4.4s]\n", (char *)&err); | |
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 | 548 } |
549 | |
550 ao_msg(MSGT_AO, MSGL_V, "current device stream number: %d\n", i_streams); | |
551 | |
552 for (i = 0; i < i_streams && ao->i_stream_index < 0; ++i) | |
553 { | |
554 /* Find a stream with a cac3 stream. */ | |
555 AudioStreamBasicDescription *p_format_list = NULL; | |
556 int i_formats = 0, j = 0, b_digital = 0; | |
557 | |
558 /* Retrieve all the stream formats supported by each output stream. */ | |
559 err = AudioStreamGetPropertyInfo(p_streams[i], 0, | |
560 kAudioStreamPropertyPhysicalFormats, | |
561 &i_param_size, NULL); | |
562 if (err != noErr) | |
563 { | |
564 ao_msg(MSGT_AO, MSGL_WARN, "could not get number of streamformats: [%4.4s]\n", (char *)&err); | |
565 continue; | |
566 } | |
567 | |
568 i_formats = i_param_size / sizeof(AudioStreamBasicDescription); | |
569 p_format_list = (AudioStreamBasicDescription *)malloc(i_param_size); | |
570 if (p_format_list == NULL) | |
571 { | |
572 ao_msg(MSGT_AO, MSGL_WARN, "could not malloc the memory\n" ); | |
573 continue; | |
574 } | |
575 | |
576 err = AudioStreamGetProperty(p_streams[i], 0, | |
577 kAudioStreamPropertyPhysicalFormats, | |
578 &i_param_size, p_format_list); | |
579 if (err != noErr) | |
580 { | |
581 ao_msg(MSGT_AO, MSGL_WARN, "could not get the list of streamformats: [%4.4s]\n", (char *)&err); | |
582 if (p_format_list) free(p_format_list); | |
583 continue; | |
584 } | |
585 | |
586 /* Check if one of the supported formats is a digital format. */ | |
587 for (j = 0; j < i_formats; ++j) | |
588 { | |
589 if (p_format_list[j].mFormatID == 'IAC3' || | |
590 p_format_list[j].mFormatID == kAudioFormat60958AC3) | |
591 { | |
592 b_digital = 1; | |
593 break; | |
594 } | |
595 } | |
596 | |
597 if (b_digital) | |
598 { | |
599 /* If this stream supports a digital (cac3) format, then set it. */ | |
600 int i_requested_rate_format = -1; | |
601 int i_current_rate_format = -1; | |
602 int i_backup_rate_format = -1; | |
603 | |
604 ao->i_stream_id = p_streams[i]; | |
605 ao->i_stream_index = i; | |
606 | |
607 if (ao->b_revert == 0) | |
608 { | |
609 /* Retrieve the original format of this stream first if not done so already. */ | |
610 i_param_size = sizeof(ao->sfmt_revert); | |
611 err = AudioStreamGetProperty(ao->i_stream_id, 0, | |
612 kAudioStreamPropertyPhysicalFormat, | |
613 &i_param_size, | |
614 &ao->sfmt_revert); | |
615 if (err != noErr) | |
616 { | |
617 ao_msg(MSGT_AO, MSGL_WARN, "could not retrieve the original streamformat: [%4.4s]\n", (char *)&err); | |
618 if (p_format_list) free(p_format_list); | |
619 continue; | |
620 } | |
621 ao->b_revert = 1; | |
622 } | |
623 | |
624 for (j = 0; j < i_formats; ++j) | |
625 if (p_format_list[j].mFormatID == 'IAC3' || | |
626 p_format_list[j].mFormatID == kAudioFormat60958AC3) | |
627 { | |
628 if (p_format_list[j].mSampleRate == ao->stream_format.mSampleRate) | |
629 { | |
630 i_requested_rate_format = j; | |
631 break; | |
632 } | |
633 if (p_format_list[j].mSampleRate == ao->sfmt_revert.mSampleRate) | |
634 i_current_rate_format = j; | |
635 else if (i_backup_rate_format < 0 || p_format_list[j].mSampleRate > p_format_list[i_backup_rate_format].mSampleRate) | |
636 i_backup_rate_format = j; | |
637 } | |
638 | |
639 if (i_requested_rate_format >= 0) /* We prefer to output at the samplerate of the original audio. */ | |
640 ao->stream_format = p_format_list[i_requested_rate_format]; | |
641 else if (i_current_rate_format >= 0) /* If not possible, we will try to use the current samplerate of the device. */ | |
642 ao->stream_format = p_format_list[i_current_rate_format]; | |
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). */ | |
644 } | |
645 if (p_format_list) free(p_format_list); | |
646 } | |
647 if (p_streams) free(p_streams); | |
648 | |
649 if (ao->i_stream_index < 0) | |
650 { | |
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 | 653 } |
654 | |
655 print_format(MSGL_V, "original stream format:", &ao->sfmt_revert); | |
656 | |
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 | 659 |
660 err = AudioDeviceAddPropertyListener(ao->i_selected_dev, | |
661 kAudioPropertyWildcardChannel, | |
662 0, | |
663 kAudioDevicePropertyDeviceHasChanged, | |
664 DeviceListener, | |
665 NULL); | |
666 if (err != noErr) | |
667 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceAddPropertyListener for kAudioDevicePropertyDeviceHasChanged failed: [%4.4s]\n", (char *)&err); | |
668 | |
669 | |
670 /* FIXME: If output stream is not native byte-order, we need change endian somewhere. */ | |
671 /* Although there's no such case reported. */ | |
672 #ifdef WORDS_BIGENDIAN | |
673 if (!(ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian)) | |
674 #else | |
675 if (ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian) | |
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 | 678 |
679 /* For ac3/dts, just use packet size 6144 bytes as chunk size. */ | |
680 ao->chunk_size = ao->stream_format.mBytesPerPacket; | |
681 | |
682 ao_data.samplerate = ao->stream_format.mSampleRate; | |
683 ao_data.channels = ao->stream_format.mChannelsPerFrame; | |
684 ao_data.bps = ao_data.samplerate * (ao->stream_format.mBytesPerPacket/ao->stream_format.mFramesPerPacket); | |
685 ao_data.outburst = ao->chunk_size; | |
686 ao_data.buffersize = ao_data.bps; | |
687 | |
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 | 691 |
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); | |
693 | |
694 | |
695 /* Add IOProc callback. */ | |
696 err = AudioDeviceAddIOProc(ao->i_selected_dev, | |
697 (AudioDeviceIOProc)RenderCallbackSPDIF, | |
698 (void *)ao); | |
699 if (err != noErr) | |
700 { | |
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 | 703 } |
704 | |
705 reset(); | |
706 | |
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 | 738 } |
739 | |
740 /***************************************************************************** | |
741 * AudioDeviceSupportsDigital: Check i_dev_id for digital stream support. | |
742 *****************************************************************************/ | |
743 static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id ) | |
744 { | |
745 OSStatus err = noErr; | |
746 UInt32 i_param_size = 0; | |
747 AudioStreamID *p_streams = NULL; | |
748 int i = 0, i_streams = 0; | |
749 int b_return = CONTROL_FALSE; | |
750 | |
751 /* Retrieve all the output streams. */ | |
752 err = AudioDeviceGetPropertyInfo(i_dev_id, 0, FALSE, | |
753 kAudioDevicePropertyStreams, | |
754 &i_param_size, NULL); | |
755 if (err != noErr) | |
756 { | |
757 ao_msg(MSGT_AO,MSGL_V, "could not get number of streams: [%4.4s]\n", (char *)&err); | |
758 return CONTROL_FALSE; | |
759 } | |
760 | |
761 i_streams = i_param_size / sizeof(AudioStreamID); | |
762 p_streams = (AudioStreamID *)malloc(i_param_size); | |
763 if (p_streams == NULL) | |
764 { | |
765 ao_msg(MSGT_AO,MSGL_V, "out of memory\n"); | |
766 return CONTROL_FALSE; | |
767 } | |
768 | |
769 err = AudioDeviceGetProperty(i_dev_id, 0, FALSE, | |
770 kAudioDevicePropertyStreams, | |
771 &i_param_size, p_streams); | |
772 | |
773 if (err != noErr) | |
774 { | |
775 ao_msg(MSGT_AO,MSGL_V, "could not get number of streams: [%4.4s]\n", (char *)&err); | |
776 free(p_streams); | |
777 return CONTROL_FALSE; | |
778 } | |
779 | |
780 for (i = 0; i < i_streams; ++i) | |
781 { | |
782 if (AudioStreamSupportsDigital(p_streams[i])) | |
783 b_return = CONTROL_OK; | |
784 } | |
785 | |
786 free(p_streams); | |
787 return b_return; | |
788 } | |
789 | |
790 /***************************************************************************** | |
791 * AudioStreamSupportsDigital: Check i_stream_id for digital stream support. | |
792 *****************************************************************************/ | |
793 static int AudioStreamSupportsDigital( AudioStreamID i_stream_id ) | |
794 { | |
795 OSStatus err = noErr; | |
796 UInt32 i_param_size; | |
797 AudioStreamBasicDescription *p_format_list = NULL; | |
798 int i, i_formats, b_return = CONTROL_FALSE; | |
799 | |
800 /* Retrieve all the stream formats supported by each output stream. */ | |
801 err = AudioStreamGetPropertyInfo(i_stream_id, 0, | |
802 kAudioStreamPropertyPhysicalFormats, | |
803 &i_param_size, NULL); | |
804 if (err != noErr) | |
805 { | |
806 ao_msg(MSGT_AO,MSGL_V, "could not get number of streamformats: [%4.4s]\n", (char *)&err); | |
807 return CONTROL_FALSE; | |
808 } | |
809 | |
810 i_formats = i_param_size / sizeof(AudioStreamBasicDescription); | |
811 p_format_list = (AudioStreamBasicDescription *)malloc(i_param_size); | |
812 if (p_format_list == NULL) | |
813 { | |
814 ao_msg(MSGT_AO,MSGL_V, "could not malloc the memory\n" ); | |
815 return CONTROL_FALSE; | |
816 } | |
817 | |
818 err = AudioStreamGetProperty(i_stream_id, 0, | |
819 kAudioStreamPropertyPhysicalFormats, | |
820 &i_param_size, p_format_list); | |
821 if (err != noErr) | |
822 { | |
823 ao_msg(MSGT_AO,MSGL_V, "could not get the list of streamformats: [%4.4s]\n", (char *)&err); | |
824 free(p_format_list); | |
825 return CONTROL_FALSE; | |
826 } | |
827 | |
828 for (i = 0; i < i_formats; ++i) | |
829 { | |
830 print_format(MSGL_V, "supported format:", &p_format_list[i]); | |
831 | |
832 if (p_format_list[i].mFormatID == 'IAC3' || | |
833 p_format_list[i].mFormatID == kAudioFormat60958AC3) | |
834 b_return = CONTROL_OK; | |
835 } | |
836 | |
837 free(p_format_list); | |
838 return b_return; | |
839 } | |
840 | |
841 /***************************************************************************** | |
842 * AudioStreamChangeFormat: Change i_stream_id to change_format | |
843 *****************************************************************************/ | |
844 static int AudioStreamChangeFormat( AudioStreamID i_stream_id, AudioStreamBasicDescription change_format ) | |
845 { | |
846 OSStatus err = noErr; | |
847 UInt32 i_param_size = 0; | |
848 int i; | |
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 | 852 |
853 print_format(MSGL_V, "setting stream format:", &change_format); | |
854 | |
855 /* Install the callback. */ | |
856 err = AudioStreamAddPropertyListener(i_stream_id, 0, | |
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 | 860 if (err != noErr) |
861 { | |
862 ao_msg(MSGT_AO, MSGL_WARN, "AudioStreamAddPropertyListener failed: [%4.4s]\n", (char *)&err); | |
863 return CONTROL_FALSE; | |
864 } | |
865 | |
866 /* Change the format. */ | |
867 err = AudioStreamSetProperty(i_stream_id, 0, 0, | |
868 kAudioStreamPropertyPhysicalFormat, | |
869 sizeof(AudioStreamBasicDescription), | |
870 &change_format); | |
871 if (err != noErr) | |
872 { | |
873 ao_msg(MSGT_AO, MSGL_WARN, "could not set the stream format: [%4.4s]\n", (char *)&err); | |
874 return CONTROL_FALSE; | |
875 } | |
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 | 878 * it is also not Atomic, in its behaviour. |
879 * Therefore we check 5 times before we really give up. | |
880 * FIXME: failing isn't actually implemented yet. */ | |
881 for (i = 0; i < 5; ++i) | |
882 { | |
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 | 890 ao_msg(MSGT_AO, MSGL_V, "reached timeout\n" ); |
891 | |
892 i_param_size = sizeof(AudioStreamBasicDescription); | |
893 err = AudioStreamGetProperty(i_stream_id, 0, | |
894 kAudioStreamPropertyPhysicalFormat, | |
895 &i_param_size, | |
896 &actual_format); | |
897 | |
898 print_format(MSGL_V, "actual format in use:", &actual_format); | |
899 if (actual_format.mSampleRate == change_format.mSampleRate && | |
900 actual_format.mFormatID == change_format.mFormatID && | |
901 actual_format.mFramesPerPacket == change_format.mFramesPerPacket) | |
902 { | |
903 /* The right format is now active. */ | |
904 break; | |
905 } | |
906 /* We need to check again. */ | |
907 } | |
908 | |
909 /* Removing the property listener. */ | |
910 err = AudioStreamRemovePropertyListener(i_stream_id, 0, | |
911 kAudioStreamPropertyPhysicalFormat, | |
912 StreamListener); | |
913 if (err != noErr) | |
914 { | |
915 ao_msg(MSGT_AO, MSGL_WARN, "AudioStreamRemovePropertyListener failed: [%4.4s]\n", (char *)&err); | |
916 return CONTROL_FALSE; | |
917 } | |
918 | |
919 return CONTROL_TRUE; | |
920 } | |
921 | |
922 /***************************************************************************** | |
923 * RenderCallbackSPDIF: callback for SPDIF audio output | |
924 *****************************************************************************/ | |
925 static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice, | |
926 const AudioTimeStamp * inNow, | |
927 const void * inInputData, | |
928 const AudioTimeStamp * inInputTime, | |
929 AudioBufferList * outOutputData, | |
930 const AudioTimeStamp * inOutputTime, | |
931 void * threadGlobals ) | |
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 | 934 int req = outOutputData->mBuffers[ao->i_stream_index].mDataByteSize; |
935 | |
936 if (amt > req) | |
937 amt = req; | |
938 if (amt) | |
24990 | 939 read_buffer(ao->b_muted ? NULL : (unsigned char *)outOutputData->mBuffers[ao->i_stream_index].mData, amt); |
24734 | 940 |
941 return noErr; | |
942 } | |
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 | 947 int wrote, b_digital; |
948 | |
949 // Check whether we need to reset the digital output stream. | |
950 if (ao->b_digital && ao->b_stream_format_changed) | |
951 { | |
952 ao->b_stream_format_changed = 0; | |
953 b_digital = AudioStreamSupportsDigital(ao->i_stream_id); | |
954 if (b_digital) | |
955 { | |
956 /* Current stream support digital format output, let's set it. */ | |
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 | 959 if (!AudioStreamChangeFormat(ao->i_stream_id, ao->stream_format)) |
960 { | |
961 ao_msg(MSGT_AO, MSGL_WARN, "restore digital output failed.\n"); | |
962 } | |
963 else | |
964 { | |
965 ao_msg(MSGT_AO, MSGL_WARN, "restore digital output succeed.\n"); | |
966 reset(); | |
967 } | |
968 } | |
969 else | |
970 ao_msg(MSGT_AO, MSGL_V, "detected current stream do not support digital.\n"); | |
971 } | |
972 | |
973 wrote=write_buffer(output_samples, num_bytes); | |
974 audio_resume(); | |
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 | 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 | 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 | 1004 OSStatus err = noErr; |
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 | 1013 if (!ao->b_digital) { |
1014 AudioOutputUnitStop(ao->theOutputUnit); | |
1015 AudioUnitUninitialize(ao->theOutputUnit); | |
1016 CloseComponent(ao->theOutputUnit); | |
1017 } | |
1018 else { | |
1019 /* Stop device. */ | |
1020 err = AudioDeviceStop(ao->i_selected_dev, | |
1021 (AudioDeviceIOProc)RenderCallbackSPDIF); | |
1022 if (err != noErr) | |
1023 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceStop failed: [%4.4s]\n", (char *)&err); | |
1024 | |
1025 /* Remove IOProc callback. */ | |
1026 err = AudioDeviceRemoveIOProc(ao->i_selected_dev, | |
1027 (AudioDeviceIOProc)RenderCallbackSPDIF); | |
1028 if (err != noErr) | |
1029 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceRemoveIOProc failed: [%4.4s]\n", (char *)&err); | |
1030 | |
1031 if (ao->b_revert) | |
1032 AudioStreamChangeFormat(ao->i_stream_id, ao->sfmt_revert); | |
1033 | |
1034 if (ao->b_changed_mixing && ao->sfmt_revert.mFormatID != kAudioFormat60958AC3) | |
1035 { | |
1036 int b_mix; | |
1037 Boolean b_writeable; | |
1038 /* Revert mixable to true if we are allowed to. */ | |
1039 err = AudioDeviceGetPropertyInfo(ao->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing, | |
1040 &i_param_size, &b_writeable); | |
1041 err = AudioDeviceGetProperty(ao->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing, | |
1042 &i_param_size, &b_mix); | |
1043 if (err != noErr && b_writeable) | |
1044 { | |
1045 b_mix = 1; | |
1046 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE, | |
1047 kAudioDevicePropertySupportsMixing, i_param_size, &b_mix); | |
1048 } | |
1049 if (err != noErr) | |
1050 ao_msg(MSGT_AO, MSGL_WARN, "failed to set mixmode: [%4.4s]\n", (char *)&err); | |
1051 } | |
1052 if (ao->i_hog_pid == getpid()) | |
1053 { | |
1054 ao->i_hog_pid = -1; | |
1055 i_param_size = sizeof(ao->i_hog_pid); | |
1056 err = AudioDeviceSetProperty(ao->i_selected_dev, 0, 0, FALSE, | |
1057 kAudioDevicePropertyHogMode, i_param_size, &ao->i_hog_pid); | |
1058 if (err != noErr) ao_msg(MSGT_AO, MSGL_WARN, "Could not release hogmode: [%4.4s]\n", (char *)&err); | |
1059 } | |
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 | 1071 OSErr err=noErr; |
10147
f2725d6717bd
Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff
changeset
|
1072 |
24734 | 1073 /* Stop callback. */ |
1074 if (!ao->b_digital) | |
1075 { | |
1076 err=AudioOutputUnitStop(ao->theOutputUnit); | |
1077 if (err != noErr) | |
1078 ao_msg(MSGT_AO,MSGL_WARN, "AudioOutputUnitStop returned [%4.4s]\n", (char *)&err); | |
1079 } | |
1080 else | |
1081 { | |
1082 err = AudioDeviceStop(ao->i_selected_dev, (AudioDeviceIOProc)RenderCallbackSPDIF); | |
1083 if (err != noErr) | |
1084 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceStop failed: [%4.4s]\n", (char *)&err); | |
1085 } | |
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 | 1093 OSErr err=noErr; |
1094 | |
1095 if (!ao->paused) | |
1096 return; | |
1097 | |
1098 /* Start callback. */ | |
1099 if (!ao->b_digital) | |
1100 { | |
1101 err = AudioOutputUnitStart(ao->theOutputUnit); | |
1102 if (err != noErr) | |
1103 ao_msg(MSGT_AO,MSGL_WARN, "AudioOutputUnitStart returned [%4.4s]\n", (char *)&err); | |
1104 } | |
1105 else | |
1106 { | |
1107 err = AudioDeviceStart(ao->i_selected_dev, (AudioDeviceIOProc)RenderCallbackSPDIF); | |
1108 if (err != noErr) | |
1109 ao_msg(MSGT_AO, MSGL_WARN, "AudioDeviceStart failed: [%4.4s]\n", (char *)&err); | |
1110 } | |
1111 ao->paused = 0; | |
10147
f2725d6717bd
Native MacOSX audio output by Dan Christiansen <danchr@daimi.au.dk>
alex
parents:
diff
changeset
|
1112 } |
24734 | 1113 |
1114 /***************************************************************************** | |
1115 * StreamListener | |
1116 *****************************************************************************/ | |
1117 static OSStatus StreamListener( AudioStreamID inStream, | |
1118 UInt32 inChannel, | |
1119 AudioDevicePropertyID inPropertyID, | |
1120 void * inClientData ) | |
1121 { | |
1122 switch (inPropertyID) | |
1123 { | |
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 | 1128 default: |
1129 break; | |
1130 } | |
1131 return noErr; | |
1132 } | |
1133 | |
1134 static OSStatus DeviceListener( AudioDeviceID inDevice, | |
1135 UInt32 inChannel, | |
1136 Boolean isInput, | |
1137 AudioDevicePropertyID inPropertyID, | |
1138 void* inClientData ) | |
1139 { | |
1140 switch (inPropertyID) | |
1141 { | |
1142 case kAudioDevicePropertyDeviceHasChanged: | |
1143 ao_msg(MSGT_AO, MSGL_WARN, "got notify kAudioDevicePropertyDeviceHasChanged.\n"); | |
1144 ao->b_stream_format_changed = 1; | |
1145 default: | |
1146 break; | |
1147 } | |
1148 return noErr; | |
1149 } |