feat: 添加HDR最高亮度设置

Author: qiin2333

app/src/main/java/com/limelight/Game.java

@@ -3710,8 +3710,10 @@ private void notifySystemHdrStatus(boolean hdrEnabled) {
                 // 通过WindowManager.LayoutParams设置亮度
                 WindowManager.LayoutParams params = getWindow().getAttributes();
                 if (hdrEnabled) {
-                    // 强制高亮度模式
-                    // params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL;
+                    // 根据设置决定是否强制高亮度模式
+                    if (prefConfig != null && prefConfig.enableHdrHighBrightness) {
+                        params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL;
+                    }
                     // 设置窗口标志以支持HDR
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                         getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java

@@ -83,6 +83,7 @@ public enum PerfOverlayPosition {
     private static final String HALF_HEIGHT_OSC_PORTRAIT_PREF_STRING = "checkbox_half_height_osc_portrait";
     private static final String LEGACY_DISABLE_FRAME_DROP_PREF_STRING = "checkbox_disable_frame_drop";
     private static final String ENABLE_HDR_PREF_STRING = "checkbox_enable_hdr";
+    private static final String ENABLE_HDR_HIGH_BRIGHTNESS_PREF_STRING = "checkbox_enable_hdr_high_brightness";
     private static final String ENABLE_PIP_PREF_STRING = "checkbox_enable_pip";
     private static final String ENABLE_PERF_OVERLAY_STRING = "checkbox_enable_perf_overlay";
     private static final String PERF_OVERLAY_LOCKED_STRING = "perf_overlay_locked";
@@ -171,6 +172,7 @@ public enum PerfOverlayPosition {
     private static final boolean SHOW_GUIDE_BUTTON_DEFAULT = true;
     private static final boolean HALF_HEIGHT_OSC_PORTRAIT_DEFAULT = true;
     private static final boolean DEFAULT_ENABLE_HDR = false;
+    private static final boolean DEFAULT_ENABLE_HDR_HIGH_BRIGHTNESS = false;
     private static final boolean DEFAULT_ENABLE_PIP = false;
     private static final boolean DEFAULT_ENABLE_PERF_OVERLAY = false;
     private static final boolean DEFAULT_PERF_OVERLAY_LOCKED = false;
@@ -306,6 +308,7 @@ public enum ScreenPosition {
     public boolean showGuideButton;
     public boolean halfHeightOscPortrait;
     public boolean enableHdr;
+    public boolean enableHdrHighBrightness;
     public boolean enablePip;
     public boolean enablePerfOverlay;
     public boolean perfOverlayLocked;
@@ -646,6 +649,7 @@ public static void resetStreamingSettings(Context context) {
                 .remove(FPS_PREF_STRING)
                 .remove(VIDEO_FORMAT_PREF_STRING)
                 .remove(ENABLE_HDR_PREF_STRING)
+                .remove(ENABLE_HDR_HIGH_BRIGHTNESS_PREF_STRING)
                 .remove(UNLOCK_FPS_STRING)
                 .remove(FULL_RANGE_PREF_STRING)
                 .apply();
@@ -788,6 +792,7 @@ else if (audioConfig.equals("51")) {
         config.showGuideButton = prefs.getBoolean(SHOW_GUIDE_BUTTON_PREF_STRING, SHOW_GUIDE_BUTTON_DEFAULT);
         config.halfHeightOscPortrait = prefs.getBoolean(HALF_HEIGHT_OSC_PORTRAIT_PREF_STRING, HALF_HEIGHT_OSC_PORTRAIT_DEFAULT);
         config.enableHdr = prefs.getBoolean(ENABLE_HDR_PREF_STRING, DEFAULT_ENABLE_HDR) && !isShieldAtvFirmwareWithBrokenHdr();
+        config.enableHdrHighBrightness = prefs.getBoolean(ENABLE_HDR_HIGH_BRIGHTNESS_PREF_STRING, DEFAULT_ENABLE_HDR_HIGH_BRIGHTNESS);
         config.enablePip = prefs.getBoolean(ENABLE_PIP_PREF_STRING, DEFAULT_ENABLE_PIP);
         config.enablePerfOverlay = prefs.getBoolean(ENABLE_PERF_OVERLAY_STRING, DEFAULT_ENABLE_PERF_OVERLAY);
         config.perfOverlayLocked = prefs.getBoolean(PERF_OVERLAY_LOCKED_STRING, DEFAULT_PERF_OVERLAY_LOCKED);
@@ -1015,6 +1020,7 @@ public boolean writePreferences(Context context, boolean synchronous) {
                     .putInt(BITRATE_PREF_STRING, bitrate)
                     .putString(VIDEO_FORMAT_PREF_STRING, getVideoFormatPreferenceString(videoFormat))
                     .putBoolean(ENABLE_HDR_PREF_STRING, enableHdr)
+                    .putBoolean(ENABLE_HDR_HIGH_BRIGHTNESS_PREF_STRING, enableHdrHighBrightness)
                     .putBoolean(ENABLE_PERF_OVERLAY_STRING, enablePerfOverlay)
                     .putBoolean(PERF_OVERLAY_LOCKED_STRING, perfOverlayLocked)
                     .putBoolean(REVERSE_RESOLUTION_PREF_STRING, reverseResolution)
@@ -1060,6 +1066,7 @@ public PreferenceConfiguration copy() {
         copy.bitrate = this.bitrate;
         copy.videoFormat = this.videoFormat;
         copy.enableHdr = this.enableHdr;
+        copy.enableHdrHighBrightness = this.enableHdrHighBrightness;
         copy.enablePerfOverlay = this.enablePerfOverlay;
         copy.perfOverlayLocked = this.perfOverlayLocked;
         copy.perfOverlayOrientation = this.perfOverlayOrientation;

app/src/main/java/com/limelight/utils/AppSettingsManager.java

@@ -32,6 +32,7 @@ public class AppSettingsManager {
     private static final String INTENT_LAST_SETTINGS_RESOLUTION_SCALE = "LastSettingsResolutionScale";
     private static final String INTENT_LAST_SETTINGS_VIDEO_FORMAT = "LastSettingsVideoFormat";
     private static final String INTENT_LAST_SETTINGS_ENABLE_HDR = "LastSettingsEnableHdr";
+    private static final String INTENT_LAST_SETTINGS_ENABLE_HDR_HIGH_BRIGHTNESS = "LastSettingsEnableHdrHighBrightness";
     private static final String INTENT_LAST_SETTINGS_ENABLE_MIC = "LastSettingsEnableMic";
     private static final String INTENT_LAST_SETTINGS_MIC_BITRATE = "LastSettingsMicBitrate";
     private static final String INTENT_LAST_SETTINGS_ENABLE_NATIVE_MOUSE = "LastSettingsEnableNativeMouse";
@@ -335,6 +336,7 @@ private JSONObject settingsToJson(PreferenceConfiguration settings) throws JSONE
         settingsJson.put("resolutionScale", settings.resolutionScale);
         settingsJson.put("videoFormat", getVideoFormatPreferenceString(settings.videoFormat));
         settingsJson.put("enableHdr", settings.enableHdr);
+        settingsJson.put("enableHdrHighBrightness", settings.enableHdrHighBrightness);
         settingsJson.put("enableMic", settings.enableMic);
         settingsJson.put("micBitrate", settings.micBitrate);
         settingsJson.put("enableNativeMousePointer", settings.enableNativeMousePointer);
@@ -384,6 +386,7 @@ private PreferenceConfiguration jsonToSettings(JSONObject settingsJson) throws J
         settings.videoFormat = parseVideoFormat(settingsJson.optString("videoFormat", "auto"));
 
         settings.enableHdr = settingsJson.optBoolean("enableHdr", false);
+        settings.enableHdrHighBrightness = settingsJson.optBoolean("enableHdrHighBrightness", false);
         settings.enableMic = settingsJson.optBoolean("enableMic", false);
         settings.micBitrate = settingsJson.optInt("micBitrate", 96);
         settings.enableNativeMousePointer = settingsJson.optBoolean("enableNativeMousePointer", false);
@@ -445,6 +448,7 @@ public static void addLastSettingsToIntent(Intent intent, PreferenceConfiguratio
         intent.putExtra(INTENT_LAST_SETTINGS_RESOLUTION_SCALE, lastSettings.resolutionScale);
         intent.putExtra(INTENT_LAST_SETTINGS_VIDEO_FORMAT, lastSettings.videoFormat.toString());
         intent.putExtra(INTENT_LAST_SETTINGS_ENABLE_HDR, lastSettings.enableHdr);
+        intent.putExtra(INTENT_LAST_SETTINGS_ENABLE_HDR_HIGH_BRIGHTNESS, lastSettings.enableHdrHighBrightness);
         intent.putExtra(INTENT_LAST_SETTINGS_ENABLE_MIC, lastSettings.enableMic);
         intent.putExtra(INTENT_LAST_SETTINGS_MIC_BITRATE, lastSettings.micBitrate);
         intent.putExtra(INTENT_LAST_SETTINGS_ENABLE_NATIVE_MOUSE, lastSettings.enableNativeMousePointer);
@@ -483,6 +487,7 @@ public boolean applyLastSettingsFromIntent(Intent intent, PreferenceConfiguratio
             prefConfig.bitrate = intent.getIntExtra(INTENT_LAST_SETTINGS_BITRATE, prefConfig.bitrate);
             prefConfig.resolutionScale = intent.getIntExtra(INTENT_LAST_SETTINGS_RESOLUTION_SCALE, prefConfig.resolutionScale);
             prefConfig.enableHdr = intent.getBooleanExtra(INTENT_LAST_SETTINGS_ENABLE_HDR, prefConfig.enableHdr);
+            prefConfig.enableHdrHighBrightness = intent.getBooleanExtra(INTENT_LAST_SETTINGS_ENABLE_HDR_HIGH_BRIGHTNESS, prefConfig.enableHdrHighBrightness);
             prefConfig.enableMic = intent.getBooleanExtra(INTENT_LAST_SETTINGS_ENABLE_MIC, prefConfig.enableMic);
             prefConfig.micBitrate = intent.getIntExtra(INTENT_LAST_SETTINGS_MIC_BITRATE, prefConfig.micBitrate);
             prefConfig.enableNativeMousePointer = intent.getBooleanExtra(INTENT_LAST_SETTINGS_ENABLE_NATIVE_MOUSE, prefConfig.enableNativeMousePointer);

app/src/main/res/values-zh-rCN/strings.xml

@@ -259,6 +259,8 @@
     <string name="summary_video_format">如果您的设备支持较新的编解码器，则可以降低视频带宽要求。如果主机软件或显卡不支持编解码器选择，则可能会忽略编解码器选择。</string>
     <string name="title_enable_hdr">启用 HDR </string>
     <string name="summary_enable_hdr">当游戏和显卡支持时以HDR模式串流，HDR需要显卡支持 HEVC/AV1 Main 10 编码。⚠注意：串流返回菜单中的HDR开关是切换windows的HDR。</string>
+    <string name="title_enable_hdr_high_brightness">启用 HDR 串流高亮度</string>
+    <string name="summary_enable_hdr_high_brightness">启用 HDR 串流时强制使用最高屏幕亮度</string>
     <string name="title_enable_perf_overlay">性能监控图层</string>
     <string name="summary_enable_perf_overlay">显示实时的串流监控数据，盯帧必备！</string>
     <string name="title_perf_overlay_orientation">性能图层方向</string>

app/src/main/res/values/strings.xml

@@ -365,6 +365,8 @@
     <string name="summary_video_format">Newer codecs can lower video bandwidth requirements if your device supports them. Codec selections may be ignored if not supported by the host software or GPU.</string>
     <string name="title_enable_hdr">Enable HDR (Experimental)</string>
     <string name="summary_enable_hdr">Stream HDR when the game and PC GPU support it. HDR requires a GPU with HEVC Main 10 encoding support.</string>
+    <string name="title_enable_hdr_high_brightness">Enable HDR High Brightness</string>
+    <string name="summary_enable_hdr_high_brightness">Force maximum screen brightness when HDR streaming is enabled</string>
     <string name="title_full_range">Force full range video (Experimental)</string>
     <string name="summary_full_range">This will cause loss of detail in light and dark areas if your device doesn\'t properly display full range video content.</string>
     <string name="title_enable_perf_overlay">Show performance stats while streaming</string>

app/src/main/res/xml/preferences.xml

@@ -560,6 +560,12 @@
             android:title="@string/title_enable_hdr"
             android:summary="@string/summary_enable_hdr"
             android:defaultValue="false" />
+        <CheckBoxPreference
+            android:key="checkbox_enable_hdr_high_brightness"
+            android:dependency="checkbox_enable_hdr"
+            android:title="@string/title_enable_hdr_high_brightness"
+            android:summary="@string/summary_enable_hdr_high_brightness"
+            android:defaultValue="false" />
         <CheckBoxPreference
             android:key="checkbox_full_range"
             android:title="@string/title_full_range"