From f93bfdec4208c1fd3586ccb9b9030822197bc04e Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Fri, 14 Apr 2023 18:50:24 +0800 Subject: [PATCH 1/3] Add tonemap mode options Signed-off-by: nyanmisaka --- src/controllers/dashboard/encodingsettings.html | 12 ++++++++---- src/controllers/dashboard/encodingsettings.js | 4 ++-- src/strings/en-us.json | 4 +++- src/strings/zh-cn.json | 4 +++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html index 759c19d7d4..3d4ed0b99b 100644 --- a/src/controllers/dashboard/encodingsettings.html +++ b/src/controllers/dashboard/encodingsettings.html @@ -167,6 +167,14 @@ ${TonemappingAlgorithmHelp} +
+ +
${TonemappingModeHelp}
+
${LabelTonemappingDesatHelp}
-
- -
${LabelTonemappingThresholdHelp}
-
${LabelTonemappingPeakHelp}
diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js index 38ca954d0e..2ae00b3dec 100644 --- a/src/controllers/dashboard/encodingsettings.js +++ b/src/controllers/dashboard/encodingsettings.js @@ -32,9 +32,9 @@ function loadPage(page, config, systemInfo) { page.querySelector('#chkTonemapping').checked = config.EnableTonemapping; page.querySelector('#chkVppTonemapping').checked = config.EnableVppTonemapping; page.querySelector('#selectTonemappingAlgorithm').value = config.TonemappingAlgorithm; + page.querySelector('#selectTonemappingMode').value = config.TonemappingMode; page.querySelector('#selectTonemappingRange').value = config.TonemappingRange; page.querySelector('#txtTonemappingDesat').value = config.TonemappingDesat; - page.querySelector('#txtTonemappingThreshold').value = config.TonemappingThreshold; page.querySelector('#txtTonemappingPeak').value = config.TonemappingPeak; page.querySelector('#txtTonemappingParam').value = config.TonemappingParam || ''; page.querySelector('#txtVppTonemappingBrightness').value = config.VppTonemappingBrightness; @@ -90,9 +90,9 @@ function onSubmit() { config.EnableTonemapping = form.querySelector('#chkTonemapping').checked; config.EnableVppTonemapping = form.querySelector('#chkVppTonemapping').checked; config.TonemappingAlgorithm = form.querySelector('#selectTonemappingAlgorithm').value; + config.TonemappingMode = form.querySelector('#selectTonemappingMode').value; config.TonemappingRange = form.querySelector('#selectTonemappingRange').value; config.TonemappingDesat = form.querySelector('#txtTonemappingDesat').value; - config.TonemappingThreshold = form.querySelector('#txtTonemappingThreshold').value; config.TonemappingPeak = form.querySelector('#txtTonemappingPeak').value; config.TonemappingParam = form.querySelector('#txtTonemappingParam').value || '0'; config.VppTonemappingBrightness = form.querySelector('#txtVppTonemappingBrightness').value; diff --git a/src/strings/en-us.json b/src/strings/en-us.json index e2b39af691..7a8ce9d8ee 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1706,5 +1706,7 @@ "MediaInfoElPresentFlag": "DV el preset flag", "MediaInfoBlPresentFlag": "DV bl preset flag", "MediaInfoDvBlSignalCompatibilityId": "DV bl signal compatibility id", - "Unreleased": "Not yet released" + "Unreleased": "Not yet released", + "LabelTonemappingMode": "Tone mapping mode:", + "TonemappingModeHelp": "Select the tone mapping mode. If you experience blown out highlights try switching to the RGB mode." } diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json index d0ce56c4f8..9a047ed0be 100644 --- a/src/strings/zh-cn.json +++ b/src/strings/zh-cn.json @@ -1721,5 +1721,7 @@ "HeaderPerformance": "性能", "LabelParallelImageEncodingLimit": "并行图像编码限制", "LabelEnableAudioVbr": "启用 VBR 音频编码", - "LabelEnableAudioVbrHelp": "可变比特率（VBR）相比平均比特率（ABR）可以提供更好的质量，但在少见情况中可能造成缓冲和兼容性问题。" + "LabelEnableAudioVbrHelp": "可变比特率（VBR）相比平均比特率（ABR）可以提供更好的质量，但在少见情况中可能造成缓冲和兼容性问题。", + "LabelTonemappingMode": "色调映射模式：", + "TonemappingModeHelp": "如果您遇到高光过曝问题，请尝试切换到 RGB 模式。" } From 89158b66531a9f71a9f4fe25a1808bec6ed69ee3 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Fri, 14 Apr 2023 18:55:08 +0800 Subject: [PATCH 2/3] Update translations for tonemapping Signed-off-by: nyanmisaka --- src/strings/en-us.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 7a8ce9d8ee..be9ee91bab 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -32,7 +32,7 @@ "AllowOnTheFlySubtitleExtractionHelp": "Embedded subtitles can be extracted from videos and delivered to clients in plain text, in order to help prevent video transcoding. On some systems this can take a long time and cause video playback to stall during the extraction process. Disable this to have embedded subtitles burned in with video transcoding when they are not natively supported by the client device.", "AllowRemoteAccess": "Allow remote connections to this server", "AllowRemoteAccessHelp": "If unchecked, all remote connections will be blocked.", - "AllowTonemappingHelp": "Tone-mapping can transform the dynamic range of a video from HDR to SDR while maintaining image details and colors, which are very important information for representing the original scene. Currently works only with HDR10 or HLG videos. This requires the corresponding OpenCL or CUDA runtime.", + "AllowTonemappingHelp": "Tone-mapping can transform the dynamic range of a video from HDR to SDR while maintaining image details and colors, which are very important information for representing the original scene. Currently works only with 10bit HDR10，HLG and DoVi videos. This requires the corresponding OpenCL or CUDA runtime.", "AlwaysPlaySubtitles": "Always Play", "AlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.", "AnyLanguage": "Any Language", @@ -1691,9 +1691,9 @@ "EnableEnhancedNvdecDecoderHelp": "Experimental NVDEC implementation, do not enable this option unless you encounter decoding errors.", "EnableSplashScreen": "Enable the splash screen", "LabelVppTonemappingBrightness": "VPP Tone mapping brightness gain", - "LabelVppTonemappingBrightnessHelp": "Apply brightness gain in VPP tone mapping. Both recommended and default values are 0.", + "LabelVppTonemappingBrightnessHelp": "Apply brightness gain in VPP tone mapping. The recommended and default values are 16 and 0.", "LabelVppTonemappingContrast": "VPP Tone mapping contrast gain", - "LabelVppTonemappingContrastHelp": "Apply contrast gain in VPP tone mapping. The recommended and default values are 1.2 and 1.", + "LabelVppTonemappingContrastHelp": "Apply contrast gain in VPP tone mapping. Both recommended and default values are 1.", "VideoRangeTypeNotSupported": "The video's range type is not supported", "LabelVideoRangeType": "Video range type", "MediaInfoVideoRangeType": "Video range type", From 24126b15740ee6b340dfd9807d8ce321e7d3bade Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Tue, 25 Apr 2023 01:54:03 -0400 Subject: [PATCH 3/3] Remove colons from label translations --- src/strings/en-us.json | 2 +- src/strings/zh-cn.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index be9ee91bab..9c4d2c8764 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1707,6 +1707,6 @@ "MediaInfoBlPresentFlag": "DV bl preset flag", "MediaInfoDvBlSignalCompatibilityId": "DV bl signal compatibility id", "Unreleased": "Not yet released", - "LabelTonemappingMode": "Tone mapping mode:", + "LabelTonemappingMode": "Tone mapping mode", "TonemappingModeHelp": "Select the tone mapping mode. If you experience blown out highlights try switching to the RGB mode." } diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json index 9a047ed0be..8818053189 100644 --- a/src/strings/zh-cn.json +++ b/src/strings/zh-cn.json @@ -1722,6 +1722,6 @@ "LabelParallelImageEncodingLimit": "并行图像编码限制", "LabelEnableAudioVbr": "启用 VBR 音频编码", "LabelEnableAudioVbrHelp": "可变比特率（VBR）相比平均比特率（ABR）可以提供更好的质量，但在少见情况中可能造成缓冲和兼容性问题。", - "LabelTonemappingMode": "色调映射模式：", + "LabelTonemappingMode": "色调映射模式", "TonemappingModeHelp": "如果您遇到高光过曝问题，请尝试切换到 RGB 模式。" }