Merge branch 'livekit:main' into video-size-constraint

Author: holzgeist

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.4.5
+
+* feat: noise filter for flutter web. (#762)
+
 ## 2.4.4
 
 * feat: data stream

ios/livekit_client.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'livekit_client'
-  s.version             = '2.4.4'
+  s.version             = '2.4.5'
   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/'

lib/livekit_client.dart

@@ -44,7 +44,11 @@ export 'src/track/remote/audio.dart';
 export 'src/track/remote/remote.dart';
 export 'src/track/remote/video.dart';
 export 'src/track/track.dart';
+
 export 'src/track/processor.dart';
+export 'src/track/processor_native.dart'
+    if (dart.library.js_interop) 'src/track/processor_web.dart';
+
 export 'src/track/audio_visualizer.dart';
 export 'src/types/other.dart';
 export 'src/types/participant_permissions.dart';

lib/src/livekit.dart

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

lib/src/support/platform/io.dart

@@ -14,6 +14,8 @@
 
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
+
 import '../platform.dart';
 
 PlatformType lkPlatformImplementation() {
@@ -31,7 +33,7 @@ bool lkPlatformIsWebMobileImplementation() {
 }
 
 bool lkPlatformIsTestImplementation() =>
-    Platform.environment.containsKey('FLUTTER_TEST');
+    !kIsWeb && !kIsWasm && Platform.environment.containsKey('FLUTTER_TEST');
 
 bool lkE2EESupportedImplementation() {
   return [

lib/src/track/local/local.dart

@@ -36,6 +36,9 @@ import '../track.dart';
 import 'audio.dart';
 import 'video.dart';
 
+import '../processor_native.dart'
+    if (dart.library.js_interop) '../processor_web.dart';
+
 /// Used to group [LocalVideoTrack] and [RemoteVideoTrack].
 mixin VideoTrack on Track {
   @internal
@@ -258,13 +261,16 @@ abstract class LocalTrack extends Track {
 
     _processor = processor;
 
-    var processorOptions = ProcessorOptions(
-      kind: kind,
+    var processorOptions = AudioProcessorOptions(
       track: mediaStreamTrack,
     );
 
     await _processor!.init(processorOptions);
 
+    if (_processor?.processedTrack != null) {
+      setProcessedTrack(processor.processedTrack!);
+    }
+
     logger.fine('processor initialized');
 
     events.emit(TrackProcessorUpdateEvent(track: this, processor: _processor));

lib/src/track/options.dart

@@ -21,6 +21,9 @@ import '../track/local/video.dart';
 import '../types/video_parameters.dart';
 import 'processor.dart';
 
+import 'processor_native.dart'
+    if (dart.library.js_interop) 'processor_web.dart';
+
 /// A type that represents front or back of the camera.
 enum CameraPosition {
   front,

lib/src/track/processor.dart

@@ -12,18 +12,6 @@ class ProcessorOptions<T extends TrackType> {
   });
 }
 
-class AudioProcessorOptions extends ProcessorOptions {
-  AudioProcessorOptions({
-    required MediaStreamTrack track,
-  }) : super(kind: TrackType.AUDIO, track: track);
-}
-
-class VideoProcessorOptions extends ProcessorOptions {
-  VideoProcessorOptions({
-    required MediaStreamTrack track,
-  }) : super(kind: TrackType.VIDEO, track: track);
-}
-
 abstract class TrackProcessor<T extends ProcessorOptions> {
   String get name;
 
@@ -36,4 +24,6 @@ abstract class TrackProcessor<T extends ProcessorOptions> {
   Future<void> onPublish(Room room);
 
   Future<void> onUnpublish();
+
+  MediaStreamTrack? get processedTrack;
 }

lib/src/track/processor_native.dart

@@ -0,0 +1,16 @@
+import 'package:flutter_webrtc/flutter_webrtc.dart';
+
+import '../types/other.dart';
+import 'processor.dart';
+
+class AudioProcessorOptions extends ProcessorOptions {
+  AudioProcessorOptions({
+    required MediaStreamTrack track,
+  }) : super(kind: TrackType.AUDIO, track: track);
+}
+
+class VideoProcessorOptions extends ProcessorOptions {
+  VideoProcessorOptions({
+    required MediaStreamTrack track,
+  }) : super(kind: TrackType.VIDEO, track: track);
+}

lib/src/track/processor_web.dart

@@ -1,14 +1,22 @@
-import 'package:web/web.dart';
+import 'package:flutter_webrtc/flutter_webrtc.dart' show MediaStreamTrack;
+import 'package:web/web.dart' show AudioContext, HTMLAudioElement;
 
+import '../types/other.dart';
 import 'processor.dart';
 
-class AudioProcessorOptionsWeb extends AudioProcessorOptions {
-  AudioProcessorOptionsWeb({
+class AudioProcessorOptions extends ProcessorOptions {
+  AudioProcessorOptions({
+    required MediaStreamTrack track,
     this.audioElement,
     this.audioContext,
-    required super.track,
-  });
+  }) : super(kind: TrackType.AUDIO, track: track);
 
   HTMLAudioElement? audioElement;
   AudioContext? audioContext;
 }
+
+class VideoProcessorOptions extends ProcessorOptions {
+  VideoProcessorOptions({
+    required MediaStreamTrack track,
+  }) : super(kind: TrackType.VIDEO, track: track);
+}

lib/src/track/track.dart

@@ -46,6 +46,8 @@ abstract class Track extends DisposableChangeNotifier
   rtc.MediaStreamTrack get mediaStreamTrack => _mediaStreamTrack;
   rtc.MediaStreamTrack _mediaStreamTrack;
 
+  rtc.MediaStreamTrack? _originalTrack;
+
   String? sid;
   rtc.RTCRtpTransceiver? transceiver;
   String? _cid;
@@ -137,6 +139,11 @@ abstract class Track extends DisposableChangeNotifier
       await mediaStreamTrack.stop();
     }
 
+    if (_originalTrack != null) {
+      await _originalTrack?.stop();
+      _originalTrack = null;
+    }
+
     _active = false;
     return true;
   }
@@ -220,4 +227,10 @@ abstract class Track extends DisposableChangeNotifier
       stream: stream,
     ));
   }
+
+  @internal
+  void setProcessedTrack(rtc.MediaStreamTrack track) {
+    _originalTrack = _mediaStreamTrack;
+    _mediaStreamTrack = track;
+  }
 }

macos/livekit_client.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'livekit_client'
-  s.version             = '2.4.4'
+  s.version             = '2.4.5'
   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/'

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.4.4
+version: 2.4.5
 homepage: https://github.com/livekit/client-sdk-flutter
 
 environment: