Feat/release 0.9.43 (flutter-webrtc#1447)

cloudwebrtc · web-flow · commit eef757783f9f · 2023-09-20T19:00:13.000+08:00
* wip.

* win/linux.

* release: 0.9.43.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
 --------------------------------------------
+[0.9.43] - 2023-09-15
+
+* [Native] fix: send frame cryptor events from signaling thread.
+* [Native] fix: h264 freeze when using E2EE.
+
 [0.9.42+hotfix.1] - 2023-09-15
 
 * [Windows/Linux] fix: fix cannot start vp8/h264 encoder correctly.
diff --git a/android/build.gradle b/android/build.gradle
@@ -52,7 +52,7 @@ android {
 }
 
 dependencies {
-    implementation 'io.github.webrtc-sdk:android:114.5735.03'
+    implementation 'io.github.webrtc-sdk:android:114.5735.04'
     implementation 'com.github.davidliu:audioswitch:d18e3e31d427c27f1593030e024b370bf24480fd'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/FlutterRTCFrameCryptor.java b/android/src/main/java/com/cloudwebrtc/webrtc/FlutterRTCFrameCryptor.java
@@ -181,7 +181,8 @@ private void frameCryptorFactoryCreateFrameCryptor(Map<String, Object> params, @
         if(type.equals("sender")) {
             RtpSender rtpSender = pco.getRtpSenderById(rtpSenderId);
 
-            FrameCryptor frameCryptor = FrameCryptorFactory.createFrameCryptorForRtpSender(rtpSender,
+            FrameCryptor frameCryptor = FrameCryptorFactory.createFrameCryptorForRtpSender(stateProvider.getPeerConnectionFactory(),
+                    rtpSender,
                     participantId,
                     frameCryptorAlgorithmFromInt(algorithm),
                     keyProvider);
@@ -196,7 +197,8 @@ private void frameCryptorFactoryCreateFrameCryptor(Map<String, Object> params, @
         } else if(type.equals("receiver")) {
             RtpReceiver rtpReceiver = pco.getRtpReceiverById(rtpReceiverId);
 
-            FrameCryptor frameCryptor = FrameCryptorFactory.createFrameCryptorForRtpReceiver(rtpReceiver,
+            FrameCryptor frameCryptor = FrameCryptorFactory.createFrameCryptorForRtpReceiver(stateProvider.getPeerConnectionFactory(),
+                    rtpReceiver,
                     participantId,
                     frameCryptorAlgorithmFromInt(algorithm),
                     keyProvider);
diff --git a/common/cpp/include/flutter_frame_cryptor.h b/common/cpp/include/flutter_frame_cryptor.h
@@ -91,7 +91,7 @@ class FlutterFrameCryptor {
   FlutterWebRTCBase* base_;
   std::map<std::string, scoped_refptr<libwebrtc::RTCFrameCryptor>>
       frame_cryptors_;
-  std::map<std::string, std::unique_ptr<FlutterFrameCryptorObserver>>
+  std::map<std::string, scoped_refptr<FlutterFrameCryptorObserver>>
       frame_cryptor_observers_;
   std::map<std::string, scoped_refptr<libwebrtc::KeyProvider>> key_providers_;
 };
diff --git a/common/cpp/src/flutter_frame_cryptor.cc b/common/cpp/src/flutter_frame_cryptor.cc
@@ -159,18 +159,17 @@ void FlutterFrameCryptor::FrameCryptorFactoryCreateFrameCryptor(
       return;
     }
     auto frameCryptor =
-        libwebrtc::FrameCryptorFactory::frameCryptorFromRtpSender(
+        libwebrtc::FrameCryptorFactory::frameCryptorFromRtpSender(base_->factory_,
             string(participantId), sender, AlgorithmFromInt(algorithm),
             keyProvider);
     std::string event_channel = "FlutterWebRTC/frameCryptorEvent" + uuid;
 
-    std::unique_ptr<FlutterFrameCryptorObserver> observer(
-        new FlutterFrameCryptorObserver(base_->messenger_, event_channel));
+    scoped_refptr<FlutterFrameCryptorObserver> observer(new RefCountedObject<FlutterFrameCryptorObserver>(base_->messenger_, event_channel));
 
-    frameCryptor->RegisterRTCFrameCryptorObserver(observer.get());
+    frameCryptor->RegisterRTCFrameCryptorObserver(observer);
 
     frame_cryptors_[uuid] = frameCryptor;
-    frame_cryptor_observers_[uuid] = std::move(observer);
+    frame_cryptor_observers_[uuid] = observer;
     EncodableMap params;
     params[EncodableValue("frameCryptorId")] = uuid;
 
@@ -185,19 +184,18 @@ void FlutterFrameCryptor::FrameCryptorFactoryCreateFrameCryptor(
     std::string uuid = base_->GenerateUUID();
     auto keyProvider = key_providers_[keyProviderId];
     auto frameCryptor =
-        libwebrtc::FrameCryptorFactory::frameCryptorFromRtpReceiver(
+        libwebrtc::FrameCryptorFactory::frameCryptorFromRtpReceiver(base_->factory_,
             string(participantId), receiver, AlgorithmFromInt(algorithm),
             keyProvider);
 
     std::string event_channel = "FlutterWebRTC/frameCryptorEvent" + uuid;
 
-    std::unique_ptr<FlutterFrameCryptorObserver> observer(
-        new FlutterFrameCryptorObserver(base_->messenger_, event_channel));
+    scoped_refptr<FlutterFrameCryptorObserver> observer(new RefCountedObject<FlutterFrameCryptorObserver>(base_->messenger_, event_channel));
 
     frameCryptor->RegisterRTCFrameCryptorObserver(observer.get());
 
     frame_cryptors_[uuid] = frameCryptor;
-    frame_cryptor_observers_[uuid] = std::move(observer);
+    frame_cryptor_observers_[uuid] = observer;
     EncodableMap params;
     params[EncodableValue("frameCryptorId")] = uuid;
 
diff --git a/common/darwin/Classes/FlutterRTCFrameCryptor.m b/common/darwin/Classes/FlutterRTCFrameCryptor.m
@@ -146,7 +146,8 @@ - (void)frameCryptorFactoryCreateFrameCryptor:(nonnull NSDictionary*)constraints
     }
 
     RTCFrameCryptor* frameCryptor =
-        [[RTCFrameCryptor alloc] initWithRtpSender:sender
+        [[RTCFrameCryptor alloc] initWithFactory:self.peerConnectionFactory
+                                         rtpSender:sender
                                      participantId:participantId
                                          algorithm:[self getAlgorithm:algorithm]
                                         keyProvider:keyProvider];
@@ -172,7 +173,8 @@ - (void)frameCryptorFactoryCreateFrameCryptor:(nonnull NSDictionary*)constraints
       return;
     }
     RTCFrameCryptor* frameCryptor =
-        [[RTCFrameCryptor alloc] initWithRtpReceiver:receiver
+        [[RTCFrameCryptor alloc] initWithFactory:self.peerConnectionFactory
+                                         rtpReceiver:receiver
                                        participantId:participantId
                                            algorithm:[self getAlgorithm:algorithm]
                                           keyProvider:keyProvider];
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/ios/flutter_webrtc.podspec b/ios/flutter_webrtc.podspec
@@ -15,7 +15,7 @@ A new flutter plugin project.
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'WebRTC-SDK', '114.5735.06'
-  s.ios.deployment_target = '11.0'
+  s.dependency 'WebRTC-SDK', '114.5735.07'
+  s.ios.deployment_target = '12.0'
   s.static_framework = true
 end
diff --git a/macos/flutter_webrtc.podspec b/macos/flutter_webrtc.podspec
@@ -15,6 +15,6 @@ A new flutter plugin project.
   s.source_files     = ['Classes/**/*']
 
   s.dependency 'FlutterMacOS'
-  s.dependency 'WebRTC-SDK', '114.5735.06'
+  s.dependency 'WebRTC-SDK', '114.5735.07'
   s.osx.deployment_target = '10.13'
 end
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_webrtc
 description: Flutter WebRTC plugin for iOS/Android/Destkop/Web, based on GoogleWebRTC.
-version: 0.9.42+hotfix.1
+version: 0.9.43
 homepage: https://github.com/cloudwebrtc/flutter-webrtc
 environment:
   sdk: '>=2.12.0 <4.0.0'
diff --git a/third_party/libwebrtc/include/rtc_frame_cryptor.h b/third_party/libwebrtc/include/rtc_frame_cryptor.h
@@ -2,6 +2,7 @@
 #define LIB_RTC_FRAME_CYRPTOR_H_
 
 #include "base/refcount.h"
+#include "rtc_peerconnection_factory.h"
 #include "rtc_rtp_receiver.h"
 #include "rtc_rtp_sender.h"
 #include "rtc_types.h"
@@ -69,7 +70,7 @@ enum RTCFrameCryptionState {
   kInternalError,
 };
 
-class RTCFrameCryptorObserver {
+class RTCFrameCryptorObserver : public RefCountInterface {
  public:
   virtual void OnFrameCryptionStateChanged(const string participant_id,
                                            RTCFrameCryptionState state) = 0;
@@ -98,7 +99,7 @@ class RTCFrameCryptor : public RefCountInterface {
   virtual const string participant_id() const = 0;
 
   virtual void RegisterRTCFrameCryptorObserver(
-      RTCFrameCryptorObserver* observer) = 0;
+       scoped_refptr<RTCFrameCryptorObserver> observer) = 0;
 
   virtual void DeRegisterRTCFrameCryptorObserver() = 0;
 
@@ -110,14 +111,16 @@ class FrameCryptorFactory {
  public:
   /// Create a frame cyrptor for [RTCRtpSender].
   LIB_WEBRTC_API static scoped_refptr<RTCFrameCryptor>
-  frameCryptorFromRtpSender(const string participant_id,
+  frameCryptorFromRtpSender(scoped_refptr<RTCPeerConnectionFactory> factory,
+                            const string participant_id,
                             scoped_refptr<RTCRtpSender> sender,
                             Algorithm algorithm,
                             scoped_refptr<KeyProvider> key_provider);
 
   /// Create a frame cyrptor for [RTCRtpReceiver].
   LIB_WEBRTC_API static scoped_refptr<RTCFrameCryptor>
-  frameCryptorFromRtpReceiver(const string participant_id,
+  frameCryptorFromRtpReceiver(scoped_refptr<RTCPeerConnectionFactory> factory,
+                              const string participant_id,
                               scoped_refptr<RTCRtpReceiver> receiver,
                               Algorithm algorithm,
                               scoped_refptr<KeyProvider> key_provider);
diff --git a/third_party/libwebrtc/lib/linux-arm64/libwebrtc.so b/third_party/libwebrtc/lib/linux-arm64/libwebrtc.so
diff --git a/third_party/libwebrtc/lib/linux-x64/libwebrtc.so b/third_party/libwebrtc/lib/linux-x64/libwebrtc.so
diff --git a/third_party/libwebrtc/lib/win64/libwebrtc.dll b/third_party/libwebrtc/lib/win64/libwebrtc.dll
diff --git a/third_party/libwebrtc/lib/win64/libwebrtc.dll.lib b/third_party/libwebrtc/lib/win64/libwebrtc.dll.lib

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ android {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`dependencies {`
`55`		`- implementation 'io.github.webrtc-sdk:android:114.5735.03'`
	`55`	`+ implementation 'io.github.webrtc-sdk:android:114.5735.04'`
`56`	`56`	`implementation 'com.github.davidliu:audioswitch:d18e3e31d427c27f1593030e024b370bf24480fd'`
`57`	`57`	`implementation 'androidx.annotation:annotation:1.1.0'`
`58`	`58`	`implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"`