fix: Fixed confusing room options causing settings to overwrite.

livekit · Aug 8, 2024 · 5387d76 · 5387d76
1 parent c0c4140
commit 5387d76
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/example/lib/pages/prejoin.dart b/example/lib/pages/prejoin.dart
@@ -165,10 +165,10 @@ class _PreJoinPageState extends State<PreJoinPage> {
 
     try {
       //create new room
-      final room = Room();
-
-      // Create a Listener before connecting
-      final listener = room.createListener();
+      var encoding = VideoEncoding(
+        maxBitrate: 5 * 1000 * 1000,
+        maxFramerate: 30,
+      );
 
       E2EEOptions? e2eeOptions;
       if (args.e2ee && args.e2eeKey != null) {
@@ -177,36 +177,38 @@ class _PreJoinPageState extends State<PreJoinPage> {
         await keyProvider.setKey(args.e2eeKey!);
       }
 
-      // Try to connect to the room
-      // This will throw an Exception if it fails for any reason.
-      await room.connect(
-        args.url,
-        args.token,
+      final room = Room(
         roomOptions: RoomOptions(
           adaptiveStream: args.adaptiveStream,
           dynacast: args.dynacast,
           defaultAudioPublishOptions: const AudioPublishOptions(
             name: 'custom_audio_track_name',
           ),
+          defaultCameraCaptureOptions: CameraCaptureOptions(
+              maxFrameRate: 30,
+              params: VideoParameters(
+                dimensions: const VideoDimensions(1280, 720),
+                encoding: encoding,
+              )),
           defaultVideoPublishOptions: VideoPublishOptions(
             simulcast: args.simulcast,
             videoCodec: args.preferredCodec,
             backupVideoCodec: BackupVideoCodec(
               enabled: args.enableBackupVideoCodec,
             ),
+            videoEncoding: encoding,
           ),
-          defaultScreenShareCaptureOptions: const ScreenShareCaptureOptions(
-              useiOSBroadcastExtension: true,
-              params: VideoParameters(
-                  dimensions: VideoDimensionsPresets.h1080_169,
-                  encoding: VideoEncoding(
-                    maxBitrate: 3 * 1000 * 1000,
-                    maxFramerate: 15,
-                  ))),
-          defaultCameraCaptureOptions: CameraCaptureOptions(
-              maxFrameRate: 30, params: _selectedVideoParameters),
           e2eeOptions: e2eeOptions,
         ),
+      );
+      // Create a Listener before connecting
+      final listener = room.createListener();
+
+      // Try to connect to the room
+      // This will throw an Exception if it fails for any reason.
+      await room.connect(
+        args.url,
+        args.token,
         fastConnectOptions: FastConnectOptions(
           microphone: TrackOption(track: _audioTrack),
           camera: TrackOption(track: _videoTrack),

diff --git a/lib/src/core/engine.dart b/lib/src/core/engine.dart
@@ -100,7 +100,7 @@ class Engine extends Disposable with EventsEmittable<EngineEvent> {
   String? url;
   String? token;
 
-  ConnectOptions connectOptions;
+  late ConnectOptions connectOptions;
   RoomOptions roomOptions;
   FastConnectOptions? fastConnectOptions;
 
@@ -143,7 +143,6 @@ class Engine extends Disposable with EventsEmittable<EngineEvent> {
   }
 
   Engine({
-    required this.connectOptions,
     required this.roomOptions,
     SignalClient? signalClient,
     PeerConnectionCreate? peerConnectionCreate,

diff --git a/lib/src/core/room.dart b/lib/src/core/room.dart
@@ -111,12 +111,10 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
   late EventsListener<SignalEvent> _signalListener;
 
   Room({
-    ConnectOptions connectOptions = const ConnectOptions(),
     RoomOptions roomOptions = const RoomOptions(),
     Engine? engine,
   }) : engine = engine ??
             Engine(
-              connectOptions: connectOptions,
               roomOptions: roomOptions,
             ) {
     //
@@ -152,10 +150,10 @@ class Room extends DisposableChangeNotifier with EventsEmittable<RoomEvent> {
     String url,
     String token, {
     ConnectOptions? connectOptions,
-    RoomOptions? roomOptions,
     FastConnectOptions? fastConnectOptions,
   }) async {
-    roomOptions ??= this.roomOptions;
+    var roomOptions = this.roomOptions;
+    connectOptions ??= ConnectOptions();
     if (roomOptions.e2eeOptions != null) {
       if (!lkPlatformSupportsE2EE()) {
         throw LiveKitE2EEException('E2EE is not supported on this platform');