oleks/moonlight-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plumb AV1 preference and rework HEVC preference to match

Browse Source
This commit is contained in:
Cameron Gutman
2023-07-02 23:29:17 -05:00
parent 3a78095574
commit 458460515d
7 changed files with 122 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java
+42 -15
View File
@@ -10,6 +10,12 @@ import android.view.Display;
import com.limelight.nvstream.jni.MoonBridge;
public class PreferenceConfiguration {
public enum FormatOption {
AUTO,
FORCE_ON,
FORCE_OFF
};
private static final String LEGACY_RES_FPS_PREF_STRING = "list_resolution_fps";
private static final String LEGACY_ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
@@ -28,7 +34,8 @@ public class PreferenceConfiguration {
private static final String MULTI_CONTROLLER_PREF_STRING = "checkbox_multi_controller";
static final String AUDIO_CONFIG_PREF_STRING = "list_audio_config";
private static final String USB_DRIVER_PREF_SRING = "checkbox_usb_driver";
private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
private static final String HEVC_FORMAT_PREF_STRING = "video_format";
private static final String AV1_FORMAT_PREF_STRING = "av1_format";
private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_show_onscreen_controls";
private static final String ONLY_L3_R3_PREF_STRING = "checkbox_only_show_L3R3";
private static final String LEGACY_DISABLE_FRAME_DROP_PREF_STRING = "checkbox_disable_frame_drop";
@@ -61,7 +68,9 @@ public class PreferenceConfiguration {
public static final String DEFAULT_LANGUAGE = "default";
private static final boolean DEFAULT_MULTI_CONTROLLER = true;
private static final boolean DEFAULT_USB_DRIVER = true;
private static final String DEFAULT_VIDEO_FORMAT = "auto";
private static final String DEFAULT_HEVC_FORMAT = "auto";
private static final String DEFAULT_AV1_FORMAT = "never";
private static final boolean ONSCREEN_CONTROLLER_DEFAULT = false;
private static final boolean ONLY_L3_R3_DEFAULT = false;
private static final boolean DEFAULT_ENABLE_HDR = false;
@@ -83,10 +92,6 @@ public class PreferenceConfiguration {
private static final boolean DEFAULT_REDUCE_REFRESH_RATE = false;
private static final boolean DEFAULT_FULL_RANGE = false;
public static final int FORCE_H265_ON = -1;
public static final int AUTOSELECT_H265 = 0;
public static final int FORCE_H265_OFF = 1;
public static final int FRAME_PACING_MIN_LATENCY = 0;
public static final int FRAME_PACING_BALANCED = 1;
public static final int FRAME_PACING_CAP_FPS = 2;
@@ -102,7 +107,8 @@ public class PreferenceConfiguration {
public int width, height, fps;
public int bitrate;
public int videoFormat;
public FormatOption hevcFormat;
public FormatOption av1Format;
public int deadzonePercentage;
public int oscOpacity;
public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
@@ -289,22 +295,41 @@ public class PreferenceConfiguration {
prefs.getString(FPS_PREF_STRING, DEFAULT_FPS));
}
private static int getVideoFormatValue(Context context) {
private static FormatOption getHevcFormatValue(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String str = prefs.getString(VIDEO_FORMAT_PREF_STRING, DEFAULT_VIDEO_FORMAT);
String str = prefs.getString(HEVC_FORMAT_PREF_STRING, DEFAULT_HEVC_FORMAT);
if (str.equals("auto")) {
return AUTOSELECT_H265;
return FormatOption.AUTO;
}
else if (str.equals("forceh265")) {
return FORCE_H265_ON;
return FormatOption.FORCE_ON;
}
else if (str.equals("neverh265")) {
return FORCE_H265_OFF;
return FormatOption.FORCE_OFF;
}
else {
// Should never get here
return AUTOSELECT_H265;
return FormatOption.AUTO;
}
}
private static FormatOption getAV1FormatValue(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String str = prefs.getString(AV1_FORMAT_PREF_STRING, DEFAULT_AV1_FORMAT);
if (str.equals("auto")) {
return FormatOption.AUTO;
}
else if (str.equals("force")) {
return FormatOption.FORCE_ON;
}
else if (str.equals("never")) {
return FormatOption.FORCE_OFF;
}
else {
// Should never get here
return FormatOption.AUTO;
}
}
@@ -348,7 +373,8 @@ public class PreferenceConfiguration {
.remove(LEGACY_RES_FPS_PREF_STRING)
.remove(RESOLUTION_PREF_STRING)
.remove(FPS_PREF_STRING)
.remove(VIDEO_FORMAT_PREF_STRING)
.remove(HEVC_FORMAT_PREF_STRING)
.remove(AV1_FORMAT_PREF_STRING)
.remove(ENABLE_HDR_PREF_STRING)
.remove(UNLOCK_FPS_STRING)
.remove(FULL_RANGE_PREF_STRING)
@@ -475,7 +501,8 @@ public class PreferenceConfiguration {
config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_STEREO;
}
config.videoFormat = getVideoFormatValue(context);
config.hevcFormat = getHevcFormatValue(context);
config.av1Format = getAV1FormatValue(context);
config.framePacing = getFramePacingValue(context);
config.deadzonePercentage = prefs.getInt(DEADZONE_PREF_STRING, DEFAULT_DEADZONE);