Consolidate AV1 and HEVC options into a single preference

This commit is contained in:
Cameron Gutman
2023-07-09 15:04:26 -05:00
parent e6876926a4
commit 1f72c82acb
6 changed files with 32 additions and 73 deletions

View File

@@ -96,27 +96,18 @@
</string-array>
<string-array name="video_format_names">
<item>@string/videoformat_hevcauto</item>
<item>@string/videoformat_auto</item>
<item>@string/videoformat_av1always</item>
<item>@string/videoformat_hevcalways</item>
<item>@string/videoformat_hevcnever</item>
<item>@string/videoformat_h264always</item>
</string-array>
<string-array name="video_format_values" translatable="false">
<item>auto</item>
<item>forceav1</item>
<item>forceh265</item>
<item>neverh265</item>
</string-array>
<string-array name="av1_format_names">
<item>@string/av1_format_auto</item>
<item>@string/av1_format_always</item>
<item>@string/av1_format_never</item>
</string-array>
<string-array name="av1_format_values" translatable="false">
<item>auto</item>
<item>force</item>
<item>never</item>
</string-array>
<string-array name="video_frame_pacing_names">
<item>@string/pacing_latency</item>
<item>@string/pacing_balanced</item>

View File

@@ -236,10 +236,8 @@
<string name="summary_checkbox_disable_warnings">Disable on-screen connection warning messages while streaming</string>
<string name="title_disable_frame_drop">Never drop frames</string>
<string name="summary_disable_frame_drop">May reduce micro-stuttering on some devices, but can increase latency</string>
<string name="title_video_format">Change HEVC settings</string>
<string name="summary_video_format">HEVC lowers video bandwidth requirements but requires a newer device</string>
<string name="title_av1_format">Change AV1 settings (Experimental)</string>
<string name="summary_av1_format">AV1 lowers video bandwidth requirements more than HEVC, but is currently experimental.</string>
<string name="title_video_format">Change codec settings</string>
<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_full_range">Force full range video (Experimental)</string>
@@ -274,13 +272,10 @@
<string name="audioconf_51surround">5.1 Surround Sound</string>
<string name="audioconf_71surround">7.1 Surround Sound</string>
<string name="videoformat_hevcauto">Automatic (Recommended)</string>
<string name="videoformat_auto">Automatic (Recommended)</string>
<string name="videoformat_av1always">Prefer AV1 (Experimental)</string>
<string name="videoformat_hevcalways">Prefer HEVC</string>
<string name="videoformat_hevcnever">Never use HEVC</string>
<string name="av1_format_auto">Automatic (Recommended)</string>
<string name="av1_format_always">Prefer AV1</string>
<string name="av1_format_never">Never use AV1</string>
<string name="videoformat_h264always">Prefer H.264</string>
<string name="title_frame_pacing">Video frame pacing</string>
<string name="summary_frame_pacing">Specify how to balance video latency and smoothness</string>

View File

@@ -220,13 +220,6 @@
android:entryValues="@array/video_format_values"
android:summary="@string/summary_video_format"
android:defaultValue="auto" />
<ListPreference
android:key="av1_format"
android:title="@string/title_av1_format"
android:entries="@array/av1_format_names"
android:entryValues="@array/av1_format_values"
android:summary="@string/summary_av1_format"
android:defaultValue="auto" />
<CheckBoxPreference
android:key="checkbox_enable_hdr"
android:title="@string/title_enable_hdr"