@scrypted/libav 1.0.4 → 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/package.json

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

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;
 }