Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-28 20:50:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix audio failures on systems that return incorrect/unsupported mixFormat

Browse source
This commit is contained in:
Ken Cooke 2017-01-14 10:26:13 -08:00
parent 584feef56d
commit 42e13d1e97
1 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
libraries/audio-client/src/AudioClient.cpp
View file

@ -424,35 +424,25 @@ bool adjustedFormatForAudioDevice(const QAudioDeviceInfo& audioDevice,
adjustedAudioFormat = desiredAudioFormat; adjustedAudioFormat = desiredAudioFormat;
// //
// Attempt the device sample rate in decreasing order of preference. // Attempt the device sample rate and channel count in decreasing order of preference.
// //
if (audioDevice.supportedSampleRates().contains(48000)) { const int sampleRates[] = { 48000, 44100, 32000, 24000, 16000, 96000, 192000, 88200, 176400 };
adjustedAudioFormat.setSampleRate(48000); const int inputChannels[] = { 1, 2, 4, 6, 8 }; // prefer mono
} else if (audioDevice.supportedSampleRates().contains(44100)) { const int outputChannels[] = { 2, 4, 6, 8, 1 }; // prefer stereo, downmix as last resort
adjustedAudioFormat.setSampleRate(44100);
} else if (audioDevice.supportedSampleRates().contains(32000)) { for (int channelCount : (desiredAudioFormat.channelCount() == 1 ? inputChannels : outputChannels)) {
adjustedAudioFormat.setSampleRate(32000); for (int sampleRate : sampleRates) {
} else if (audioDevice.supportedSampleRates().contains(24000)) {
adjustedAudioFormat.setSampleRate(24000); adjustedAudioFormat.setChannelCount(channelCount);
} else if (audioDevice.supportedSampleRates().contains(16000)) { adjustedAudioFormat.setSampleRate(sampleRate);
adjustedAudioFormat.setSampleRate(16000);
} else if (audioDevice.supportedSampleRates().contains(96000)) { if (audioDevice.isFormatSupported(adjustedAudioFormat)) {
adjustedAudioFormat.setSampleRate(96000); return true;
} else if (audioDevice.supportedSampleRates().contains(192000)) { }
adjustedAudioFormat.setSampleRate(192000); }
} else if (audioDevice.supportedSampleRates().contains(88200)) {
adjustedAudioFormat.setSampleRate(88200);
} else if (audioDevice.supportedSampleRates().contains(176400)) {
adjustedAudioFormat.setSampleRate(176400);
} }
if (adjustedAudioFormat != desiredAudioFormat) { return false; // a supported format could not be found
// return the nearest in case it needs 2 channels
adjustedAudioFormat = audioDevice.nearestFormat(adjustedAudioFormat);
return true;
} else {
return false;
}
} }
bool sampleChannelConversion(const int16_t* sourceSamples, int16_t* destinationSamples, unsigned int numSourceSamples, bool sampleChannelConversion(const int16_t* sourceSamples, int16_t* destinationSamples, unsigned int numSourceSamples,