moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-19 19:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the ability for clients to reduce bitrate when HEVC is used

Browse Source
This commit is contained in:
Cameron Gutman 2017-09-25 21:38:43 -07:00
parent 1f504288cb
commit d237ceb1df
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,9 @@ public class NvConnection {
context.negotiatedFps, context.streamConfig.getBitrate(),
context.streamConfig.getMaxPacketSize(),
context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration(),
context.streamConfig.getHevcSupported(), context.riKey.getEncoded(), ib.array(),
context.streamConfig.getHevcSupported(),
context.streamConfig.getHevcBitratePercentageMultiplier(),
context.riKey.getEncoded(), ib.array(),
context.videoCapabilities);
}
}

10
moonlight-common/src/main/java/com/limelight/nvstream/StreamConfiguration.java
View File

@ -25,6 +25,7 @@ public class StreamConfiguration {
private int audioChannelCount;
private int audioConfiguration;
private boolean supportsHevc;
private int hevcBitratePercentageMultiplier;
public static class Builder {
private StreamConfiguration config = new StreamConfiguration();
@ -74,6 +75,11 @@ public class StreamConfiguration {
config.maxPacketSize = maxPacketSize;
return this;
}
public StreamConfiguration.Builder setHevcBitratePercentageMultiplier(int multiplier) {
config.hevcBitratePercentageMultiplier = multiplier;
return this;
}
public StreamConfiguration.Builder setAudioConfiguration(int audioConfig) {
if (audioConfig == MoonBridge.AUDIO_CONFIGURATION_STEREO) {
@ -173,4 +179,8 @@ public class StreamConfiguration {
public boolean getHevcSupported() {
return supportsHevc;
}
public int getHevcBitratePercentageMultiplier() {
return hevcBitratePercentageMultiplier;
}
}

1
moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
View File

@ -160,6 +160,7 @@ public class MoonBridge {
int width, int height, int fps,
int bitrate, int packetSize, boolean streamingRemotely,
int audioConfiguration, boolean supportsHevc,
int hevcBitratePercentageMultiplier,
byte[] riAesKey, byte[] riAesIv,
int videoCapabilities);

2
moonlight-common/src/main/jni/moonlight-core/callbacks.c
View File

@ -382,6 +382,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jobject
jint width, jint height, jint fps,
jint bitrate, jint packetSize, jboolean streamingRemotely,
jint audioConfiguration, jboolean supportsHevc,
jint hevcBitratePercentageMultiplier,
jbyteArray riAesKey, jbyteArray riAesIv,
jint videoCapabilities) {
SERVER_INFORMATION serverInfo = {
@ -398,6 +399,7 @@ Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jobject
.streamingRemotely = streamingRemotely,
.audioConfiguration = audioConfiguration,
.supportsHevc = supportsHevc,
.hevcBitratePercentageMultiplier = hevcBitratePercentageMultiplier,
};
jbyte* riAesKeyBuf = (*env)->GetByteArrayElements(env, riAesKey, NULL);

2
moonlight-common/src/main/jni/moonlight-core/moonlight-common-c

@ -1 +1 @@
Subproject commit 957b1de1ad2a0beea442aeecd943ff6caa25df30
Subproject commit c0596ad1df9828d5ede020681317494405188821