mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
d586aee8fd
https://github.com/kinetiknz/cubeb/commit/6b2c610 changed the output unit from kAudioUnitSubType_DefaultOutput to kAudioUnitSubType_HALOutput because capture is never available on the DefaultOutputUnit. For the case where we're doing output only to the default device, this regressed the automatic device switching when the output device was changed in the Sound system preferences. Reverting to the DefaultOutputUnit for this case restores the previous behaviour. This addresses BMO #1278612.
137 lines
4.8 KiB
Diff
137 lines
4.8 KiB
Diff
diff --git a/media/libcubeb/src/cubeb_audiounit.cpp b/media/libcubeb/src/cubeb_audiounit.cpp
|
|
--- a/media/libcubeb/src/cubeb_audiounit.cpp
|
|
+++ b/media/libcubeb/src/cubeb_audiounit.cpp
|
|
@@ -48,22 +48,16 @@
|
|
typedef UInt32 AudioFormatFlags;
|
|
#endif
|
|
|
|
#define CUBEB_STREAM_MAX 8
|
|
|
|
#define AU_OUT_BUS 0
|
|
#define AU_IN_BUS 1
|
|
|
|
-#if TARGET_OS_IPHONE
|
|
-#define CUBEB_AUDIOUNIT_SUBTYPE kAudioUnitSubType_RemoteIO
|
|
-#else
|
|
-#define CUBEB_AUDIOUNIT_SUBTYPE kAudioUnitSubType_HALOutput
|
|
-#endif
|
|
-
|
|
//#define LOGGING_ENABLED
|
|
#ifdef LOGGING_ENABLED
|
|
#define LOG(...) do { \
|
|
fprintf(stderr, __VA_ARGS__); \
|
|
fprintf(stderr, "(line: %d)\n", __LINE__); \
|
|
} while(0)
|
|
#else
|
|
#define LOG(...)
|
|
@@ -905,63 +899,79 @@ audiounit_create_unit(AudioUnit * unit,
|
|
{
|
|
AudioComponentDescription desc;
|
|
AudioComponent comp;
|
|
UInt32 enable;
|
|
AudioDeviceID devid;
|
|
OSStatus rv;
|
|
|
|
desc.componentType = kAudioUnitType_Output;
|
|
- desc.componentSubType = CUBEB_AUDIOUNIT_SUBTYPE;
|
|
+#if TARGET_OS_IPHONE
|
|
+ bool use_default_output = false;
|
|
+ desc.componentSubType = kAudioUnitSubType_RemoteIO;
|
|
+#else
|
|
+ // Use the DefaultOutputUnit for output when no device is specified
|
|
+ // so we retain automatic output device switching when the default
|
|
+ // changes. Once we have complete support for device notifications
|
|
+ // and switching, we can use the AUHAL for everything.
|
|
+ bool use_default_output = device == NULL && !is_input;
|
|
+ if (use_default_output) {
|
|
+ desc.componentSubType = kAudioUnitSubType_DefaultOutput;
|
|
+ } else {
|
|
+ desc.componentSubType = kAudioUnitSubType_HALOutput;
|
|
+ }
|
|
+#endif
|
|
desc.componentManufacturer = kAudioUnitManufacturer_Apple;
|
|
desc.componentFlags = 0;
|
|
desc.componentFlagsMask = 0;
|
|
comp = AudioComponentFindNext(NULL, &desc);
|
|
if (comp == NULL) {
|
|
LOG("Could not find matching audio hardware.");
|
|
return CUBEB_ERROR;
|
|
}
|
|
|
|
rv = AudioComponentInstanceNew(comp, unit);
|
|
if (rv != noErr) {
|
|
PRINT_ERROR_CODE("AudioComponentInstanceNew", rv);
|
|
return CUBEB_ERROR;
|
|
}
|
|
|
|
- enable = 1;
|
|
- rv = AudioUnitSetProperty(*unit, kAudioOutputUnitProperty_EnableIO,
|
|
- is_input ? kAudioUnitScope_Input : kAudioUnitScope_Output,
|
|
- is_input ? AU_IN_BUS : AU_OUT_BUS, &enable, sizeof(UInt32));
|
|
- if (rv != noErr) {
|
|
- PRINT_ERROR_CODE("AudioUnitSetProperty/kAudioOutputUnitProperty_EnableIO", rv);
|
|
- return CUBEB_ERROR;
|
|
- }
|
|
+ if (!use_default_output) {
|
|
+ enable = 1;
|
|
+ rv = AudioUnitSetProperty(*unit, kAudioOutputUnitProperty_EnableIO,
|
|
+ is_input ? kAudioUnitScope_Input : kAudioUnitScope_Output,
|
|
+ is_input ? AU_IN_BUS : AU_OUT_BUS, &enable, sizeof(UInt32));
|
|
+ if (rv != noErr) {
|
|
+ PRINT_ERROR_CODE("AudioUnitSetProperty/kAudioOutputUnitProperty_EnableIO", rv);
|
|
+ return CUBEB_ERROR;
|
|
+ }
|
|
|
|
- enable = 0;
|
|
- rv = AudioUnitSetProperty(*unit, kAudioOutputUnitProperty_EnableIO,
|
|
- is_input ? kAudioUnitScope_Output : kAudioUnitScope_Input,
|
|
- is_input ? AU_OUT_BUS : AU_IN_BUS, &enable, sizeof(UInt32));
|
|
- if (rv != noErr) {
|
|
- PRINT_ERROR_CODE("AudioUnitSetProperty/kAudioOutputUnitProperty_EnableIO", rv);
|
|
- return CUBEB_ERROR;
|
|
- }
|
|
+ enable = 0;
|
|
+ rv = AudioUnitSetProperty(*unit, kAudioOutputUnitProperty_EnableIO,
|
|
+ is_input ? kAudioUnitScope_Output : kAudioUnitScope_Input,
|
|
+ is_input ? AU_OUT_BUS : AU_IN_BUS, &enable, sizeof(UInt32));
|
|
+ if (rv != noErr) {
|
|
+ PRINT_ERROR_CODE("AudioUnitSetProperty/kAudioOutputUnitProperty_EnableIO", rv);
|
|
+ return CUBEB_ERROR;
|
|
+ }
|
|
|
|
- if (device == NULL) {
|
|
- devid = audiounit_get_default_device_id(is_input ? CUBEB_DEVICE_TYPE_INPUT
|
|
- : CUBEB_DEVICE_TYPE_OUTPUT);
|
|
- } else {
|
|
- devid = reinterpret_cast<intptr_t>(device);
|
|
- }
|
|
- int err = AudioUnitSetProperty(*unit, kAudioOutputUnitProperty_CurrentDevice,
|
|
- kAudioUnitScope_Global,
|
|
- is_input ? AU_IN_BUS : AU_OUT_BUS,
|
|
- &devid, sizeof(AudioDeviceID));
|
|
- if (err != noErr) {
|
|
- PRINT_ERROR_CODE("AudioUnitSetProperty/kAudioOutputUnitProperty_CurrentDevice", rv);
|
|
- return CUBEB_ERROR;
|
|
+ if (device == NULL) {
|
|
+ assert(is_input);
|
|
+ devid = audiounit_get_default_device_id(CUBEB_DEVICE_TYPE_INPUT);
|
|
+ } else {
|
|
+ devid = reinterpret_cast<intptr_t>(device);
|
|
+ }
|
|
+ int err = AudioUnitSetProperty(*unit, kAudioOutputUnitProperty_CurrentDevice,
|
|
+ kAudioUnitScope_Global,
|
|
+ is_input ? AU_IN_BUS : AU_OUT_BUS,
|
|
+ &devid, sizeof(AudioDeviceID));
|
|
+ if (err != noErr) {
|
|
+ PRINT_ERROR_CODE("AudioUnitSetProperty/kAudioOutputUnitProperty_CurrentDevice", rv);
|
|
+ return CUBEB_ERROR;
|
|
+ }
|
|
}
|
|
|
|
return CUBEB_OK;
|
|
}
|
|
|
|
static int
|
|
audiounit_init_input_linear_buffer(cubeb_stream * stream, uint32_t capacity)
|
|
{
|