Merge remote-tracking branch 'upstream/main'

Author: Tyler

.changes/audio-renderer-api

@@ -1 +1 @@
-2.6.5
+2.7.0

.version

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 2.7.0
+
+* Added: Add setVideoDimensions for remote track publications
+* Added: Add audio renderer API for receiving raw audio frames
+* Changed: Bump flutter-webrtc to 1.4.0 and upgrade to libwebrtc m144
+* Fixed: Add signal RTT tracking via pingReq/pongResp
+* Fixed: Add jitter to reconnect retry delays
+* Fixed: Fix missing params in CameraCaptureOptions.copyWith
+* Fixed: Fix missing RoomReconnectedEvent and incorrect SyncState timing during signal-only reconnection
+* Fixed: Fix VP9/SVC dynacast layer handling
+* Fixed: Stop processor on track end
+* Fixed: Include last server offer in SyncState during reconnection
+
 ## 2.6.5
 
 * Added: Send reconnect reason to server during WebSocket reconnection

CHANGELOG.md

@@ -46,7 +46,7 @@ Include this package to your `pubspec.yaml`
 ```yaml
 ---
 dependencies:
-  livekit_client: ^2.6.5
+  livekit_client: ^2.7.0
 ```
 
 ### iOS

README.md

@@ -52,7 +52,7 @@ android {
     dependencies {
         testImplementation("org.jetbrains.kotlin:kotlin-test")
         testImplementation("org.mockito:mockito-core:5.0.0")
-        implementation 'io.github.webrtc-sdk:android:137.7151.04'
+        implementation 'io.github.webrtc-sdk:android:144.7559.01'
         implementation 'io.livekit:noise:2.0.0'
     }
 

android/build.gradle

@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>13.0</string>
 </dict>
 </plist>

example/ios/Flutter/AppFrameworkInfo.plist

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'livekit_client'
-  s.version             = '2.6.5'
+  s.version             = '2.7.0'
   s.summary             = 'Open source platform for real-time audio and video.'
   s.description         = 'Open source platform for real-time audio and video.'
   s.homepage            = 'https://livekit.io/'
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.static_framework    = true
 
   s.dependency 'Flutter'
-  s.dependency 'WebRTC-SDK', '137.7151.04'
+  s.dependency 'WebRTC-SDK', '144.7559.01'
   s.dependency 'flutter_webrtc'
 end

ios/livekit_client.podspec

@@ -15,6 +15,7 @@
 // ignore_for_file: deprecated_member_use_from_same_package
 
 import 'dart:async';
+import 'dart:math' as math;
 import 'dart:typed_data' show Uint8List;
 
 import 'package:flutter/foundation.dart' show kDebugMode, kIsWeb;
@@ -1018,7 +1019,11 @@ class Engine extends Disposable with EventsEmittable<EngineEvent> {
       return;
     }
 
-    final delay = defaultRetryDelaysInMs[reconnectAttempts!];
+    var delay = defaultRetryDelaysInMs[reconnectAttempts!];
+    // Add random jitter to prevent thundering herd on reconnect
+    if (reconnectAttempts! > 1) {
+      delay += math.Random().nextInt(1000);
+    }
 
     events.emit(EngineAttemptReconnectEvent(
       attempt: reconnectAttempts! + 1,
@@ -1236,6 +1241,7 @@ class Engine extends Disposable with EventsEmittable<EngineEvent> {
     required List<String> trackSidsDisabled,
   }) async {
     final previousAnswer = (await subscriber?.pc.getLocalDescription())?.toPBType();
+    final previousOffer = (await subscriber?.pc.getRemoteDescription())?.toPBType();
 
     // Build data channel receive states for reliability
     final dataChannelReceiveStates = <lk_rtc.DataChannelReceiveState>[];
@@ -1250,6 +1256,7 @@ class Engine extends Disposable with EventsEmittable<EngineEvent> {
     }
     signalClient.sendSyncState(
       answer: previousAnswer,
+      offer: previousOffer,
       subscription: subscription,
       publishTracks: publishTracks,
       dataChannelInfo: dataChannelInfo(),

lib/src/core/engine.dart

@@ -51,7 +51,7 @@ import '../types/data_stream.dart';
 import '../types/other.dart';
 import '../types/rpc.dart';
 import '../types/transcription_segment.dart';
-import '../utils.dart' show unpackStreamId;
+import '../utils.dart' show isSVCCodec, unpackStreamId;
 import 'engine.dart';
 import 'participant_collection.dart';
 import 'pending_track_queue.dart';
@@ -363,7 +363,8 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
         }
       } else if (event.subscribedQualities.isNotEmpty) {
         final videoTrack = publication.track as LocalVideoTrack;
-        await videoTrack.updatePublishingLayers(videoTrack, event.subscribedQualities);
+        await videoTrack.setPublishingLayers(videoTrack, event.subscribedQualities,
+            isSVC: isSVCCodec(videoTrack.codec ?? ''));
       }
     })
     ..on<SignalSubscriptionPermissionUpdateEvent>((event) async {
@@ -499,6 +500,7 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
     ..on<EngineResumedEvent>((event) async {
       // re-send tracks permissions
       localParticipant?.sendTrackSubscriptionPermissions();
+      events.emit(const RoomReconnectedEvent());
       notifyListeners();
     })
     ..on<EngineFullRestartingEvent>((event) async {
@@ -536,9 +538,12 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
       notifyListeners();
     })
     ..on<EngineResumingEvent>((event) async {
-      await _sendSyncState();
+      events.emit(const RoomResumingEvent());
       notifyListeners();
     })
+    ..on<SignalReconnectedEvent>((event) async {
+      await _sendSyncState();
+    })
     ..on<EngineAttemptReconnectEvent>((event) async {
       events.emit(RoomAttemptReconnectEvent(
         attempt: event.attempt,

lib/src/core/room.dart

@@ -53,8 +53,11 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
   Timer? _pingIntervalTimer;
 
   int get pingCount => _pingCount;
-
   int _pingCount = 0;
+
+  /// Signal round-trip time in milliseconds, calculated from pingReq/pongResp.
+  int get rtt => _rtt;
+  int _rtt = 0;
   String? participantSid;
 
   int _requestId = 0;
@@ -345,6 +348,11 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
         _pingCount++;
         _resetPingTimeout();
         break;
+      case lk_rtc.SignalResponse_Message.pongResp:
+        _rtt = DateTime.timestamp().millisecondsSinceEpoch - msg.pongResp.lastPingTimestamp.toInt();
+        _pingCount++;
+        _resetPingTimeout();
+        break;
       case lk_rtc.SignalResponse_Message.reconnect:
         events.emit(SignalReconnectResponseEvent(response: msg.reconnect));
         break;
@@ -379,7 +387,14 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
   }
 
   void _sendPing() {
-    _sendRequest(lk_rtc.SignalRequest()..ping = Int64(DateTime.timestamp().millisecondsSinceEpoch));
+    final now = DateTime.timestamp().millisecondsSinceEpoch;
+    // Send both ping and pingReq for compatibility with old and new servers
+    _sendRequest(lk_rtc.SignalRequest()..ping = Int64(now));
+    _sendRequest(lk_rtc.SignalRequest()
+      ..pingReq = lk_rtc.Ping(
+        timestamp: Int64(now),
+        rtt: Int64(_rtt),
+      ));
   }
 
   void _startPingInterval() {
@@ -485,6 +500,7 @@ extension SignalClientRequests on SignalClient {
   @internal
   void sendSyncState({
     required lk_rtc.SessionDescription? answer,
+    required lk_rtc.SessionDescription? offer,
     required lk_rtc.UpdateSubscription subscription,
     required Iterable<lk_rtc.TrackPublishedResponse>? publishTracks,
     required Iterable<lk_rtc.DataChannelInfo>? dataChannelInfo,
@@ -494,6 +510,7 @@ extension SignalClientRequests on SignalClient {
       _sendRequest(lk_rtc.SignalRequest(
         syncState: lk_rtc.SyncState(
           answer: answer,
+          offer: offer,
           subscription: subscription,
           publishTracks: publishTracks,
           dataChannels: dataChannelInfo,