Merge branch 'main' into prepare-release-0.10.0

CHANGELOG.md

@@ -21,7 +21,7 @@ All user visible changes to this project will be documented in this file. This p
 
 ### Changed
 
-- Upgraded [libwebrtc] to [126.0.6478.182-r2] version. ([#155], [#162])
+- Upgraded [libwebrtc] to [127.0.6533.72] version. ([#155], [#162], [#166])
 - Disable [H264] software encoders and decoders. ([#153])
 - Migrated from [`dart:html`] to [`package:web`]. ([#164])
 
@@ -33,6 +33,7 @@ All user visible changes to this project will be documented in this file. This p
 - Unexpected audio category on `setOutputAudioId` call on [iOS]. ([#146])
 - Race condition bug on `setOutputAudioId` call on [Android]. ([#146])
 - Race condition bug on input/output device switch on desktop platforms. ([#151])
+- `RtpReceiver` use after free on [Android]. ([#165])
 
 [#137]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/137
 [#139]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/139
@@ -47,9 +48,11 @@ All user visible changes to this project will be documented in this file. This p
 [#156]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/156
 [#162]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/162
 [#164]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/164
+[#165]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/165
+[#166]: https://github.com/instrumentisto/medea-flutter-webrtc/pull/166
 [`dart:html`]: https://dart.dev/libraries/dart-html
 [`package:web`]: https://pub.dev/packages/web
-[126.0.6478.182-r2]: https://github.com/instrumentisto/libwebrtc-bin/releases/tag/126.0.6478.182-r2
+[127.0.6533.72]: https://github.com/instrumentisto/libwebrtc-bin/releases/tag/127.0.6533.72
 
 
 

README.md

@@ -2,7 +2,7 @@ Medea Flutter-WebRTC
 ====================
 
 [![pub](https://img.shields.io/pub/v/medea_flutter_webrtc "pub")](https://pub.dev/packages/medea_flutter_webrtc)
-[![libwebrtc](https://img.shields.io/badge/libwebrtc-126.0.6478.182-r2-blue "libwebrtc")](https://github.com/instrumentisto/libwebrtc-bin/releases/tag/126.0.6478.182-r2)
+[![libwebrtc](https://img.shields.io/badge/libwebrtc-127.0.6533.72-blue "libwebrtc")](https://github.com/instrumentisto/libwebrtc-bin/releases/tag/127.0.6533.72)
 [![OpenAL](https://img.shields.io/badge/OpenAL-1.23.1-blue "OpenAL")](https://github.com/kcat/openal-soft/releases/tag/1.23.1)
 
 [Changelog](https://github.com/instrumentisto/medea-flutter-webrtc/blob/main/CHANGELOG.md)

android/build.gradle

@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.instrumentisto:libwebrtc-bin:126.0.6478.182-r2@aar'
+    implementation 'com.github.instrumentisto:libwebrtc-bin:127.0.6533.72@aar'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 }

android/src/main/kotlin/com/instrumentisto/medea_flutter_webrtc/proxy/PeerObserver.kt

@@ -65,11 +65,11 @@ class PeerObserver : PeerConnection.Observer {
   override fun onTrack(transceiver: RtpTransceiver?) {
     if (transceiver != null && peer != null) {
       if (!peer!!.disposed) {
+        val receiverId = transceiver.receiver.id()
         Handler(Looper.getMainLooper()).post {
-          val receiver = transceiver.receiver
           val transceivers = peer?.getTransceivers()!!
           for (trans in transceivers) {
-            if (trans.receiver.id == receiver.id()) {
+            if (trans.receiver.id == receiverId) {
               peer?.observableEventBroadcaster()?.onTrack(trans.receiver.track, trans)
             }
           }

crates/libwebrtc-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libwebrtc-sys"
-version = "0.0.0+126.0.6478.182-r2"
+version = "0.0.0+127.0.6533.72"
 edition = "2021"
 rust-version = "1.62"
 publish = false

crates/libwebrtc-sys/build.rs

@@ -23,7 +23,7 @@ use walkdir::{DirEntry, WalkDir};
 /// [`libwebrtc-bin`]: https://github.com/instrumentisto/libwebrtc-bin
 static LIBWEBRTC_URL: &str =
     "https://github.com/instrumentisto/libwebrtc-bin/releases/download\
-                                                    /126.0.6478.182-r2";
+                                                    /127.0.6533.72";
 
 /// URL for downloading `openal-soft` source code.
 static OPENAL_URL: &str =
@@ -120,19 +120,19 @@ fn get_target() -> anyhow::Result<String> {
 fn get_expected_libwebrtc_hash() -> anyhow::Result<&'static str> {
     Ok(match get_target()?.as_str() {
         "aarch64-unknown-linux-gnu" => {
-            "f35ef4076a4c6a9adce54717f14c7408a5a3e2d9e09c3f112a70a823b7369933"
+            "56ccde930cacd2251fff8aba9991782f93deb1883fd9763ae3b297d2b2973023"
         }
         "x86_64-unknown-linux-gnu" => {
-            "9bc1995fcd28d6b26191717a92bae64e13e583d15e8c582322527b43be2b7c84"
+            "2dd4c7cb497d6b1ce10a52a22effd0ae5d616f50ec12192956d904cca838743b"
         }
         "aarch64-apple-darwin" => {
-            "8e135face9e03b3f90c9fd73d02bc9a024fe9f1ac07fd8aa6d4c1dfaef61de86"
+            "9ce99c5ede1bcf16ddf630be9a0fc34c086c948f17645254c9537a43c831bbc1"
         }
         "x86_64-apple-darwin" => {
-            "0ffcee42398804e27408f1c4acadefce69f88e425ac311eda8a6ff0f9da12eb1"
+            "e3dbc4cb009ed8413c7ff18edb5a82cb7fdc8502eed0cc02ffffffbfca4f6560"
         }
         "x86_64-pc-windows-msvc" => {
-            "7dda117194077d0408d9e644014cca499f80dd4df4c78dc069ba09ac4b95549a"
+            "69045ff8f9b239f680e6df0256993981d3d4218de5618238d3cc1c111c6b4801"
         }
         arch => return Err(anyhow::anyhow!("Unsupported target: {arch}")),
     })

example/ios/Podfile.lock

@@ -1,11 +1,11 @@
 PODS:
   - Flutter (1.0.0)
-  - instrumentisto-libwebrtc-bin (126.0.6478.182-r2)
+  - instrumentisto-libwebrtc-bin (127.0.6533.72)
   - integration_test (0.0.1):
     - Flutter
   - medea_flutter_webrtc (0.10.0):
     - Flutter
-    - instrumentisto-libwebrtc-bin (= 126.0.6478.182-r2)
+    - instrumentisto-libwebrtc-bin (= 127.0.6533.72)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)

ios/medea_flutter_webrtc.podspec

@@ -15,7 +15,7 @@ Flutter WebRTC plugin based on Google WebRTC.
   s.source           = { :path => '.' }
   s.source_files     = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'instrumentisto-libwebrtc-bin', '126.0.6478.182-r2'
+  s.dependency 'instrumentisto-libwebrtc-bin', '127.0.6533.72'
   s.platform         = :ios, '13.0'
   s.static_framework = true