NVEnc 7.32で10bit深度のy4m読みが異常終了する問題を修正。

rigaya · Oct 8, 2023 · 44eab09 · 44eab09
1 parent 029af9a
commit 44eab09
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/NVEnc/NVEnc_readme.txt b/NVEnc/NVEnc_readme.txt
@@ -213,6 +213,10 @@ NVIDIA グラフィックドライバ 536.23
 今後の更新で設定ファイルの互換性がなくなるかもしれません。
 
 【メモ】
+2023.10.06 (7.33)
+[NVEncC]
+- NVEnc 7.32で10bit深度のy4m読みが異常終了する問題を修正。
+
 2023.10.05 (7.32)
 [NVEncC]
 - エンコードせずにy4m出力するオプションを追加。 (-c raw)

diff --git a/NVEncCore/rgy_input.cpp b/NVEncCore/rgy_input.cpp
@@ -37,26 +37,26 @@ static const auto RGY_CSP_TO_Y4MHEADER_CSP = make_array<std::pair<RGY_CSP, const
     std::make_pair(RGY_CSP_YV12,      "420mpeg2"),
     std::make_pair(RGY_CSP_YV12,      "420jpeg"),
     std::make_pair(RGY_CSP_YV12,      "420paldv"),
-    std::make_pair(RGY_CSP_YV12,      "420"),
     std::make_pair(RGY_CSP_YV12_09,   "420p9"),
     std::make_pair(RGY_CSP_YV12_10,   "420p10"),
     std::make_pair(RGY_CSP_YV12_12,   "420p12"),
     std::make_pair(RGY_CSP_YV12_14,   "420p14"),
     std::make_pair(RGY_CSP_YV12_16,   "420p16"),
-    std::make_pair(RGY_CSP_YUV422,    "422"),
-    std::make_pair(RGY_CSP_YUV422,    "422p"),
+    std::make_pair(RGY_CSP_YV12,      "420"),
     std::make_pair(RGY_CSP_YUV422_09, "422p9"),
     std::make_pair(RGY_CSP_YUV422_10, "422p10"),
     std::make_pair(RGY_CSP_YUV422_12, "422p12"),
     std::make_pair(RGY_CSP_YUV422_14, "422p14"),
     std::make_pair(RGY_CSP_YUV422_16, "422p16"),
-    std::make_pair(RGY_CSP_YUV444,    "444"),
-    std::make_pair(RGY_CSP_YUV444,    "444p"),
+    std::make_pair(RGY_CSP_YUV422,    "422p"),
+    std::make_pair(RGY_CSP_YUV422,    "422"),
     std::make_pair(RGY_CSP_YUV444_09, "444p9"),
     std::make_pair(RGY_CSP_YUV444_10, "444p10"),
     std::make_pair(RGY_CSP_YUV444_12, "444p12"),
     std::make_pair(RGY_CSP_YUV444_14, "444p14"),
     std::make_pair(RGY_CSP_YUV444_16, "444p16"),
+    std::make_pair(RGY_CSP_YUV444,    "444p"),
+    std::make_pair(RGY_CSP_YUV444,    "444"),
     std::make_pair(RGY_CSP_NV12,      "nv12"),
     std::make_pair(RGY_CSP_P010,      "p010")
     );

diff --git a/NVEncCore/rgy_version.h b/NVEncCore/rgy_version.h
@@ -29,9 +29,9 @@
 #ifndef __RGY_CONFIG_H__
 #define __RGY_CONFIG_H__
 
-#define VER_FILEVERSION              0,7,32,0
-#define VER_STR_FILEVERSION          "7.32"
-#define VER_STR_FILEVERSION_TCHAR _T("7.32")
+#define VER_FILEVERSION              0,7,33,0
+#define VER_STR_FILEVERSION          "7.33"
+#define VER_STR_FILEVERSION_TCHAR _T("7.33")
 
 #ifdef _M_IX86
 #define BUILD_ARCH_STR _T("x86")