Merge pull request #28 from GetStream/chore/sync_0.14.0

Chore/sync 0.14.0

Author: renefloor

common/darwin/Classes/FlutterWebRTCPlugin.m

@@ -6,12 +6,12 @@
 #import "FlutterRTCMediaStream.h"
 #import "FlutterRTCPeerConnection.h"
 #import "FlutterRTCVideoRenderer.h"
-#import "FlutterRTCMediaRecorder.h"
 #import "FlutterRTCFrameCryptor.h"
 #import "VideoEffectProcessor.h"
 #import "ProcessorProvider.h"
 #import "VideoFrameProcessor.h"
 #if TARGET_OS_IPHONE
+#import "FlutterRTCMediaRecorder.h"
 #import "FlutterRTCVideoPlatformViewFactory.h"
 #import "FlutterRTCVideoPlatformViewController.h"
 #endif
@@ -1529,8 +1529,9 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
                 message:[NSString stringWithFormat:@"Error: peerConnection not found!"]
                 details:nil]);
     }
+#if TARGET_OS_IOS
   } else if ([@"startRecordToFile" isEqualToString:call.method]){
-        #if TARGET_OS_IOS
+
             NSDictionary* argsMap = call.arguments;
             NSNumber* recorderId = argsMap[@"recorderId"];
             NSString* path = argsMap[@"path"];
@@ -1549,10 +1550,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
                 ];
             }
             result(nil);
-        #endif
-      
     } else if ([@"stopRecordToFile" isEqualToString:call.method]) {
-       #if TARGET_OS_IOS
                 NSDictionary* argsMap = call.arguments;
                 NSNumber* recorderId = argsMap[@"recorderId"];
                 FlutterRTCMediaRecorder* recorder = self.recorders[recorderId];
@@ -1564,7 +1562,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
                                               message:[NSString stringWithFormat:@"Error: recorder with id %@ not found!",recorderId]
                                                 details:nil]);
                 }
-        #endif
+#endif
     } else {
     [self handleFrameCryptorMethodCall:call result:result];
   }

example/lib/src/get_user_media_sample.dart

@@ -125,7 +125,7 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
     if (await file.exists()) {
       await file.delete();
     }
-    _mediaRecorder = MediaRecorder();
+    _mediaRecorder = MediaRecorder(albumName: 'FlutterWebRTC');
     setState(() {});
 
     final videoTrack = _localStream!
@@ -145,7 +145,7 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
     }
 
     // album name works only for android, for ios use gallerySaver
-    await _mediaRecorder?.stop(albumName: 'FlutterWebRTC');
+    await _mediaRecorder?.stop();
     setState(() {
       _mediaRecorder = null;
     });

ios/stream_webrtc_flutter.podspec

@@ -15,7 +15,7 @@ A new flutter plugin project.
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'StreamWebRTC', '125.6422.065'
+  s.dependency 'StreamWebRTC', '125.6422.070'
   s.ios.deployment_target = '13.0'
   s.static_framework = true
   s.pod_target_xcconfig = {

lib/src/media_recorder.dart

@@ -1,9 +1,17 @@
+import 'package:flutter/foundation.dart';
+
 import 'package:webrtc_interface/webrtc_interface.dart' as rtc;
 
 import '../stream_webrtc_flutter.dart';
+import 'native/media_recorder_impl.dart' show MediaRecorderNative;
 
 class MediaRecorder extends rtc.MediaRecorder {
-  MediaRecorder() : _delegate = mediaRecorder();
+  MediaRecorder({
+    String? albumName,
+  }) : _delegate = (kIsWeb || kIsWasm)
+            ? mediaRecorder()
+            : MediaRecorderNative(albumName: albumName);
+
   final rtc.MediaRecorder _delegate;
 
   @override
@@ -21,8 +29,7 @@ class MediaRecorder extends rtc.MediaRecorder {
   }
 
   @override
-  Future stop({String? albumName}) =>
-      _delegate.stop(albumName: albumName ?? "FlutterWebRtc");
+  Future stop() => _delegate.stop();
 
   @override
   void startWeb(

lib/src/native/media_recorder_impl.dart

@@ -7,9 +7,13 @@ import 'media_stream_track_impl.dart';
 import 'utils.dart';
 
 class MediaRecorderNative extends MediaRecorder {
+  MediaRecorderNative({
+    String? albumName = 'FlutterWebRTC',
+  }) : _albumName = albumName;
   static final _random = Random();
   final _recorderId = _random.nextInt(0x7FFFFFFF);
   var _isStarted = false;
+  final String? _albumName;
 
   @override
   Future<void> start(
@@ -42,13 +46,13 @@ class MediaRecorderNative extends MediaRecorder {
   }
 
   @override
-  Future<dynamic> stop({String? albumName}) async {
+  Future<dynamic> stop() async {
     if (!_isStarted) {
       throw "Media recorder not started!";
     }
     return await WebRTC.invokeMethod('stopRecordToFile', {
       'recorderId': _recorderId,
-      'albumName': albumName,
+      'albumName': _albumName,
     });
   }
 }

lib/src/native/rtc_video_platform_view_controller.dart

@@ -32,9 +32,6 @@ class RTCVideoPlatformViewController extends ValueNotifier<RTCVideoValue>
   @override
   int get videoHeight => value.height.toInt();
 
-  @override
-  RTCVideoValue get videoValue => value;
-
   @override
   int? get textureId => _viewId;
 

lib/src/native/rtc_video_renderer_impl.dart

@@ -38,9 +38,6 @@ class RTCVideoRenderer extends ValueNotifier<RTCVideoValue>
   @override
   int get videoHeight => value.height.toInt();
 
-  @override
-  RTCVideoValue get videoValue => value;
-
   @override
   int? get textureId => _textureId;
 

lib/src/video_renderer_extension.dart

@@ -0,0 +1,5 @@
+import 'package:stream_webrtc_flutter/stream_webrtc_flutter.dart';
+
+extension VideoRendererExtension on RTCVideoRenderer {
+  RTCVideoValue get videoValue => value;
+}

lib/src/web/rtc_video_renderer_impl.dart

@@ -71,9 +71,6 @@ class RTCVideoRenderer extends ValueNotifier<RTCVideoValue>
   @override
   int get videoHeight => value.height.toInt();
 
-  @override
-  RTCVideoValue get videoValue => value;
-
   @override
   int get textureId => _textureId;
 

lib/stream_webrtc_flutter.dart

@@ -7,6 +7,7 @@ export 'src/helper.dart';
 export 'src/desktop_capturer.dart';
 export 'src/media_devices.dart';
 export 'src/media_recorder.dart';
+export 'src/video_renderer_extension.dart';
 export 'src/native/factory_impl.dart'
     if (dart.library.js_interop) 'src/web/factory_impl.dart';
 export 'src/native/rtc_video_renderer_impl.dart'