JNI code complete

This commit is contained in:
Cameron Gutman 2017-05-14 23:08:21 -07:00
parent 81d1e615bf
commit a2de98c91a
4 changed files with 5 additions and 20 deletions

View File

@ -230,12 +230,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
.setRemote(remote) .setRemote(remote)
.setHevcSupported(decoderRenderer.isHevcSupported()) .setHevcSupported(decoderRenderer.isHevcSupported())
.setAudioConfiguration(prefConfig.enable51Surround ? .setAudioConfiguration(prefConfig.enable51Surround ?
StreamConfiguration.AUDIO_CONFIGURATION_5_1 : MoonBridge.AUDIO_CONFIGURATION_51_SURROUND :
StreamConfiguration.AUDIO_CONFIGURATION_STEREO) MoonBridge.AUDIO_CONFIGURATION_STEREO)
.build(); .build();
// Initialize the connection // Initialize the connection
conn = new NvConnection(host, uniqueId, Game.this, config, PlatformBinding.getCryptoProvider(this)); conn = new NvConnection(host, uniqueId, config, PlatformBinding.getCryptoProvider(this));
controllerHandler = new ControllerHandler(this, conn, this, prefConfig.multiController, prefConfig.deadzonePercentage); controllerHandler = new ControllerHandler(this, conn, this, prefConfig.multiController, prefConfig.deadzonePercentage);
InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE); InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
@ -971,7 +971,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
connecting = true; connecting = true;
decoderRenderer.setRenderTarget(holder); decoderRenderer.setRenderTarget(holder);
conn.start(PlatformBinding.getAudioRenderer(), decoderRenderer); conn.start(PlatformBinding.getAudioRenderer(), decoderRenderer, Game.this);
} }
} }

View File

@ -89,9 +89,4 @@ public class AndroidAudioRenderer implements AudioRenderer {
track.release(); track.release();
} }
} }
@Override
public int getCapabilities() {
return 0;
}
} }

View File

@ -611,16 +611,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
LimeLog.info("SPS replay complete"); LimeLog.info("SPS replay complete");
} }
@Override
public int getCapabilities() {
int caps = 0;
caps |= directSubmit ?
MoonBridge.CAPABILITY_DIRECT_SUBMIT : 0;
return caps;
}
public int getAverageEndToEndLatency() { public int getAverageEndToEndLatency() {
if (totalFrames == 0) { if (totalFrames == 0) {
return 0; return 0;

@ -1 +1 @@
Subproject commit f5b8743d693af4884e65f45243a8507fc598f40d Subproject commit bdaed5712289ba1878f646e7b3d5ddd5332dcae6