Drop deprecated support for manual brotli decompression

It doesn't have much benefit but comes with a maintenance cost.
Instead the browser-inbuilt support for HTTP's Content-Encoding: header
can beu sed instead to let the browser handle decompression. This will
also work for more formats than just brotli.

Author: TheOneric

Makefile

@@ -47,8 +47,6 @@ $(DIST_DIR)/lib/libexpat.a: build/lib/expat/configured
 	$(JSO_MAKE) install
 
 # Brotli
-build/lib/brotli/js/decode.js: build/lib/brotli/configured
-build/lib/brotli/js/polyfill.js: build/lib/brotli/configured
 build/lib/brotli/configured: lib/brotli $(wildcard $(BASE_DIR)build/patches/brotli/*.patch)
 	$(call PREPARE_SRC_PATCHED,brotli)
 	touch build/lib/brotli/configured
@@ -167,24 +165,21 @@ EMCC_COMMON_ARGS = \
 
 dist: src/subtitles-octopus-worker.bc dist/js/subtitles-octopus-worker.js dist/js/subtitles-octopus-worker-legacy.js dist/js/subtitles-octopus.js dist/js/COPYRIGHT dist/js/default.woff2
 
-dist/js/subtitles-octopus-worker.js: src/subtitles-octopus-worker.bc src/pre-worker.js src/SubOctpInterface.js src/post-worker.js build/lib/brotli/js/decode.js
+dist/js/subtitles-octopus-worker.js: src/subtitles-octopus-worker.bc src/pre-worker.js src/SubOctpInterface.js src/post-worker.js
 	mkdir -p dist/js
 	emcc src/subtitles-octopus-worker.bc $(OCTP_DEPS) \
 		--pre-js src/pre-worker.js \
-		--pre-js build/lib/brotli/js/decode.js \
 		--post-js src/SubOctpInterface.js \
 		--post-js src/post-worker.js \
 		-s WASM=1 \
 		-s EVAL_CTORS=1 \
 		$(EMCC_COMMON_ARGS)
 
-dist/js/subtitles-octopus-worker-legacy.js: src/subtitles-octopus-worker.bc src/polyfill.js src/pre-worker.js src/SubOctpInterface.js src/post-worker.js build/lib/brotli/js/decode.js build/lib/brotli/js/polyfill.js
+dist/js/subtitles-octopus-worker-legacy.js: src/subtitles-octopus-worker.bc src/polyfill.js src/pre-worker.js src/SubOctpInterface.js src/post-worker.js
 	mkdir -p dist/js
 	emcc src/subtitles-octopus-worker.bc $(OCTP_DEPS) \
 		--pre-js src/polyfill.js \
-		--pre-js build/lib/brotli/js/polyfill.js \
 		--pre-js src/pre-worker.js \
-		--pre-js build/lib/brotli/js/decode.js \
 		--post-js src/SubOctpInterface.js \
 		--post-js src/post-worker.js \
 		-s WASM=0 \

Makefile_licence

@@ -5,7 +5,7 @@
 all: dist/license/all
 
 LIB_LICENSES := brotli expat freetype fribidi fontconfig harfbuzz libass
-LIB_LICENSES_FINDOPT_brotli   := -path ./research -prune -false -o ! -path ./js/decode.min.js
+LIB_LICENSES_FINDOPT_brotli   := -regex \./c/.+
 LIB_LICENSES_FINDOPT_expat    := -path ./expat/fuzz -prune -false -o
 LIB_LICENSES_FINDOPT_freetype := -path ./src/tools -prune -false -o
 LIB_LICENSES_FINDOPT_fribidi  := -path ./bin -prune -false -o

README.md

@@ -177,17 +177,6 @@ simply will not draw anything in canvas, mostly on low end devices.
 **WARNING: Experimental, not stable and not working in some browsers**
 
 
-### Brotli Compressed Subtitles (DEPRECATED)
-Manual support for brotli-compressed subtitles is tentatively deprecated
-and may be removed with the next release.
-
-Instead use HTTP's `Content-Encoding:` header to transmit files compressed and
-let the browser handle decompression before it reaches JSO. This supports more
-compression algorithms and is likely faster.
-Do not use a `.br` file extension if you use `Content-Ecoding:` as this will
-conflict with the still existing manual support which tries to decompress any data
-with a `.br` extension.
-
 ## How to build?
 
 ### Dependencies

build/patches/brotli/0001-fix-brotli-js-for-webworkers.patch

@@ -116,11 +116,7 @@ self.freeTrack = function () {
  */
 self.setTrackByUrl = function (url) {
     var content = "";
-    if (isBrotliFile(url)) {
-        content = Module["BrotliDecode"](readBinary(url))
-    } else {
-        content = read_(url);
-    }
+    content = read_(url);
     self.setTrack(content);
 };
 

…eam_Enable-install-with-emscripten.patch …eam_Enable-install-with-emscripten.patchbuild/patches/brotli/0002-upstream_Enable-install-with-emscripten.patch renamed to build/patches/brotli/0001-upstream_Enable-install-with-emscripten.patch build/patches/brotli/0002-upstream_Enable-install-with-emscripten.patch renamed to build/patches/brotli/0001-upstream_Enable-install-with-emscripten.patch

@@ -32,28 +32,6 @@ function makeCustomConsole() {
     return console;
 }
 
-/**
- * Test the subtitle file for Brotli compression.
- * @param {!string} url the URL of the subtitle file.
- * @returns {boolean} Brotli compression found or not.
- */
-function isBrotliFile(url) {
-    // Search for parameters
-    var len = url.indexOf("?");
-
-    if (len === -1) {
-        len = url.length;
-    }
-
-    if (url.endsWith(".br", len)) {
-        console.warn("Support for manual brotli decompression is tentatively deprecated and "
-                + "may be removed with the next release. Instead use HTTP's Content-Encoding.")
-        return true;
-    }
-
-    return false;
-}
-
 Module = Module || {};
 
 Module["preRun"] = Module["preRun"] || [];
@@ -64,11 +42,7 @@ Module["preRun"].push(function () {
 
     if (!self.subContent) {
         // We can use sync xhr cause we're inside Web Worker
-        if (isBrotliFile(self.subUrl)) {
-            self.subContent = Module["BrotliDecode"](readBinary(self.subUrl))
-        } else {
-            self.subContent = read_(self.subUrl);
-        }
+        self.subContent = read_(self.subUrl);
     }
 
     if (self.availableFonts && self.availableFonts.length !== 0) {