Merge pull request #50 from seiya-dev/dev

Tweak matrix guess by video size + Work with frame copy instead of just modifying it

Author: pinterf

docs/BUILD.md

@@ -7,7 +7,7 @@
   - set PKG_CONFIG_PATH env `setx PKG_CONFIG_PATH "C:/lib/pkgconfig"`
 
 * Clone repos
-  - Clone `git clone https://github.com/seiya-dev/assrender.git`
+  - Clone `git clone https://github.com/pinterf/assrender.git`
   - and clone libass as subdirectory `cd assrender && git clone https://github.com/libass/libass.git`
 
 * Prequisite: avisynth.lib versions (x86 and x64)
@@ -30,7 +30,7 @@
 
 ### Linux
 * Clone repo
-  - git clone https://github.com/seiya-dev/assrender
+  - git clone https://github.com/pinterf/assrender
   - cd assrender
   - cmake -B build -S .
   - cmake --build build --clean-first

docs/CHANGELOG.md

@@ -1,18 +1,16 @@
 ## Change log
 
-### 0.36.0-dev.3 (20251202)
-* Use frame properties if they available for "YCbCr Matrix: None"
-
-### 0.36.0-dev.2 (20251201)
-* Restore x86-32 assrender.dll build
-
-### 0.36.0-dev.1 (20251201)
+### 0.36.0-dev.5 (20251209)
+* Fix hinting
+* Fix ass_set_storage_size not be called
 * Switch submodule build system to meson
 * Update avisynth(plus) headers to v12
+* Update libass to 0.17.4
 * Unicode-safe file reading
 * Add frame size parameters
 * Add set_default_storage_size boolean
-* Update libass to 0.17.4
+* Use frame properties if they available for "YCbCr Matrix: None"
+* Work with frame copy instead of just modifying it
 
 ### 0.35 (20210304)
 * Windows MSVC: Update to libass v0.15
@@ -26,7 +24,7 @@
 * Fix: possible crash on initializing phase (buffer overread, linux crashed, Windows was just lucky)
 
 ### 0.34 (20210301)
-* Fix the fix: revert matrix change made in 0.33	
+* Fix the fix: revert matrix change made in 0.33
 * Fix: Check matrix from .ASS file "YCbCr Matrix:" section besides "Video Colorspace:"
   Recognized values are "tv.601" and "tv.709"
 

docs/README.md

@@ -81,8 +81,7 @@ Default is to use the ASS script's "YCbCr Matrix" or "Video Colorspace" property
 
 Recognized .ASS properties: "TV.601" "TV.709", "PC.601" "PC.709" "TV.240m" "PC.240m" "TV.fcc" "PC.fcc" and "none". 
 
-"none" and "guess" decides upon on video resolution: width > 1280 or height > 576 → BT.709, else → BT.601.
-When no hint found in ASS script and 'colorspace' parameter is empty then the default is BT.601.
+"none" and "guess" determine the colorspace based on the video's `_Matrix` frame property if available. Otherwise, if the resolution is width > 1024 or height > 576, BT.709 is used; otherwise BT.601.
 
 ## Build instructions
 See: [BUILD.md](BUILD.md)

src/assrender.c

@@ -57,13 +57,6 @@ static const char* detect_bom(const char* buf, const size_t bufsize) {
     return "UTF-8";
 }
 
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#else
-#include <sys/stat.h>
-#endif
-
 #ifdef _WIN32
 static wchar_t *utf8_to_utf16le(const char *data) {
     const int out_size = MultiByteToWideChar(CP_UTF8, 0, data, -1, NULL, 0);
@@ -216,7 +209,6 @@ AVS_Value AVSC_CC assrender_create(AVS_ScriptEnvironment* env, AVS_Value args,
     AVS_FilterInfo* fi;
     AVS_Clip* c = avs_new_c_filter(env, &fi, avs_array_elt(args, 0), 1);
     const AVS_VideoInfo *vi = &fi->vi;
-    char e[250];
 
     const char* f = avs_as_string(avs_array_elt(args, 1));
     const char* vfr = avs_as_string(avs_array_elt(args, 2));
@@ -318,7 +310,7 @@ AVS_Value AVSC_CC assrender_create(AVS_ScriptEnvironment* env, AVS_Value args,
     if (!strcasecmp(strrchr(f, '.'), ".srt")) {
         FILE* fp = open_utf8_filename(f, "r");
         if (!fp) {
-            sprintf(e, "AssRender: input file '%s' does not exist or is not a regular file", f);
+            const char* e = avs_sprintf(env, "AssRender: input file '%s' does not exist or is not a regular file", f);
             v = avs_new_value_error(e);
             avs_release_clip(c);
             return v;
@@ -330,15 +322,15 @@ AVS_Value AVSC_CC assrender_create(AVS_ScriptEnvironment* env, AVS_Value args,
 
         fp = open_utf8_filename(f, "rb");
         if (!fp) {
-            sprintf(e, "AssRender: input file '%s' does not exist or is not a regular file", f);
+            const char* e = avs_sprintf(env, "AssRender: input file '%s' does not exist or is not a regular file", f);
             v = avs_new_value_error(e);
             avs_release_clip(c);
             return v;
         }
 
         buf = read_file_bytes(fp, &bufsize);
         if (!buf) {
-            sprintf(e, "AssRender: unable to read '%s'", f);
+            const char* e = avs_sprintf(env, "AssRender: unable to read '%s'", f);
             v = avs_new_value_error(e);
             avs_release_clip(c);
             return v;
@@ -358,7 +350,7 @@ AVS_Value AVSC_CC assrender_create(AVS_ScriptEnvironment* env, AVS_Value args,
     }
 
     if (!ass) {
-        sprintf(e, "AssRender: unable to parse '%s'", f);
+        const char* e = avs_sprintf(env, "AssRender: unable to parse '%s'", f);
         v = avs_new_value_error(e);
         avs_release_clip(c);
         return v;
@@ -371,7 +363,7 @@ AVS_Value AVSC_CC assrender_create(AVS_ScriptEnvironment* env, AVS_Value args,
         FILE* fh = open_utf8_filename(vfr, "r");
 
         if (!fh) {
-            sprintf(e, "AssRender: could not read timecodes file '%s'", vfr);
+            const char* e = avs_sprintf(env, "AssRender: could not read timecodes file '%s'", vfr);
             v = avs_new_value_error(e);
             avs_release_clip(c);
             return v;
@@ -380,7 +372,7 @@ AVS_Value AVSC_CC assrender_create(AVS_ScriptEnvironment* env, AVS_Value args,
         data->isvfr = 1;
 
         if (fscanf(fh, "# timecode format v%d", &ver) != 1) {
-            sprintf(e, "AssRender: invalid timecodes file '%s'", vfr);
+            const char* e = avs_sprintf(env, "AssRender: invalid timecodes file '%s'", vfr);
             v = avs_new_value_error(e);
             avs_release_clip(c);
             return v;
@@ -450,13 +442,6 @@ AVS_Value AVSC_CC assrender_create(AVS_ScriptEnvironment* env, AVS_Value args,
         color_mt = MATRIX_BT2020;
       }
       else if (!strcasecmp(tmpcsp, "none") || !strcasecmp(tmpcsp, "guess")) {
-        /* not yet
-        * Theoretically only for 10 and 12 bits:
-        if (fi->vi.width > 1920 || fi->vi.height > 1080)
-          color_mt = MATRIX_BT2020;
-        else 
-        */
-
         int mt_from_props_ok = 0;
         matrix_type mt_from_props = MATRIX_NONE;
 
@@ -467,10 +452,16 @@ AVS_Value AVSC_CC assrender_create(AVS_ScriptEnvironment* env, AVS_Value args,
         if (mt_from_props_ok && mt_from_props != MATRIX_NONE) {
             color_mt = mt_from_props;
         } else {
-            if (vi->width >= 1280 || vi->height >= 576) {
-                color_mt = MATRIX_PC709;
+            /* not yet
+            * Theoretically only for 10 and 12 bits:
+            if (fi->vi.width > 1920 || fi->vi.height > 1080)
+            color_mt = MATRIX_BT2020;
+            else
+            */
+            if (vi->width > 1024 || vi->height > 576) {
+                color_mt = MATRIX_BT709;
             } else {
-                color_mt = MATRIX_PC601;
+                color_mt = MATRIX_BT601;
             }
         }
       }
@@ -501,7 +492,6 @@ AVS_Value AVSC_CC assrender_create(AVS_ScriptEnvironment* env, AVS_Value args,
       return v;
     }
 
-
     switch (fi->vi.pixel_type)
     {
     case AVS_CS_YV12:

src/assrender.h

@@ -9,42 +9,50 @@
 #include <string.h>
 #include <time.h>
 #include <ass/ass.h>
+
+#ifdef _WIN32
+#    define WIN32_LEAN_AND_MEAN
+#    include <windows.h>
+#else
+#    include <sys/stat.h>
+#endif
+
 #include "avs/config.h"
 #ifdef AVS_WINDOWS
-#include "avisynth_c.h"
+#    include "avisynth_c.h"
 #else
-#include <avisynth/avisynth_c.h>
+#    include <avisynth/avisynth_c.h>
 #endif
 
 #if defined(_MSC_VER)
-#define __NO_ISOCEXT
-#define __NO_INLINE__
+#    define __NO_ISOCEXT
+#    define __NO_INLINE__
 
-#define strcasecmp _stricmp
-#define atoll _atoi64
+#    define strcasecmp _stricmp
+#    define atoll _atoi64
 #endif
 
 typedef struct {
-  // premultiplied coefficients for integer scaled arithmetics
-  int y_r, y_g, y_b;
-  int u_r, u_g, u_b;
-  int v_r, v_g, v_b;
-  int offset_y;
-  bool valid;
+    // premultiplied coefficients for integer scaled arithmetics
+    int y_r, y_g, y_b;
+    int u_r, u_g, u_b;
+    int v_r, v_g, v_b;
+    int offset_y;
+    bool valid;
 } ConversionMatrix;
 
 typedef enum {
-  MATRIX_NONE = 0,
-  MATRIX_BT601,
-  MATRIX_PC601,
-  MATRIX_BT709,
-  MATRIX_PC709,
-  MATRIX_PC2020,
-  MATRIX_BT2020,
-  MATRIX_TVFCC,
-  MATRIX_PCFCC,
-  MATRIX_TV240M,
-  MATRIX_PC240M
+    MATRIX_NONE = 0,
+    MATRIX_BT601,
+    MATRIX_PC601,
+    MATRIX_BT709,
+    MATRIX_PC709,
+    MATRIX_PC2020,
+    MATRIX_BT2020,
+    MATRIX_TVFCC,
+    MATRIX_PCFCC,
+    MATRIX_TV240M,
+    MATRIX_PC240M
 } matrix_type;
 
 typedef void (* fPixel)(uint8_t** sub_img, uint8_t** data, uint32_t* pitch, uint32_t width, uint32_t height);

src/include/avs/capi.h

@@ -43,9 +43,9 @@
 #endif
 
 #ifdef __cplusplus
-#  define EXTERN_C extern "C"
+#  define AVS_EXTERN_C extern "C"
 #else
-#  define EXTERN_C
+#  define AVS_EXTERN_C
 #endif
 
 #ifdef AVS_WINDOWS
@@ -99,20 +99,20 @@
 #  else
 #    define AVSC_EXPORT
 #  endif
-#  define AVSC_API(ret, name) EXTERN_C AVSC_EXPORT ret AVSC_CC name
+#  define AVSC_API(ret, name) AVS_EXTERN_C AVSC_EXPORT ret AVSC_CC name
 #else
-#  define AVSC_EXPORT EXTERN_C
-#  define AVSC_API(ret, name) EXTERN_C ret AVSC_CC name
+#  define AVSC_EXPORT AVS_EXTERN_C
+#  define AVSC_API(ret, name) AVS_EXTERN_C ret AVSC_CC name
 #endif
 #else
-#  define AVSC_EXPORT EXTERN_C __declspec(dllexport)
+#  define AVSC_EXPORT AVS_EXTERN_C __declspec(dllexport)
 #  ifndef AVS_STATIC_LIB
 #    define AVSC_IMPORT __declspec(dllimport)
 #  else
 #    define AVSC_IMPORT
 #  endif
 #  ifndef AVSC_NO_DECLSPEC
-#    define AVSC_API(ret, name) EXTERN_C AVSC_IMPORT ret AVSC_CC name
+#    define AVSC_API(ret, name) AVS_EXTERN_C AVSC_IMPORT ret AVSC_CC name
 #  else
 #    define AVSC_API(ret, name) typedef ret (AVSC_CC *name##_func)
 #  endif