@scrypted/libav 1.0.4 → 1.0.6

package/darwin.md

@@ -0,0 +1,24 @@
+Mimimum macOS configuration for RTSP, h264, h265, jpg, and videotoolbox.
+
+```sh
+./configure \
+    --disable-everything \
+    --enable-hwaccels \
+    --enable-videotoolbox \
+    --enable-decoder=h264 \
+    --enable-decoder=hevc \
+    --enable-demuxer=rtsp \
+    --enable-muxer=mjpeg \
+    --enable-encoder=mjpeg \
+    --enable-parser=mjpeg \
+    --enable-protocol=tcp \
+    --enable-protocol=udp \
+    --enable-filter=crop \
+    --enable-filter=scale \
+    --enable-filter=scale_vt \
+    --enable-filter=format \
+    --enable-filter=hwdownload \
+    --enable-filter=hwupload \
+    --enable-parser=h264 \
+    --enable-parser=hevc
+```

package/lib/index.d.ts

@@ -1,4 +1,5 @@
-export declare function isAvailable(): boolean;
+export declare function isInstalled(): boolean;
+export declare function install(): Promise<void>;
 export interface AVFrame {
     close(): void;
     width: number;

package/lib/index.js

@@ -1,17 +1,94 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAvailable = isAvailable;
+exports.isInstalled = isInstalled;
+exports.install = install;
 exports.setAVLogCallback = setAVLogCallback;
 exports.createAVFormatContext = createAVFormatContext;
+var path_1 = __importDefault(require("path"));
+var child_process_1 = require("child_process");
 var addon;
 try {
     addon = require('../build/Release/addon');
 }
 catch (e) {
 }
-function isAvailable() {
+function isInstalled() {
     return !!addon;
 }
+var installing;
+function install() {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            if (addon)
+                return [2 /*return*/];
+            if (installing)
+                return [2 /*return*/, installing];
+            installing = new Promise(function (resolve, reject) {
+                var cp = (0, child_process_1.fork)(require.resolve('prebuild-install/bin.js'), {
+                    cwd: path_1.default.dirname(__dirname),
+                });
+                cp.on('error', reject);
+                cp.on('exit', function (code) {
+                    if (code === 0) {
+                        try {
+                            addon = require('../build/Release/addon');
+                            resolve();
+                        }
+                        catch (e) {
+                            reject(e);
+                        }
+                    }
+                    else {
+                        reject(new Error('Failed to install'));
+                    }
+                });
+            })
+                .finally(function () {
+                installing = undefined;
+            });
+            return [2 /*return*/, installing];
+        });
+    });
+}
 function setAVLogCallback(callback) {
     addon.set_console_callback(callback);
 }

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAOA,kCAEC;AA4BD,4CAEC;AAED,sDAEC;AA3CD,IAAI,KAAU,CAAC;AACf,IAAI,CAAC;IACD,KAAK,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAC9C,CAAC;AACD,OAAO,CAAC,EAAE,CAAC;AACX,CAAC;AAED,SAAgB,WAAW;IACvB,OAAO,CAAC,CAAC,KAAK,CAAC;AACnB,CAAC;AA4BD,SAAgB,gBAAgB,CAAC,QAA+B;IAC5D,KAAK,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,qBAAqB;IACjC,OAAO,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;AACvC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUA,kCAEC;AAGD,0BAkCC;AA4BD,4CAEC;AAED,sDAEC;AAnFD,8CAAwB;AACxB,+CAAqC;AAErC,IAAI,KAAU,CAAC;AACf,IAAI,CAAC;IACD,KAAK,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAC9C,CAAC;AACD,OAAO,CAAC,EAAE,CAAC;AACX,CAAC;AAED,SAAgB,WAAW;IACvB,OAAO,CAAC,CAAC,KAAK,CAAC;AACnB,CAAC;AAED,IAAI,UAAqC,CAAC;AAC1C,SAAsB,OAAO;;;YACzB,IAAI,KAAK;gBACL,sBAAO;YAEX,IAAI,UAAU;gBACV,sBAAO,UAAU,EAAC;YAEtB,UAAU,GAAG,IAAI,OAAO,CAAO,UAAC,OAAO,EAAE,MAAM;gBAC3C,IAAM,EAAE,GAAG,IAAA,oBAAI,EAAC,OAAO,CAAC,OAAO,CAAC,yBAAyB,CAAC,EAAE;oBACxD,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC;iBAC/B,CAAC,CAAC;gBAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAEvB,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,UAAC,IAAI;oBACf,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;wBACb,IAAI,CAAC;4BACD,KAAK,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;4BAC1C,OAAO,EAAE,CAAC;wBACd,CAAC;wBACD,OAAO,CAAC,EAAE,CAAC;4BACP,MAAM,CAAC,CAAC,CAAC,CAAC;wBACd,CAAC;oBACL,CAAC;yBACI,CAAC;wBACF,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;oBAC3C,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC,CAAC;iBACD,OAAO,CAAC;gBACL,UAAU,GAAG,SAAS,CAAC;YAC3B,CAAC,CAAC,CAAC;YAEH,sBAAO,UAAU,EAAC;;;CACrB;AA4BD,SAAgB,gBAAgB,CAAC,QAA+B;IAC5D,KAAK,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,qBAAqB;IACjC,OAAO,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;AACvC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/libav",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "dependencies": {
     "node-addon-api": "^8.1.0",
     "prebuild-install": "npm:@scrypted/prebuild-install@^7.1.8"
@@ -26,7 +26,6 @@
     "node-gyp-build": "node-gyp build",
     "node-gyp-rebuild": "node-gyp rebuild",
     "build": "tsc -b ./src/tsconfig.json",
-    "install": "prebuild-install || npm run node-gyp-rebuild",
     "prepare": "npm run build",
     "release": "npm version patch && npm publish --access public && git push --tags",
     "prepublishOnly": "npm run build"

package/src/frame.cpp

@@ -127,9 +127,9 @@ Napi::Value AVFrameObject::ToJPEG(const Napi::CallbackInfo &info)
 
     // Set the JPEG quality
     int quality = info[0].As<Napi::Number>().Int32Value(); // 1-31, lower is better quality
-    av_opt_set_int(c, "qscale", quality, 0); // Set the quality scale (1-31, lower is better quality)
-    av_opt_set_int(c, "qmin", quality, 0);   // Set the minimum quality
-    av_opt_set_int(c, "qmax", quality, 0);   // Set the maximum quality
+    av_opt_set_int(c, "qscale", quality, 0);               // Set the quality scale (1-31, lower is better quality)
+    av_opt_set_int(c, "qmin", quality, 0);                 // Set the minimum quality
+    av_opt_set_int(c, "qmax", quality, 0);                 // Set the maximum quality
 
     if (avcodec_open2(c, codec, NULL) < 0)
     {
@@ -159,7 +159,7 @@ Napi::Value AVFrameObject::ToJPEG(const Napi::CallbackInfo &info)
         return env.Null();
     }
 
-    Napi::Buffer<uint8_t> buffer = Napi::Buffer<uint8_t>::New(env, pkt.data, pkt.size);
+    Napi::Buffer<uint8_t> buffer = Napi::Buffer<uint8_t>::Copy(env, pkt.data, pkt.size);
     av_packet_unref(&pkt);
     avcodec_free_context(&c);
 
@@ -180,22 +180,27 @@ Napi::Value AVFrameObject::ToBuffer(const Napi::CallbackInfo &info)
     int height = frame_->height;
     int buffer_size = av_image_get_buffer_size((enum AVPixelFormat)frame_->format, width, height, 1);
 
-    // Allocate memory for the byte array
-    uint8_t *byte_array = (uint8_t *)malloc(buffer_size);
+    Napi::Buffer<uint8_t> buffer = Napi::Buffer<uint8_t>::New(env, buffer_size);
+
+    uint8_t *byte_array = buffer.Data();
     if (!byte_array)
     {
         Napi::Error::New(env, "Failed to allocate memory for byte array").ThrowAsJavaScriptException();
         return env.Null();
     }
 
-    // Copy the frame data to the byte array
-    int plane_size = width * 3; // Width * 3 bytes per pixel
-    for (int y = 0; y < height; y++)
+    int frame_size = frame_->linesize[0] * height;
+    if (frame_size != buffer_size)
     {
-        memcpy(byte_array + y * plane_size, frame_->data[0] + y * frame_->linesize[0], plane_size);
+        int stride = buffer_size / height;
+        for (int y = 0; y < height; y++)
+        {
+            memcpy(byte_array + y * stride, frame_->data[0] + y * frame_->linesize[0], stride);
+        }
+    }
+    else {
+        memcpy(byte_array, frame_->data[0], buffer_size);
     }
-
-    Napi::Buffer<uint8_t> buffer = Napi::Buffer<uint8_t>::New(env, byte_array, buffer_size);
 
     return buffer;
 }

package/src/index.ts

@@ -1,3 +1,6 @@
+import path from 'path';
+import { fork } from 'child_process';
+
 let addon: any;
 try {
     addon = require('../build/Release/addon');
@@ -5,10 +8,47 @@ try {
 catch (e) {
 }
 
-export function isAvailable() {
+export function isInstalled() {
     return !!addon;
 }
 
+let installing: Promise<void> | undefined;
+export async function install() {
+    if (addon)
+        return;
+
+    if (installing)
+        return installing;
+
+    installing = new Promise<void>((resolve, reject) => {
+        const cp = fork(require.resolve('prebuild-install/bin.js'), {
+            cwd: path.dirname(__dirname),
+        });
+
+        cp.on('error', reject);
+
+        cp.on('exit', (code) => {
+            if (code === 0) {
+                try {
+                    addon = require('../build/Release/addon');
+                    resolve();
+                }
+                catch (e) {
+                    reject(e);
+                }
+            }
+            else {
+                reject(new Error('Failed to install'));
+            }
+        });
+    })
+    .finally(() => {
+        installing = undefined;
+    });
+
+    return installing;
+}
+
 export interface AVFrame {
     close(): void;
     width: number;

package/src/tsconfig.json

@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+      "esModuleInterop": true,
       "module": "commonjs",
       "target": "es5",
       "rootDir": ".",