Allow setting glyph limit separately

Allow resetting libass limits to defaults

Author: JustAMan

Makefile

@@ -293,7 +293,7 @@ src/subtitles-octopus-worker.bc: dist/libraries/lib/libass.a src/Makefile src/su
 # Dist Files
 EMCC_COMMON_ARGS = \
 	$(GLOBAL_CFLAGS) \
-	-s EXPORTED_FUNCTIONS="['_main', '_malloc', '_libassjs_render_blend', '_libassjs_set_memory_limit']" \
+	-s EXPORTED_FUNCTIONS="['_main', '_malloc', '_libassjs_render_blend', '_libassjs_set_memory_limits']" \
 	-s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap', 'getValue', 'FS_createPreloadedFile', 'FS_createFolder']" \
 	-s NO_EXIT_RUNTIME=1 \
 	--use-preload-plugins \

src/SubtitleOctopus.cpp

@@ -212,11 +212,10 @@ class SubtitleOctopus {
     }
 };
 
-void libassjs_set_memory_limit(int limit) {
-    if (limit > 0) {
-        printf("libass: setting total libass memory limit to %d MiB\n", limit);
-        ass_set_cache_limits(ass_renderer, 0, limit);
-    }
+void libassjs_set_memory_limits(int glyph_limit, int bitmap_cache_limit) {
+    printf("libass: setting total libass memory limits to: glyph=%d MiB, bitmap cache=%d MiB\n",
+        glyph_limit, bitmap_cache_limit);
+    ass_set_cache_limits(ass_renderer, glyph_limit, bitmap_cache_limit);
 }
 
 const float MIN_UINT8_CAST = 0.9 / 255;

src/post-worker.js

@@ -550,6 +550,7 @@ function onMessageFromMainEmscriptenThread(message) {
             }
             self.targetFps = message.data.targetFps || self.targetFps;
             self.libassMemoryLimit = message.data.libassMemoryLimit || self.libassMemoryLimit;
+            self.libassGlyphLimit = message.data.libassGlyphLimit || 0;
             removeRunDependency('worker-init');
             break;
         }

src/pre-worker.js

@@ -93,7 +93,7 @@ Module['onRuntimeInitialized'] = function () {
     self.octObj = new Module.SubtitleOctopus();
 
     self._render_blend = Module['cwrap']('libassjs_render_blend', null, ['number', 'number', 'number', 'number', 'number', 'number', 'number', 'number']);
-    self._set_memory_limit = Module['cwrap']('libassjs_set_memory_limit', null, ['number']);
+    self._set_memory_limits = Module['cwrap']('libassjs_set_memory_limits', null, ['number', 'number']);
 
     self.changed = Module._malloc(4);
 
@@ -108,8 +108,8 @@ Module['onRuntimeInitialized'] = function () {
     self.ass_track = self.octObj.track;
     self.ass_library = self.octObj.ass_library;
     self.ass_renderer = self.octObj.ass_renderer;
-    if (self.libassMemoryLimit > 0) {
-        self._set_memory_limit(self.libassMemoryLimit);
+    if (self.libassMemoryLimit > 0 || self.libassGlyphLimit > 0) {
+        self._set_memory_limits(self.libassGlyphLimit, self.libassMemoryLimit);
     }
 };
 

src/subtitles-octopus.js

@@ -15,6 +15,7 @@ var SubtitlesOctopus = function (options) {
     self.canvas = options.canvas; // HTML canvas element (optional if video specified)
     self.renderMode = options.lossyRender ? 'fast' : (options.blendRender ? 'blend' : 'normal');
     self.libassMemoryLimit = options.libassMemoryLimit || 0;
+    self.libassGlyphLimit = options.libassGlyphLimit || 0;
     self.targetFps = options.targetFps || undefined;
     self.isOurCanvas = false; // (internal) we created canvas and manage it
     self.video = options.video; // HTML video element (optional if canvas specified)
@@ -108,7 +109,8 @@ var SubtitlesOctopus = function (options) {
             availableFonts: self.availableFonts,
             debug: self.debug,
             targetFps: self.targetFps,
-            libassMemoryLimit: self.libassMemoryLimit
+            libassMemoryLimit: self.libassMemoryLimit,
+            libassGlyphLimit: self.libassGlyphLimit
         });
     };