moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-04-12 02:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'debug'

Browse Source 
Conflicts:
	src/com/limelight/Limelight.java
	src/com/limelight/binding/video/FakeVideoRenderer.java
This commit is contained in:
Iwan Timmer
2014-06-25 03:06:47 +02:00
parent 244359e048 e6d6e0ef16
commit 1d2bdda14b
3 changed files with 84 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/limelight/Limelight.java
View File

@@ -101,12 +101,12 @@ public class Limelight implements NvConnectionListener {
/*
* Creates a connection to the host and starts up the stream.
*/
private void startUpFake(StreamConfiguration streamConfig) {
private void startUpFake(StreamConfiguration streamConfig, String videoFile) {
conn = new NvConnection(host, this, streamConfig, PlatformBinding.getCryptoProvider());
conn.start(PlatformBinding.getDeviceName(), null,
VideoDecoderRenderer.FLAG_PREFER_QUALITY,
new FakeAudioRenderer(),
new FakeVideoRenderer());
new FakeVideoRenderer(videoFile));
}
/**
@@ -176,6 +176,7 @@ public class Limelight implements NvConnectionListener {
boolean tests = true;
String mapping = null;
String audio = "default";
String video = null;
Level debug = Level.SEVERE;
for (int i = 0; i < args.length; i++) {
@@ -256,6 +257,14 @@ public class Limelight implements NvConnectionListener {
}
} else if (args[i].equals("-fake")) {
fake = true;
} else if (args[i].equals("-out")) {
if (i + 1 < args.length) {
video = args[i+1];
i++;
} else {
System.out.println("Syntax error: output file expected after -out");
System.exit(3);
}
} else if (args[i].equals("-notest")) {
tests = false;
} else if (args[i].equals("-v")) {
@@ -314,7 +323,7 @@ public class Limelight implements NvConnectionListener {
Limelight limelight = new Limelight(host);
if (!pair)
if (fake)
limelight.startUpFake(streamConfig);
limelight.startUpFake(streamConfig, video);
else
limelight.startUp(streamConfig, inputs, mapping, audio, tests);
else