moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-04-04 06:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent racing connection start and stop

Browse Source
This commit is contained in:
Cameron Gutman
2017-05-21 11:52:43 -07:00
parent b3a1938c1d
commit 7651ce5e84
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
moonlight-common/src/main/java/com/limelight/nvstream/NvConnection.java
View File

@@ -63,8 +63,12 @@ public class NvConnection {
}
public void stop() {
MoonBridge.stopConnection();
MoonBridge.cleanupBridge();
// Moonlight-core is not thread-safe with respect to connection start and stop, so
// we must not invoke that functionality in parallel.
synchronized (MoonBridge.class) {
MoonBridge.stopConnection();
MoonBridge.cleanupBridge();
}
}
private boolean startApp() throws XmlPullParserException, IOException
@@ -210,6 +214,13 @@ public class NvConnection {
private void establishConnection() {
String appName = context.streamConfig.getApp().getAppName();
try {
context.serverAddress = InetAddress.getByName(host);
} catch (UnknownHostException e) {
context.connListener.connectionTerminated(-1);
return;
}
context.connListener.stageStarting(appName);
try {
@@ -234,22 +245,19 @@ public class NvConnection {
context.videoCapabilities);
}
public void start(AudioRenderer audioRenderer, VideoDecoderRenderer videoDecoderRenderer, NvConnectionListener connectionListener)
public void start(final AudioRenderer audioRenderer, final VideoDecoderRenderer videoDecoderRenderer, final NvConnectionListener connectionListener)
{
MoonBridge.setupBridge(videoDecoderRenderer, audioRenderer, connectionListener);
context.connListener = connectionListener;
context.videoCapabilities = videoDecoderRenderer.getCapabilities();
new Thread(new Runnable() {
public void run() {
try {
context.serverAddress = InetAddress.getByName(host);
} catch (UnknownHostException e) {
context.connListener.connectionTerminated(-1);
return;
// Moonlight-core is not thread-safe with respect to connection start and stop, so
// we must not invoke that functionality in parallel.
synchronized (MoonBridge.class) {
MoonBridge.setupBridge(videoDecoderRenderer, audioRenderer, connectionListener);
context.connListener = connectionListener;
context.videoCapabilities = videoDecoderRenderer.getCapabilities();
establishConnection();
}
establishConnection();
}
}).start();
}