changes for 3.42.1

* Add support for yuv420p10 with bt.709 #104
argorar · Nov 5, 2024 · 4ff003c · 4ff003c
1 parent 99d91cb
commit 4ff003c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/MainForm.cs b/MainForm.cs
@@ -129,6 +129,7 @@ public partial class MainForm : Form
         bool bt2020;
         bool hdr10;
         bool bt601;
+        bool bt709;
 
         private List<string> _temporaryFilesList;
 
@@ -1613,6 +1614,8 @@ void SetFile(string path)
             hdr10 = false;
             bt2020 = false;
             yuvj420p = false;
+            bt601 = false;
+            bt709 = false;
 
             if (Path.GetExtension(path) == ".avs")
             {
@@ -1845,6 +1848,11 @@ void SetFile(string path)
                                         bt601 = true;
                                     }
 
+                                    if (nav.GetAttribute("color_space", "") == "bt709")
+                                    {
+                                        bt709 = true;
+                                    }
+
                                     // Check if this is a Hi444p video - if so, we'll need to do something weird if you wanna add subs later.
                                     Program.InputHasWeirdPixelFormat = nav.GetAttribute("pix_fmt", "").StartsWith("yuv444p");
 
@@ -2482,8 +2490,7 @@ string GenerateArguments()
 
             var pixelFormat = checkBoxAlpha.Checked && checkBoxAlpha.Enabled ? "yuva420p" : "yuv420p";
             pixelFormat = hdr10 && mp4Box.SelectedIndex == ((int)Mp4Codec.Hevc_nvenc) ? "p010le" : pixelFormat;
-            pixelFormat = hdr10 && mp4Box.SelectedIndex < ((int)Mp4Codec.H264_nvenc)
-                          && mp4Box.SelectedIndex > ((int)Mp4Codec.H264_nvenc) ? "yuv420p10le" : pixelFormat;
+            pixelFormat = hdr10 && mp4Box.SelectedIndex != ((int)Mp4Codec.Hevc_nvenc) ? "yuv420p10le" : pixelFormat;
 
             var threads = trackThreads.Value;
             var slices = GetSlices();
@@ -2505,10 +2512,14 @@ string GenerateArguments()
                             extraArguments + $@" -color_primaries bt709 -color_trc bt709 -colorspace {colorSpace} -color_range full" :
                             extraArguments;
 
-            extraArguments = hdr10 ?
+            extraArguments = hdr10 && !bt709?
                             extraArguments + @" -color_trc smpte2084 -color_primaries bt2020 -colorspace bt2020nc " :
                             extraArguments;
 
+            extraArguments = hdr10 && bt709 ?
+                            extraArguments + @" -color_trc bt709 -color_primaries bt709 -colorspace bt709 " :
+                            extraArguments;
+
             extraArguments = bt2020 ?
                             extraArguments + @" -color_trc arib-std-b67 -color_primaries bt2020 -colorspace bt2020nc " :
                             extraArguments;

diff --git a/NewUpdate/3.42.1.zip b/NewUpdate/3.42.1.zip
diff --git a/NewUpdate/latest b/NewUpdate/latest
@@ -1 +1 @@
-3.42.0
+3.42.1
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,4 +31,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.42.0")]
+[assembly: AssemblyVersion("3.42.1")]
diff --git a/README.md b/README.md
@@ -224,13 +224,17 @@ Drag and drop two or more video files inside the application, select what do you
 * Change Rate: ```Alt + Shift + c```
 
 ### Supporters
+* Cybelia♡ 
 * Chibi
 * bouteloua
 * ManletPride
 * 3nly
 
 ## Changelog
 
+#### Version 3.42.1
+* Add support for yuv420p10 with bt.709 [issue](https://github.com/argorar/WebMConverter/issues/104)
+
 #### Version 3.42.0
 * Add merge audio, in track selector choose mix all (only two tracks sopported now) [request](https://github.com/argorar/WebMConverter/issues/102)
 * Expand support for HDR