--dolby-vision-profileで対象外のプロファイルも読み込めていた問題を修正。 ( #222 )

rigaya · Nov 18, 2024 · 16ca333 · 16ca333
1 parent a66e36a
commit 16ca333
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/QSVPipeline/rgy_cmd.cpp b/QSVPipeline/rgy_cmd.cpp
@@ -6138,9 +6138,7 @@ int parse_one_common_option(const TCHAR *option_name, const TCHAR *strInput[], i
     if (IS_OPTION("dolby-vision-profile")) {
         i++;
         int value = 0;
-        if (get_list_value(list_dovi_profile, strInput[i], &value)) {
-            common->doviProfile = (RGYDOVIProfile)value;
-        } else if (_stscanf_s(strInput[i], _T("%d"), &value) == 1) {
+        if (get_list_value(list_dovi_profile_parse, strInput[i], &value)) {
             common->doviProfile = (RGYDOVIProfile)value;
         } else {
             print_cmd_error_invalid_value(option_name, strInput[i], list_dovi_profile);

diff --git a/QSVPipeline/rgy_def.h b/QSVPipeline/rgy_def.h
@@ -498,6 +498,17 @@ const CX_DESC list_dovi_profile[] = {
     { NULL, 0 }
 };
 
+const CX_DESC list_dovi_profile_parse[] = {
+    { _T("unset"), RGY_DOVI_PROFILE_UNSET },
+    { _T("copy"),  RGY_DOVI_PROFILE_COPY },
+    { _T("5.0"),   RGY_DOVI_PROFILE_50 },
+    { _T("5"),     RGY_DOVI_PROFILE_50 },
+    { _T("8.1"),   RGY_DOVI_PROFILE_81 },
+    { _T("8.2"),   RGY_DOVI_PROFILE_82 },
+    { _T("8.4"),   RGY_DOVI_PROFILE_84 },
+    { NULL, 0 }
+};
+
 
 // 1st luma line > |X   X ...    |3 4 X ...     X が輝度ピクセル位置
 //                 |             |1 2           1-6 are possible chroma positions