Merge branch 'MediaArea:main' into master

History_CLI.txt

@@ -1,3 +1,12 @@
+Version 24.11, 2024-11-11
+-------------
+Cleanup of the output
+Add --log-name option for summary in a file at the end of the processing
+Support of DPX Y 10-bit from DIAMANT-Film
+Accept null bytes in DPX version
+Add TIFF 8-bit LE
+Fix wrong compute of max slice count with DPX having group of pixels
+
 Version 23.12, 2023-12-18
 -------------
 Support of DPX/Y/12-bit/Packed/BE

Project/Chocolatey/rawcooked.nuspec

@@ -4,7 +4,7 @@
   <metadata>
     <id>rawcooked</id>
     <title>RAWcooked</title>
-    <version>23.12</version>
+    <version>24.11</version>
     <packageSourceUrl>https://github.com/MediaArea/RAWcooked/blob/master/Project/Chocolatey</packageSourceUrl>
     <owners>MediaArea.net</owners>
     <authors>MediaArea.net</authors>

Project/Chocolatey/tools/chocolateyinstall.ps1

@@ -2,7 +2,7 @@
 
 $packageArgs = @{
   PackageName    = "${env:ChocolateyPackageName}"
-  Url64bit       = "https://mediaarea.net/download/binary/rawcooked/23.12/RAWcooked_CLI_23.12_Windows_x64.zip"
+  Url64bit       = "https://mediaarea.net/download/binary/rawcooked/24.11/RAWcooked_CLI_24.11_Windows_x64.zip"
   Checksum64     = '0000000000000000000000000000000000000000000000000000000000000000'
   ChecksumType64 = 'sha256'
   UnzipLocation = "$(split-path -parent $MyInvocation.MyCommand.Definition)\rawcooked"

Project/GNU/CLI/test/test1.txt

@@ -210,8 +210,10 @@ Formats/DPX/Flavors/Y_10_FilledB_BE/Y_10_FilledB_BE_Modified_9x4_Scanity.dpx
 Formats/DPX/Flavors/Y_12_Packed_BE/086400.dpx pass
 Formats/DPX/Flavors/Y_16_FilledA_BE/0000001.dpx pass
 Formats/DPX/Flavors/Y_16_Packed_BE/FFmpeg_gray16be.dpx pass
+Formats/DPX/Flavors/Y_16_Packed_BE/pack3.dpx pass
 Formats/DPX/Flavors/Y_16_Packed_LE/FFmpeg_gray16le.dpx pass
 Formats/DPX/Conformance/0004_OffsetToImageData/0004_OffsetToImageData_000000.dpx fail
+Formats/DPX/Conformance/0008_VersionNumber/0008_VersionNumber_null.dpx pass
 Formats/DPX/Conformance/0008_VersionNumber/0008_VersionNumber_v.dpx pass
 Formats/EXR/Features/Compressed/PXR24/AllHalfValues.exr fail
 Formats/EXR/Flavors/RGB_16F/Color_Test_Chart_LogC_400ASA_3200k.cpu.00.exr pass
@@ -252,6 +254,7 @@ Formats/TIFF/Flavors/Raw_Y_2_U/flower-minisblack-02.tif fail
 Formats/TIFF/Flavors/Raw_Y_4_U/flower-minisblack-04.tif fail
 Formats/TIFF/Flavors/Raw_Y_6_U/flower-minisblack-06.tif fail
 Formats/TIFF/Flavors/Raw_Y_8_U/flower-minisblack-08.tif pass
+Formats/TIFF/Flavors/Raw_Y_8_U/Raw_Y_8_U_LE.tif pass
 Formats/TIFF/Flavors/Raw_Y_10_U/flower-minisblack-10.tif fail
 Formats/TIFF/Flavors/Raw_Y_12_U/flower-minisblack-12.tif fail
 Formats/TIFF/Flavors/Raw_Y_14_U/flower-minisblack-14.tif fail

Project/GNU/PKGBUILD

@@ -2,7 +2,7 @@
 # Maintainer: MediaArea.net SARL <[email protected]>
 
 pkgname=('rawcooked')
-pkgver=23.12
+pkgver=24.11
 pkgrel=1
 pkgdesc="Encodes RAW audio-visual data while permitting reversibility"
 url="http://mediaarea.net"

Project/GNU/rawcooked.dsc

@@ -2,11 +2,11 @@ Format: 3.0 (quilt)
 Source: rawcooked
 Binary: rawcooked, rawcooked-dbg
 Architecture: any
-Version: 23.12-1
+Version: 24.11-1
 Maintainer: Jerome Martinez <[email protected]>
 Homepage: https://mediaarea.net
 Standards-Version: 3.7.3
 Build-Depends: debhelper (>=7), pkg-config, automake, autoconf, libtool
 Files:
- 00000000000000000000000000000000 000000 rawcooked_23.12.orig.tar.xz
- 00000000000000000000000000000000 000000 rawcooked_23.12-1.debian.tar.xz
+ 00000000000000000000000000000000 000000 rawcooked_24.11.orig.tar.xz
+ 00000000000000000000000000000000 000000 rawcooked_24.11-1.debian.tar.xz

Project/GNU/rawcooked.spec

@@ -4,7 +4,7 @@
 
 # norootforbuild
 
-%global rawcooked_version		23.12
+%global rawcooked_version		24.11
 
 Name:			rawcooked
 Version:		%rawcooked_version
@@ -72,5 +72,5 @@ popd
 %{_mandir}/man1/rawcooked.*
 
 %changelog
-* Mon Jan 01 2018 Jerome Martinez <[email protected]> - 23.12-0
+* Mon Jan 01 2018 Jerome Martinez <[email protected]> - 24.11-0
 - See History.txt for more info and real dates

Project/MSVC2017/CLI/RAWcooked.rc

@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,12,0,0
- PRODUCTVERSION 23,12,0,0
+ FILEVERSION 24,11,0,0
+ PRODUCTVERSION 24,11,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "RAWcooked"
-            VALUE "FileVersion", "23.12.0.0"
+            VALUE "FileVersion", "24.11.0.0"
             VALUE "InternalName", "RAWcooked - CLI"
             VALUE "LegalCopyright", "MediaArea.net"
             VALUE "OriginalFilename", "RAWcooked.exe"
             VALUE "ProductName", "RAWcooked"
-            VALUE "ProductVersion", "23.12.0.0"
+            VALUE "ProductVersion", "24.11.0.0"
         END
     END
     BLOCK "VarFileInfo"

Project/MSVC2019/CLI/RAWcooked.rc

@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,12,0,0
- PRODUCTVERSION 23,12,0,0
+ FILEVERSION 24,11,0,0
+ PRODUCTVERSION 24,11,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "RAWcooked"
-            VALUE "FileVersion", "23.12.0.0"
+            VALUE "FileVersion", "24.11.0.0"
             VALUE "InternalName", "RAWcooked - CLI"
             VALUE "LegalCopyright", "MediaArea.net"
             VALUE "OriginalFilename", "RAWcooked.exe"
             VALUE "ProductName", "RAWcooked"
-            VALUE "ProductVersion", "23.12.0.0"
+            VALUE "ProductVersion", "24.11.0.0"
         END
     END
     BLOCK "VarFileInfo"

Project/Mac/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>23.12</string>
+	<string>24.11</string>
 	<key>CFBundleVersion</key>
-	<string>23.12</string>
+	<string>24.11</string>
 	<key>DTSDKName</key>
 	<string>macosx10.6</string>
 	<key>LSApplicationCategoryType</key>

Project/version.txt

@@ -1 +1 @@
-23.12
+24.11

Source/CLI/Global.cpp

@@ -242,6 +242,13 @@ int global::SetHash(bool Value)
     return 0;
 }
 
+//---------------------------------------------------------------------------
+int global::SetLogFileName(const char* FileName)
+{
+    LogFileName = FileName;
+    return 0;
+}
+
 //---------------------------------------------------------------------------
 int global::SetAll(bool Value)
 {
@@ -314,6 +321,18 @@ int global::SetOption(const char* argv[], int& i, int argc)
             License.Encoder(encoder::FFV1);
             return 0;
         }
+        if (!strncmp(argv[i], "ffv1_vulkan", 11) && (!argv[i][11] || (argv[i][11] == ':' && argv[i][12] >= '0' && argv[i][12] <= '9' && !argv[i][13])))
+        {
+            OutputOptions["c:v"] = "ffv1_vulkan";
+            if (argv[i][11])
+                OutputOptions["init_hw_device"] = "\"vulkan=vk" + string(argv[i] + 11) + '\"';
+            else
+                OutputOptions["init_hw_device"] = "\"vulkan=vk:0\"";
+            OutputOptions["vf"] = "hwupload";
+            License.Encoder(encoder::FFV1);
+            License.Feature(feature::HwAccel);
+            return 0;
+        }
         return Error_NotTested(argv[i - 1], argv[i]);
     }
     if (!strcmp(argv[i], "-coder"))
@@ -582,6 +601,16 @@ int global::ManageCommandLine(const char* argv[], int argc)
             if (Value)
                 return Value;
         }
+        else if (strcmp(argv[i], "--log-name") == 0)
+        {
+            LogFile_IgnorePos.insert(i);
+            if (i + 1 == argc)
+                return Error_Missing(argv[i]);
+            int Value = SetLogFileName(argv[++i]);
+            LogFile_IgnorePos.insert(i);
+            if (Value)
+                return Value;
+        }
         else if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0)
         {
             int Value = Help(argv[0]);
@@ -780,6 +809,7 @@ int global::ManageCommandLine(const char* argv[], int argc)
             OutputOptions["n"] = string();
             OutputOptions.erase("y");
             Mode = AlwaysNo; // Also RAWcooked itself
+            LogFile_IgnorePos.insert(i);
         }
         else if (!strcmp(argv[i], "-threads"))
         {
@@ -793,6 +823,7 @@ int global::ManageCommandLine(const char* argv[], int argc)
             OutputOptions["y"] = string();
             OutputOptions.erase("n");
             Mode = AlwaysYes; // Also RAWcooked itself
+            LogFile_IgnorePos.insert(i);
         }
         else if (OptionsForOtherFiles)
         {
@@ -815,9 +846,15 @@ int global::ManageCommandLine(const char* argv[], int argc)
                 return Value;
         }
         else
+        {
             Inputs.push_back(argv[i]);
+            LogFile_IgnorePos.insert(i);
+        }
     }
 
+    if (BinName.empty())
+        BinName = "ffmpeg";
+
     // License
     if (License.LoadLicense(LicenseKey, StoreLicenseKey))
         return true;
@@ -834,6 +871,8 @@ int global::ManageCommandLine(const char* argv[], int argc)
     if (Inputs.empty() && (ShowLicenseKey || SubLicenseId))
         return 0;
 
+    if (!LogFileName.empty())
+        Log = new string;
     return 0;
 }
 

Source/CLI/Global.h

@@ -15,6 +15,7 @@
 #include "Lib/Uncompressed/HashSum/HashSum.h"
 #include "Lib/License/License.h"
 #include <map>
+#include <set>
 #include <vector>
 #include <string>
 #include <thread>
@@ -34,6 +35,7 @@ class global
     string                      rawcooked_reversibility_FileName;
     string                      OutputFileName;
     string                      FrameMd5FileName;
+    string                      LogFileName;
     string                      BinName;
     string                      LicenseKey;
     uint64_t                    SubLicenseId;
@@ -52,11 +54,13 @@ class global
     // Intermediate info
     size_t                      Path_Pos_Global;
     vector<string>              Inputs;
+    set<int>                    LogFile_IgnorePos;
     license                     License;
     user_mode                   Mode = Ask;
     hashes                      Hashes;
     errors                      Errors;
     ask_callback                Ask_Callback = nullptr;
+    string*                     Log = nullptr;
 
     // Conformance check intermediary info
     vector<double>              Durations;
@@ -100,6 +104,7 @@ class global
     int SetFrameMd5An(bool Value);
     int SetFrameMd5FileName(const char* FileName);
     int SetHash(bool Value);
+    int SetLogFileName(const char* FileName);
     int SetAll(bool Value);
 
 private:

Source/CLI/Help.cpp

@@ -138,6 +138,10 @@ ReturnValue Help(const char* Name)
         "       -n     Automatic no to prompts.\n"
         "              Assume no as answer to all prompts, and run non-interactively.\n"
         "\n"
+        "       --log-name value\n"
+        "              Set the name of the RAWcooked log file written after\n"
+        "              successful processing.\n"
+        "\n"
         "   ACTIONS\n"
         "       --all  Same as --info --conch --decode --encode --hash --coherency\n"
         "              --check-padding --check --accept-gaps (see below)\n"
@@ -385,3 +389,15 @@ ReturnValue Version()
 
   return ReturnValue_OK;
 }
+
+//---------------------------------------------------------------------------
+const char* GetLibraryName()
+{
+    return LibraryName;
+}
+
+//---------------------------------------------------------------------------
+const char* GetLibraryVersion()
+{
+    return LibraryVersion;
+}

Source/CLI/Help.h

@@ -17,5 +17,7 @@
 ReturnValue Help(const char* Name);
 ReturnValue Usage(const char* Name);
 ReturnValue Version();
+const char* GetLibraryVersion();
+const char* GetLibraryName();
 
 #endif