Fix macOS compile (flutter-webrtc#795)

hiroshihorie · davidzhao · web-flow · commit afe95b32b0c1 · 2021-12-05T18:26:10.000+08:00
* Use `track` instead of `kind` when both `track` and `kind` are set (flutter-webrtc#4) * `getSettings` for Web (flutter-webrtc#3) * Fix: init would never be `RTCRtpTransceiverInitWeb` * Clean up * Fix: Flutter 2.5.0 `RTCVideoRendererWeb` bug * use .10 for iOS also * Enable audio capture when acquiring track * fix macos compile * import sorter Co-authored-by: David Zhao <david@davidzhao.com>
diff --git a/common/darwin/Classes/FlutterRTCFrameCapturer.h b/common/darwin/Classes/FlutterRTCFrameCapturer.h
@@ -1,6 +1,6 @@
 #if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_MAC
+#elif TARGET_OS_OSX
 #import <FlutterMacOS/FlutterMacOS.h>
 #endif
 #import <WebRTC/WebRTC.h>
@@ -9,6 +9,8 @@
 
 - (instancetype)initWithTrack:(RTCVideoTrack *) track toPath:(NSString *) path result:(FlutterResult)result;
 
+#if TARGET_OS_IPHONE
 + (UIImage *)convertFrameToUIImage:(RTCVideoFrame *)frame;
+#endif
 
 @end
diff --git a/common/darwin/Classes/FlutterRTCFrameCapturer.m b/common/darwin/Classes/FlutterRTCFrameCapturer.m
@@ -1,6 +1,6 @@
 #if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_MAC
+#elif TARGET_OS_OSX
 #import <FlutterMacOS/FlutterMacOS.h>
 #endif
 
@@ -38,6 +38,7 @@ - (void)setSize:(CGSize)size
 {
 }
 
+#if TARGET_OS_IPHONE
 // Thanks Juan Giorello https://groups.google.com/g/discuss-webrtc/c/ULGIodbbLvM
 + (UIImage *)convertFrameToUIImage:(RTCVideoFrame *)frame {
     // https://chromium.googlesource.com/external/webrtc/+/refs/heads/main/sdk/objc/base/RTCVideoFrame.h    
@@ -104,6 +105,7 @@ + (UIImage *)convertFrameToUIImage:(RTCVideoFrame *)frame {
     
     return image;
 }
+#endif
 
 - (void)renderFrame:(nullable RTCVideoFrame *)frame
 {
diff --git a/lib/src/web/rtc_video_renderer_impl.dart b/lib/src/web/rtc_video_renderer_impl.dart
@@ -3,10 +3,11 @@ import 'dart:html' as html;
 import 'dart:js_util' as jsutil;
 import 'dart:ui' as ui;
 
-import 'package:dart_webrtc/dart_webrtc.dart';
-import 'package:dart_webrtc/src/media_stream_impl.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
+
+import 'package:dart_webrtc/dart_webrtc.dart';
+import 'package:dart_webrtc/src/media_stream_impl.dart';
 import 'package:webrtc_interface/webrtc_interface.dart';
 
 // An error code value to error name Map.
diff --git a/lib/src/web/rtc_video_view_impl.dart b/lib/src/web/rtc_video_view_impl.dart
@@ -1,8 +1,9 @@
 import 'dart:async';
 import 'dart:math';
 
-import 'package:dart_webrtc/dart_webrtc.dart';
 import 'package:flutter/material.dart';
+
+import 'package:dart_webrtc/dart_webrtc.dart';
 import 'package:webrtc_interface/webrtc_interface.dart';
 
 import 'rtc_video_renderer_impl.dart';

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#if TARGET_OS_IPHONE`
`2`	`2`	`#import <Flutter/Flutter.h>`
`3`		`-#elif TARGET_OS_MAC`
	`3`	`+#elif TARGET_OS_OSX`
`4`	`4`	`#import <FlutterMacOS/FlutterMacOS.h>`
`5`	`5`	`#endif`
`6`	`6`
`@@ -38,6 +38,7 @@ - (void)setSize:(CGSize)size`
`38`	`38`	`{`
`39`	`39`	`}`
`40`	`40`
	`41`	`+#if TARGET_OS_IPHONE`
`41`	`42`	`// Thanks Juan Giorello https://groups.google.com/g/discuss-webrtc/c/ULGIodbbLvM`
`42`	`43`	`+ (UIImage )convertFrameToUIImage:(RTCVideoFrame )frame {`
`43`	`44`	`// https://chromium.googlesource.com/external/webrtc/+/refs/heads/main/sdk/objc/base/RTCVideoFrame.h`
`@@ -104,6 +105,7 @@ + (UIImage )convertFrameToUIImage:(RTCVideoFrame )frame {`
`104`	`105`
`105`	`106`	`return image;`
`106`	`107`	`}`
	`108`	`+#endif`
`107`	`109`
`108`	`110`	`- (void)renderFrame:(nullable RTCVideoFrame *)frame`
`109`	`111`	`{`