Fix stretching, add UHD 4:3 option

simontime · May 4, 2024 · 2d46e67 · 2d46e67
1 parent 75ba1b1
commit 2d46e67
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/Brovicon/Main.Designer.cs b/Brovicon/Main.Designer.cs
diff --git a/Brovicon/Main.cs b/Brovicon/Main.cs
@@ -204,8 +204,11 @@ private void boxOutputResolution_SelectedIndexChanged(object sender, EventArgs e
                 case 4: // HD 1920x1080
                     videoStandard = new Standards.HD_1920_1080();
                     break;
-                case 5: // UHD 2160 (4K)
-                    videoStandard = new Standards.UHD_2160();
+                case 5: // UHD/4K 2880x2160
+                    videoStandard = new Standards.UHD_2880_2160();
+                    break;
+                case 6: // UHD/4K 3840x2160 (4K)
+                    videoStandard = new Standards.UHD_3840_2160();
                     break;
                 default: // Shouldn't ever be reached, defaults to 1920x1080
                     videoStandard = new Standards.HD_1920_1080();
@@ -323,7 +326,7 @@ private async void btnConvert_Click(object sender, EventArgs e)
                     cropRatio = string2Ratio(boxCrop.Text);
 
                 if (boxStretch.Enabled)
-                    cropRatio = string2Ratio(boxCrop.Text);
+                    stretchRatio = string2Ratio(boxStretch.Text);
 
                 // Dimensions and ratios
                 var originalHeight = videoInformation.Height;

diff --git a/Brovicon/Standards.cs b/Brovicon/Standards.cs
@@ -85,7 +85,25 @@ public class HD_1920_1080 : IStandard
             public int GetHeight() => 1080;
         }
 
-        public class UHD_2160 : IStandard
+        public class UHD_2880_2160 : IStandard
+        {
+            // All combinations allowed
+            public string[] GetAllowedFrameRates() => new string[] {
+                "23.976p",
+                "24p",
+                "25p",
+                "29.97p",
+                "30p",
+                "50p",
+                "59.94p",
+                "60p",
+            };
+
+            public int GetWidth() => 2880;
+            public int GetHeight() => 2160;
+        }
+
+        public class UHD_3840_2160 : IStandard
         {
             // All combinations allowed
             public string[] GetAllowedFrameRates() => new string[] {