@scrypted/libav 1.0.3 → 1.0.5

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

@@ -5,7 +5,11 @@ export interface AVFrame {
     height: number;
     format: string;
     toBuffer(): Buffer;
-    toJpeg(): Buffer;
+    /**
+     *
+     * @param quality 1-31. Lower is better quality.
+     */
+    toJpeg(quality: number): Buffer;
 }
 export interface AVFilter {
     destroy(): void;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAOA,kCAEC;AAwBD,4CAEC;AAED,sDAEC;AAvCD,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;AAwBD,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":";;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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/libav",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "dependencies": {
     "node-addon-api": "^8.1.0",
     "prebuild-install": "npm:@scrypted/prebuild-install@^7.1.8"

package/src/frame.cpp

@@ -92,6 +92,13 @@ AVFrameObject::~AVFrameObject()
 Napi::Value AVFrameObject::ToJPEG(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();
+
+    if (info.Length() < 1 || !info[0].IsNumber())
+    {
+        Napi::TypeError::New(env, "String expected").ThrowAsJavaScriptException();
+        return env.Null();
+    }
+
     if (!frame_)
     {
         Napi::Error::New(env, "Frame object is null").ThrowAsJavaScriptException();
@@ -112,17 +119,17 @@ Napi::Value AVFrameObject::ToJPEG(const Napi::CallbackInfo &info)
         return env.Null();
     }
 
-    c->bit_rate = 400000; // This is generally less relevant for single images
+    c->bit_rate = 2000000; // This is generally less relevant for single images
     c->width = frame_->width;
     c->height = frame_->height;
     c->pix_fmt = (enum AVPixelFormat)frame_->format;
     c->time_base = (AVRational){1, 25};
 
     // Set the JPEG quality
-    int quality = 2; // 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
+    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
 
     if (avcodec_open2(c, codec, NULL) < 0)
     {
@@ -152,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);
 
@@ -173,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)
     {
-        fprintf(stderr, "Failed to allocate memory for byte array\n");
+        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

@@ -15,7 +15,11 @@ export interface AVFrame {
     height: number;
     format: string;
     toBuffer(): Buffer;
-    toJpeg(): Buffer;
+    /**
+     *
+     * @param quality 1-31. Lower is better quality.
+     */
+    toJpeg(quality: number): Buffer;
 }
 
 export interface AVFilter {