Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-12-14 13:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix audio device error with PA renderer (and constify some methods)

Browse source
This commit is contained in:
Cameron Gutman 2018-09-29 22:19:41 -07:00
parent 6758d6c43e
commit fa52e7c1b7
5 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/streaming/audio/renderers/portaudiorenderer.cpp
View file

@ -109,7 +109,7 @@ void PortAudioRenderer::submitAudio(short* audioBuffer, int audioSize)
}
}
bool PortAudioRenderer::testAudio(int audioConfiguration)
bool PortAudioRenderer::testAudio(int audioConfiguration) const
{
PaStreamParameters params = {};
@ -120,6 +120,13 @@ bool PortAudioRenderer::testAudio(int audioConfiguration)
return false;
}
const PaDeviceInfo* deviceInfo = Pa_GetDeviceInfo(outputDeviceIndex);
if (deviceInfo == nullptr) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"Pa_GetDeviceInfo() failed");
return false;
}
switch (audioConfiguration)
{
case AUDIO_CONFIGURATION_STEREO:
@ -135,20 +142,37 @@ bool PortAudioRenderer::testAudio(int audioConfiguration)
params.sampleFormat = paInt16;
params.device = outputDeviceIndex;
params.suggestedLatency = deviceInfo->defaultLowOutputLatency;
PaError error = Pa_IsFormatSupported(nullptr, &params, 48000);
if (error == paFormatIsSupported) {
return true;
}
else {
// We used to just use Pa_IsFormatSupported() but there are cases
// where Pa_IsFormatSupported() will fail but when we actually
// call Pa_OpenStream(), it fails with device unavailable.
PaStream* stream;
PaError error = Pa_OpenStream(&stream, nullptr, &params,
48000,
SAMPLES_PER_FRAME,
paNoFlag,
nullptr, nullptr);
if (error != paNoError) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"Pa_IsFormatSupported() failed: %s",
"Pa_OpenStream() failed: %s",
Pa_GetErrorText(error));
return false;
}
error = Pa_StartStream(m_Stream);
if (error != paNoError) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"Pa_StartStream() failed: %s",
Pa_GetErrorText(error));
}
Pa_CloseStream(stream);
return error == paNoError;
}
int PortAudioRenderer::detectAudioConfiguration()
int PortAudioRenderer::detectAudioConfiguration() const
{
const PaDeviceInfo* deviceInfo = Pa_GetDeviceInfo(Pa_GetDefaultOutputDevice());
if (deviceInfo == nullptr) {

4
app/streaming/audio/renderers/portaudiorenderer.h
View file

@ -20,9 +20,9 @@ public:
virtual void submitAudio(short* audioBuffer, int audioSize);
virtual bool testAudio(int audioConfiguration);
virtual bool testAudio(int audioConfiguration) const;
virtual int detectAudioConfiguration();
virtual int detectAudioConfiguration() const;
static int paStreamCallback(const void *input,
void *output,

4
app/streaming/audio/renderers/renderer.h
View file

@ -14,7 +14,7 @@ public:
virtual void submitAudio(short* audioBuffer, int audioSize) = 0;
virtual bool testAudio(int audioConfiguration) = 0;
virtual bool testAudio(int audioConfiguration) const = 0;
virtual int detectAudioConfiguration() = 0;
virtual int detectAudioConfiguration() const = 0;
};

4
app/streaming/audio/renderers/sdl.h
View file

@ -19,9 +19,9 @@ public:
virtual void submitAudio(short* audioBuffer, int audioSize);
virtual bool testAudio(int audioConfiguration);
virtual bool testAudio(int audioConfiguration) const;
virtual int detectAudioConfiguration();
virtual int detectAudioConfiguration() const;
private:
SDL_AudioDeviceID m_AudioDevice;

4
app/streaming/audio/renderers/sdlaud.cpp
View file

@ -13,7 +13,7 @@
// This isn't accurate on macOS and Linux (PulseAudio),
// since they both report supporting a large number of
// channels, regardless of the actual output device.
int SdlAudioRenderer::detectAudioConfiguration()
int SdlAudioRenderer::detectAudioConfiguration() const
{
SDL_AudioSpec want, have;
SDL_AudioDeviceID dev;
@ -51,7 +51,7 @@ int SdlAudioRenderer::detectAudioConfiguration()
}
}
bool SdlAudioRenderer::testAudio(int audioConfiguration)
bool SdlAudioRenderer::testAudio(int audioConfiguration) const
{
SDL_AudioSpec want, have;
SDL_AudioDeviceID dev;