werift 0.16.0 → 0.16.1

package/lib/rtp/src/codec/index.d.ts

@@ -10,9 +10,5 @@ export * from "./vp9";
 export declare function dePacketizeRtpPackets(codec: string, packets: RtpPacket[]): {
     isKeyframe: boolean;
     data: Buffer;
-    partitions: DePacketizerBase[];
-} | {
-    isKeyframe: boolean;
-    data: Buffer;
 };
 export declare function dePacketizeRtpPacket(codec: string, packet: RtpPacket): DePacketizerBase;

package/lib/rtp/src/codec/index.js

@@ -31,7 +31,7 @@ function dePacketizeRtpPackets(codec, packets) {
         const partitions = packets.map((p) => DePacketizer.deSerialize(p.payload));
         const isKeyframe = !!partitions.find((f) => f.isKeyframe);
         const data = Buffer.concat(partitions.map((f) => f.payload));
-        return { isKeyframe, data, partitions };
+        return { isKeyframe, data };
     };
     switch (codec.toUpperCase()) {
         case "AV1": {
@@ -43,11 +43,7 @@ function dePacketizeRtpPackets(codec, packets) {
         case "MPEG4/ISO/AVC":
             return basicCodecParser(h264_1.H264RtpPayload);
         case "VP8": {
-            const { partitions, data, isKeyframe } = basicCodecParser(vp8_1.Vp8RtpPayload);
-            if (!partitions[0].payloadHeaderExist) {
-                throw new Error();
-            }
-            return { data, isKeyframe };
+            return basicCodecParser(vp8_1.Vp8RtpPayload);
         }
         case "VP9":
             return basicCodecParser(vp9_1.Vp9RtpPayload);

package/lib/rtp/src/codec/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../rtp/src/codec/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { RtpPacket } from \"../rtp/rtp\";\nimport { AV1RtpPayload } from \"./av1\";\nimport { DePacketizerBase } from \"./base\";\nimport { H264RtpPayload } from \"./h264\";\nimport { OpusRtpPayload } from \"./opus\";\nimport { Vp8RtpPayload } from \"./vp8\";\nimport { Vp9RtpPayload } from \"./vp9\";\n\nexport * from \"./av1\";\nexport * from \"./base\";\nexport * from \"./h264\";\nexport * from \"./opus\";\nexport * from \"./vp8\";\nexport * from \"./vp9\";\n\nexport function dePacketizeRtpPackets(codec: string, packets: RtpPacket[]) {\n  const basicCodecParser = (DePacketizer: typeof DePacketizerBase) => {\n    const partitions = packets.map((p) => DePacketizer.deSerialize(p.payload));\n    const isKeyframe = !!partitions.find((f) => f.isKeyframe);\n    const data = Buffer.concat(partitions.map((f) => f.payload));\n    return { isKeyframe, data, partitions };\n  };\n\n  switch (codec.toUpperCase()) {\n    case \"AV1\": {\n      const chunks = packets.map((p) => AV1RtpPayload.deSerialize(p.payload));\n      const isKeyframe = !!chunks.find((f) => f.isKeyframe);\n      const data = AV1RtpPayload.getFrame(chunks);\n      return { isKeyframe, data };\n    }\n    case \"MPEG4/ISO/AVC\":\n      return basicCodecParser(H264RtpPayload);\n    case \"VP8\": {\n      const { partitions, data, isKeyframe } = basicCodecParser(Vp8RtpPayload);\n      if (!(partitions[0] as Vp8RtpPayload).payloadHeaderExist) {\n        throw new Error();\n      }\n\n      return { data, isKeyframe };\n    }\n    case \"VP9\":\n      return basicCodecParser(Vp9RtpPayload);\n    case \"OPUS\":\n      return basicCodecParser(OpusRtpPayload);\n    default:\n      throw new Error();\n  }\n}\n\nexport function dePacketizeRtpPacket(codec: string, packet: RtpPacket) {\n  const depacketizer = (DePacketizer: typeof DePacketizerBase) => {\n    return DePacketizer.deSerialize(packet.payload);\n  };\n\n  switch (codec.toUpperCase()) {\n    case \"AV1\":\n      return depacketizer(AV1RtpPayload as any);\n    case \"MPEG4/ISO/AVC\":\n      return depacketizer(H264RtpPayload);\n    case \"VP8\":\n      return depacketizer(Vp8RtpPayload);\n    case \"VP9\":\n      return depacketizer(Vp9RtpPayload);\n    case \"OPUS\":\n      return depacketizer(OpusRtpPayload);\n    default:\n      throw new Error();\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../rtp/src/codec/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,+BAAsC;AAEtC,iCAAwC;AACxC,iCAAwC;AACxC,+BAAsC;AACtC,+BAAsC;AAEtC,wCAAsB;AACtB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,wCAAsB;AACtB,wCAAsB;AAEtB,SAAgB,qBAAqB,CAAC,KAAa,EAAE,OAAoB;IACvE,MAAM,gBAAgB,GAAG,CAAC,YAAqC,EAAE,EAAE;QACjE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3E,MAAM,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7D,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IAC9B,CAAC,CAAC;IAEF,QAAQ,KAAK,CAAC,WAAW,EAAE,EAAE;QAC3B,KAAK,KAAK,CAAC,CAAC;YACV,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAa,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACxE,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YACtD,MAAM,IAAI,GAAG,mBAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC5C,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;SAC7B;QACD,KAAK,eAAe;YAClB,OAAO,gBAAgB,CAAC,qBAAc,CAAC,CAAC;QAC1C,KAAK,KAAK,CAAC,CAAC;YACV,OAAO,gBAAgB,CAAC,mBAAa,CAAC,CAAC;SACxC;QACD,KAAK,KAAK;YACR,OAAO,gBAAgB,CAAC,mBAAa,CAAC,CAAC;QACzC,KAAK,MAAM;YACT,OAAO,gBAAgB,CAAC,qBAAc,CAAC,CAAC;QAC1C;YACE,MAAM,IAAI,KAAK,EAAE,CAAC;KACrB;AACH,CAAC;AA3BD,sDA2BC;AAED,SAAgB,oBAAoB,CAAC,KAAa,EAAE,MAAiB;IACnE,MAAM,YAAY,GAAG,CAAC,YAAqC,EAAE,EAAE;QAC7D,OAAO,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC,CAAC;IAEF,QAAQ,KAAK,CAAC,WAAW,EAAE,EAAE;QAC3B,KAAK,KAAK;YACR,OAAO,YAAY,CAAC,mBAAoB,CAAC,CAAC;QAC5C,KAAK,eAAe;YAClB,OAAO,YAAY,CAAC,qBAAc,CAAC,CAAC;QACtC,KAAK,KAAK;YACR,OAAO,YAAY,CAAC,mBAAa,CAAC,CAAC;QACrC,KAAK,KAAK;YACR,OAAO,YAAY,CAAC,mBAAa,CAAC,CAAC;QACrC,KAAK,MAAM;YACT,OAAO,YAAY,CAAC,qBAAc,CAAC,CAAC;QACtC;YACE,MAAM,IAAI,KAAK,EAAE,CAAC;KACrB;AACH,CAAC;AAnBD,oDAmBC","sourcesContent":["import { RtpPacket } from \"../rtp/rtp\";\nimport { AV1RtpPayload } from \"./av1\";\nimport { DePacketizerBase } from \"./base\";\nimport { H264RtpPayload } from \"./h264\";\nimport { OpusRtpPayload } from \"./opus\";\nimport { Vp8RtpPayload } from \"./vp8\";\nimport { Vp9RtpPayload } from \"./vp9\";\n\nexport * from \"./av1\";\nexport * from \"./base\";\nexport * from \"./h264\";\nexport * from \"./opus\";\nexport * from \"./vp8\";\nexport * from \"./vp9\";\n\nexport function dePacketizeRtpPackets(codec: string, packets: RtpPacket[]) {\n  const basicCodecParser = (DePacketizer: typeof DePacketizerBase) => {\n    const partitions = packets.map((p) => DePacketizer.deSerialize(p.payload));\n    const isKeyframe = !!partitions.find((f) => f.isKeyframe);\n    const data = Buffer.concat(partitions.map((f) => f.payload));\n    return { isKeyframe, data };\n  };\n\n  switch (codec.toUpperCase()) {\n    case \"AV1\": {\n      const chunks = packets.map((p) => AV1RtpPayload.deSerialize(p.payload));\n      const isKeyframe = !!chunks.find((f) => f.isKeyframe);\n      const data = AV1RtpPayload.getFrame(chunks);\n      return { isKeyframe, data };\n    }\n    case \"MPEG4/ISO/AVC\":\n      return basicCodecParser(H264RtpPayload);\n    case \"VP8\": {\n      return basicCodecParser(Vp8RtpPayload);\n    }\n    case \"VP9\":\n      return basicCodecParser(Vp9RtpPayload);\n    case \"OPUS\":\n      return basicCodecParser(OpusRtpPayload);\n    default:\n      throw new Error();\n  }\n}\n\nexport function dePacketizeRtpPacket(codec: string, packet: RtpPacket) {\n  const depacketizer = (DePacketizer: typeof DePacketizerBase) => {\n    return DePacketizer.deSerialize(packet.payload);\n  };\n\n  switch (codec.toUpperCase()) {\n    case \"AV1\":\n      return depacketizer(AV1RtpPayload as any);\n    case \"MPEG4/ISO/AVC\":\n      return depacketizer(H264RtpPayload);\n    case \"VP8\":\n      return depacketizer(Vp8RtpPayload);\n    case \"VP9\":\n      return depacketizer(Vp9RtpPayload);\n    case \"OPUS\":\n      return depacketizer(OpusRtpPayload);\n    default:\n      throw new Error();\n  }\n}\n"]}

package/lib/rtp/src/index.d.ts

@@ -1,12 +1,7 @@
 import "buffer";
 export * from "../../common/src";
 export * from "./codec";
-export * from "./processor/base";
-export * from "./processor/jitterBuffer";
-export * from "./processor/lipsync";
-export * from "./processor/sampleBuilder";
-export * from "./processor/webm";
-export * from "./processor_v2";
+export * from "./processor";
 export * from "./rtcp/header";
 export * from "./rtcp/psfb";
 export * from "./rtcp/psfb/pictureLossIndication";

package/lib/rtp/src/index.js

@@ -17,12 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("buffer");
 __exportStar(require("../../common/src"), exports);
 __exportStar(require("./codec"), exports);
-__exportStar(require("./processor/base"), exports);
-__exportStar(require("./processor/jitterBuffer"), exports);
-__exportStar(require("./processor/lipsync"), exports);
-__exportStar(require("./processor/sampleBuilder"), exports);
-__exportStar(require("./processor/webm"), exports);
-__exportStar(require("./processor_v2"), exports);
+__exportStar(require("./processor"), exports);
 __exportStar(require("./rtcp/header"), exports);
 __exportStar(require("./rtcp/psfb"), exports);
 __exportStar(require("./rtcp/psfb/pictureLossIndication"), exports);

package/lib/rtp/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../rtp/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kBAAgB;AAChB,mDAAiC;AACjC,0CAAwB;AACxB,mDAAiC;AACjC,2DAAyC;AACzC,sDAAoC;AACpC,4DAA0C;AAC1C,mDAAiC;AACjC,iDAA+B;AAC/B,gDAA8B;AAC9B,8CAA4B;AAC5B,oEAAkD;AAClD,mDAAiC;AACjC,4CAA0B;AAC1B,8CAA4B;AAC5B,+CAA6B;AAC7B,oDAAkC;AAClC,oDAAkC;AAClC,8CAA4B;AAC5B,4CAA0B;AAC1B,oDAAkC;AAClC,mDAAiC;AACjC,4CAA0B;AAC1B,+CAA6B;AAC7B,8CAA4B","sourcesContent":["import \"buffer\";\nexport * from \"../../common/src\";\nexport * from \"./codec\";\nexport * from \"./processor/base\";\nexport * from \"./processor/jitterBuffer\";\nexport * from \"./processor/lipsync\";\nexport * from \"./processor/sampleBuilder\";\nexport * from \"./processor/webm\";\nexport * from \"./processor_v2\";\nexport * from \"./rtcp/header\";\nexport * from \"./rtcp/psfb\";\nexport * from \"./rtcp/psfb/pictureLossIndication\";\nexport * from \"./rtcp/psfb/remb\";\nexport * from \"./rtcp/rr\";\nexport * from \"./rtcp/rtcp\";\nexport * from \"./rtcp/rtpfb\";\nexport * from \"./rtcp/rtpfb/nack\";\nexport * from \"./rtcp/rtpfb/twcc\";\nexport * from \"./rtcp/sdes\";\nexport * from \"./rtcp/sr\";\nexport * from \"./rtp/red/encoder\";\nexport * from \"./rtp/red/packet\";\nexport * from \"./rtp/rtp\";\nexport * from \"./srtp/srtcp\";\nexport * from \"./srtp/srtp\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../rtp/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kBAAgB;AAChB,mDAAiC;AACjC,0CAAwB;AACxB,8CAA4B;AAC5B,gDAA8B;AAC9B,8CAA4B;AAC5B,oEAAkD;AAClD,mDAAiC;AACjC,4CAA0B;AAC1B,8CAA4B;AAC5B,+CAA6B;AAC7B,oDAAkC;AAClC,oDAAkC;AAClC,8CAA4B;AAC5B,4CAA0B;AAC1B,oDAAkC;AAClC,mDAAiC;AACjC,4CAA0B;AAC1B,+CAA6B;AAC7B,8CAA4B","sourcesContent":["import \"buffer\";\nexport * from \"../../common/src\";\nexport * from \"./codec\";\nexport * from \"./processor\";\nexport * from \"./rtcp/header\";\nexport * from \"./rtcp/psfb\";\nexport * from \"./rtcp/psfb/pictureLossIndication\";\nexport * from \"./rtcp/psfb/remb\";\nexport * from \"./rtcp/rr\";\nexport * from \"./rtcp/rtcp\";\nexport * from \"./rtcp/rtpfb\";\nexport * from \"./rtcp/rtpfb/nack\";\nexport * from \"./rtcp/rtpfb/twcc\";\nexport * from \"./rtcp/sdes\";\nexport * from \"./rtcp/sr\";\nexport * from \"./rtp/red/encoder\";\nexport * from \"./rtp/red/packet\";\nexport * from \"./rtp/rtp\";\nexport * from \"./srtp/srtcp\";\nexport * from \"./srtp/srtp\";\n"]}

package/lib/rtp/src/processor/depacketizer.d.ts

@@ -0,0 +1,26 @@
+/// <reference types="node" />
+import { RtpHeader } from "..";
+import { RtpOutput } from "./source/rtp";
+export declare type DepacketizerInput = RtpOutput;
+export interface DepacketizerOutput {
+    frame?: {
+        data: Buffer;
+        isKeyframe: boolean;
+        timestamp: number;
+    };
+    eol?: boolean;
+}
+export declare class DepacketizeBase {
+    private codec;
+    private options;
+    private buffering;
+    private lastSeqNum?;
+    private packetLostHappened;
+    constructor(codec: string, options?: {
+        waitForKeyframe?: boolean;
+        isFinalPacketInSequence?: (header: RtpHeader) => boolean;
+    });
+    processInput(input: DepacketizerInput): DepacketizerOutput[];
+    private clearBuffer;
+    private checkFinalPacket;
+}

package/lib/rtp/src/processor/depacketizer.js

@@ -0,0 +1,114 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DepacketizeBase = void 0;
+const debug_1 = __importDefault(require("debug"));
+const __1 = require("..");
+const codec_1 = require("../codec");
+const helper_1 = require("../helper");
+const srcPath = `werift-rtp : packages/rtp/src/processor_v2/depacketizer.ts`;
+const log = (0, debug_1.default)(srcPath);
+class DepacketizeBase {
+    constructor(codec, options = {}) {
+        this.codec = codec;
+        this.options = options;
+        this.buffering = [];
+        this.packetLostHappened = false;
+    }
+    processInput(input) {
+        const output = [];
+        if (!input.rtp) {
+            if (input.eol) {
+                output.push({ eol: true });
+            }
+            return output;
+        }
+        if (this.options.isFinalPacketInSequence) {
+            const isFinal = this.checkFinalPacket(input.rtp);
+            if (isFinal) {
+                try {
+                    const { timestamp } = this.buffering[0].header;
+                    const { data, isKeyframe } = (0, codec_1.dePacketizeRtpPackets)(this.codec, this.buffering);
+                    this.clearBuffer();
+                    if (this.packetLostHappened) {
+                        if (isKeyframe) {
+                            this.packetLostHappened = false;
+                        }
+                        else if (this.options.waitForKeyframe) {
+                            return [];
+                        }
+                    }
+                    output.push({
+                        frame: {
+                            data,
+                            isKeyframe,
+                            timestamp,
+                        },
+                    });
+                    return output;
+                }
+                catch (error) {
+                    log("error", error, input);
+                    this.clearBuffer();
+                }
+            }
+        }
+        else {
+            try {
+                const { data, isKeyframe } = (0, codec_1.dePacketizeRtpPackets)(this.codec, [
+                    input.rtp,
+                ]);
+                output.push({
+                    frame: {
+                        data,
+                        isKeyframe,
+                        timestamp: input.rtp.header.timestamp,
+                    },
+                });
+                return output;
+            }
+            catch (error) {
+                log("error", error, input);
+            }
+        }
+        return [];
+    }
+    clearBuffer() {
+        this.buffering.forEach((b) => b.clear());
+        this.buffering = [];
+    }
+    checkFinalPacket(rtp) {
+        if (!this.options.isFinalPacketInSequence) {
+            throw new Error("isFinalPacketInSequence not exist");
+        }
+        const { sequenceNumber } = rtp.header;
+        if (this.lastSeqNum != undefined) {
+            const expect = (0, __1.uint16Add)(this.lastSeqNum, 1);
+            if (sequenceNumber < expect) {
+                return false;
+            }
+            if (sequenceNumber > expect) {
+                log("packet lost happened", { expect, sequenceNumber });
+                this.packetLostHappened = true;
+                this.clearBuffer();
+            }
+        }
+        this.buffering.push(rtp);
+        this.lastSeqNum = sequenceNumber;
+        let finalPacket;
+        for (const [i, p] of (0, helper_1.enumerate)(this.buffering)) {
+            if (this.options.isFinalPacketInSequence(p.header)) {
+                finalPacket = i;
+                break;
+            }
+        }
+        if (finalPacket == undefined) {
+            return false;
+        }
+        return true;
+    }
+}
+exports.DepacketizeBase = DepacketizeBase;
+//# sourceMappingURL=depacketizer.js.map

package/lib/rtp/src/processor/depacketizer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"depacketizer.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/depacketizer.ts"],"names":[],"mappings":"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","sourcesContent":["import debug from \"debug\";\n\nimport { RtpHeader, RtpPacket, uint16Add } from \"..\";\nimport { dePacketizeRtpPackets } from \"../codec\";\nimport { enumerate } from \"../helper\";\nimport { RtpOutput } from \"./source/rtp\";\n\nconst srcPath = `werift-rtp : packages/rtp/src/processor_v2/depacketizer.ts`;\nconst log = debug(srcPath);\n\nexport type DepacketizerInput = RtpOutput;\n\nexport interface DepacketizerOutput {\n  frame?: { data: Buffer; isKeyframe: boolean; timestamp: number };\n  eol?: boolean;\n}\n\nexport class DepacketizeBase {\n  private buffering: RtpPacket[] = [];\n  private lastSeqNum?: number;\n  private packetLostHappened = false;\n\n  constructor(\n    private codec: string,\n    private options: {\n      waitForKeyframe?: boolean;\n      isFinalPacketInSequence?: (header: RtpHeader) => boolean;\n    } = {}\n  ) {}\n\n  processInput(input: DepacketizerInput): DepacketizerOutput[] {\n    const output: DepacketizerOutput[] = [];\n    if (!input.rtp) {\n      if (input.eol) {\n        output.push({ eol: true });\n      }\n      return output;\n    }\n\n    if (this.options.isFinalPacketInSequence) {\n      const isFinal = this.checkFinalPacket(input.rtp);\n      if (isFinal) {\n        try {\n          const { timestamp } = this.buffering[0].header;\n          const { data, isKeyframe } = dePacketizeRtpPackets(\n            this.codec,\n            this.buffering\n          );\n          this.clearBuffer();\n\n          if (this.packetLostHappened) {\n            if (isKeyframe) {\n              this.packetLostHappened = false;\n            } else if (this.options.waitForKeyframe) {\n              return [];\n            }\n          }\n\n          output.push({\n            frame: {\n              data,\n              isKeyframe,\n              timestamp,\n            },\n          });\n          return output;\n        } catch (error) {\n          log(\"error\", error, input);\n          this.clearBuffer();\n        }\n      }\n    } else {\n      try {\n        const { data, isKeyframe } = dePacketizeRtpPackets(this.codec, [\n          input.rtp,\n        ]);\n        output.push({\n          frame: {\n            data,\n            isKeyframe,\n            timestamp: input.rtp.header.timestamp,\n          },\n        });\n        return output;\n      } catch (error) {\n        log(\"error\", error, input);\n      }\n    }\n    return [];\n  }\n\n  private clearBuffer() {\n    this.buffering.forEach((b) => b.clear());\n    this.buffering = [];\n  }\n\n  private checkFinalPacket(rtp: RtpPacket): boolean {\n    if (!this.options.isFinalPacketInSequence) {\n      throw new Error(\"isFinalPacketInSequence not exist\");\n    }\n\n    const { sequenceNumber } = rtp.header;\n    if (this.lastSeqNum != undefined) {\n      const expect = uint16Add(this.lastSeqNum, 1);\n      if (sequenceNumber < expect) {\n        return false;\n      }\n      if (sequenceNumber > expect) {\n        log(\"packet lost happened\", { expect, sequenceNumber });\n        this.packetLostHappened = true;\n        this.clearBuffer();\n      }\n    }\n\n    this.buffering.push(rtp);\n    this.lastSeqNum = sequenceNumber;\n\n    let finalPacket: number | undefined;\n    for (const [i, p] of enumerate(this.buffering)) {\n      if (this.options.isFinalPacketInSequence(p.header)) {\n        finalPacket = i;\n        break;\n      }\n    }\n    if (finalPacket == undefined) {\n      return false;\n    }\n\n    return true;\n  }\n}\n"]}

package/lib/rtp/src/processor/depacketizerCallback.d.ts

@@ -0,0 +1,13 @@
+import { RtpHeader } from "..";
+import { DepacketizeBase, DepacketizerInput, DepacketizerOutput } from "./depacketizer";
+export declare class DepacketizeCallback extends DepacketizeBase {
+    private cb;
+    constructor(codec: string, options?: {
+        waitForKeyframe?: boolean;
+        isFinalPacketInSequence?: (header: RtpHeader) => boolean;
+    });
+    pipe: (instance: {
+        input: (input: DepacketizerOutput) => void;
+    }) => this;
+    input: (input: DepacketizerInput) => void;
+}

package/lib/rtp/src/processor/depacketizerCallback.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DepacketizeCallback = void 0;
+const depacketizer_1 = require("./depacketizer");
+class DepacketizeCallback extends depacketizer_1.DepacketizeBase {
+    constructor(codec, options = {}) {
+        super(codec, options);
+        this.pipe = (instance) => {
+            this.cb = instance.input;
+            return this;
+        };
+        this.input = (input) => {
+            for (const output of this.processInput(input)) {
+                this.cb(output);
+            }
+        };
+    }
+}
+exports.DepacketizeCallback = DepacketizeCallback;
+//# sourceMappingURL=depacketizerCallback.js.map

package/lib/rtp/src/processor/depacketizerCallback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"depacketizerCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/depacketizerCallback.ts"],"names":[],"mappings":";;;AACA,iDAIwB;AAExB,MAAa,mBAAoB,SAAQ,8BAAe;IAGtD,YACE,KAAa,EACb,UAGI,EAAE;QAEN,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAGxB,SAAI,GAAG,CAAC,QAAwD,EAAE,EAAE;YAClE,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;YACzB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,UAAK,GAAG,CAAC,KAAwB,EAAE,EAAE;YACnC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;aACjB;QACH,CAAC,CAAC;IAXF,CAAC;CAYF;AAvBD,kDAuBC","sourcesContent":["import { RtpHeader } from \"..\";\nimport {\n  DepacketizeBase,\n  DepacketizerInput,\n  DepacketizerOutput,\n} from \"./depacketizer\";\n\nexport class DepacketizeCallback extends DepacketizeBase {\n  private cb!: (input: DepacketizerOutput) => void;\n\n  constructor(\n    codec: string,\n    options: {\n      waitForKeyframe?: boolean;\n      isFinalPacketInSequence?: (header: RtpHeader) => boolean;\n    } = {}\n  ) {\n    super(codec, options);\n  }\n\n  pipe = (instance: { input: (input: DepacketizerOutput) => void }) => {\n    this.cb = instance.input;\n    return this;\n  };\n\n  input = (input: DepacketizerInput) => {\n    for (const output of this.processInput(input)) {\n      this.cb(output);\n    }\n  };\n}\n"]}

package/lib/rtp/src/processor/depacketizerTransformer.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="node" />
+import { TransformStream } from "stream/web";
+import { RtpHeader } from "..";
+import { DepacketizerOutput } from "./depacketizer";
+export declare const depacketizeTransformer: (codec: string, options?: {
+    waitForKeyframe?: boolean | undefined;
+    isFinalPacketInSequence?: ((header: RtpHeader) => boolean) | undefined;
+} | undefined) => TransformStream<import("./source/rtp").RtpOutput, DepacketizerOutput>;

package/lib/rtp/src/processor/depacketizerTransformer.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.depacketizeTransformer = void 0;
+const web_1 = require("stream/web");
+const depacketizer_1 = require("./depacketizer");
+const depacketizeTransformer = (...args) => new DepacketizeTransformer(...args).transform;
+exports.depacketizeTransformer = depacketizeTransformer;
+class DepacketizeTransformer extends depacketizer_1.DepacketizeBase {
+    constructor(codec, options = {}) {
+        super(codec, options);
+        this.transform = new web_1.TransformStream({
+            transform: (input, output) => {
+                for (const res of this.processInput(input)) {
+                    output.enqueue(res);
+                }
+            },
+        });
+    }
+}
+//# sourceMappingURL=depacketizerTransformer.js.map

package/lib/rtp/src/processor/depacketizerTransformer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"depacketizerTransformer.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/depacketizerTransformer.ts"],"names":[],"mappings":";;;AAAA,oCAA6C;AAG7C,iDAIwB;AAEjB,MAAM,sBAAsB,GAAG,CACpC,GAAG,IAA0D,EAC7D,EAAE,CAAC,IAAI,sBAAsB,CAAC,GAAG,IAAI,CAAC,CAAC,SAAS,CAAC;AAFtC,QAAA,sBAAsB,0BAEgB;AAEnD,MAAM,sBAAuB,SAAQ,8BAAe;IAGlD,YACE,KAAa,EACb,UAGI,EAAE;QAEN,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAEtB,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAe,CAAC;YACnC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBAC3B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;oBAC1C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;iBACrB;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF","sourcesContent":["import { TransformStream } from \"stream/web\";\n\nimport { RtpHeader } from \"..\";\nimport {\n  DepacketizeBase,\n  DepacketizerInput,\n  DepacketizerOutput,\n} from \"./depacketizer\";\n\nexport const depacketizeTransformer = (\n  ...args: ConstructorParameters<typeof DepacketizeTransformer>\n) => new DepacketizeTransformer(...args).transform;\n\nclass DepacketizeTransformer extends DepacketizeBase {\n  transform: TransformStream<DepacketizerInput, DepacketizerOutput>;\n\n  constructor(\n    codec: string,\n    options: {\n      waitForKeyframe?: boolean;\n      isFinalPacketInSequence?: (header: RtpHeader) => boolean;\n    } = {}\n  ) {\n    super(codec, options);\n\n    this.transform = new TransformStream({\n      transform: (input, output) => {\n        for (const res of this.processInput(input)) {\n          output.enqueue(res);\n        }\n      },\n    });\n  }\n}\n"]}

package/lib/rtp/src/processor/index.d.ts

@@ -0,0 +1,9 @@
+export * from "./depacketizer";
+export * from "./depacketizerCallback";
+export * from "./depacketizerTransformer";
+export * from "./jitterBuffer";
+export * from "./jitterBufferCallback";
+export * from "./jitterBufferTransformer";
+export * from "./source";
+export * from "./webm";
+export * from "./webmStream";

package/lib/rtp/src/{processor_v2 → processor}/index.js

@@ -15,7 +15,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./depacketizer"), exports);
+__exportStar(require("./depacketizerCallback"), exports);
+__exportStar(require("./depacketizerTransformer"), exports);
 __exportStar(require("./jitterBuffer"), exports);
+__exportStar(require("./jitterBufferCallback"), exports);
+__exportStar(require("./jitterBufferTransformer"), exports);
 __exportStar(require("./source"), exports);
-__exportStar(require("./webmLive"), exports);
+__exportStar(require("./webm"), exports);
+__exportStar(require("./webmStream"), exports);
 //# sourceMappingURL=index.js.map

package/lib/rtp/src/processor/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,yDAAuC;AACvC,4DAA0C;AAC1C,iDAA+B;AAC/B,yDAAuC;AACvC,4DAA0C;AAC1C,2CAAyB;AACzB,yCAAuB;AACvB,+CAA6B","sourcesContent":["export * from \"./depacketizer\";\nexport * from \"./depacketizerCallback\";\nexport * from \"./depacketizerTransformer\";\nexport * from \"./jitterBuffer\";\nexport * from \"./jitterBufferCallback\";\nexport * from \"./jitterBufferTransformer\";\nexport * from \"./source\";\nexport * from \"./webm\";\nexport * from \"./webmStream\";\n"]}

package/lib/rtp/src/processor/jitterBuffer.d.ts

@@ -1,12 +1,27 @@
-import { RtpPacket } from "..";
-import { RtcpPacket } from "../rtcp/rtcp";
-import { Pipeline } from "./base";
-export declare class JitterBuffer extends Pipeline {
-    private retry;
-    private head?;
-    private buffer;
-    maxRetry: number;
-    pushRtpPackets(packets: RtpPacket[]): void;
-    pushRtcpPackets(packets: RtcpPacket[]): void;
-    private onRtp;
+import { RtpOutput } from "./source/rtp";
+export declare type JitterBufferInput = RtpOutput;
+export interface JitterBufferOutput extends RtpOutput {
+    isPacketLost?: {
+        from: number;
+        to: number;
+    };
+}
+export declare class JitterBufferBase {
+    clockRate: number;
+    private options;
+    private presentSeqNum?;
+    private rtpBuffer;
+    private get expectNextSeqNum();
+    constructor(clockRate: number, options?: Partial<JitterBufferOptions>);
+    processInput(input: JitterBufferInput): JitterBufferOutput[];
+    private processRtp;
+    private pushRtpBuffer;
+    private resolveBuffer;
+    private sortAndClearBuffer;
+    private disposeTimeoutPackets;
+}
+export interface JitterBufferOptions {
+    /**milliseconds */
+    latency: number;
+    bufferSize: number;
 }

package/lib/rtp/src/processor/jitterBuffer.js

@@ -1,54 +1,162 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JitterBuffer = void 0;
-const debug_1 = require("debug");
-const src_1 = require("../../../common/src");
-const base_1 = require("./base");
-const log = (0, debug_1.debug)("werift : packages/rtp/src/processor/jitterBuffer.ts");
-class JitterBuffer extends base_1.Pipeline {
-    constructor() {
-        super(...arguments);
-        this.retry = 0;
-        this.buffer = {};
-        this.maxRetry = 100;
-        this.onRtp = (p) => {
-            this.buffer[p.header.sequenceNumber] = p;
-            if (this.head == undefined) {
-                this.head = p.header.sequenceNumber;
-            }
-            else if (p.header.sequenceNumber != (0, src_1.uint16Add)(this.head, 1)) {
-                if (this.retry++ >= this.maxRetry) {
-                    this.head = (0, src_1.uint16Add)(this.head, 2);
-                }
-                else {
-                    return;
+exports.JitterBufferBase = void 0;
+const debug_1 = __importDefault(require("debug"));
+const __1 = require("..");
+const srcPath = `werift-rtp : packages/rtp/src/processor_v2/jitterBuffer.ts`;
+const log = (0, debug_1.default)(srcPath);
+class JitterBufferBase {
+    constructor(clockRate, options = {}) {
+        this.clockRate = clockRate;
+        this.rtpBuffer = {};
+        this.options = {
+            latency: options.latency ?? 200,
+            bufferSize: options.bufferSize ?? 10000,
+        };
+    }
+    get expectNextSeqNum() {
+        return (0, __1.uint16Add)(this.presentSeqNum, 1);
+    }
+    processInput(input) {
+        const output = [];
+        if (!input.rtp) {
+            if (input.eol) {
+                const packets = this.sortAndClearBuffer(this.rtpBuffer);
+                for (const rtp of packets) {
+                    output.push({ rtp });
                 }
+                output.push({ eol: true });
             }
-            else {
-                this.head = (0, src_1.uint16Add)(this.head, 1);
-            }
-            const packets = [];
-            let tail = this.head;
-            for (;; tail = (0, src_1.uint16Add)(tail, 1)) {
-                const p = this.buffer[tail];
-                if (p) {
-                    packets.push(p);
-                    delete this.buffer[tail];
+            return output;
+        }
+        const { packets, timeoutSeqNum } = this.processRtp(input.rtp);
+        if (timeoutSeqNum != undefined) {
+            const isPacketLost = {
+                from: this.expectNextSeqNum,
+                to: timeoutSeqNum,
+            };
+            this.presentSeqNum = input.rtp.header.sequenceNumber;
+            output.push({ isPacketLost });
+            if (packets) {
+                for (const rtp of [...packets, input.rtp]) {
+                    output.push({ rtp });
                 }
-                else {
-                    break;
+            }
+            return output;
+        }
+        else {
+            if (packets) {
+                for (const rtp of packets) {
+                    output.push({ rtp });
                 }
+                return output;
             }
-            this.head = (0, src_1.uint16Add)(tail, -1);
-            this.children?.pushRtpPackets?.(packets);
-        };
+            return [];
+        }
+    }
+    processRtp(rtp) {
+        const { sequenceNumber, timestamp } = rtp.header;
+        // init
+        if (this.presentSeqNum == undefined) {
+            this.presentSeqNum = sequenceNumber;
+            return { packets: [rtp] };
+        }
+        // duplicate
+        if (sequenceNumber <= this.presentSeqNum) {
+            return { nothing: undefined };
+        }
+        // expect
+        if (sequenceNumber === this.expectNextSeqNum) {
+            this.presentSeqNum = sequenceNumber;
+            const rtpBuffer = this.resolveBuffer((0, __1.uint16Add)(sequenceNumber, 1));
+            this.presentSeqNum =
+                rtpBuffer.at(-1)?.header.sequenceNumber ?? this.presentSeqNum;
+            return { packets: [rtp, ...rtpBuffer] };
+        }
+        this.pushRtpBuffer(rtp);
+        const { latestTimeoutSeqNum, sorted } = this.disposeTimeoutPackets(timestamp);
+        if (latestTimeoutSeqNum) {
+            return { timeoutSeqNum: latestTimeoutSeqNum, packets: sorted };
+        }
+        else {
+            return { nothing: undefined };
+        }
     }
-    pushRtpPackets(packets) {
-        packets.forEach(this.onRtp);
+    pushRtpBuffer(rtp) {
+        if (Object.values(this.rtpBuffer).length > this.options.bufferSize) {
+            return;
+        }
+        this.rtpBuffer[rtp.header.sequenceNumber] = rtp;
     }
-    pushRtcpPackets(packets) {
-        this.children?.pushRtcpPackets?.(packets);
+    resolveBuffer(seqNumFrom) {
+        const resolve = [];
+        for (let index = seqNumFrom;; index = (0, __1.uint16Add)(index, 1)) {
+            const rtp = this.rtpBuffer[index];
+            if (rtp) {
+                resolve.push(rtp);
+                delete this.rtpBuffer[index];
+            }
+            else {
+                break;
+            }
+        }
+        return resolve;
+    }
+    sortAndClearBuffer(rtpBuffer) {
+        const buffer = [];
+        for (let index = this.presentSeqNum ?? 0;; index = (0, __1.uint16Add)(index, 1)) {
+            const rtp = rtpBuffer[index];
+            if (rtp) {
+                buffer.push(rtp);
+                delete rtpBuffer[index];
+            }
+            if (Object.values(rtpBuffer).length === 0) {
+                break;
+            }
+        }
+        return buffer;
+    }
+    disposeTimeoutPackets(baseTimestamp) {
+        let latestTimeoutSeqNum;
+        const packets = Object.values(this.rtpBuffer)
+            .map((rtp) => {
+            const { timestamp, sequenceNumber } = rtp.header;
+            if ((0, __1.uint32Gt)(timestamp, baseTimestamp)) {
+                log("gap", { timestamp, baseTimestamp });
+                return;
+            }
+            const elapsedSec = (0, __1.uint32Add)(baseTimestamp, -timestamp) / this.clockRate;
+            if (elapsedSec * 1000 > this.options.latency) {
+                log("timeout packet", {
+                    sequenceNumber,
+                    elapsedSec,
+                    baseTimestamp,
+                    timestamp,
+                });
+                if (latestTimeoutSeqNum == undefined) {
+                    latestTimeoutSeqNum = sequenceNumber;
+                }
+                // 現在のSeqNumとの差が最も大きいSeqNumを探す
+                if ((0, __1.uint16Add)(sequenceNumber, -this.presentSeqNum) >
+                    (0, __1.uint16Add)(latestTimeoutSeqNum, -this.presentSeqNum)) {
+                    latestTimeoutSeqNum = sequenceNumber;
+                }
+                const packet = this.rtpBuffer[sequenceNumber];
+                delete this.rtpBuffer[sequenceNumber];
+                return packet;
+            }
+        })
+            .flatMap((p) => p)
+            .filter((p) => p);
+        const sorted = this.sortAndClearBuffer(packets.reduce((acc, cur) => {
+            acc[cur.header.sequenceNumber] = cur;
+            return acc;
+        }, {}));
+        return { latestTimeoutSeqNum, sorted };
     }
 }
-exports.JitterBuffer = JitterBuffer;
+exports.JitterBufferBase = JitterBufferBase;
 //# sourceMappingURL=jitterBuffer.js.map