Print short unknown type data if all characters are ascii printable

vapoursynth · Sep 18, 2023 · 33e9774 · 33e9774
1 parent 8d3a384
commit 33e9774
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,5 @@
 r64:
+added json output of video frame properties to vspipe
 fixed clearMap function, previously it would forget to properly clear the error state in maps which could cause crashes in frameeval and other filters
 32 bit binaries are no longer provided for windows
 updated zimg to fix issues on zen4 cpus

diff --git a/src/avisynth/avisynth_compat.cpp b/src/avisynth/avisynth_compat.cpp
@@ -899,7 +899,7 @@ static void VS_CC fakeAvisynthFunctionWrapper(const VSMap *in, VSMap *out, void
                                     avisynthFilterFree,
                                     (preFetchClips.empty() || prefetchInfo.from > prefetchInfo.to) ? fmFrameState : fmParallelRequests,
                                     deps.data(),
-                                    preFetchClips.size(),
+                                    static_cast<int>(preFetchClips.size()),
                                     filterData.release(),
                                     core);
 

diff --git a/src/vspipe/vsjson.cpp b/src/vspipe/vsjson.cpp
@@ -21,6 +21,13 @@
 #include "vsjson.h"
 #include "clocale"
 
+static bool isAsciiPrintable(const std::string &s) {
+    for (const auto c : s)
+        if (c < 0x20 || c > 0x7E)
+            return false;
+    return true;
+}
+
 static std::string doubleToString(double v) {
     std::string result = std::to_string(v);
     char point = *localeconv()->decimal_point;
@@ -90,7 +97,7 @@ std::string convertVSMapToJSON(const VSMap *map, const VSAPI *vsapi) {
                 for (int j = 0; j < numElems; j++) {
                     int typeHint = vsapi->mapGetDataTypeHint(map, key, j, nullptr);
                     jsonStr += (j ? ", " : "");
-                    if (typeHint == dtUtf8)
+                    if (typeHint == dtUtf8 || (typeHint == dtUnknown && vsapi->mapGetDataSize(map, key, j, nullptr) < 200 && isAsciiPrintable(std::string(vsapi->mapGetData(map, key, j, nullptr), vsapi->mapGetDataSize(map, key, j, nullptr)))))
                         jsonStr += escapeJSONString(vsapi->mapGetData(map, key, j, nullptr));
                     else
                         jsonStr += "\"[binary data size: " + std::to_string(vsapi->mapGetDataSize(map, key, j, nullptr)) + "]\"";