werift 0.14.1-debug → 0.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "werift",
-  "version": "0.14.1-debug",
+  "version": "0.14.1",
   "description": "WebRTC Implementation for TypeScript (Node.js)",
   "keywords": [
     "WebRTC",

package/src/media/rtpSender.ts

@@ -16,7 +16,7 @@ import {
   GenericNack,
   PictureLossIndication,
   ReceiverEstimatedMaxBitrate,
-  Red,
+  RedEncoder,
   RtcpPacket,
   RtcpPayloadSpecificFeedback,
   RtcpRrPacket,
@@ -71,7 +71,8 @@ export class RTCRtpSender {
   private rtxPayloadType?: number;
   private rtxSequenceNumber = random16();
   redRedundantPayloadType?: number;
-  redDistance = 2;
+  private _redDistance = 2;
+  redEncoder = new RedEncoder(this._redDistance);
   private headerExtensions: RTCRtpHeaderExtensionParameters[] = [];
   private disposeTrack?: () => void;
 
@@ -115,6 +116,14 @@ export class RTCRtpSender {
     }
   }
 
+  get redDistance() {
+    return this._redDistance;
+  }
+  set redDistance(n: number) {
+    this._redDistance = n;
+    this.redEncoder.distance = n;
+  }
+
   prepareSend(params: RTCRtpSendParameters) {
     this.cname = params.rtcp?.cname;
     this.mid = params.muxId;
@@ -327,20 +336,12 @@ export class RTCRtpSender {
     let rtpPayload = rtp.payload;
 
     if (this.redRedundantPayloadType) {
-      const redundantPackets = [...Array(this.redDistance).keys()]
-        .map((i) => {
-          return this.rtpCache.find(
-            (c) =>
-              c.header.sequenceNumber ===
-              header.sequenceNumber - (this.redDistance - i)
-          );
-        })
-        .filter((p): p is NonNullable<typeof p> => typeof p !== "undefined");
-      const red = buildRedPacket(
-        redundantPackets,
-        this.redRedundantPayloadType,
-        rtp
-      );
+      this.redEncoder.push({
+        block: rtpPayload,
+        timestamp: header.timestamp,
+        blockPT: this.redRedundantPayloadType,
+      });
+      const red = this.redEncoder.build();
       rtpPayload = red.serialize();
     }
 
@@ -462,27 +463,3 @@ export function wrapRtx(
   );
   return rtx;
 }
-
-export function buildRedPacket(
-  redundantPackets: RtpPacket[],
-  blockPT: number,
-  presentPacket: RtpPacket
-) {
-  const red = new Red();
-  redundantPackets.forEach((redundant) => {
-    red.blocks.push({
-      block: redundant.payload,
-      blockPT,
-      timestampOffset: uint32Add(
-        presentPacket.header.timestamp,
-        -redundant.header.timestamp
-      ),
-    });
-  });
-
-  red.blocks.push({
-    block: presentPacket.payload,
-    blockPT,
-  });
-  return red;
-}