Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changes/macos-video-platform-view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
patch type="fixed" "Support platform video rendering on macOS"
27 changes: 19 additions & 8 deletions lib/src/widgets/video_track_renderer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import 'dart:async';
import 'dart:math';

import 'package:flutter/foundation.dart' show kIsWeb;
import 'package:flutter/foundation.dart' show ValueListenable, kIsWeb;
import 'package:flutter/material.dart';

import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
Expand Down Expand Up @@ -101,9 +101,21 @@ class _VideoTrackRendererState extends State<VideoTrackRenderer> {
// Used to compute visibility information
late VideoTrackViewRegistration _viewRegistration;

Future<rtc.VideoRenderer> _initializeRenderer() async {
if (lkPlatformIs(PlatformType.iOS) && widget.renderMode == VideoRenderMode.platformView) {
return Null as Future<rtc.VideoRenderer>;
bool get _shouldUsePlatformView =>
widget.renderMode == VideoRenderMode.platformView &&
[PlatformType.iOS, PlatformType.macOS].contains(lkPlatform());

double? get _rendererAspectRatio {
final renderer = _renderer;
if (renderer != null && renderer is ValueListenable<rtc.RTCVideoValue>) {
return (renderer as ValueListenable<rtc.RTCVideoValue>).value.aspectRatio;
}
return null;
}

Future<rtc.VideoRenderer?> _initializeRenderer() async {
if (_shouldUsePlatformView) {
return null;
}
if (_renderer == null) {
_renderer = rtc.RTCVideoRenderer();
Expand Down Expand Up @@ -186,7 +198,7 @@ class _VideoTrackRendererState extends State<VideoTrackRenderer> {
_renderer?.onResize = () {
if (mounted) {
setState(() {
_aspectRatio = (_renderer as rtc.RTCVideoRenderer?)?.videoValue.aspectRatio;
_aspectRatio = _rendererAspectRatio;
});
}
};
Expand Down Expand Up @@ -229,7 +241,7 @@ class _VideoTrackRendererState extends State<VideoTrackRenderer> {
);

Widget _videoRendererView() {
if (lkPlatformIs(PlatformType.iOS) && widget.renderMode == VideoRenderMode.platformView) {
if (_shouldUsePlatformView) {
return rtc.RTCVideoPlatFormView(
mirror: _shouldMirror(),
objectFit: widget.fit.toRTCType(),
Expand All @@ -251,8 +263,7 @@ class _VideoTrackRendererState extends State<VideoTrackRenderer> {
Widget _videoViewForNative() => FutureBuilder(
future: _initializeRenderer(),
builder: (context, snapshot) {
if ((snapshot.hasData && _renderer != null) ||
(lkPlatformIs(PlatformType.iOS) && widget.renderMode == VideoRenderMode.platformView)) {
if ((snapshot.hasData && _renderer != null) || _shouldUsePlatformView) {
return Builder(
key: _viewRegistration.key,
builder: (ctx) {
Expand Down
Loading