Print short unknown type data if all characters are ascii printable

AmusementClub · Apr 4, 2024 · 15c6828 · 15c6828
1 parent 2bff1e5
commit 15c6828
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/avisynth/avisynth_compat.cpp b/src/avisynth/avisynth_compat.cpp
@@ -902,7 +902,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)) + "]\"";