jyapayne/moonlight-common-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Only start the audio UDP ping thread when we are ready to accept samples

Browse source
This commit is contained in:
Cameron Gutman 2019-01-03 19:59:53 -08:00
commit 610c00bf2d
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/AudioStream.c
View file

@ -325,21 +325,11 @@ int startAudioStream(void* audioContext, int arFlags) {
return err; return err;
} }
err = PltCreateThread(UdpPingThreadProc, NULL, &udpPingThread);
if (err != 0) {
AudioCallbacks.cleanup();
closeSocket(rtpSocket);
return err;
}
AudioCallbacks.start(); AudioCallbacks.start();
err = PltCreateThread(ReceiveThreadProc, NULL, &receiveThread); err = PltCreateThread(ReceiveThreadProc, NULL, &receiveThread);
if (err != 0) { if (err != 0) {
AudioCallbacks.stop(); AudioCallbacks.stop();
PltInterruptThread(&udpPingThread);
PltJoinThread(&udpPingThread);
PltCloseThread(&udpPingThread);
closeSocket(rtpSocket); closeSocket(rtpSocket);
AudioCallbacks.cleanup(); AudioCallbacks.cleanup();
return err; return err;
@ -349,11 +339,8 @@ int startAudioStream(void* audioContext, int arFlags) {
err = PltCreateThread(DecoderThreadProc, NULL, &decoderThread); err = PltCreateThread(DecoderThreadProc, NULL, &decoderThread);
if (err != 0) { if (err != 0) {
AudioCallbacks.stop(); AudioCallbacks.stop();
PltInterruptThread(&udpPingThread);
PltInterruptThread(&receiveThread); PltInterruptThread(&receiveThread);
PltJoinThread(&udpPingThread);
PltJoinThread(&receiveThread); PltJoinThread(&receiveThread);
PltCloseThread(&udpPingThread);
PltCloseThread(&receiveThread); PltCloseThread(&receiveThread);
closeSocket(rtpSocket); closeSocket(rtpSocket);
AudioCallbacks.cleanup(); AudioCallbacks.cleanup();
@ -361,5 +348,31 @@ int startAudioStream(void* audioContext, int arFlags) {
} }
} }
// Don't start pinging (which will cause GFE to start sending us traffic)
// until everything else is started. Otherwise we could accumulate a
// bunch of audio packets in the socket receive buffer while our audio
// backend is starting up and create audio latency.
err = PltCreateThread(UdpPingThreadProc, NULL, &udpPingThread);
if (err != 0) {
AudioCallbacks.stop();
PltInterruptThread(&receiveThread);
if ((AudioCallbacks.capabilities & CAPABILITY_DIRECT_SUBMIT) == 0) {
// Signal threads waiting on the LBQ
LbqSignalQueueShutdown(&packetQueue);
PltInterruptThread(&decoderThread);
}
PltJoinThread(&receiveThread);
if ((AudioCallbacks.capabilities & CAPABILITY_DIRECT_SUBMIT) == 0) {
PltJoinThread(&decoderThread);
}
PltCloseThread(&receiveThread);
if ((AudioCallbacks.capabilities & CAPABILITY_DIRECT_SUBMIT) == 0) {
PltCloseThread(&decoderThread);
}
closeSocket(rtpSocket);
AudioCallbacks.cleanup();
return err;
}
return 0; return 0;
} }