fix: improve processor handling

.version

@@ -1 +1 @@
-2.8.0
+2.8.1

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.8.1
+
+* Added: Add agent deployment targeting to token source options
+* Fixed: Android plugin compatibility with AGP 9 built-in Kotlin
+* Fixed: Use maintain-resolution as the default video degradation preference for local video publishing
+
 ## 2.8.0
 
 * Added: Session API support for simpler E2EE setup

README.md

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

android/build.gradle

@@ -2,7 +2,7 @@ group = "io.livekit.plugin"
 version = "1.0-SNAPSHOT"
 
 buildscript {
-    ext.kotlin_version = "1.8.22"
+    ext.kotlin_version = "2.1.0"
     repositories {
         google()
         mavenCentral()
@@ -22,7 +22,18 @@ allprojects {
 }
 
 apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
+
+// AGP 9's built-in Kotlin compiles Kotlin itself and rejects the Kotlin Gradle
+// Plugin. Apply KGP only when built-in Kotlin is NOT active: that means AGP < 9,
+// or AGP 9 with android.builtInKotlin=false (the configuration Flutter currently
+// ships by default while the ecosystem migrates).
+def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize(".")[0] as int
+def builtInKotlinActive = agpMajor >= 9 &&
+    (!project.hasProperty("android.builtInKotlin") ||
+        Boolean.parseBoolean(project.property("android.builtInKotlin").toString()))
+if (!builtInKotlinActive) {
+    apply plugin: "kotlin-android"
+}
 
 android {
     if (project.android.hasProperty("namespace")) {
@@ -36,10 +47,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
-
     sourceSets {
         main.java.srcDirs += "src/main/kotlin"
         test.java.srcDirs += "src/test/kotlin"
@@ -68,3 +75,19 @@ android {
         }
     }
 }
+
+// Configure the Kotlin JVM target. The compilerOptions DSL requires KGP 1.9+ or
+// AGP 9 built-in Kotlin; older Flutter app templates ship KGP 1.8.x, which only
+// supports the legacy kotlinOptions DSL.
+def kotlinExt = project.extensions.findByName("kotlin")
+if (kotlinExt?.hasProperty("compilerOptions")) {
+    kotlin {
+        compilerOptions {
+            jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
+        }
+    }
+} else {
+    android.kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+}

ios/livekit_client.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'livekit_client'
-  s.version             = '2.8.0'
+  s.version             = '2.8.1'
   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', '144.7559.01'
+  s.dependency 'WebRTC-SDK', '144.7559.09'
   s.dependency 'flutter_webrtc'
 end

lib/src/livekit.dart

@@ -20,7 +20,7 @@ import 'support/platform.dart' show lkPlatformIsMobile;
 /// Main entry point to connect to a room.
 /// {@category Room}
 class LiveKitClient {
-  static const version = '2.8.0';
+  static const version = '2.8.1';
 
   /// Initialize the WebRTC plugin. If this is not manually called, will be
   /// initialized with default settings.

lib/src/participant/local.dart

@@ -386,10 +386,7 @@ class LocalParticipant extends Participant<LocalTrackPublication> {
       }
 
       if ([TrackSource.camera, TrackSource.screenShareVideo].contains(track.source)) {
-        final degradationPreference = publishOptions.degradationPreference ??
-            getDefaultDegradationPreference(
-              track,
-            );
+        final degradationPreference = publishOptions.degradationPreference ?? DegradationPreference.maintainResolution;
         await track.setDegradationPreference(degradationPreference);
       }
 
@@ -487,10 +484,7 @@ class LocalParticipant extends Participant<LocalTrackPublication> {
       }
 
       if ([TrackSource.camera, TrackSource.screenShareVideo].contains(track.source)) {
-        final degradationPreference = publishOptions.degradationPreference ??
-            getDefaultDegradationPreference(
-              track,
-            );
+        final degradationPreference = publishOptions.degradationPreference ?? DegradationPreference.maintainResolution;
         await track.setDegradationPreference(degradationPreference);
       }
 
@@ -593,17 +587,6 @@ class LocalParticipant extends Participant<LocalTrackPublication> {
     await pub.dispose();
   }
 
-  DegradationPreference getDefaultDegradationPreference(LocalVideoTrack track) {
-    // a few of reasons we have different default paths:
-    // 1. without this, Chrome seems to aggressively resize the SVC video stating `quality-limitation: bandwidth` even when BW isn't an issue
-    // 2. since we are overriding contentHint to motion (to workaround L1T3 publishing), it overrides the default degradationPreference to `balanced`
-    final VideoDimensions dimensions = track.currentOptions.params.dimensions;
-    if (track.source == TrackSource.screenShareVideo || dimensions.height >= 1080) {
-      return DegradationPreference.maintainResolution;
-    }
-    return DegradationPreference.balanced;
-  }
-
   /// Convenience method to unpublish all tracks.
   Future<void> unpublishAllTracks({bool notify = true, bool? stopOnUnpublish}) async {
     final trackSids = trackPublications.keys.toSet();

lib/src/token_source/room_configuration.dart

@@ -26,9 +26,13 @@ class RoomAgentDispatch {
   /// Metadata for the agent.
   final String? metadata;
 
+  /// Optional deployment to target. Leave empty to target the production deployment.
+  final String? deployment;
+
   const RoomAgentDispatch({
     this.agentName,
     this.metadata,
+    this.deployment,
   });
 
   factory RoomAgentDispatch.fromJson(Map<String, dynamic> json) => _$RoomAgentDispatchFromJson(json);

lib/src/token_source/token_source.dart

@@ -43,6 +43,9 @@ class TokenRequestOptions {
   /// Metadata passed to the agent job.
   final String? agentMetadata;
 
+  /// Optional deployment to target. Leave empty to target the production deployment.
+  final String? agentDeployment;
+
   const TokenRequestOptions({
     this.roomName,
     this.participantName,
@@ -51,15 +54,16 @@ class TokenRequestOptions {
     this.participantAttributes,
     this.agentName,
     this.agentMetadata,
+    this.agentDeployment,
   });
 
   factory TokenRequestOptions.fromJson(Map<String, dynamic> json) => _$TokenRequestOptionsFromJson(json);
   Map<String, dynamic> toJson() => _$TokenRequestOptionsToJson(this);
 
   /// Converts this options object to a wire-format request.
   TokenSourceRequest toRequest() {
-    final List<RoomAgentDispatch>? agents = (agentName != null || agentMetadata != null)
-        ? [RoomAgentDispatch(agentName: agentName, metadata: agentMetadata)]
+    final List<RoomAgentDispatch>? agents = (agentName != null || agentMetadata != null || agentDeployment != null)
+        ? [RoomAgentDispatch(agentName: agentName, metadata: agentMetadata, deployment: agentDeployment)]
         : null;
 
     return TokenSourceRequest(
@@ -83,6 +87,7 @@ class TokenRequestOptions {
         other.participantMetadata == participantMetadata &&
         other.agentName == agentName &&
         other.agentMetadata == agentMetadata &&
+        other.agentDeployment == agentDeployment &&
         const MapEquality().equals(other.participantAttributes, participantAttributes);
   }
 
@@ -95,6 +100,7 @@ class TokenRequestOptions {
       participantMetadata,
       agentName,
       agentMetadata,
+      agentDeployment,
       const MapEquality().hash(participantAttributes),
     );
   }

lib/src/track/local/local.dart

@@ -353,7 +353,7 @@ abstract class LocalTrack extends Track {
     await _processor!.init(processorOptions);
 
     if (_processor?.processedTrack != null) {
-      setProcessedTrack(processor.processedTrack!);
+      await setProcessedTrack(processor.processedTrack!);
     }
 
     logger.fine('processor initialized');
@@ -379,6 +379,8 @@ abstract class LocalTrack extends Track {
     // force re-setting of the mediaStreamTrack on the sender
     //await this.setMediaStreamTrack(this._mediaStreamTrack, true);
 
+    await setProcessedTrack(null);
+
     events.emit(TrackProcessorUpdateEvent(track: this));
   }
 

lib/src/track/track.dart

@@ -222,8 +222,25 @@ abstract class Track extends DisposableChangeNotifier with EventsEmittable<Track
   }
 
   @internal
-  void setProcessedTrack(rtc.MediaStreamTrack track) {
-    _originalTrack = _mediaStreamTrack;
-    _mediaStreamTrack = track;
+  Future<void> setProcessedTrack(rtc.MediaStreamTrack? track) async {
+    if (track != null) {
+      // set processed track
+      _originalTrack = _mediaStreamTrack;
+      _mediaStreamTrack = track;
+      if (_originalTrack != null) {
+        await _mediaStream.removeTrack(_originalTrack!);
+      }
+      await _mediaStream.addTrack(track);
+    } else if (_originalTrack != null) {
+      // reset processed track
+      await _mediaStream.removeTrack(_mediaStreamTrack);
+      await _mediaStream.addTrack(_originalTrack!);
+      _mediaStreamTrack = _originalTrack!;
+      _originalTrack = null;
+    }
+    events.emit(TrackStreamUpdatedEvent(
+      track: this,
+      stream: _mediaStream,
+    ));
   }
 }

macos/livekit_client.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'livekit_client'
-  s.version             = '2.8.0'
+  s.version             = '2.8.1'
   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 'FlutterMacOS'
-  s.dependency 'WebRTC-SDK', '144.7559.01'
+  s.dependency 'WebRTC-SDK', '144.7559.09'
   s.dependency 'flutter_webrtc'
 end

pubspec.yaml

@@ -15,7 +15,7 @@
 name: livekit_client
 description: Flutter Client SDK for LiveKit. Build real-time video and audio
   into your apps. Supports iOS, Android, and Web.
-version: 2.8.0
+version: 2.8.1
 homepage: https://github.com/livekit/client-sdk-flutter
 
 environment:
@@ -46,7 +46,7 @@ dependencies:
   json_annotation: ^4.9.0
 
   # Fix version to avoid version conflicts between WebRTC-SDK pods, which both this package and flutter_webrtc depend on.
-  flutter_webrtc: 1.4.0
+  flutter_webrtc: 1.5.2
   dart_webrtc: ^1.8.0
 
 dev_dependencies: