Merge branch 'current' into feat/twitch

2023-05-23 12:24:54 -05:00
parent c8d0eb862c fa4e418e36
commit 8551243207
21 changed files with 352 additions and 203 deletions
--- a/src/modules/sub/utils.js
+++ b/src/modules/sub/utils.js
@@ -142,3 +142,15 @@ export function checkJSONPost(obj) {
 export function getIP(req) {
    return req.header('cf-connecting-ip') ? req.header('cf-connecting-ip') : req.ip;
 }
+export function getThreads() {
+    try {
+        if (process.env.ffmpegThreads && process.env.ffmpegThreads.length <= 3
+            && (Number(process.env.ffmpegThreads) >= 0 && Number(process.env.ffmpegThreads) <= 256)) {
+            return process.env.ffmpegThreads
+        } else {
+            return '0'
+        }
+    } catch (e) {
+        return '0'
+    }
+}