werift 0.17.6 → 0.18.0

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

@@ -1,22 +1,30 @@
 /// <reference types="node" />
-import { RtpHeader } from "..";
+import { RtpHeader, RtpPacket } from "..";
 import { Processor } from "./interface";
-import { RtpOutput } from "./source";
-export declare type DepacketizerInput = RtpOutput;
+export type DepacketizerInput = {
+    rtp?: RtpPacket;
+    /**ms */
+    time?: number;
+    eol?: boolean;
+};
 export interface DepacketizerOutput {
-    frame?: {
-        data: Buffer;
-        isKeyframe: boolean;
-        timestamp: number;
-    };
+    frame?: CodecFrame;
     eol?: boolean;
 }
+export interface CodecFrame {
+    data: Buffer;
+    isKeyframe: boolean;
+    /**ms */
+    time: number;
+    [key: string]: any;
+}
 export declare class DepacketizeBase implements Processor<DepacketizerInput, DepacketizerOutput> {
     private codec;
     private options;
     private buffering;
     private lastSeqNum?;
     private frameBroken;
+    sequence: number;
     constructor(codec: string, options?: {
         isFinalPacketInSequence?: (header: RtpHeader) => boolean;
     });

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

@@ -8,14 +8,46 @@ 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);
+const path = `werift-rtp : packages/rtp/src/processor/depacketizer.ts`;
+const log = (0, debug_1.default)(path);
 class DepacketizeBase {
     constructor(codec, options = {}) {
-        this.codec = codec;
-        this.options = options;
-        this.buffering = [];
-        this.frameBroken = false;
+        Object.defineProperty(this, "codec", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: codec
+        });
+        Object.defineProperty(this, "options", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: options
+        });
+        Object.defineProperty(this, "buffering", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "lastSeqNum", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "frameBroken", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        Object.defineProperty(this, "sequence", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
     }
     processInput(input) {
         const output = [];
@@ -26,20 +58,22 @@ class DepacketizeBase {
             return output;
         }
         if (this.options.isFinalPacketInSequence) {
-            const isFinal = this.checkFinalPacket(input.rtp);
+            const isFinal = this.checkFinalPacket(input);
             if (isFinal) {
                 try {
-                    const { timestamp } = this.buffering[0].header;
-                    const { data, isKeyframe } = (0, codec_1.dePacketizeRtpPackets)(this.codec, this.buffering);
-                    this.clearBuffer();
+                    const { data, isKeyframe, sequence, timestamp } = (0, codec_1.dePacketizeRtpPackets)(this.codec, this.buffering.map((b) => b.rtp));
                     if (isKeyframe) {
-                        // console.log("isKeyframe", this.codec);
+                        log("isKeyframe", this.codec);
                     }
                     if (!this.frameBroken) {
+                        const time = this.buffering.at(-1)?.time ?? 0;
                         output.push({
                             frame: {
                                 data,
                                 isKeyframe,
+                                time,
+                                sequence: this.sequence++,
+                                rtpSeq: sequence,
                                 timestamp,
                             },
                         });
@@ -47,6 +81,7 @@ class DepacketizeBase {
                     if (this.frameBroken) {
                         this.frameBroken = false;
                     }
+                    this.clearBuffer();
                     return output;
                 }
                 catch (error) {
@@ -57,14 +92,15 @@ class DepacketizeBase {
         }
         else {
             try {
-                const { data, isKeyframe } = (0, codec_1.dePacketizeRtpPackets)(this.codec, [
-                    input.rtp,
-                ]);
+                const { data, isKeyframe, sequence, timestamp } = (0, codec_1.dePacketizeRtpPackets)(this.codec, [input.rtp]);
                 output.push({
                     frame: {
                         data,
                         isKeyframe,
-                        timestamp: input.rtp.header.timestamp,
+                        time: input.time,
+                        sequence: this.sequence++,
+                        rtpSeq: sequence,
+                        timestamp,
                     },
                 });
                 return output;
@@ -76,30 +112,31 @@ class DepacketizeBase {
         return [];
     }
     clearBuffer() {
-        this.buffering.forEach((b) => b.clear());
+        this.buffering.forEach((b) => b.rtp.clear());
         this.buffering = [];
     }
-    checkFinalPacket(rtp) {
+    checkFinalPacket({ rtp, time }) {
         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) {
+            if ((0, __1.uint16Gt)(expect, sequenceNumber)) {
+                log("unexpect", { expect, sequenceNumber });
                 return false;
             }
-            if (sequenceNumber > expect) {
+            if ((0, __1.uint16Gt)(sequenceNumber, expect)) {
                 log("packet lost happened", { expect, sequenceNumber });
                 this.frameBroken = true;
                 this.clearBuffer();
             }
         }
-        this.buffering.push(rtp);
+        this.buffering.push({ rtp, time });
         this.lastSeqNum = sequenceNumber;
         let finalPacket;
-        for (const [i, p] of (0, helper_1.enumerate)(this.buffering)) {
-            if (this.options.isFinalPacketInSequence(p.header)) {
+        for (const [i, { rtp }] of (0, helper_1.enumerate)(this.buffering)) {
+            if (this.options.isFinalPacketInSequence(rtp.header)) {
                 finalPacket = i;
                 break;
             }

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

@@ -1 +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 { Processor } from \"./interface\";\nimport { RtpOutput } from \"./source\";\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  implements Processor<DepacketizerInput, DepacketizerOutput>\n{\n  private buffering: RtpPacket[] = [];\n  private lastSeqNum?: number;\n  private frameBroken = false;\n\n  constructor(\n    private codec: string,\n    private options: {\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 (isKeyframe) {\n            // console.log(\"isKeyframe\", this.codec);\n          }\n\n          if (!this.frameBroken) {\n            output.push({\n              frame: {\n                data,\n                isKeyframe,\n                timestamp,\n              },\n            });\n          }\n\n          if (this.frameBroken) {\n            this.frameBroken = false;\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.frameBroken = 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"]}
+{"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, uint16Gt } from \"..\";\nimport { dePacketizeRtpPackets } from \"../codec\";\nimport { enumerate } from \"../helper\";\nimport { Processor } from \"./interface\";\n\nconst path = `werift-rtp : packages/rtp/src/processor/depacketizer.ts`;\nconst log = debug(path);\n\nexport type DepacketizerInput = {\n  rtp?: RtpPacket;\n  /**ms */\n  time?: number;\n  eol?: boolean;\n};\n\nexport interface DepacketizerOutput {\n  frame?: CodecFrame;\n  eol?: boolean;\n}\n\nexport interface CodecFrame {\n  data: Buffer;\n  isKeyframe: boolean;\n  /**ms */\n  time: number;\n  [key: string]: any;\n}\n\nexport class DepacketizeBase\n  implements Processor<DepacketizerInput, DepacketizerOutput>\n{\n  private buffering: DepacketizerInput[] = [];\n  private lastSeqNum?: number;\n  private frameBroken = false;\n  sequence = 0;\n\n  constructor(\n    private codec: string,\n    private options: {\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);\n      if (isFinal) {\n        try {\n          const { data, isKeyframe, sequence, timestamp } =\n            dePacketizeRtpPackets(\n              this.codec,\n              this.buffering.map((b) => b.rtp!)\n            );\n\n          if (isKeyframe) {\n            log(\"isKeyframe\", this.codec);\n          }\n\n          if (!this.frameBroken) {\n            const time = this.buffering.at(-1)?.time ?? 0;\n            output.push({\n              frame: {\n                data,\n                isKeyframe,\n                time,\n                sequence: this.sequence++,\n                rtpSeq: sequence,\n                timestamp,\n              },\n            });\n          }\n\n          if (this.frameBroken) {\n            this.frameBroken = false;\n          }\n\n          this.clearBuffer();\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, sequence, timestamp } = dePacketizeRtpPackets(\n          this.codec,\n          [input.rtp]\n        );\n        output.push({\n          frame: {\n            data,\n            isKeyframe,\n            time: input.time!,\n            sequence: this.sequence++,\n            rtpSeq: sequence,\n            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.rtp!.clear());\n    this.buffering = [];\n  }\n\n  private checkFinalPacket({ rtp, time }: DepacketizerInput): 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 (uint16Gt(expect, sequenceNumber)) {\n        log(\"unexpect\", { expect, sequenceNumber });\n        return false;\n      }\n      if (uint16Gt(sequenceNumber, expect)) {\n        log(\"packet lost happened\", { expect, sequenceNumber });\n        this.frameBroken = true;\n        this.clearBuffer();\n      }\n    }\n\n    this.buffering.push({ rtp, time });\n    this.lastSeqNum = sequenceNumber;\n\n    let finalPacket: number | undefined;\n    for (const [i, { rtp }] of enumerate(this.buffering)) {\n      if (this.options.isFinalPacketInSequence(rtp!.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.js

@@ -5,15 +5,31 @@ const depacketizer_1 = require("./depacketizer");
 class DepacketizeCallback extends depacketizer_1.DepacketizeBase {
     constructor(codec, options = {}) {
         super(codec, options);
-        this.pipe = (cb) => {
-            this.cb = cb;
-            return this;
-        };
-        this.input = (input) => {
-            for (const output of this.processInput(input)) {
-                this.cb(output);
+        Object.defineProperty(this, "cb", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "pipe", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (cb) => {
+                this.cb = cb;
+                return this;
             }
-        };
+        });
+        Object.defineProperty(this, "input", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (input) => {
+                for (const output of this.processInput(input)) {
+                    this.cb(output);
+                }
+            }
+        });
     }
 }
 exports.DepacketizeCallback = DepacketizeCallback;

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

@@ -1 +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,EAAuC,EAAE,EAAE;YACjD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;YACb,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 = (cb: (input: DepacketizerOutput) => void) => {\n    this.cb = cb;\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"]}
+{"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;QATxB;;;;;WAAiD;QAYjD;;;;mBAAO,CAAC,EAAuC,EAAE,EAAE;gBACjD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;WAAC;QAEF;;;;mBAAQ,CAAC,KAAwB,EAAE,EAAE;gBACnC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;oBAC7C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;iBACjB;YACH,CAAC;WAAC;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 = (cb: (input: DepacketizerOutput) => void) => {\n    this.cb = cb;\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

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

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

@@ -8,6 +8,12 @@ exports.depacketizeTransformer = depacketizeTransformer;
 class DepacketizeTransformer extends depacketizer_1.DepacketizeBase {
     constructor(codec, options = {}) {
         super(codec, options);
+        Object.defineProperty(this, "transform", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.transform = new web_1.TransformStream({
             transform: (input, output) => {
                 for (const res of this.processInput(input)) {

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

@@ -1 +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"]}
+{"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;QATxB;;;;;WAAkE;QAWhE,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

@@ -1,11 +1,13 @@
-export * from "./avBuffer";
-export * from "./avBufferCallback";
 export * from "./depacketizer";
 export * from "./depacketizerCallback";
 export * from "./depacketizerTransformer";
 export * from "./jitterBuffer";
 export * from "./jitterBufferCallback";
 export * from "./jitterBufferTransformer";
+export * from "./lipsync";
+export * from "./lipsyncCallback";
+export * from "./ntpTime";
+export * from "./ntpTimeCallback";
 export * from "./source";
 export * from "./webm";
 export * from "./webmCallback";

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

@@ -14,14 +14,16 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./avBuffer"), exports);
-__exportStar(require("./avBufferCallback"), exports);
 __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("./lipsync"), exports);
+__exportStar(require("./lipsyncCallback"), exports);
+__exportStar(require("./ntpTime"), exports);
+__exportStar(require("./ntpTimeCallback"), exports);
 __exportStar(require("./source"), exports);
 __exportStar(require("./webm"), exports);
 __exportStar(require("./webmCallback"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA2B;AAC3B,qDAAmC;AACnC,iDAA+B;AAC/B,yDAAuC;AACvC,4DAA0C;AAC1C,iDAA+B;AAC/B,yDAAuC;AACvC,4DAA0C;AAC1C,2CAAyB;AACzB,yCAAuB;AACvB,iDAA+B;AAC/B,+CAA6B","sourcesContent":["export * from \"./avBuffer\";\nexport * from \"./avBufferCallback\";\nexport * 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 \"./webmCallback\";\nexport * from \"./webmStream\";\n"]}
+{"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,4CAA0B;AAC1B,oDAAkC;AAClC,4CAA0B;AAC1B,oDAAkC;AAClC,2CAAyB;AACzB,yCAAuB;AACvB,iDAA+B;AAC/B,+CAA6B","sourcesContent":["export * from \"./depacketizer\";\nexport * from \"./depacketizerCallback\";\nexport * from \"./depacketizerTransformer\";\nexport * from \"./jitterBuffer\";\nexport * from \"./jitterBufferCallback\";\nexport * from \"./jitterBufferTransformer\";\nexport * from \"./lipsync\";\nexport * from \"./lipsyncCallback\";\nexport * from \"./ntpTime\";\nexport * from \"./ntpTimeCallback\";\nexport * from \"./source\";\nexport * from \"./webm\";\nexport * from \"./webmCallback\";\nexport * from \"./webmStream\";\n"]}

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

@@ -1,3 +1,7 @@
 export interface Processor<Input, Output> {
     processInput: (input: Input) => Output[];
 }
+export interface AVProcessor<Input> {
+    processAudioInput: (input: Input) => void;
+    processVideoInput: (input: Input) => void;
+}

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

@@ -1 +1 @@
-{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/interface.ts"],"names":[],"mappings":"","sourcesContent":["export interface Processor<Input, Output> {\n  processInput: (input: Input) => Output[];\n}\n"]}
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/interface.ts"],"names":[],"mappings":"","sourcesContent":["export interface Processor<Input, Output> {\n  processInput: (input: Input) => Output[];\n}\n\nexport interface AVProcessor<Input> {\n  processAudioInput: (input: Input) => void;\n  processVideoInput: (input: Input) => void;\n}\n"]}

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

@@ -1,6 +1,6 @@
 import { Processor } from "./interface";
 import { RtpOutput } from "./source";
-export declare type JitterBufferInput = RtpOutput;
+export type JitterBufferInput = RtpOutput;
 export interface JitterBufferOutput extends RtpOutput {
     isPacketLost?: {
         from: number;
@@ -10,6 +10,7 @@ export interface JitterBufferOutput extends RtpOutput {
 export declare class JitterBufferBase implements Processor<JitterBufferInput, JitterBufferOutput> {
     clockRate: number;
     private options;
+    /**uint16 */
     private presentSeqNum?;
     private rtpBuffer;
     private get expectNextSeqNum();

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

@@ -6,20 +6,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 srcPath = `werift-rtp : packages/rtp/src/processor/jitterBuffer.ts`;
 const log = (0, debug_1.default)(srcPath);
 class JitterBufferBase {
+    get expectNextSeqNum() {
+        return (0, __1.uint16Add)(this.presentSeqNum, 1);
+    }
     constructor(clockRate, options = {}) {
-        this.clockRate = clockRate;
-        this.rtpBuffer = {};
+        Object.defineProperty(this, "clockRate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: clockRate
+        });
+        Object.defineProperty(this, "options", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        /**uint16 */
+        Object.defineProperty(this, "presentSeqNum", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "rtpBuffer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: {}
+        });
         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) {
@@ -65,7 +88,8 @@ class JitterBufferBase {
             return { packets: [rtp] };
         }
         // duplicate
-        if (sequenceNumber <= this.presentSeqNum) {
+        if ((0, __1.uint16Gte)(this.presentSeqNum, sequenceNumber)) {
+            log("duplicate", { sequenceNumber });
             return { nothing: undefined };
         }
         // expect
@@ -74,6 +98,7 @@ class JitterBufferBase {
             const rtpBuffer = this.resolveBuffer((0, __1.uint16Add)(sequenceNumber, 1));
             this.presentSeqNum =
                 rtpBuffer.at(-1)?.header.sequenceNumber ?? this.presentSeqNum;
+            this.disposeTimeoutPackets(timestamp);
             return { packets: [rtp, ...rtpBuffer] };
         }
         this.pushRtpBuffer(rtp);
@@ -87,8 +112,10 @@ class JitterBufferBase {
     }
     pushRtpBuffer(rtp) {
         if (Object.values(this.rtpBuffer).length > this.options.bufferSize) {
+            log("buffer over flow");
             return;
         }
+        // log("pushRtpBuffer", { seq: rtp.header.sequenceNumber });
         this.rtpBuffer[rtp.header.sequenceNumber] = rtp;
     }
     resolveBuffer(seqNumFrom) {
@@ -103,6 +130,12 @@ class JitterBufferBase {
                 break;
             }
         }
+        // if (resolve.length > 0) {
+        //   log(
+        //     "resolveBuffer",
+        //     resolve.map((r) => r.header.sequenceNumber)
+        //   );
+        // }
         return resolve;
     }
     sortAndClearBuffer(rtpBuffer) {
@@ -125,7 +158,6 @@ class JitterBufferBase {
             .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;

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

@@ -1 +1 @@
-{"version":3,"file":"jitterBuffer.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/jitterBuffer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,0BAMY;AAIZ,MAAM,OAAO,GAAG,4DAA4D,CAAC;AAC7E,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,OAAO,CAAC,CAAC;AAQ3B,MAAa,gBAAgB;IAU3B,YACS,SAAiB,EACxB,UAAwC,EAAE;QADnC,cAAS,GAAT,SAAS,CAAQ;QANlB,cAAS,GAA4C,EAAE,CAAC;QAS9D,IAAI,CAAC,OAAO,GAAG;YACb,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,GAAG;YAC/B,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,KAAK;SACxC,CAAC;IACJ,CAAC;IAZD,IAAY,gBAAgB;QAC1B,OAAO,IAAA,aAAS,EAAC,IAAI,CAAC,aAAc,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC;IAYD,YAAY,CAAC,KAAwB;QACnC,MAAM,MAAM,GAAyB,EAAE,CAAC;QAExC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;YACd,IAAI,KAAK,CAAC,GAAG,EAAE;gBACb,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACxD,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;oBACzB,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;iBACtB;gBACD,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;aAC5B;YACD,OAAO,MAAM,CAAC;SACf;QAED,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE9D,IAAI,aAAa,IAAI,SAAS,EAAE;YAC9B,MAAM,YAAY,GAAG;gBACnB,IAAI,EAAE,IAAI,CAAC,gBAAgB;gBAC3B,EAAE,EAAE,aAAa;aAClB,CAAC;YACF,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;YAC9B,IAAI,OAAO,EAAE;gBACX,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;oBACzC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;iBACtB;aACF;YACD,OAAO,MAAM,CAAC;SACf;aAAM;YACL,IAAI,OAAO,EAAE;gBACX,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;oBACzB,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;iBACtB;gBACD,OAAO,MAAM,CAAC;aACf;YACD,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAEO,UAAU,CAAC,GAAc;QAK/B,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAEjD,OAAO;QACP,IAAI,IAAI,CAAC,aAAa,IAAI,SAAS,EAAE;YACnC,IAAI,CAAC,aAAa,GAAG,cAAc,CAAC;YACpC,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;SAC3B;QAED,YAAY;QACZ,IAAI,cAAc,IAAI,IAAI,CAAC,aAAa,EAAE;YACxC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;SAC/B;QAED,SAAS;QACT,IAAI,cAAc,KAAK,IAAI,CAAC,gBAAgB,EAAE;YAC5C,IAAI,CAAC,aAAa,GAAG,cAAc,CAAC;YAEpC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,IAAA,aAAS,EAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;YACnE,IAAI,CAAC,aAAa;gBAChB,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,cAAc,IAAI,IAAI,CAAC,aAAa,CAAC;YAEhE,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;SACzC;QAED,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAExB,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,GACnC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAExC,IAAI,mBAAmB,EAAE;YACvB,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;SAChE;aAAM;YACL,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;SAC/B;IACH,CAAC;IAEO,aAAa,CAAC,GAAc;QAClC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAClE,OAAO;SACR;QACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAEO,aAAa,CAAC,UAAkB;QACtC,MAAM,OAAO,GAAgB,EAAE,CAAC;QAEhC,KAAK,IAAI,KAAK,GAAG,UAAU,GAAI,KAAK,GAAG,IAAA,aAAS,EAAC,KAAK,EAAE,CAAC,CAAC,EAAE;YAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,GAAG,EAAE;gBACP,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;aAC9B;iBAAM;gBACL,MAAM;aACP;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,kBAAkB,CAAC,SAE1B;QACC,MAAM,MAAM,GAAgB,EAAE,CAAC;QAC/B,KAAK,IAAI,KAAK,GAAG,IAAI,CAAC,aAAa,IAAI,CAAC,GAAI,KAAK,GAAG,IAAA,aAAS,EAAC,KAAK,EAAE,CAAC,CAAC,EAAE;YACvE,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjB,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC;aACzB;YACD,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBACzC,MAAM;aACP;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,qBAAqB,CAAC,aAAqB;QACjD,IAAI,mBAAuC,CAAC;QAE5C,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;aAC1C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAEjD,IAAI,IAAA,YAAQ,EAAC,SAAS,EAAE,aAAa,CAAC,EAAE;gBACtC,GAAG,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;gBACzC,OAAO;aACR;YAED,MAAM,UAAU,GACd,IAAA,aAAS,EAAC,aAAa,EAAE,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;YAExD,IAAI,UAAU,GAAG,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBAC5C,GAAG,CAAC,gBAAgB,EAAE;oBACpB,cAAc;oBACd,UAAU;oBACV,aAAa;oBACb,SAAS;iBACV,CAAC,CAAC;gBAEH,IAAI,mBAAmB,IAAI,SAAS,EAAE;oBACpC,mBAAmB,GAAG,cAAc,CAAC;iBACtC;gBACD,8BAA8B;gBAC9B,IACE,IAAA,aAAS,EAAC,cAAc,EAAE,CAAC,IAAI,CAAC,aAAc,CAAC;oBAC/C,IAAA,aAAS,EAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC,aAAc,CAAC,EACpD;oBACA,mBAAmB,GAAG,cAAc,CAAC;iBACtC;gBAED,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;gBAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;gBACtC,OAAO,MAAM,CAAC;aACf;QACH,CAAC,CAAC;aACD,OAAO,CAAC,CAAC,CAAC,EAAa,EAAE,CAAC,CAAc,CAAC;aACzC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpB,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CACpC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC1B,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,GAAG,CAAC;YACrC,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;QAEF,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,CAAC;IACzC,CAAC;CACF;AA/LD,4CA+LC","sourcesContent":["import debug from \"debug\";\n\nimport {\n  RequireAtLeastOne,\n  RtpPacket,\n  uint16Add,\n  uint32Add,\n  uint32Gt,\n} from \"..\";\nimport { Processor } from \"./interface\";\nimport { RtpOutput } from \"./source\";\n\nconst srcPath = `werift-rtp : packages/rtp/src/processor_v2/jitterBuffer.ts`;\nconst log = debug(srcPath);\n\nexport type JitterBufferInput = RtpOutput;\n\nexport interface JitterBufferOutput extends RtpOutput {\n  isPacketLost?: { from: number; to: number };\n}\n\nexport class JitterBufferBase\n  implements Processor<JitterBufferInput, JitterBufferOutput>\n{\n  private options: JitterBufferOptions;\n  private presentSeqNum?: number;\n  private rtpBuffer: { [sequenceNumber: number]: RtpPacket } = {};\n  private get expectNextSeqNum() {\n    return uint16Add(this.presentSeqNum!, 1);\n  }\n\n  constructor(\n    public clockRate: number,\n    options: Partial<JitterBufferOptions> = {}\n  ) {\n    this.options = {\n      latency: options.latency ?? 200,\n      bufferSize: options.bufferSize ?? 10000,\n    };\n  }\n\n  processInput(input: JitterBufferInput): JitterBufferOutput[] {\n    const output: JitterBufferOutput[] = [];\n\n    if (!input.rtp) {\n      if (input.eol) {\n        const packets = this.sortAndClearBuffer(this.rtpBuffer);\n        for (const rtp of packets) {\n          output.push({ rtp });\n        }\n        output.push({ eol: true });\n      }\n      return output;\n    }\n\n    const { packets, timeoutSeqNum } = this.processRtp(input.rtp);\n\n    if (timeoutSeqNum != undefined) {\n      const isPacketLost = {\n        from: this.expectNextSeqNum,\n        to: timeoutSeqNum,\n      };\n      this.presentSeqNum = input.rtp.header.sequenceNumber;\n      output.push({ isPacketLost });\n      if (packets) {\n        for (const rtp of [...packets, input.rtp]) {\n          output.push({ rtp });\n        }\n      }\n      return output;\n    } else {\n      if (packets) {\n        for (const rtp of packets) {\n          output.push({ rtp });\n        }\n        return output;\n      }\n      return [];\n    }\n  }\n\n  private processRtp(rtp: RtpPacket): RequireAtLeastOne<{\n    packets: RtpPacket[];\n    timeoutSeqNum: number;\n    nothing: undefined;\n  }> {\n    const { sequenceNumber, timestamp } = rtp.header;\n\n    // init\n    if (this.presentSeqNum == undefined) {\n      this.presentSeqNum = sequenceNumber;\n      return { packets: [rtp] };\n    }\n\n    // duplicate\n    if (sequenceNumber <= this.presentSeqNum) {\n      return { nothing: undefined };\n    }\n\n    // expect\n    if (sequenceNumber === this.expectNextSeqNum) {\n      this.presentSeqNum = sequenceNumber;\n\n      const rtpBuffer = this.resolveBuffer(uint16Add(sequenceNumber, 1));\n      this.presentSeqNum =\n        rtpBuffer.at(-1)?.header.sequenceNumber ?? this.presentSeqNum;\n\n      return { packets: [rtp, ...rtpBuffer] };\n    }\n\n    this.pushRtpBuffer(rtp);\n\n    const { latestTimeoutSeqNum, sorted } =\n      this.disposeTimeoutPackets(timestamp);\n\n    if (latestTimeoutSeqNum) {\n      return { timeoutSeqNum: latestTimeoutSeqNum, packets: sorted };\n    } else {\n      return { nothing: undefined };\n    }\n  }\n\n  private pushRtpBuffer(rtp: RtpPacket) {\n    if (Object.values(this.rtpBuffer).length > this.options.bufferSize) {\n      return;\n    }\n    this.rtpBuffer[rtp.header.sequenceNumber] = rtp;\n  }\n\n  private resolveBuffer(seqNumFrom: number) {\n    const resolve: RtpPacket[] = [];\n\n    for (let index = seqNumFrom; ; index = uint16Add(index, 1)) {\n      const rtp = this.rtpBuffer[index];\n      if (rtp) {\n        resolve.push(rtp);\n        delete this.rtpBuffer[index];\n      } else {\n        break;\n      }\n    }\n    return resolve;\n  }\n\n  private sortAndClearBuffer(rtpBuffer: {\n    [sequenceNumber: number]: RtpPacket;\n  }) {\n    const buffer: RtpPacket[] = [];\n    for (let index = this.presentSeqNum ?? 0; ; index = uint16Add(index, 1)) {\n      const rtp = rtpBuffer[index];\n      if (rtp) {\n        buffer.push(rtp);\n        delete rtpBuffer[index];\n      }\n      if (Object.values(rtpBuffer).length === 0) {\n        break;\n      }\n    }\n    return buffer;\n  }\n\n  private disposeTimeoutPackets(baseTimestamp: number) {\n    let latestTimeoutSeqNum: number | undefined;\n\n    const packets = Object.values(this.rtpBuffer)\n      .map((rtp) => {\n        const { timestamp, sequenceNumber } = rtp.header;\n\n        if (uint32Gt(timestamp, baseTimestamp)) {\n          log(\"gap\", { timestamp, baseTimestamp });\n          return;\n        }\n\n        const elapsedSec =\n          uint32Add(baseTimestamp, -timestamp) / this.clockRate;\n\n        if (elapsedSec * 1000 > this.options.latency) {\n          log(\"timeout packet\", {\n            sequenceNumber,\n            elapsedSec,\n            baseTimestamp,\n            timestamp,\n          });\n\n          if (latestTimeoutSeqNum == undefined) {\n            latestTimeoutSeqNum = sequenceNumber;\n          }\n          // 現在のSeqNumとの差が最も大きいSeqNumを探す\n          if (\n            uint16Add(sequenceNumber, -this.presentSeqNum!) >\n            uint16Add(latestTimeoutSeqNum, -this.presentSeqNum!)\n          ) {\n            latestTimeoutSeqNum = sequenceNumber;\n          }\n\n          const packet = this.rtpBuffer[sequenceNumber];\n          delete this.rtpBuffer[sequenceNumber];\n          return packet;\n        }\n      })\n      .flatMap((p): RtpPacket => p as RtpPacket)\n      .filter((p) => p);\n\n    const sorted = this.sortAndClearBuffer(\n      packets.reduce((acc, cur) => {\n        acc[cur.header.sequenceNumber] = cur;\n        return acc;\n      }, {})\n    );\n\n    return { latestTimeoutSeqNum, sorted };\n  }\n}\n\nexport interface JitterBufferOptions {\n  /**milliseconds */\n  latency: number;\n  bufferSize: number;\n}\n"]}
+{"version":3,"file":"jitterBuffer.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/jitterBuffer.ts"],"names":[],"mappings":"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","sourcesContent":["import debug from \"debug\";\n\nimport {\n  RequireAtLeastOne,\n  RtpPacket,\n  uint16Add,\n  uint16Gte,\n  uint32Add,\n  uint32Gt,\n} from \"..\";\nimport { Processor } from \"./interface\";\nimport { RtpOutput } from \"./source\";\n\nconst srcPath = `werift-rtp : packages/rtp/src/processor/jitterBuffer.ts`;\nconst log = debug(srcPath);\n\nexport type JitterBufferInput = RtpOutput;\n\nexport interface JitterBufferOutput extends RtpOutput {\n  isPacketLost?: { from: number; to: number };\n}\n\nexport class JitterBufferBase\n  implements Processor<JitterBufferInput, JitterBufferOutput>\n{\n  private options: JitterBufferOptions;\n  /**uint16 */\n  private presentSeqNum?: number;\n  private rtpBuffer: { [sequenceNumber: number]: RtpPacket } = {};\n  private get expectNextSeqNum() {\n    return uint16Add(this.presentSeqNum!, 1);\n  }\n\n  constructor(\n    public clockRate: number,\n    options: Partial<JitterBufferOptions> = {}\n  ) {\n    this.options = {\n      latency: options.latency ?? 200,\n      bufferSize: options.bufferSize ?? 10000,\n    };\n  }\n\n  processInput(input: JitterBufferInput): JitterBufferOutput[] {\n    const output: JitterBufferOutput[] = [];\n\n    if (!input.rtp) {\n      if (input.eol) {\n        const packets = this.sortAndClearBuffer(this.rtpBuffer);\n        for (const rtp of packets) {\n          output.push({ rtp });\n        }\n        output.push({ eol: true });\n      }\n      return output;\n    }\n\n    const { packets, timeoutSeqNum } = this.processRtp(input.rtp);\n\n    if (timeoutSeqNum != undefined) {\n      const isPacketLost = {\n        from: this.expectNextSeqNum,\n        to: timeoutSeqNum,\n      };\n      this.presentSeqNum = input.rtp.header.sequenceNumber;\n      output.push({ isPacketLost });\n      if (packets) {\n        for (const rtp of [...packets, input.rtp]) {\n          output.push({ rtp });\n        }\n      }\n      return output;\n    } else {\n      if (packets) {\n        for (const rtp of packets) {\n          output.push({ rtp });\n        }\n        return output;\n      }\n      return [];\n    }\n  }\n\n  private processRtp(rtp: RtpPacket): RequireAtLeastOne<{\n    packets: RtpPacket[];\n    timeoutSeqNum: number;\n    nothing: undefined;\n  }> {\n    const { sequenceNumber, timestamp } = rtp.header;\n\n    // init\n    if (this.presentSeqNum == undefined) {\n      this.presentSeqNum = sequenceNumber;\n      return { packets: [rtp] };\n    }\n\n    // duplicate\n    if (uint16Gte(this.presentSeqNum, sequenceNumber)) {\n      log(\"duplicate\", { sequenceNumber });\n      return { nothing: undefined };\n    }\n\n    // expect\n    if (sequenceNumber === this.expectNextSeqNum) {\n      this.presentSeqNum = sequenceNumber;\n\n      const rtpBuffer = this.resolveBuffer(uint16Add(sequenceNumber, 1));\n      this.presentSeqNum =\n        rtpBuffer.at(-1)?.header.sequenceNumber ?? this.presentSeqNum;\n\n      this.disposeTimeoutPackets(timestamp);\n\n      return { packets: [rtp, ...rtpBuffer] };\n    }\n\n    this.pushRtpBuffer(rtp);\n\n    const { latestTimeoutSeqNum, sorted } =\n      this.disposeTimeoutPackets(timestamp);\n\n    if (latestTimeoutSeqNum) {\n      return { timeoutSeqNum: latestTimeoutSeqNum, packets: sorted };\n    } else {\n      return { nothing: undefined };\n    }\n  }\n\n  private pushRtpBuffer(rtp: RtpPacket) {\n    if (Object.values(this.rtpBuffer).length > this.options.bufferSize) {\n      log(\"buffer over flow\");\n      return;\n    }\n    // log(\"pushRtpBuffer\", { seq: rtp.header.sequenceNumber });\n    this.rtpBuffer[rtp.header.sequenceNumber] = rtp;\n  }\n\n  private resolveBuffer(seqNumFrom: number) {\n    const resolve: RtpPacket[] = [];\n\n    for (let index = seqNumFrom; ; index = uint16Add(index, 1)) {\n      const rtp = this.rtpBuffer[index];\n      if (rtp) {\n        resolve.push(rtp);\n        delete this.rtpBuffer[index];\n      } else {\n        break;\n      }\n    }\n    // if (resolve.length > 0) {\n    //   log(\n    //     \"resolveBuffer\",\n    //     resolve.map((r) => r.header.sequenceNumber)\n    //   );\n    // }\n    return resolve;\n  }\n\n  private sortAndClearBuffer(rtpBuffer: {\n    [sequenceNumber: number]: RtpPacket;\n  }) {\n    const buffer: RtpPacket[] = [];\n    for (let index = this.presentSeqNum ?? 0; ; index = uint16Add(index, 1)) {\n      const rtp = rtpBuffer[index];\n      if (rtp) {\n        buffer.push(rtp);\n        delete rtpBuffer[index];\n      }\n      if (Object.values(rtpBuffer).length === 0) {\n        break;\n      }\n    }\n    return buffer;\n  }\n\n  private disposeTimeoutPackets(baseTimestamp: number) {\n    let latestTimeoutSeqNum: number | undefined;\n\n    const packets = Object.values(this.rtpBuffer)\n      .map((rtp) => {\n        const { timestamp, sequenceNumber } = rtp.header;\n\n        if (uint32Gt(timestamp, baseTimestamp)) {\n          return;\n        }\n\n        const elapsedSec =\n          uint32Add(baseTimestamp, -timestamp) / this.clockRate;\n\n        if (elapsedSec * 1000 > this.options.latency) {\n          log(\"timeout packet\", {\n            sequenceNumber,\n            elapsedSec,\n            baseTimestamp,\n            timestamp,\n          });\n\n          if (latestTimeoutSeqNum == undefined) {\n            latestTimeoutSeqNum = sequenceNumber;\n          }\n          // 現在のSeqNumとの差が最も大きいSeqNumを探す\n          if (\n            uint16Add(sequenceNumber, -this.presentSeqNum!) >\n            uint16Add(latestTimeoutSeqNum, -this.presentSeqNum!)\n          ) {\n            latestTimeoutSeqNum = sequenceNumber;\n          }\n\n          const packet = this.rtpBuffer[sequenceNumber];\n          delete this.rtpBuffer[sequenceNumber];\n          return packet;\n        }\n      })\n      .flatMap((p): RtpPacket => p as RtpPacket)\n      .filter((p) => p);\n\n    const sorted = this.sortAndClearBuffer(\n      packets.reduce((acc, cur) => {\n        acc[cur.header.sequenceNumber] = cur;\n        return acc;\n      }, {})\n    );\n\n    return { latestTimeoutSeqNum, sorted };\n  }\n}\n\nexport interface JitterBufferOptions {\n  /**milliseconds */\n  latency: number;\n  bufferSize: number;\n}\n"]}

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

@@ -5,16 +5,37 @@ const jitterBuffer_1 = require("./jitterBuffer");
 class JitterBufferCallback extends jitterBuffer_1.JitterBufferBase {
     constructor(clockRate, options = {}) {
         super(clockRate, options);
-        this.clockRate = clockRate;
-        this.pipe = (cb) => {
-            this.cb = cb;
-            return this;
-        };
-        this.input = (input) => {
-            for (const output of this.processInput(input)) {
-                this.cb(output);
+        Object.defineProperty(this, "clockRate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: clockRate
+        });
+        Object.defineProperty(this, "cb", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "pipe", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (cb) => {
+                this.cb = cb;
+                return this;
             }
-        };
+        });
+        Object.defineProperty(this, "input", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (input) => {
+                for (const output of this.processInput(input)) {
+                    this.cb(output);
+                }
+            }
+        });
     }
 }
 exports.JitterBufferCallback = JitterBufferCallback;

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

@@ -1 +1 @@
-{"version":3,"file":"jitterBufferCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/jitterBufferCallback.ts"],"names":[],"mappings":";;;AAAA,iDAKwB;AAExB,MAAa,oBAAqB,SAAQ,+BAAgB;IAExD,YACS,SAAiB,EACxB,UAAwC,EAAE;QAE1C,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAHnB,cAAS,GAAT,SAAS,CAAQ;QAM1B,SAAI,GAAG,CAAC,EAAuC,EAAE,EAAE;YACjD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;YACb,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;AAnBD,oDAmBC","sourcesContent":["import {\n  JitterBufferBase,\n  JitterBufferInput,\n  JitterBufferOptions,\n  JitterBufferOutput,\n} from \"./jitterBuffer\";\n\nexport class JitterBufferCallback extends JitterBufferBase {\n  private cb!: (input: JitterBufferOutput) => void;\n  constructor(\n    public clockRate: number,\n    options: Partial<JitterBufferOptions> = {}\n  ) {\n    super(clockRate, options);\n  }\n\n  pipe = (cb: (input: JitterBufferOutput) => void) => {\n    this.cb = cb;\n    return this;\n  };\n\n  input = (input: JitterBufferInput) => {\n    for (const output of this.processInput(input)) {\n      this.cb(output);\n    }\n  };\n}\n"]}
+{"version":3,"file":"jitterBufferCallback.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/jitterBufferCallback.ts"],"names":[],"mappings":";;;AAAA,iDAKwB;AAExB,MAAa,oBAAqB,SAAQ,+BAAgB;IAExD,YACS,SAAiB,EACxB,UAAwC,EAAE;QAE1C,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;;;;;mBAHnB;;QAFT;;;;;WAAiD;QAQjD;;;;mBAAO,CAAC,EAAuC,EAAE,EAAE;gBACjD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;WAAC;QAEF;;;;mBAAQ,CAAC,KAAwB,EAAE,EAAE;gBACnC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;oBAC7C,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;iBACjB;YACH,CAAC;WAAC;IAXF,CAAC;CAYF;AAnBD,oDAmBC","sourcesContent":["import {\n  JitterBufferBase,\n  JitterBufferInput,\n  JitterBufferOptions,\n  JitterBufferOutput,\n} from \"./jitterBuffer\";\n\nexport class JitterBufferCallback extends JitterBufferBase {\n  private cb!: (input: JitterBufferOutput) => void;\n  constructor(\n    public clockRate: number,\n    options: Partial<JitterBufferOptions> = {}\n  ) {\n    super(clockRate, options);\n  }\n\n  pipe = (cb: (input: JitterBufferOutput) => void) => {\n    this.cb = cb;\n    return this;\n  };\n\n  input = (input: JitterBufferInput) => {\n    for (const output of this.processInput(input)) {\n      this.cb(output);\n    }\n  };\n}\n"]}

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

@@ -8,7 +8,18 @@ exports.jitterBufferTransformer = jitterBufferTransformer;
 class JitterBufferTransformer extends jitterBuffer_1.JitterBufferBase {
     constructor(clockRate, options = {}) {
         super(clockRate, options);
-        this.clockRate = clockRate;
+        Object.defineProperty(this, "clockRate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: clockRate
+        });
+        Object.defineProperty(this, "transform", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.transform = new web_1.TransformStream({
             transform: (input, output) => {
                 for (const res of this.processInput(input)) {

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

@@ -1 +1 @@
-{"version":3,"file":"jitterBufferTransformer.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/jitterBufferTransformer.ts"],"names":[],"mappings":";;;AAAA,oCAA6C;AAE7C,iDAKwB;AAEjB,MAAM,uBAAuB,GAAG,CACrC,GAAG,IAA2D,EAC9D,EAAE,CAAC,IAAI,uBAAuB,CAAC,GAAG,IAAI,CAAC,CAAC,SAAS,CAAC;AAFvC,QAAA,uBAAuB,2BAEgB;AAEpD,MAAa,uBAAwB,SAAQ,+BAAgB;IAG3D,YACS,SAAiB,EACxB,UAAwC,EAAE;QAE1C,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAHnB,cAAS,GAAT,SAAS,CAAQ;QAKxB,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;AAjBD,0DAiBC","sourcesContent":["import { TransformStream } from \"stream/web\";\n\nimport {\n  JitterBufferBase,\n  JitterBufferInput,\n  JitterBufferOptions,\n  JitterBufferOutput,\n} from \"./jitterBuffer\";\n\nexport const jitterBufferTransformer = (\n  ...args: ConstructorParameters<typeof JitterBufferTransformer>\n) => new JitterBufferTransformer(...args).transform;\n\nexport class JitterBufferTransformer extends JitterBufferBase {\n  transform: TransformStream<JitterBufferInput, JitterBufferOutput>;\n\n  constructor(\n    public clockRate: number,\n    options: Partial<JitterBufferOptions> = {}\n  ) {\n    super(clockRate, 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"]}
+{"version":3,"file":"jitterBufferTransformer.js","sourceRoot":"","sources":["../../../../../rtp/src/processor/jitterBufferTransformer.ts"],"names":[],"mappings":";;;AAAA,oCAA6C;AAE7C,iDAKwB;AAEjB,MAAM,uBAAuB,GAAG,CACrC,GAAG,IAA2D,EAC9D,EAAE,CAAC,IAAI,uBAAuB,CAAC,GAAG,IAAI,CAAC,CAAC,SAAS,CAAC;AAFvC,QAAA,uBAAuB,2BAEgB;AAEpD,MAAa,uBAAwB,SAAQ,+BAAgB;IAG3D,YACS,SAAiB,EACxB,UAAwC,EAAE;QAE1C,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;;;;;mBAHnB;;QAHT;;;;;WAAkE;QAQhE,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;AAjBD,0DAiBC","sourcesContent":["import { TransformStream } from \"stream/web\";\n\nimport {\n  JitterBufferBase,\n  JitterBufferInput,\n  JitterBufferOptions,\n  JitterBufferOutput,\n} from \"./jitterBuffer\";\n\nexport const jitterBufferTransformer = (\n  ...args: ConstructorParameters<typeof JitterBufferTransformer>\n) => new JitterBufferTransformer(...args).transform;\n\nexport class JitterBufferTransformer extends JitterBufferBase {\n  transform: TransformStream<JitterBufferInput, JitterBufferOutput>;\n\n  constructor(\n    public clockRate: number,\n    options: Partial<JitterBufferOptions> = {}\n  ) {\n    super(clockRate, 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"]}