@scrypted/libav 1.0.143 → 1.0.145

package/lib/index.d.ts

@@ -51,8 +51,8 @@ export interface AVPacket {
     readonly streamIndex: number;
     flags: number;
     readonly size: number;
-    readonly pts: number;
-    readonly dts: number;
+    pts: number;
+    dts: number;
     readonly duration: number;
     [Symbol.dispose](): void;
     getData(): Buffer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/libav",
-  "version": "1.0.143",
+  "version": "1.0.145",
   "dependencies": {
     "detect-libc": "^2.0.3",
     "follow-redirects": "^1.15.9",

package/src/codeccontext.cpp

@@ -105,11 +105,12 @@ public:
     ReceiveFrameWorker(napi_env env, napi_deferred deferred, AVCodecContext *codecContext)
         : Napi::AsyncWorker(env), deferred(deferred), codecContext(codecContext)
     {
-        result = nullptr;
     }
 
     void Execute() override
     {
+        result = nullptr;
+
         AVFrame *frame = av_frame_alloc();
         if (!frame)
         {
@@ -171,6 +172,8 @@ public:
 
     void Execute() override
     {
+        result = nullptr;
+
         AVPacket *packet = av_packet_alloc();
         if (!packet)
         {
@@ -264,9 +267,11 @@ public:
 
     void Execute() override
     {
+        result = false;
+
         if (!frame)
         {
-            SetError("Packet is null");
+            SetError("SendFrame received null frame");
             return;
         }
         if (!codecContext)
@@ -283,8 +288,6 @@ public:
             return;
         }
 
-        result = false;
-
         if (ret != AVERROR(EAGAIN))
         {
             // what would cause this?
@@ -325,9 +328,11 @@ public:
 
     void Execute() override
     {
+        result = false;
+
         if (!packet)
         {
-            SetError("Packet is null");
+            SetError("SendPacket received null packet");
             return;
         }
 
@@ -339,8 +344,6 @@ public:
             return;
         }
 
-        result = false;
-
         if (ret != AVERROR(EAGAIN))
         {
             // errors are typically caused by missing codec info

package/src/formatcontext.cpp

@@ -599,6 +599,7 @@ Napi::Value AVFormatContextObject::Create(const Napi::CallbackInfo &info)
     if (formatName == "rtp")
     {
         int MAX_RTP_PACKET_SIZE = 65536;
+        fmt_ctx_->packet_size = MAX_RTP_PACKET_SIZE;
         RTPMuxContext *rtp_ctx = (RTPMuxContext *)fmt_ctx_->priv_data;
         rtp_ctx->max_payload_size = MAX_RTP_PACKET_SIZE - 12;
         rtp_ctx->buf = (uint8_t *)av_malloc(MAX_RTP_PACKET_SIZE);
@@ -670,7 +671,7 @@ Napi::Value AVFormatContextObject::WriteFrame(const Napi::CallbackInfo &info)
 
     if (!packet)
     {
-        Napi::Error::New(env, "Packet is null").ThrowAsJavaScriptException();
+        Napi::Error::New(env, "WriteFrame received null frame").ThrowAsJavaScriptException();
         return env.Undefined();
     }
 
@@ -738,7 +739,7 @@ Napi::Value AVFormatContextObject::NewStream(const Napi::CallbackInfo &info)
             Napi::Error::New(env, "Format context is null").ThrowAsJavaScriptException();
             return env.Undefined();
         }
-        if (streamIndex < 0 || streamIndex >= formatContext->nb_streams)
+        if (streamIndex >= formatContext->nb_streams)
         {
             Napi::Error::New(env, "Invalid stream index").ThrowAsJavaScriptException();
             return env.Undefined();
@@ -770,17 +771,14 @@ Napi::Value AVFormatContextObject::NewStream(const Napi::CallbackInfo &info)
         return env.Undefined();
     }
 
-    // gpt says supposed to send this but sends empty packet which crashes.
-    // sps/pps seem to be sent correctly though.
-    // may be an issue on mp4 where there's a moov header?
-    // int ret;
-    // if ((ret = avformat_write_header(fmt_ctx_, NULL)) < 0)
-    // {
-    //     avformat_free_context(fmt_ctx_);
-    //     fmt_ctx_ = nullptr;
-    //     Napi::Error::New(env, AVErrorString(ret)).ThrowAsJavaScriptException();
-    //     return env.Undefined();
-    // }
+    int ret;
+    if ((ret = avformat_write_header(fmt_ctx_, NULL)) < 0)
+    {
+        avformat_free_context(fmt_ctx_);
+        fmt_ctx_ = nullptr;
+        Napi::Error::New(env, AVErrorString(ret)).ThrowAsJavaScriptException();
+        return env.Undefined();
+    }
 
     return Napi::Number::New(env, stream->index);
 }

package/src/index.ts

@@ -149,8 +149,8 @@ export interface AVPacket {
     readonly streamIndex: number;
     flags: number;
     readonly size: number;
-    readonly pts: number;
-    readonly dts: number;
+    pts: number;
+    dts: number;
     readonly duration: number;
 
     [Symbol.dispose](): void;

package/src/packet.cpp

@@ -24,8 +24,8 @@ Napi::Object AVPacketObject::Init(Napi::Env env, Napi::Object exports)
 
     Napi::Function func = DefineClass(env, "AVPacketObject", {
                                                                  AVPacketObject::InstanceAccessor("flags", &AVPacketObject::GetFlags, &AVPacketObject::SetFlags),
-                                                                 AVPacketObject::InstanceAccessor("pts", &AVPacketObject::GetPTS, nullptr),
-                                                                 AVPacketObject::InstanceAccessor("dts", &AVPacketObject::GetDTS, nullptr),
+                                                                 AVPacketObject::InstanceAccessor("pts", &AVPacketObject::GetPTS, &AVPacketObject::SetPTS),
+                                                                 AVPacketObject::InstanceAccessor("dts", &AVPacketObject::GetDTS, &AVPacketObject::SetDTS),
                                                                  AVPacketObject::InstanceAccessor("duration", &AVPacketObject::GetDuration, nullptr),
                                                                  AVPacketObject::InstanceAccessor("size", &AVPacketObject::GetSize, nullptr),
                                                                  AVPacketObject::InstanceAccessor("streamIndex", &AVPacketObject::GetStreamIndex, nullptr),
@@ -119,11 +119,42 @@ Napi::Value AVPacketObject::GetPTS(const Napi::CallbackInfo &info)
     return Napi::Number::New(info.Env(), packet ? packet->pts : 0);
 }
 
+void AVPacketObject::SetPTS(const Napi::CallbackInfo &info, const Napi::Value &value)
+{
+    if (!packet)
+    {
+        return;
+    }
+
+    if (!value.IsNumber())
+    {
+        Napi::TypeError::New(info.Env(), "Number expected for pts").ThrowAsJavaScriptException();
+        return;
+    }
+
+    packet->pts = value.As<Napi::Number>().Int64Value();
+}
+
 Napi::Value AVPacketObject::GetDTS(const Napi::CallbackInfo &info)
 {
     return Napi::Number::New(info.Env(), packet ? packet->dts : 0);
 }
 
+void AVPacketObject::SetDTS(const Napi::CallbackInfo &info, const Napi::Value &value)
+{
+    if (!packet)
+    {
+        return;
+    }
+
+    if (!value.IsNumber())
+    {
+        Napi::TypeError::New(info.Env(), "Number expected for dts").ThrowAsJavaScriptException();
+        return;
+    }
+
+    packet->dts = value.As<Napi::Number>().Int64Value();
+}
 Napi::Value AVPacketObject::GetDuration(const Napi::CallbackInfo &info)
 {
     return Napi::Number::New(info.Env(), packet ? packet->duration : 0);

package/src/packet.h

@@ -30,7 +30,9 @@ public:
     Napi::Value GetFlags(const Napi::CallbackInfo &info);
     void SetFlags(const Napi::CallbackInfo &info, const Napi::Value &value);
     Napi::Value GetPTS(const Napi::CallbackInfo &info);
+    void SetPTS(const Napi::CallbackInfo &info, const Napi::Value &value);
     Napi::Value GetDTS(const Napi::CallbackInfo &info);
+    void SetDTS(const Napi::CallbackInfo &info, const Napi::Value &value);
     Napi::Value GetDuration(const Napi::CallbackInfo &info);
     Napi::Value GetSize(const Napi::CallbackInfo &info);
     Napi::Value GetData(const Napi::CallbackInfo &info);