diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml index 542935195..025af8686 100644 --- a/src/android/app/src/main/res/values/arrays.xml +++ b/src/android/app/src/main/res/values/arrays.xml @@ -88,12 +88,20 @@ + @string/resolution_quarter @string/resolution_half @string/resolution_three_quarter @string/resolution_one + @string/resolution_one_and_quarter + @string/resolution_one_and_half + @string/resolution_one_and_three_quarter @string/resolution_two @string/resolution_three @string/resolution_four + @string/resolution_five + @string/resolution_six + @string/resolution_seven + @string/resolution_eight @@ -104,12 +112,20 @@ - 0 - 1 - 2 - 3 - 4 - 5 + -1 + 0 + 1 + 2 + 11 + 3 + 12 + 4 + 5 + 6 + 7 + 8 + 9 + 10 diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index d80172b8c..f2b903bfd 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -636,13 +636,20 @@ Extreme (Slow) - 0.25X (180p/270p) - 0.5X (360p/540p) - 0.75X (540p/810p) + 0.25X (180p/270p) [EXPERIMENTAL] + 0.5X (360p/540p) [EXPERIMENTAL] + 0.75X (540p/810p) [EXPERIMENTAL] 1X (720p/1080p) - 2X (1440p/2160p) (Slow) - 3X (2160p/3240p) (Slow) - 4X (2880p/4320p) (Slow) + 1.25X (900p/1350p) [EXPERIMENTAL] + 1.5X (1080p/1620p) [EXPERIMENTAL] + 1.75X (1260p/1890p) [EXPERIMENTAL] + 2X (1440p/2160p) + 3X (2160p/3240p) + 4X (2880p/4320p) + 5X (3600p/5400p) + 6X (4320p/6480p) + 7X (5040p/7560p) + 8X (5760p/8640p) Immediate (Off) diff --git a/src/citron/configuration/shared_translation.cpp b/src/citron/configuration/shared_translation.cpp index 776528886..4d0a65cd1 100644 --- a/src/citron/configuration/shared_translation.cpp +++ b/src/citron/configuration/shared_translation.cpp @@ -453,7 +453,9 @@ std::unique_ptr ComboboxEnumeration(QWidget* parent) { PAIR(ResolutionSetup, Res1_2X, tr("0.5X (360p/540p) [EXPERIMENTAL]")), PAIR(ResolutionSetup, Res3_4X, tr("0.75X (540p/810p) [EXPERIMENTAL]")), PAIR(ResolutionSetup, Res1X, tr("1X (720p/1080p)")), + PAIR(ResolutionSetup, Res5_4X, tr("1.25X (900p/1350p) [EXPERIMENTAL]")), PAIR(ResolutionSetup, Res3_2X, tr("1.5X (1080p/1620p) [EXPERIMENTAL]")), + PAIR(ResolutionSetup, Res7_4X, tr("1.75X (1260p/1890p) [EXPERIMENTAL]")), PAIR(ResolutionSetup, Res2X, tr("2X (1440p/2160p)")), PAIR(ResolutionSetup, Res3X, tr("3X (2160p/3240p)")), PAIR(ResolutionSetup, Res4X, tr("4X (2880p/4320p)")), diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 02db52f5a..27caed4ae 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -293,10 +293,18 @@ void TranslateResolutionInfo(ResolutionSetup setup, ResolutionScalingInfo& info) info.up_scale = 1; info.down_shift = 0; break; + case ResolutionSetup::Res5_4X: + info.up_scale = 5; + info.down_shift = 2; + break; case ResolutionSetup::Res3_2X: info.up_scale = 3; info.down_shift = 1; break; + case ResolutionSetup::Res7_4X: + info.up_scale = 7; + info.down_shift = 2; + break; case ResolutionSetup::Res2X: info.up_scale = 2; info.down_shift = 0; diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index 489b8850c..000d1e8c0 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -625,7 +625,9 @@ enum class ResolutionSetup : s32 { Res1_2X = 0, Res3_4X = 1, Res1X = 2, + Res5_4X = 11, // 1.25X Res3_2X = 3, + Res7_4X = 12, // 1.75X Res2X = 4, Res3X = 5, Res4X = 6, @@ -643,7 +645,9 @@ EnumMetadata::Canonicalizations() { {"Res1_2X", ResolutionSetup::Res1_2X}, {"Res3_4X", ResolutionSetup::Res3_4X}, {"Res1X", ResolutionSetup::Res1X}, + {"Res5_4X", ResolutionSetup::Res5_4X}, {"Res3_2X", ResolutionSetup::Res3_2X}, + {"Res7_4X", ResolutionSetup::Res7_4X}, {"Res2X", ResolutionSetup::Res2X}, {"Res3X", ResolutionSetup::Res3X}, {"Res4X", ResolutionSetup::Res4X},