Skip to content

Commit 4fd2322

Browse files
DonaldFaQDonaldFaQ
authored
0.73
1 parent b3e45e8 commit 4fd2322

4 files changed

Lines changed: 83 additions & 41 deletions

File tree

‎Changelog.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
-v0.73 "Understanding is overrated"
2+
*UPDATED hdr10plus_tool to v1.7.2.
3+
*UPDATED mkvtoolnix to v97.0.0.0.
4+
*Reworked Plotting HDR10 / HDR10+ / DV
5+
*Minor Bugfixes.
6+
(Do not forget to Download the new 3rd Party Apps!).
7+
18
-v0.72.1 "Blessed is the mind too small for doubt"
29
*UPDATED dovi_tool to v2.3.1.
310
*UPDATED mkvtoolnix to v95.0.0.0.
@@ -22,7 +29,7 @@
2229
*FIXED - Problems with =/() symbols in tool dirname.
2330
*REWORKED - Demuxer script (more options and better stability with Dual Layer files).
2431
*COMEBACK - Support for mkvextract/mp4box for demuxing (slower speed but lesser PPS errors).
25-
(No switch in options, you can force faster FFMPEG demuxing in the scripts itselfs).
32+
(No switch in options, you can force faster FFMPEG demuxing in the scripts itselfs).
2633
*Major Bugfixes.
2734
(3rd Party Apps from v0.70 works fine!).
2835

‎DDVT_FILEINFO.cmd‎

Lines changed: 56 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ echo == CHECK INPUT FILE ======================================================
223223
if not exist "!TMP_FOLDER!" md "!TMP_FOLDER!"
224224
echo.
225225
%CYAN%
226+
echo Analysing File. Please wait...
227+
echo.
226228
if "!RPU_FILE!!HDR10P_FILE!"=="FALSEFALSE" (
227-
echo Analysing File. Please wait...
228-
echo.
229229
::SET BL EL STREAMINDEX
230230
call :ANALYSESTREAMS
231231
set "INFOSTREAM=!INPUTFILE!"
@@ -257,7 +257,7 @@ if "!RPU_FILE!!HDR10P_FILE!"=="FALSEFALSE" (
257257
)
258258
if not defined HDRFormat set "HDRFormat=SDR"
259259
set "PHDR=!HDRFormat!"
260-
if "!HDRFormat!"=="HDR10+" set "PHDR=HDR"
260+
if "!HDRFormat!"=="HDR10+" set "PHDR=HDR10"
261261

262262
::SET DV FORMAT
263263
if exist "!TMP_FOLDER!\Info.mkv" (
@@ -470,18 +470,24 @@ if "!RPU_FILE!!HDR10P_FILE!"=="FALSEFALSE" (
470470
) else (
471471
if "!RPU_FILE!"=="TRUE" (
472472
%CYAN%
473-
echo Analysing DV RPU. Please wait...
474-
echo.
475473
"!DO_VI_TOOLpath!" info -i "!RPUFILE!" -s>"!TMP_FOLDER!\RPUINFO.txt"
476474
if exist "!TMP_FOLDER!\RPUINFO.txt" (
477475
%HCGREEN%
478476
set "DV=TRUE"
479477
FOR /F "delims=" %%A IN ('findstr /C:"Profile:" "!TMP_FOLDER!\RPUINFO.txt"') DO set "RPU_PROFILE=%%A"
480478
if defined RPU_PROFILE (
479+
for /F "tokens=2 delims=:/" %%A in ("!RPU_PROFILE!") do set "DV_PROFILE=%%A"
480+
if defined DV_PROFILE set "DV_PROFILE=!DV_PROFILE:~1!"
481481
for /F "tokens=2 delims=:/ " %%A in ("!RPU_PROFILE!") do set "RPU_DVP=%%A"
482482
if "!RPU_DVP!"=="7" for /F "tokens=3 delims=:/ " %%A in ("!RPU_PROFILE!") do set "RPU_DVSP= %%A"
483+
%HCGREEN%
484+
echo Dolby Vision Profile !DV_PROFILE! found.
485+
echo.
483486
) else (
484487
set "RPU_DVP=N/A"
488+
%HCRED%
489+
echo No Dolby Vision compatible ^*.bin file.
490+
echo.
485491
)
486492
FOR /F "delims=" %%A IN ('findstr /C:"DM version" "!TMP_FOLDER!\RPUINFO.txt"') DO set "RPU_CMV=%%A"
487493
if defined RPU_CMV (
@@ -513,6 +519,7 @@ if "!RPU_FILE!!HDR10P_FILE!"=="FALSEFALSE" (
513519
) else (
514520
set "L2_TRIMS=No L2 entries in RPU."
515521
)
522+
%HCGREEN%
516523
echo Done.
517524
) else (
518525
%HCRED%
@@ -521,8 +528,6 @@ if "!RPU_FILE!!HDR10P_FILE!"=="FALSEFALSE" (
521528
)
522529
)
523530
if "!HDR10P_FILE!"=="TRUE" (
524-
%CYAN%
525-
echo Analysing HDR10+ SEI. Please wait...
526531
%HCGREEN%
527532
echo Done.
528533
echo.
@@ -952,7 +957,7 @@ if "!HDRRPU_EXIST!"=="TRUE" (
952957
set "MDL=-annotate +120+130 "Mastering display luminance^: !RPULuminance! ^(!L9MDP!^)""
953958
if "!HDR10P!"=="TRUE" set "HDR10PINFO= | HDR10+"
954959
if "!DVinput!"=="YES" set "DVINFO= | Dolby Vision Profile^: !DV_Profile!"
955-
set "HDRINFO=-annotate +120+5 "Video: !PHDR!!HDR10PINFO!!DVINFO! ^(!RESOLUTION!^)""
960+
set "HDRINFO=-annotate +120+5 "Video: !PHDR!!HDR10PINFO!!DVINFO!""
956961

957962
if "!PLOTTYPE!"=="MAX" (
958963
set "titlepos=-135"
@@ -961,7 +966,7 @@ if "!PLOTTYPE!"=="MAX" (
961966
set "titlepos=-0"
962967
)
963968

964-
"!IMAGEMAGICKpath!" convert "!TMP_FOLDER!\!INPUTFILENAME!.png" -quality 100 -fill white -stroke none -draw "rectangle 0,0 3000,150" -gravity NorthWest -pointsize 20 -fill black -font Arial-Bold !HDRINFO! -font Arial -annotate +120+30 "Frames: !RPU_FRAMES!, Scenecuts: !RPU_SHOTCOUNT!" -font Arial-Bold -pointsize 25 -gravity Center -annotate !titlepos!-552 "!INPUTFILENAME!!INPUTFILEEXT!" -font Arial -pointsize 25 -annotate !titlepos!-518 "(!PHDR! Plot)" -pointsize 20 -gravity NorthWest !A1! !A2! !A3! !A4! !A5! !P1! !P2! !P3! !P4! !P5! !MDL! -font Arial-Bold !AM! !AA! "!INPUTFILEPATH!!INPUTFILENAME!_[!PHDR! Plot].png"
969+
"!IMAGEMAGICKpath!" convert "!TMP_FOLDER!\!INPUTFILENAME!.png" -quality 100 -fill white -stroke none -draw "rectangle 0,0 3000,150" -gravity NorthWest -pointsize 20 -fill black -font Arial-Bold !HDRINFO! -font Arial -annotate +120+30 "Resolution: !RESOLUTION!, Frames: !RPU_FRAMES!, Scenecuts: !RPU_SHOTCOUNT!" -font Arial-Bold -pointsize 25 -gravity Center -annotate !titlepos!-552 "!INPUTFILENAME!!INPUTFILEEXT!" -font Arial -pointsize 25 -annotate !titlepos!-518 "(!PHDR! Plot)" -pointsize 20 -gravity NorthWest !A1! !A2! !A3! !A4! !A5! !P1! !P2! !P3! !P4! !P5! !MDL! -font Arial-Bold !AM! !AA! "!INPUTFILEPATH!!INPUTFILENAME!_[!PHDR! Plot].png"
965970
if exist "!INPUTFILEPATH!!INPUTFILENAME!_[!PHDR! Plot].png" (
966971
%HCGREEN%
967972
echo Done.
@@ -1035,8 +1040,16 @@ if "!PLOTTYPE!" NEQ "ORIGINAL" (
10351040
set "L5_STRING_TXT=No border entries in RPU."
10361041
)
10371042
)
1038-
set "RPUINFO=-annotate +120+5 "RPU: Dolby Vision Profile: !DV_Profile!, DM Version: !DM!""
1039-
set "FRAMEINFO=-annotate +120+30 "Frames: !RPU_FRAMES!, Scenecuts: !RPU_SHOTCOUNT!""
1043+
1044+
if "!HDR10P!"=="TRUE" set "HDR10PINFO= | HDR10+"
1045+
set "DVINFO= | Dolby Vision Profile: !DV_Profile!, DM Version: !DM!"
1046+
1047+
if "!RPU_FILE!"=="FALSE" (
1048+
set "RPUINFO=-annotate +120+5 "Video: !PHDR!!HDR10PINFO!!DVINFO!""
1049+
) else (
1050+
set "RPUINFO=-annotate +120+5 "RPU Binary: Dolby Vision Profile: !DV_Profile!, DM Version: !DM!""
1051+
)
1052+
set "FRAMEINFO=-annotate +120+30 "Resolution: !RESOLUTION!, Frames: !RPU_FRAMES!, Scenecuts: !RPU_SHOTCOUNT!""
10401053
if defined RPUMD set L1=-annotate +120+55 "L1 !RPUMD!"
10411054
if defined L2_TRIMS set "L2=-annotate +120+80 "L2 trims: !L2_TRIMS!""
10421055
set "L5=-annotate +120+105 "L5 Active area: !L5_STRING_TXT!""
@@ -1096,13 +1109,31 @@ pushd "!INPUTFILEPATH!"
10961109
if exist "!BLSTREAM!" (
10971110
"!HDR10P_TOOLpath!" extract "!BLSTREAM!" -o "!TMP_FOLDER!\HDR10Plus.json"
10981111
) else (
1099-
"!FFMPEGpath!" -loglevel panic -stats -i "!INPUTFILE!" -map 0:!BL_INDEX! -c:v copy -bsf:v hevc_mp4toannexb -f hevc - | "!HDR10P_TOOLpath!" extract "!BLSTREAM!" -o "!TMP_FOLDER!\HDR10Plus.json" -
1112+
if "!HDR10P_FILE!"=="FALSE" (
1113+
"!FFMPEGpath!" -loglevel panic -stats -i "!INPUTFILE!" -map 0:!BL_INDEX! -c:v copy -bsf:v hevc_mp4toannexb -f hevc - | "!HDR10P_TOOLpath!" extract "!BLSTREAM!" -o "!TMP_FOLDER!\HDR10Plus.json" -
1114+
)
11001115
)
1101-
if exist "!TMP_FOLDER!\HDR10Plus.json" (
1116+
if exist "!TMP_FOLDER!\HDR10Plus.json" set "HDR10PFILE=!TMP_FOLDER!\HDR10Plus.json"
1117+
1118+
FOR /F "delims=" %%A IN ('findstr /C:"HDR10plusProfile" "!HDR10PFILE!"') DO set "HDR10P_Profile=%%A"
1119+
if defined HDR10P_Profile (
1120+
for /F "tokens=2 delims=:, " %%A in ("!HDR10P_Profile!") do set "HDR10P_Profile=%%A"
1121+
set "HDR10P_Profile=!HDR10P_Profile:~1,1!"
1122+
) else (
1123+
set "HDR10P_Profile=N/A"
1124+
)
1125+
1126+
if "!HDR10P_FILE!"=="TRUE" (
1127+
set "MaxDML=1000"
1128+
set "MinDML=1"
1129+
set "MaxCLL=1000"
1130+
set "MaxFALL=400"
1131+
)
1132+
1133+
if exist "!HDR10PFILE!" (
11021134
(
11031135
echo {
11041136
echo "cm_version": "V29",
1105-
echo "length": !FRAMES!,
11061137
echo "level6": {
11071138
echo "max_display_mastering_luminance": !MaxDML!,
11081139
echo "min_display_mastering_luminance": !MinDML!,
@@ -1111,7 +1142,7 @@ if exist "!TMP_FOLDER!\HDR10Plus.json" (
11111142
echo }
11121143
echo }
11131144
)>"!TMP_FOLDER!\Extra.json"
1114-
"!DO_VI_TOOLpath!" generate -j "!TMP_FOLDER!\Extra.json" --hdr10plus-json "!TMP_FOLDER!\HDR10Plus.json" -o "!TMP_FOLDER!\HDR10Plus.bin">nul
1145+
"!DO_VI_TOOLpath!" generate -j "!TMP_FOLDER!\Extra.json" --hdr10plus-json "!HDR10PFILE!" -o "!TMP_FOLDER!\HDR10Plus.bin">nul
11151146
if exist "!TMP_FOLDER!\HDR10Plus.bin" (
11161147
if "!TESTMODE!"=="OFF" if exist "!WORKFILE!.measurements" del "!WORKFILE!.measurements">nul
11171148
set "HDRRPU=!TMP_FOLDER!\HDR10Plus.bin"
@@ -1135,21 +1166,25 @@ if exist "!TMP_FOLDER!\HDR10Plus.json" (
11351166
)
11361167
)
11371168

1138-
set "MDL=-annotate +120+130 "Mastering display luminance: !RPULuminance!!L9MDP!""
1139-
if "!HDR10P!"=="TRUE" set "HDR10PINFO= | HDR10+"
1169+
if "!HDR10P_FILE!"=="FALSE" set "MDL=-annotate +120+130 "Mastering display luminance: !RPULuminance!!L9MDP!""
1170+
set "HDR10PINFO= | HDR10+ Profile: !HDR10P_Profile!"
11401171
if "!DVinput!"=="YES" set "DVINFO= | Dolby Vision Profile: !DV_Profile!"
1141-
set "HDRINFO=-annotate +120+5 "Video: !PHDR!!HDR10PINFO!!DVINFO! ^(!RESOLUTION!^)""
1142-
1172+
if "!HDR10P_FILE!"=="FALSE" (
1173+
set "HDRINFO=-annotate +120+5 "Video: !PHDR!!HDR10PINFO!!DVINFO!""
1174+
) else (
1175+
set "HDRINFO=-annotate +120+5 "HDR10+ SEI: Profile !HDR10P_Profile!""
1176+
)
11431177
if "!PLOTTYPE!"=="MAX" (
11441178
set "titlepos=-135"
11451179
call :ENHPLOTS
11461180
) else (
11471181
set "titlepos=-0"
11481182
)
1149-
11501183
"!HDR10P_TOOLpath!" plot "!HDR10PFILE!" -t "" -o "!TMP_FOLDER!\!INPUTFILENAME!.png"
11511184
popd
1152-
if exist "!TMP_FOLDER!\!INPUTFILENAME!.png" "!IMAGEMAGICKpath!" convert "!TMP_FOLDER!\!INPUTFILENAME!.png" -quality 100 -fill white -stroke none -draw "rectangle 0,0 3000,150" -gravity NorthWest -pointsize 20 -fill black -font Arial-Bold !HDRINFO! -font Arial -annotate +120+30 "Frames: !RPU_FRAMES!, Scenecuts: !RPU_SHOTCOUNT!" -font Arial-Bold -pointsize 25 -gravity Center -annotate !titlepos!-552 "!INPUTFILENAME!!INPUTFILEEXT!" -font Arial -pointsize 25 -annotate !titlepos!-518 "(HDR10+ Plot)" -pointsize 20 -gravity NorthWest !A1! !A2! !A3! !A4! !A5! !P1! !P2! !P3! !P4! !P5! !MDL! -font Arial-Bold !AM! !AA! "!INPUTFILEPATH!!INPUTFILENAME!_[HDR10+ Plot].png"
1185+
1186+
if exist "!TMP_FOLDER!\!INPUTFILENAME!.png" "!IMAGEMAGICKpath!" convert "!TMP_FOLDER!\!INPUTFILENAME!.png" -quality 100 -fill white -stroke none -draw "rectangle 0,0 3000,150" -gravity NorthWest -pointsize 20 -fill black -font Arial-Bold !HDRINFO! -font Arial -annotate +120+30 "Resolution: !RESOLUTION!, Frames: !RPU_FRAMES!, Scenecuts: !RPU_SHOTCOUNT!" -font Arial-Bold -pointsize 25 -gravity Center -annotate !titlepos!-552 "!INPUTFILENAME!!INPUTFILEEXT!" -font Arial -pointsize 25 -annotate !titlepos!-518 "(HDR10+ Plot)" -pointsize 20 -gravity NorthWest !A1! !A2! !A3! !A4! !A5! !P1! !P2! !P3! !P4! !P5! !MDL! -font Arial-Bold !AM! !AA! "!INPUTFILEPATH!!INPUTFILENAME!_[HDR10+ Plot].png"
1187+
11531188
if exist "!INPUTFILEPATH!!INPUTFILENAME!_[HDR10+ Plot].png" (
11541189
%HCGREEN%
11551190
echo Done.

‎DDVT_INJECTOR.cmd‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2167,11 +2167,11 @@ if "!V_EDITING!"=="FALSE" (
21672167
goto :eof
21682168
)
21692169
copy "%~dp0tools\HDRMetadataEditor.exe" "!VS_DIR!" >nul
2170-
attrib +h "!VS_DIR!\HDRMetadataEditor.exe" >nul
2170+
attrib +h "!VS_DIR!HDRMetadataEditor.exe" >nul
21712171
copy "%~dp0tools\nvcuda.dll" "!VS_DIR!" >nul
2172-
attrib +h "!VS_DIR!\nvcuda.dll" >nul
2172+
attrib +h "!VS_DIR!nvcuda.dll" >nul
21732173
copy "%~dp0tools\nvcuvid.dll" "!VS_DIR!" >nul
2174-
attrib +h "!VS_DIR!\nvcuvid.dll" >nul
2174+
attrib +h "!VS_DIR!nvcuvid.dll" >nul
21752175
if "!L9MDP!"=="Display P3" (
21762176
set "HDR_MDCP=displayp3"
21772177
) else (
@@ -2181,13 +2181,13 @@ if "!L9MDP!"=="" set "HDR_MDCP=bt2020"
21812181
%CYAN%
21822182
echo Please wait. Editing Video HDR Metadata...
21832183
%WHITE%
2184-
echo Command^: "!VS_DIR!\HDRMetadataEditor.exe" !HDR_MDCP! !RPUMinDML_L6!,!RPUMaxDML_L6! !RPUCLL_L6!,!RPUFALL_L6! "!VS_DIR!\!VS_NAME!!VS_EXT!">>"!logfile!"
2185-
"!VS_DIR!\HDRMetadataEditor.exe" !HDR_MDCP! !RPUMinDML_L6!,!RPUMaxDML_L6! !RPUCLL_L6!,!RPUFALL_L6! "!VS_DIR!\!VS_NAME!!VS_EXT!">>"!logfile!"
2186-
if exist "!VS_DIR!\!VS_NAME! ^(HDR10-Edited^)!VS_EXT!" (
2187-
for %%f in ("!VS_DIR!\!VS_NAME! ^(HDR10-Edited^)!VS_EXT!") do set "CHECKSIZE=%%~zf" >nul 2>&1
2184+
echo Command^: "!VS_DIR!HDRMetadataEditor.exe" !HDR_MDCP! !RPUMinDML_L6!,!RPUMaxDML_L6! !RPUCLL_L6!,!RPUFALL_L6! "!VS_DIR!!VS_NAME!!VS_EXT!">>"!logfile!"
2185+
"!VS_DIR!HDRMetadataEditor.exe" !HDR_MDCP! !RPUMinDML_L6!,!RPUMaxDML_L6! !RPUCLL_L6!,!RPUFALL_L6! "!VS_DIR!!VS_NAME!!VS_EXT!">>"!logfile!"
2186+
if exist "!VS_DIR!!VS_NAME! ^(HDR10-Edited^)!VS_EXT!" (
2187+
for %%f in ("!VS_DIR!!VS_NAME! ^(HDR10-Edited^)!VS_EXT!") do set "CHECKSIZE=%%~zf" >nul 2>&1
21882188
if "!CHECKSIZE!" NEQ "0" (
21892189
%HCGREEN%
2190-
move "!VS_DIR!\!VS_NAME! ^(HDR10-Edited^)!VS_EXT!" "!TMP_FOLDER!\HDREDIT.hevc">nul
2190+
move "!VS_DIR!!VS_NAME! ^(HDR10-Edited^)!VS_EXT!" "!TMP_FOLDER!\HDREDIT.hevc">nul
21912191
set "VIDEOSTREAM=!TMP_FOLDER!\HDREDIT.hevc"
21922192
echo Done.
21932193
echo.
@@ -2209,17 +2209,17 @@ if exist "!VS_DIR!\!VS_NAME! ^(HDR10-Edited^)!VS_EXT!" (
22092209
echo Error.>>"!logfile!"
22102210
echo.>>"!logfile!"
22112211
)
2212-
if exist "!VS_DIR!\HDRMetadataEditor.exe" (
2213-
attrib -h "!VS_DIR!\HDRMetadataEditor.exe" >nul
2214-
del "!VS_DIR!\HDRMetadataEditor.exe">nul
2212+
if exist "!VS_DIR!HDRMetadataEditor.exe" (
2213+
attrib -h "!VS_DIR!HDRMetadataEditor.exe" >nul
2214+
del "!VS_DIR!HDRMetadataEditor.exe">nul
22152215
)
2216-
if exist "!VS_DIR!\nvcuda.dll" (
2217-
attrib -h "!VS_DIR!\nvcuda.dll" >nul
2218-
del "!VS_DIR!\nvcuda.dll">nul
2216+
if exist "!VS_DIR!nvcuda.dll" (
2217+
attrib -h "!VS_DIR!nvcuda.dll" >nul
2218+
del "!VS_DIR!nvcuda.dll">nul
22192219
)
2220-
if exist "!VS_DIR!\nvcuvid.dll" (
2221-
attrib -h "!VS_DIR!\nvcuvid.dll" >nul
2222-
del "!VS_DIR!\nvcuvid.dll">nul
2220+
if exist "!VS_DIR!nvcuvid.dll" (
2221+
attrib -h "!VS_DIR!nvcuvid.dll" >nul
2222+
del "!VS_DIR!nvcuvid.dll">nul
22232223
)
22242224
goto :eof
22252225

‎DDVT_OPTIONS.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@echo off & setlocal
22
mode con cols=125 lines=57
3-
set VERSION=0.72.1 "Blessed is the mind too small for doubt"
4-
set HEADER1=powered by quietvoids tools GNU License (GPL) 2021-2025
3+
set VERSION=0.73 "Understanding is overrated"
4+
set HEADER1=powered by quietvoids tools GNU License (GPL) 2021-2026
55
TITLE DDVT OPTIONS v%VERSION%
66
set DESIGN=STANDARD
77

0 commit comments

Comments
 (0)