node-av 6.2.0-beta.2 → 6.2.0-beta.21

package/dist/api/encoder-pool.d.ts

@@ -2,6 +2,24 @@ import type { AVCodecFlag, AVCodecID, FFEncoderCodec } from '../constants/index.
 import type { Codec } from '../lib/codec.js';
 import type { Frame } from '../lib/frame.js';
 import type { EncoderOptions } from './encoder.js';
+/**
+ * Minimal promise-chain mutex serializing async critical sections.
+ *
+ * @internal
+ */
+export declare class Mutex {
+    private tail;
+    /**
+     * Run a callback exclusively, after all previously queued callbacks.
+     *
+     * @param fn - Critical section to execute
+     *
+     * @returns The callback's result
+     *
+     * @internal
+     */
+    run<T>(fn: () => T | Promise<T>): Promise<T>;
+}
 /**
  * Options for encoder pool creation.
  *
@@ -98,7 +116,9 @@ export declare class EncoderPool<const C extends FFEncoderCodec | AVCodecID | Co
      * Encode a frame into a self-contained image buffer.
      *
      * Routes the frame to the encoder matching its dimensions and pixel format,
-     * creating and caching one if necessary.
+     * creating and caching one if necessary. Safe to call concurrently: encodes
+     * on the same key are serialized per encoder, different keys run in parallel,
+     * and eviction never closes an encoder with an encode in flight.
      *
      * @param frame - Frame to encode
      *
@@ -120,6 +140,9 @@ export declare class EncoderPool<const C extends FFEncoderCodec | AVCodecID | Co
      * Encode a frame into a self-contained image buffer synchronously.
      * Synchronous version of encode.
      *
+     * If the pooled encoder for the frame's key has an async encode in flight,
+     * a throwaway encoder handles this call so the two cannot interleave.
+     *
      * @param frame - Frame to encode
      *
      * @returns Encoded image bytes
@@ -184,6 +207,25 @@ export declare class EncoderPool<const C extends FFEncoderCodec | AVCodecID | Co
      * @internal
      */
     private set;
+    /**
+     * Take an entry out of service, closing it now or on last release.
+     *
+     * An entry with in-flight encodes is only marked; the final {@link release}
+     * closes the encoder once nothing uses it anymore.
+     *
+     * @param pooled - Entry removed from the pool
+     *
+     * @internal
+     */
+    private retire;
+    /**
+     * Drop an in-flight reference, closing the encoder if it was retired meanwhile.
+     *
+     * @param pooled - Entry acquired by {@link encode}
+     *
+     * @internal
+     */
+    private release;
     /**
      * Extract the encoded bytes from the produced packets and free them.
      *

package/dist/api/encoder-pool.js

@@ -1,4 +1,33 @@
 import { Encoder } from './encoder.js';
+/**
+ * Minimal promise-chain mutex serializing async critical sections.
+ *
+ * @internal
+ */
+export class Mutex {
+    tail = Promise.resolve();
+    /**
+     * Run a callback exclusively, after all previously queued callbacks.
+     *
+     * @param fn - Critical section to execute
+     *
+     * @returns The callback's result
+     *
+     * @internal
+     */
+    async run(fn) {
+        const prev = this.tail;
+        let release;
+        this.tail = new Promise((resolve) => (release = resolve));
+        await prev;
+        try {
+            return await fn();
+        }
+        finally {
+            release();
+        }
+    }
+}
 /**
  * Bounded LRU pool of image encoders keyed by resolution and pixel format.
  *
@@ -85,7 +114,9 @@ export class EncoderPool {
      * Encode a frame into a self-contained image buffer.
      *
      * Routes the frame to the encoder matching its dimensions and pixel format,
-     * creating and caching one if necessary.
+     * creating and caching one if necessary. Safe to call concurrently: encodes
+     * on the same key are serialized per encoder, different keys run in parallel,
+     * and eviction never closes an encoder with an encode in flight.
      *
      * @param frame - Frame to encode
      *
@@ -107,6 +138,8 @@ export class EncoderPool {
         let pooled = this.touch(key);
         if (!pooled) {
             const encoder = await Encoder.create(this.encoderCodec, this.options);
+            // A concurrent encode may have created and cached the same entry while we
+            // awaited; prefer the cached one and discard ours.
             pooled = this.touch(key);
             if (pooled) {
                 encoder.close();
@@ -115,19 +148,39 @@ export class EncoderPool {
                 pooled = this.set(key, encoder);
             }
         }
-        const savedPts = frame.pts;
-        frame.pts = pooled.nextPts++;
+        // Hold the entry across the awaits below: LRU eviction (and close()) defer
+        // closing an in-use encoder to release(), never mid-encode.
+        const entry = pooled;
+        entry.refs++;
         try {
-            return this.extract(await pooled.encoder.encodeAll(frame), pooled.encoder);
+            // Serialize send + drain per encoder: concurrent encodes on the same key
+            // would otherwise interleave and hand packets to the wrong caller.
+            return await entry.lock.run(async () => {
+                const savedPts = frame.pts;
+                const savedTimeBase = frame.timeBase;
+                entry.timeBase ??= savedTimeBase;
+                frame.pts = entry.nextPts++;
+                frame.timeBase = entry.timeBase;
+                try {
+                    return this.extract(await entry.encoder.encodeAll(frame), entry.encoder);
+                }
+                finally {
+                    frame.pts = savedPts;
+                    frame.timeBase = savedTimeBase;
+                }
+            });
         }
         finally {
-            frame.pts = savedPts;
+            this.release(entry);
         }
     }
     /**
      * Encode a frame into a self-contained image buffer synchronously.
      * Synchronous version of encode.
      *
+     * If the pooled encoder for the frame's key has an async encode in flight,
+     * a throwaway encoder handles this call so the two cannot interleave.
+     *
      * @param frame - Frame to encode
      *
      * @returns Encoded image bytes
@@ -147,13 +200,39 @@ export class EncoderPool {
         const key = this.keyFor(frame);
         let pooled = this.touch(key);
         pooled ??= this.set(key, Encoder.createSync(this.encoderCodec, this.options));
+        // Sync encodes cannot interleave with each other (they block the event loop),
+        // but they can land between the awaits of an in-flight async encode on the
+        // same pooled encoder. Use a throwaway encoder in that case.
+        if (pooled.refs > 0) {
+            const encoder = Encoder.createSync(this.encoderCodec, this.options);
+            if (this.flags.length > 0) {
+                encoder.setCodecFlags(...this.flags);
+            }
+            try {
+                const savedPts = frame.pts;
+                frame.pts = 0n;
+                try {
+                    return this.extract(encoder.encodeAllSync(frame), encoder);
+                }
+                finally {
+                    frame.pts = savedPts;
+                }
+            }
+            finally {
+                encoder.close();
+            }
+        }
         const savedPts = frame.pts;
+        const savedTimeBase = frame.timeBase;
+        pooled.timeBase ??= savedTimeBase;
         frame.pts = pooled.nextPts++;
+        frame.timeBase = pooled.timeBase;
         try {
             return this.extract(pooled.encoder.encodeAllSync(frame), pooled.encoder);
         }
         finally {
             frame.pts = savedPts;
+            frame.timeBase = savedTimeBase;
         }
     }
     /**
@@ -169,8 +248,10 @@ export class EncoderPool {
      * @see {@link Symbol.dispose} For automatic cleanup
      */
     close() {
-        for (const { encoder } of this.encoders.values()) {
-            encoder.close();
+        // In-use encoders are retired, not closed: the last in-flight encode closes
+        // them on release, so close() during concurrent encodes never crashes them.
+        for (const pooled of this.encoders.values()) {
+            this.retire(pooled);
         }
         this.encoders.clear();
     }
@@ -221,18 +302,49 @@ export class EncoderPool {
         if (this.flags.length > 0) {
             encoder.setCodecFlags(...this.flags);
         }
-        const pooled = { encoder, nextPts: 0n };
+        const pooled = { encoder, nextPts: 0n, timeBase: null, lock: new Mutex(), refs: 0, evicted: false };
         this.encoders.set(key, pooled);
         if (this.encoders.size > this.maxSize) {
             const oldestKey = this.encoders.keys().next().value;
             if (oldestKey !== undefined) {
                 const oldest = this.encoders.get(oldestKey);
                 this.encoders.delete(oldestKey);
-                oldest?.encoder.close();
+                if (oldest) {
+                    this.retire(oldest);
+                }
             }
         }
         return pooled;
     }
+    /**
+     * Take an entry out of service, closing it now or on last release.
+     *
+     * An entry with in-flight encodes is only marked; the final {@link release}
+     * closes the encoder once nothing uses it anymore.
+     *
+     * @param pooled - Entry removed from the pool
+     *
+     * @internal
+     */
+    retire(pooled) {
+        pooled.evicted = true;
+        if (pooled.refs === 0) {
+            pooled.encoder.close();
+        }
+    }
+    /**
+     * Drop an in-flight reference, closing the encoder if it was retired meanwhile.
+     *
+     * @param pooled - Entry acquired by {@link encode}
+     *
+     * @internal
+     */
+    release(pooled) {
+        pooled.refs--;
+        if (pooled.refs === 0 && pooled.evicted) {
+            pooled.encoder.close();
+        }
+    }
     /**
      * Extract the encoded bytes from the produced packets and free them.
      *

package/dist/api/encoder-pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"encoder-pool.js","sourceRoot":"","sources":["../../src/api/encoder-pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"encoder-pool.js","sourceRoot":"","sources":["../../src/api/encoder-pool.ts"],"names":[],"mappings":"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"}

package/dist/api/encoder.d.ts

@@ -204,6 +204,23 @@ export interface EncoderOptions<C = unknown> {
      * @default false
      */
     autoFormat?: boolean;
+    /**
+     * Keep each frame's `pictType` instead of clearing it before encoding.
+     *
+     * By default the encoder resets `frame.pictType` to `AV_PICTURE_TYPE_NONE`,
+     * since decoded input frames carry frame-type hints that should not drive the
+     * output GOP structure when re-encoding. That clearing also discards a
+     * deliberately requested keyframe: setting `frame.pictType = AV_PICTURE_TYPE_I`
+     * (with `forced-idr` on encoders that support it) is the standard FFmpeg way
+     * to force an IDR for a specific frame.
+     *
+     * Set to `true` to pass `pictType` through — needed for on-demand keyframes in
+     * live streaming (packet-loss recovery, a late-joining viewer). Leave `false`
+     * for transcoding, where the input's frame types should be ignored.
+     *
+     * @default false
+     */
+    preserveFramePictType?: boolean;
     /**
      * Additional codec-specific options.
      *
@@ -291,6 +308,8 @@ export declare class Encoder implements Disposable {
     private autoResample;
     private audioResampler?;
     private resampledFrame?;
+    private resampleChangesRate;
+    private resampledPts;
     private audioInputLayout?;
     private autoFormat;
     private videoScaler?;

package/dist/api/encoder.js

@@ -51,7 +51,7 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
 /* eslint-disable @stylistic/indent-binary-ops */
-import { AV_CHANNEL_ORDER_UNSPEC, AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, AV_CODEC_CAP_PARAM_CHANGE, AV_CODEC_FLAG_COPY_OPAQUE, AV_CODEC_FLAG_FRAME_DURATION, AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX, AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX, AV_PICTURE_TYPE_NONE, AV_PIX_FMT_NONE, AV_PKT_FLAG_TRUSTED, AVCHROMA_LOC_UNSPECIFIED, AVERROR_EAGAIN, AVERROR_ENCODER_NOT_FOUND, AVERROR_EOF, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_VIDEO, EOF, SWS_BILINEAR, } from '../constants/constants.js';
+import { AV_CHANNEL_ORDER_UNSPEC, AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, AV_CODEC_CAP_PARAM_CHANGE, AV_CODEC_FLAG_COPY_OPAQUE, AV_CODEC_FLAG_FRAME_DURATION, AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX, AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX, AV_NOPTS_VALUE, AV_PICTURE_TYPE_NONE, AV_PIX_FMT_NONE, AV_PKT_FLAG_TRUSTED, AVCHROMA_LOC_UNSPECIFIED, AVERROR_EAGAIN, AVERROR_ENCODER_NOT_FOUND, AVERROR_EOF, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_VIDEO, EOF, SWS_BILINEAR, } from '../constants/constants.js';
 import { CodecContext } from '../lib/codec-context.js';
 import { Codec } from '../lib/codec.js';
 import { Dictionary } from '../lib/dictionary.js';
@@ -158,6 +158,8 @@ export class Encoder {
     autoResample;
     audioResampler;
     resampledFrame;
+    resampleChangesRate = false;
+    resampledPts = 0n;
     audioInputLayout;
     autoFormat;
     videoScaler;
@@ -1243,9 +1245,8 @@ export class Encoder {
             }
         }
         // If using AudioFrameBuffer, flush remaining buffered samples first
-        if (this.audioFrameBuffer && this.audioFrameBuffer.size > 0) {
-            // Pull any remaining partial frame (may be less than frameSize)
-            // For the final frame, we pad or truncate as needed
+        if (this.audioFrameBuffer) {
+            // Drain all complete frames
             let _bufferedFrame;
             while (!this.isClosed && (_bufferedFrame = await this.audioFrameBuffer.pull()) !== null) {
                 const env_5 = { stack: [], error: void 0, hasError: false };
@@ -1261,6 +1262,23 @@ export class Encoder {
                     __disposeResources(env_5);
                 }
             }
+            // Encode the final partial frame padded with silence - otherwise the tail
+            // (up to frameSize - 1 samples, ~21 ms at 48 kHz/1024) would be dropped.
+            const _partialFrame = !this.isClosed ? await this.audioFrameBuffer.pullPartial() : null;
+            if (_partialFrame) {
+                const env_6 = { stack: [], error: void 0, hasError: false };
+                try {
+                    const partialFrame = __addDisposableResource(env_6, _partialFrame, false);
+                    await this.codecContext.sendFrame(partialFrame);
+                }
+                catch (e_6) {
+                    env_6.error = e_6;
+                    env_6.hasError = true;
+                }
+                finally {
+                    __disposeResources(env_6);
+                }
+            }
         }
         // Send flush frame (null)
         const ret = await this.codecContext.sendFrame(null);
@@ -1313,22 +1331,37 @@ export class Encoder {
             }
         }
         // If using AudioFrameBuffer, flush remaining buffered samples first
-        if (this.audioFrameBuffer && this.audioFrameBuffer.size > 0) {
-            // Pull any remaining partial frame (may be less than frameSize)
-            // For the final frame, we pad or truncate as needed
+        if (this.audioFrameBuffer) {
+            // Drain all complete frames
             let _bufferedFrame;
             while (!this.isClosed && (_bufferedFrame = this.audioFrameBuffer.pullSync()) !== null) {
-                const env_6 = { stack: [], error: void 0, hasError: false };
+                const env_7 = { stack: [], error: void 0, hasError: false };
                 try {
-                    const bufferedFrame = __addDisposableResource(env_6, _bufferedFrame, false);
+                    const bufferedFrame = __addDisposableResource(env_7, _bufferedFrame, false);
                     this.codecContext.sendFrameSync(bufferedFrame);
                 }
-                catch (e_6) {
-                    env_6.error = e_6;
-                    env_6.hasError = true;
+                catch (e_7) {
+                    env_7.error = e_7;
+                    env_7.hasError = true;
                 }
                 finally {
-                    __disposeResources(env_6);
+                    __disposeResources(env_7);
+                }
+            }
+            // Encode the final partial frame padded with silence (see flush)
+            const _partialFrame = !this.isClosed ? this.audioFrameBuffer.pullPartialSync() : null;
+            if (_partialFrame) {
+                const env_8 = { stack: [], error: void 0, hasError: false };
+                try {
+                    const partialFrame = __addDisposableResource(env_8, _partialFrame, false);
+                    this.codecContext.sendFrameSync(partialFrame);
+                }
+                catch (e_8) {
+                    env_8.error = e_8;
+                    env_8.hasError = true;
+                }
+                finally {
+                    __disposeResources(env_8);
                 }
             }
         }
@@ -1471,19 +1504,19 @@ export class Encoder {
         // Clear previous packet data
         this.packet.unref();
         if (this.audioFrameBuffer?.hasFrame()) {
-            const env_7 = { stack: [], error: void 0, hasError: false };
+            const env_9 = { stack: [], error: void 0, hasError: false };
             try {
-                const bufferedFrame = __addDisposableResource(env_7, await this.audioFrameBuffer.pull(), false);
+                const bufferedFrame = __addDisposableResource(env_9, await this.audioFrameBuffer.pull(), false);
                 if (bufferedFrame) {
                     await this.codecContext.sendFrame(bufferedFrame);
                 }
             }
-            catch (e_7) {
-                env_7.error = e_7;
-                env_7.hasError = true;
+            catch (e_9) {
+                env_9.error = e_9;
+                env_9.hasError = true;
             }
             finally {
-                __disposeResources(env_7);
+                __disposeResources(env_9);
             }
         }
         const ret = await this.codecContext.receivePacket(this.packet);
@@ -1576,19 +1609,19 @@ export class Encoder {
         // Clear previous packet data
         this.packet.unref();
         if (this.audioFrameBuffer?.hasFrame()) {
-            const env_8 = { stack: [], error: void 0, hasError: false };
+            const env_10 = { stack: [], error: void 0, hasError: false };
             try {
-                const bufferedFrame = __addDisposableResource(env_8, this.audioFrameBuffer.pullSync(), false);
+                const bufferedFrame = __addDisposableResource(env_10, this.audioFrameBuffer.pullSync(), false);
                 if (bufferedFrame) {
                     this.codecContext.sendFrameSync(bufferedFrame);
                 }
             }
-            catch (e_8) {
-                env_8.error = e_8;
-                env_8.hasError = true;
+            catch (e_10) {
+                env_10.error = e_10;
+                env_10.hasError = true;
             }
             finally {
-                __disposeResources(env_8);
+                __disposeResources(env_10);
             }
         }
         const ret = this.codecContext.receivePacketSync(this.packet);
@@ -1641,7 +1674,13 @@ export class Encoder {
                 const packet = await this.receiveFromQueue();
                 if (!packet)
                     break;
-                await target.writePacket(packet, streamIndex);
+                try {
+                    // writePacket clones internally; the queue-owned packet is ours to free
+                    await target.writePacket(packet, streamIndex);
+                }
+                finally {
+                    packet.free();
+                }
             }
         })();
         // Return control without pipeTo (terminal stage)
@@ -1675,7 +1714,6 @@ export class Encoder {
         this.outputQueue.close();
         this.inputQueue.clear();
         this.outputQueue.clear();
-        this.packet.free();
         this.audioFrameBuffer?.[Symbol.dispose]();
         this.audioFrameBuffer = undefined;
         this.audioResampler?.[Symbol.dispose]();
@@ -1687,6 +1725,7 @@ export class Encoder {
         this.scaledFrame?.free();
         this.scaledFrame = undefined;
         this.codecContext.freeContext();
+        this.packet.free();
         this.initialized = false;
     }
     /**
@@ -1729,9 +1768,9 @@ export class Encoder {
         try {
             // Outer loop - receive frames
             while (!this.inputQueue.isClosed) {
-                const env_9 = { stack: [], error: void 0, hasError: false };
+                const env_11 = { stack: [], error: void 0, hasError: false };
                 try {
-                    const frame = __addDisposableResource(env_9, await this.inputQueue.receive(), false);
+                    const frame = __addDisposableResource(env_11, await this.inputQueue.receive(), false);
                     if (!frame)
                         break;
                     // Open encoder if not already done
@@ -1750,12 +1789,12 @@ export class Encoder {
                         await this.outputQueue.send(packet); // Only send actual packets
                     }
                 }
-                catch (e_9) {
-                    env_9.error = e_9;
-                    env_9.hasError = true;
+                catch (e_11) {
+                    env_11.error = e_11;
+                    env_11.hasError = true;
                 }
                 finally {
-                    __disposeResources(env_9);
+                    __disposeResources(env_11);
                 }
             }
             // Flush encoder at end
@@ -2119,8 +2158,6 @@ export class Encoder {
      * @internal
      */
     setupAudioParams(frame) {
-        // Always use frame timebase (typically 1/sample_rate) for correct audio PTS.
-        this.codecContext.timeBase = frame.timeBase;
         const inRate = frame.sampleRate;
         const inFmt = frame.format;
         // Codec open and swr both need a concrete layout. PCM/raw frames often carry
@@ -2135,6 +2172,14 @@ export class Encoder {
         const targetRate = pickSupportedRate(inRate, this.codec.supportedSamplerates);
         const targetFmt = pickSupportedSampleFormat(inFmt, this.codec.sampleFormats);
         const targetLayout = pickSupportedLayout(inLayout, this.codec.channelLayouts);
+        // When the codec forces a different sample rate, the frames that reach it
+        // carry PTS as a running sample counter at that rate (resampler and FIFO
+        // paths), so the codec timebase must be 1/target_rate - the input timebase
+        // would misread those counts (e.g. 44.1 kHz in -> Opus-forced 48 kHz would
+        // play ~8.8% slow). Without rate conversion, keep the frame timebase
+        // (typically 1/sample_rate).
+        this.resampleChangesRate = targetRate !== inRate;
+        this.codecContext.timeBase = this.resampleChangesRate ? new Rational(1, targetRate) : frame.timeBase;
         const needsResample = targetRate !== inRate || targetFmt !== inFmt || targetLayout.nbChannels !== inLayout.nbChannels;
         if (needsResample && !this.autoResample) {
             const mismatches = [];
@@ -2199,8 +2244,19 @@ export class Encoder {
         out.sampleRate = this.codecContext.sampleRate;
         out.channelLayout = this.codecContext.channelLayout;
         FFmpegError.throwIfError(this.audioResampler.convertFrame(out, frame), 'Failed to resample audio frame');
-        out.timeBase = frame.timeBase;
-        out.pts = frame.pts;
+        if (this.resampleChangesRate) {
+            // Rate conversion changes the sample count, so the input PTS no longer
+            // matches the output. Stamp from a running output-sample counter in
+            // 1/out_rate (the codec timebase) - the same scheme the FIFO path uses
+            // when re-stamping - instead of replicating swr_next_pts() delay tracking.
+            out.timeBase = this.codecContext.timeBase;
+            out.pts = this.resampledPts;
+            this.resampledPts += BigInt(out.nbSamples);
+        }
+        else {
+            out.timeBase = frame.timeBase;
+            out.pts = frame.pts;
+        }
         return out;
     }
     /**
@@ -2224,6 +2280,12 @@ export class Encoder {
         if (ret < 0 || out.nbSamples <= 0) {
             return null;
         }
+        if (this.resampleChangesRate) {
+            // Continue the running output-sample counter (see resampleAudio)
+            out.timeBase = this.codecContext.timeBase;
+            out.pts = this.resampledPts;
+            this.resampledPts += BigInt(out.nbSamples);
+        }
         return out;
     }
     /**
@@ -2324,9 +2386,12 @@ export class Encoder {
      * @internal
      */
     prepareFrameForEncoding(frame) {
-        // Clear pict_type - encoder will determine frame types based on its own settings
-        // Input stream's frame type hints are irrelevant when re-encoding
-        frame.pictType = AV_PICTURE_TYPE_NONE;
+        // Clear pict_type - encoder will determine frame types based on its own settings.
+        // Input stream's frame type hints are irrelevant when re-encoding. Opt out with
+        // { preserveFramePictType: true } to force keyframes via frame.pictType = I.
+        if (!this.options.preserveFramePictType) {
+            frame.pictType = AV_PICTURE_TYPE_NONE;
+        }
         // Adjust frame PTS and timebase to encoder timebase
         // This matches FFmpeg's adjust_frame_pts_to_encoder_tb() behavior which:
         // 1. Converts PTS from frame's timebase to encoder's timebase (av_rescale_q)
@@ -2354,14 +2419,16 @@ export class Encoder {
             // Matches FFmpeg's CFR mode: frame->duration = 1
             frameDuration = 1n;
         }
-        if (pts !== null && pts !== undefined) {
+        // AV_NOPTS_VALUE (INT64_MIN) must pass through untouched - rescaling it
+        // yields a garbage timestamp instead of the "unset" marker.
+        if (pts !== AV_NOPTS_VALUE) {
             // Convert PTS to encoder timebase
             frame.pts = avRescaleQ(pts, oldTimebase, encoderTimebase);
-            // IMPORTANT: Set frame timebase to encoder timebase
-            // FFmpeg does this in adjust_frame_pts_to_encoder_tb(): frame->time_base = tb_dst
-            // This ensures encoder gets frames with correct timebase (1/framerate for video, 1/sample_rate for audio)
-            frame.timeBase = encoderTimebase;
         }
+        // IMPORTANT: Set frame timebase to encoder timebase
+        // FFmpeg does this in adjust_frame_pts_to_encoder_tb(): frame->time_base = tb_dst
+        // This ensures encoder gets frames with correct timebase (1/framerate for video, 1/sample_rate for audio)
+        frame.timeBase = encoderTimebase;
         // Set frame duration in encoder timebase
         // This matches FFmpeg's video_sync_process() which sets frame->duration
         // based on vsync_method (CFR: 1, VFR: calculated, PASSTHROUGH: calculated)