Merge pull request #19 from GetStream/chore/sync_0.13.0

chore: sync with flutter_webrtc v0.13.0 + bump StreamWebRTC

Author: Brazol

CHANGELOG.md

@@ -1,6 +1,12 @@
 
 # Changelog
 
+[1.0.0] - 2025-03-31
+* Bumped StreamWebRTC version to 125.6422.065
+* Synced flutter-webrtc v0.13.0
+	* [All] feat: add getBufferedAmount for DataChannel.
+	* [Windows] fix: fixed non-platform thread call error.
+
 [1.0.0-dev.1] - 2025-03-14
 * Switched native webrtc dependencies for iOS and Android to Stream's internal builds
 * Replaced deprecated `onSurfaceDestroyed` with `onSurfaceCleanup` in `SurfaceTextureRenderer`

android/src/main/java/io/getstream/webrtc/flutter/MethodCallHandlerImpl.java

@@ -495,6 +495,12 @@ public void onMethodCall(MethodCall call, @NonNull Result notSafeResult) {
         createDataChannel(peerConnectionId, label, new ConstraintsMap(dataChannelDict), result);
         break;
       }
+      case "dataChannelGetBufferedAmount": {
+        String peerConnectionId = call.argument("peerConnectionId");
+        String dataChannelId = call.argument("dataChannelId");
+        dataChannelGetBufferedAmount(peerConnectionId, dataChannelId, result);
+        break;
+      }
       case "dataChannelSend": {
         String peerConnectionId = call.argument("peerConnectionId");
         String dataChannelId = call.argument("dataChannelId");
@@ -2062,6 +2068,17 @@ public void dataChannelSend(String peerConnectionId, String dataChannelId, ByteB
     }
   }
 
+  public void dataChannelGetBufferedAmount(String peerConnectionId, String dataChannelId, Result result) {
+    PeerConnectionObserver pco
+            = mPeerConnectionObservers.get(peerConnectionId);
+    if (pco == null || pco.getPeerConnection() == null) {
+      Log.d(TAG, "dataChannelGetBufferedAmount() peerConnection is null");
+      resultError("dataChannelGetBufferedAmount", "peerConnection is null", result);
+    } else {
+      pco.dataChannelGetBufferedAmount(dataChannelId, result);
+    }
+  }
+
   public void dataChannelClose(String peerConnectionId, String dataChannelId) {
     // Forward to PeerConnectionObserver which deals with DataChannels
     // because DataChannel is owned by PeerConnection.

android/src/main/java/io/getstream/webrtc/flutter/PeerConnectionObserver.java

@@ -168,6 +168,18 @@ void dataChannelSend(String dataChannelId, ByteBuffer byteBuffer, Boolean isBina
     }
   }
 
+  void dataChannelGetBufferedAmount(String dataChannelId, Result result) {
+    DataChannel dataChannel = dataChannels.get(dataChannelId);
+    if (dataChannel != null) {
+      ConstraintsMap params = new ConstraintsMap();
+      params.putLong("bufferedAmount", dataChannel.bufferedAmount());
+      result.success(params.toMap());
+    } else {
+      Log.d(TAG, "dataChannelGetBufferedAmount() dataChannel is null");
+      resultError("dataChannelGetBufferedAmount", "DataChannel is null", result);
+    }
+  }
+
   RtpTransceiver getRtpTransceiverById(String id) {
     RtpTransceiver transceiver = transceivers.get(id);
     if (null == transceiver) {

common/cpp/include/flutter_common.h

@@ -12,8 +12,10 @@
 
 #include <list>
 #include <memory>
-#include <string>
+#include <mutex>
 #include <optional>
+#include <queue>
+#include <string>
 
 typedef flutter::EncodableValue EncodableValue;
 typedef flutter::EncodableMap EncodableMap;
@@ -27,6 +29,8 @@ typedef flutter::EventSink<EncodableValue> EventSink;
 typedef flutter::MethodCall<EncodableValue> MethodCall;
 typedef flutter::MethodResult<EncodableValue> MethodResult;
 
+class TaskRunner;
+
 // foo.StringValue() becomes std::get<std::string>(foo)
 // foo.IsString() becomes std::holds_alternative<std::string>(foo)
 
@@ -90,7 +94,8 @@ inline double findDouble(const EncodableMap& map, const std::string& key) {
   return 0.0;
 }
 
-inline std::optional<double> maybeFindDouble(const EncodableMap& map, const std::string& key) {
+inline std::optional<double> maybeFindDouble(const EncodableMap& map,
+                                             const std::string& key) {
   auto it = map.find(EncodableValue(key));
   if (it != map.end() && TypeIs<double>(it->second))
     return GetValue<double>(it->second);
@@ -171,6 +176,7 @@ class EventChannelProxy {
  public:
   static std::unique_ptr<EventChannelProxy> Create(
       BinaryMessenger* messenger,
+      TaskRunner* task_runner,
       const std::string& channelName);
 
   virtual ~EventChannelProxy() = default;

common/cpp/include/flutter_data_channel.h

@@ -10,6 +10,7 @@ class FlutterRTCDataChannelObserver : public RTCDataChannelObserver {
  public:
   FlutterRTCDataChannelObserver(scoped_refptr<RTCDataChannel> data_channel,
                                 BinaryMessenger* messenger,
+                                TaskRunner* task_runner,
                                 const std::string& channel_name);
   virtual ~FlutterRTCDataChannelObserver();
 
@@ -39,6 +40,9 @@ class FlutterDataChannel {
                        const EncodableValue& data,
                        std::unique_ptr<MethodResultProxy>);
 
+  void DataChannelGetBufferedAmount(RTCDataChannel* data_channel,
+                       std::unique_ptr<MethodResultProxy> result);
+
   void DataChannelClose(RTCDataChannel* data_channel,
                         const std::string& data_channel_uuid,
                         std::unique_ptr<MethodResultProxy>);

common/cpp/include/flutter_frame_cryptor.h

@@ -10,8 +10,8 @@ namespace stream_webrtc_flutter_plugin {
 
 class FlutterFrameCryptorObserver : public libwebrtc::RTCFrameCryptorObserver {
  public:
-  FlutterFrameCryptorObserver(BinaryMessenger* messenger,const std::string& channelName)
-      : event_channel_(EventChannelProxy::Create(messenger, channelName)) {}
+  FlutterFrameCryptorObserver(BinaryMessenger* messenger, TaskRunner* task_runner, const std::string& channelName)
+      : event_channel_(EventChannelProxy::Create(messenger, task_runner, channelName)) {}
   void OnFrameCryptionStateChanged(
       const string participant_id,
       libwebrtc::RTCFrameCryptionState state);

common/cpp/include/flutter_peerconnection.h

@@ -11,6 +11,7 @@ class FlutterPeerConnectionObserver : public RTCPeerConnectionObserver {
   FlutterPeerConnectionObserver(FlutterWebRTCBase* base,
                                 scoped_refptr<RTCPeerConnection> peerconnection,
                                 BinaryMessenger* messenger,
+                                TaskRunner* task_runner,
                                 const std::string& channel_name,
                                 std::string& peerConnectionId);
 

common/cpp/include/flutter_video_renderer.h

@@ -22,6 +22,7 @@ class FlutterVideoRenderer
 
   void initialize(TextureRegistrar* registrar,
                   BinaryMessenger* messenger,
+                  TaskRunner* task_runner,
                   std::unique_ptr<flutter::TextureVariant> texture,
                   int64_t texture_id);
 

common/cpp/include/flutter_webrtc.h

@@ -21,6 +21,8 @@ class FlutterWebRTCPlugin : public flutter::Plugin {
   virtual BinaryMessenger* messenger() = 0;
 
   virtual TextureRegistrar* textures() = 0;
+
+  virtual TaskRunner* task_runner() = 0;
 };
 
 class FlutterWebRTC : public FlutterWebRTCBase,

common/cpp/include/flutter_webrtc_base.h

@@ -43,7 +43,7 @@ class FlutterWebRTCBase {
   enum ParseConstraintType { kMandatory, kOptional };
 
  public:
-  FlutterWebRTCBase(BinaryMessenger* messenger, TextureRegistrar* textures);
+  FlutterWebRTCBase(BinaryMessenger* messenger, TextureRegistrar* textures, TaskRunner* task_runner);
   ~FlutterWebRTCBase();
 
   std::string GenerateUUID();
@@ -122,6 +122,7 @@ class FlutterWebRTCBase {
 
  protected:
   BinaryMessenger* messenger_;
+  TaskRunner *task_runner_;
   TextureRegistrar* textures_;
   std::unique_ptr<EventChannelProxy> event_channel_;
 };