react-native-webrtc-nitro 1.2.0 → 1.3.0

package/cpp/Hybrid/HybridRTCRtpTransceiver.cpp

@@ -104,7 +104,6 @@ void HybridRTCRtpTransceiver::senderOnOpen ()
         return;
     }
 
-    const size_t mtu = 1200;
     auto ssrcs = track->description ().getSSRCs ();
     if (ssrcs.size () != 1)
     {
@@ -116,31 +115,72 @@ void HybridRTCRtpTransceiver::senderOnOpen ()
     auto separator = rtc::NalUnit::Separator::StartSequence;
     if (rtpMap->format == "H265")
     {
+        // create RTP configuration
         auto rtpConfig = std::make_shared<rtc::RtpPacketizationConfig> (
             ssrc, track->mid (), rtpMap->payloadType,
             rtc::H265RtpPacketizer::ClockRate);
-        auto packetizer = std::make_shared<rtc::H265RtpPacketizer> (
-            separator, rtpConfig, mtu);
-        track->chainMediaHandler (packetizer);
+        // create packetizer
+        auto packetizer
+            = std::make_shared<rtc::H265RtpPacketizer> (separator, rtpConfig);
+
+        // add RTCP SR handler
+        auto srReporter = make_shared<rtc::RtcpSrReporter> (rtpConfig);
+        packetizer->addToChain (srReporter);
+
+        // add RTCP NACK handler
+        auto nackResponder = make_shared<rtc::RtcpNackResponder> ();
+        packetizer->addToChain (nackResponder);
+
+        // set handler
+        track->setMediaHandler (packetizer);
+
         avCodecId = AV_CODEC_ID_H265;
     }
     else if (rtpMap->format == "H264")
     {
+        // create RTP configuration
         auto rtpConfig = std::make_shared<rtc::RtpPacketizationConfig> (
             ssrc, track->mid (), rtpMap->payloadType,
             rtc::H264RtpPacketizer::ClockRate);
-        auto packetizer = std::make_shared<rtc::H264RtpPacketizer> (
-            separator, rtpConfig, mtu);
-        track->chainMediaHandler (packetizer);
+
+        // create packetizer
+        auto packetizer
+            = std::make_shared<rtc::H264RtpPacketizer> (separator, rtpConfig);
+
+        // add RTCP SR handler
+        auto srReporter = make_shared<rtc::RtcpSrReporter> (rtpConfig);
+        packetizer->addToChain (srReporter);
+
+        // add RTCP NACK handler
+        auto nackResponder = make_shared<rtc::RtcpNackResponder> ();
+        packetizer->addToChain (nackResponder);
+
+        // set handler
+        track->setMediaHandler (packetizer);
+
         avCodecId = AV_CODEC_ID_H264;
     }
     else if (rtpMap->format == "opus")
     {
+        // create RTP configuration
         auto rtpConfig = std::make_shared<rtc::RtpPacketizationConfig> (
             ssrc, track->mid (), rtpMap->payloadType,
             rtc::OpusRtpPacketizer::DefaultClockRate);
+
+        // create packetizer
         auto packetizer = std::make_shared<rtc::OpusRtpPacketizer> (rtpConfig);
-        track->chainMediaHandler (packetizer);
+
+        // add RTCP SR handler
+        auto srReporter = make_shared<rtc::RtcpSrReporter> (rtpConfig);
+        packetizer->addToChain (srReporter);
+
+        // add RTCP NACK handler
+        auto nackResponder = make_shared<rtc::RtcpNackResponder> ();
+        packetizer->addToChain (nackResponder);
+
+        // set handler
+        track->setMediaHandler (packetizer);
+
         avCodecId = AV_CODEC_ID_OPUS;
     }
     else

package/lib/commonjs/specs/RTCPeerConnection.nitro.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeNitroModules","require","RTCPeerConnectionConstructor","getHybridObjectConstructor","RTCPeerConnectionExport","exports","RTCPeerConnection","Proxy","construct","target","args","config","instance","setConfiguration"],"sourceRoot":"../../../src","sources":["specs/RTCPeerConnection.nitro.ts"],"mappings":";;;;;;AACA,IAAAA,wBAAA,GAAAC,OAAA;AA4FA,MAAMC,4BAA4B,GAChC,IAAAC,mDAA0B,EAAoB,mBAAmB,CAAC;AACpE,MAAMC,uBAAuB,GAAAC,OAAA,CAAAC,iBAAA,GAAG,IAAIC,KAAK,CAACL,4BAA4B,EAAE;EACtEM,SAASA,CAACC,MAAM,EAAEC,IAAI,EAAE;IACtB,MAAMC,MAAM,GAAGD,IAAI,CAAC,CAAC,CAAiC;IACtD,MAAME,QAAQ,GAAG,IAAIH,MAAM,CAAC,CAAC;IAC7BG,QAAQ,CAACC,gBAAgB,CAACF,MAAM,CAAC;IACjC,OAAOC,QAAQ;EACjB;AACF,CAAC,CAA2D","ignoreList":[]}
+{"version":3,"names":["_reactNativeNitroModules","require","RTCPeerConnectionConstructor","getHybridObjectConstructor","RTCPeerConnectionExport","exports","RTCPeerConnection","Proxy","construct","target","args","config","instance","setConfiguration"],"sourceRoot":"../../../src","sources":["specs/RTCPeerConnection.nitro.ts"],"mappings":";;;;;;AACA,IAAAA,wBAAA,GAAAC,OAAA;AA6FA,MAAMC,4BAA4B,GAChC,IAAAC,mDAA0B,EAAoB,mBAAmB,CAAC;AACpE,MAAMC,uBAAuB,GAAAC,OAAA,CAAAC,iBAAA,GAAG,IAAIC,KAAK,CAACL,4BAA4B,EAAE;EACtEM,SAASA,CAACC,MAAM,EAAEC,IAAI,EAAE;IACtB,MAAMC,MAAM,GAAGD,IAAI,CAAC,CAAC,CAAiC;IACtD,MAAME,QAAQ,GAAG,IAAIH,MAAM,CAAC,CAAC;IAC7BG,QAAQ,CAACC,gBAAgB,CAACF,MAAM,CAAC;IACjC,OAAOC,QAAQ;EACjB;AACF,CAAC,CAA2D","ignoreList":[]}

package/lib/module/specs/RTCPeerConnection.nitro.js.map

@@ -1 +1 @@
-{"version":3,"names":["getHybridObjectConstructor","RTCPeerConnectionConstructor","RTCPeerConnectionExport","Proxy","construct","target","args","config","instance","setConfiguration","RTCPeerConnection"],"sourceRoot":"../../../src","sources":["specs/RTCPeerConnection.nitro.ts"],"mappings":";;AACA,SAASA,0BAA0B,QAAQ,4BAA4B;AA4FvE,MAAMC,4BAA4B,GAChCD,0BAA0B,CAAoB,mBAAmB,CAAC;AACpE,MAAME,uBAAuB,GAAG,IAAIC,KAAK,CAACF,4BAA4B,EAAE;EACtEG,SAASA,CAACC,MAAM,EAAEC,IAAI,EAAE;IACtB,MAAMC,MAAM,GAAGD,IAAI,CAAC,CAAC,CAAiC;IACtD,MAAME,QAAQ,GAAG,IAAIH,MAAM,CAAC,CAAC;IAC7BG,QAAQ,CAACC,gBAAgB,CAACF,MAAM,CAAC;IACjC,OAAOC,QAAQ;EACjB;AACF,CAAC,CAA2D;AAE5D,SAASN,uBAAuB,IAAIQ,iBAAiB","ignoreList":[]}
+{"version":3,"names":["getHybridObjectConstructor","RTCPeerConnectionConstructor","RTCPeerConnectionExport","Proxy","construct","target","args","config","instance","setConfiguration","RTCPeerConnection"],"sourceRoot":"../../../src","sources":["specs/RTCPeerConnection.nitro.ts"],"mappings":";;AACA,SAASA,0BAA0B,QAAQ,4BAA4B;AA6FvE,MAAMC,4BAA4B,GAChCD,0BAA0B,CAAoB,mBAAmB,CAAC;AACpE,MAAME,uBAAuB,GAAG,IAAIC,KAAK,CAACF,4BAA4B,EAAE;EACtEG,SAASA,CAACC,MAAM,EAAEC,IAAI,EAAE;IACtB,MAAMC,MAAM,GAAGD,IAAI,CAAC,CAAC,CAAiC;IACtD,MAAME,QAAQ,GAAG,IAAIH,MAAM,CAAC,CAAC;IAC7BG,QAAQ,CAACC,gBAAgB,CAACF,MAAM,CAAC;IACjC,OAAOC,QAAQ;EACjB;AACF,CAAC,CAA2D;AAE5D,SAASN,uBAAuB,IAAIQ,iBAAiB","ignoreList":[]}

package/lib/typescript/src/specs/RTCPeerConnection.nitro.d.ts

@@ -23,6 +23,7 @@ export interface RTCRtpTransceiverInit {
 }
 export interface RTCIceCandidate {
     readonly candidate: string;
+    readonly sdpMid: string | null;
 }
 export interface RTCIceCandidateInit {
     candidate?: string;

package/lib/typescript/src/specs/RTCPeerConnection.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RTCPeerConnection.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/RTCPeerConnection.nitro.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RTCPeerConnection.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/RTCPeerConnection.nitro.ts"],"names":[],"mappings":"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"}

package/nitrogen/generated/shared/c++/RTCIceCandidate.hpp

@@ -26,6 +26,9 @@
 
 
 #include <string>
+#include <NitroModules/Null.hpp>
+#include <variant>
+#include <optional>
 
 namespace margelo::nitro::webrtc {
 
@@ -35,10 +38,11 @@ namespace margelo::nitro::webrtc {
   struct RTCIceCandidate {
   public:
     std::string candidate     SWIFT_PRIVATE;
+    std::optional<std::variant<nitro::NullType, std::string>> sdpMid     SWIFT_PRIVATE;
 
   public:
     RTCIceCandidate() = default;
-    explicit RTCIceCandidate(std::string candidate): candidate(candidate) {}
+    explicit RTCIceCandidate(std::string candidate, std::optional<std::variant<nitro::NullType, std::string>> sdpMid): candidate(candidate), sdpMid(sdpMid) {}
   };
 
 } // namespace margelo::nitro::webrtc
@@ -51,12 +55,14 @@ namespace margelo::nitro {
     static inline margelo::nitro::webrtc::RTCIceCandidate fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::webrtc::RTCIceCandidate(
-        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "candidate"))
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "candidate")),
+        JSIConverter<std::optional<std::variant<nitro::NullType, std::string>>>::fromJSI(runtime, obj.getProperty(runtime, "sdpMid"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::webrtc::RTCIceCandidate& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, "candidate", JSIConverter<std::string>::toJSI(runtime, arg.candidate));
+      obj.setProperty(runtime, "sdpMid", JSIConverter<std::optional<std::variant<nitro::NullType, std::string>>>::toJSI(runtime, arg.sdpMid));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -68,6 +74,7 @@ namespace margelo::nitro {
         return false;
       }
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "candidate"))) return false;
+      if (!JSIConverter<std::optional<std::variant<nitro::NullType, std::string>>>::canConvert(runtime, obj.getProperty(runtime, "sdpMid"))) return false;
       return true;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-webrtc-nitro",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Nitro WebRTC module for React Native",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",

package/src/specs/RTCPeerConnection.nitro.ts

@@ -36,6 +36,7 @@ export interface RTCRtpTransceiverInit {
 
 export interface RTCIceCandidate {
   readonly candidate: string
+  readonly sdpMid: string | null
 }
 
 export interface RTCIceCandidateInit {