8000 code format and fixs some bug. · model-lib/flutter-webrtc@447bd78 · GitHub
[go: up one dir, main page]
Skip to content

Commit 447bd78

Browse files
cloudwebrtccloudwebrtc
committed
code format and fixs some bug.
1 parent 53f06ea commit 447bd78

12 files changed

+19
-25
lines changed

‎example/lib/src/get_user_media_sample_web.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
5050
// Platform messages are asynchronous, so we initialize in an async method.
5151
_makeCall() async {
5252
final Map<String, dynamic> mediaConstraints = {
53-
"audio": false,
53+
"audio": true,
5454
"video": {
5555
"mandatory": {
5656
"minWidth": '1280', // Provide your own width, height and frame rate here

‎example/lib/src/loopback_sample.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class _MyAppState extends State<LoopBackSample> {
5151
print(" timestamp: ${report.timestamp},");
5252
print(" values => {");
5353
report.values.forEach((key, value) {
54-
print(" " + key + " : " + value + ", ");
54+
print(" " + key + " : " + value.toString() + ", ");
5555
});
5656
print(" }");
5757
print("}");

‎lib/web/get_user_media.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import 'dart:async';
2-
// ignore: uri_does_not_exist
32
import 'dart:js' as JS;
43
import 'dart:js_util' as JSUtils;
5-
// ignore: uri_does_not_exist
64
import 'dart:html' as HTML;
5+
76
import 'media_stream.dart';
87

98
class navigator {

‎lib/web/media_recorder.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import 'dart:async';
2-
// ignore: uri_does_not_exist
32
import 'dart:js' as JS;
4-
// ignore: uri_does_not_exist
53
import 'dart:html' as HTML;
64

75
import 'media_stream.dart';

‎lib/web/media_stream.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:async';
2-
// ignore: uri_does_not_exist
32
import 'dart:html' as HTML;
3+
44
import 'media_stream_track.dart';
55

66
class MediaStream {

‎lib/web/media_stream_track.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import 'dart:async';
2-
// ignore: uri_does_not_exist
32
import 'dart:html' as HTML;
4-
// ignore: uri_does_not_exist
53
import 'dart:js' as JS;
64

75
class MediaStreamTrack {

‎lib/web/rtc_data_channel.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import 'dart:async';
2-
// ignore: uri_does_not_exist
32
import 'dart:html' as HTML;
4-
// ignore: uri_does_not_exist
5-
import 'dart:js' as JS;
3+
import 'dart:js_util' as JSUtils;
64
import 'dart:typed_data';
75

86
import '../enums.dart';
@@ -131,9 +129,8 @@ class RTCDataChannel {
131129
dynamic arrayBuffer;
132130
if (data is HTML.Blob) {
133131
// This should never happen actually
134-
final promise =
135-
JS.JsObject.fromBrowserObject(data).callMethod('arrayBuffer');
136-
arrayBuffer = await HTML.promiseToFuture(promise);
132+
arrayBuffer = await JSUtils.promiseToFuture(
133+
JSUtils.callMethod(data, 'arrayBuffer', []));
137134
} else {
138135
arrayBuffer = data;
139136
}

‎lib/web/rtc_ice_candidate.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// ignore: uri_does_not_exist
21
import 'dart:html' as HTML;
32

43
class RTCIceCandidate {

‎lib/web/rtc_peerconnection.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import 'dart:async';
2-
// ignore: uri_does_not_exist
32
import 'dart:js' as JS;
4-
// ignore: uri_does_not_exist
53
import 'dart:html' as HTML;
4+
65
import 'media_stream.dart';
76
import 'media_stream_track.dart';
87
import 'rtc_data_channel.dart';
@@ -85,7 +84,7 @@ class RTCPeerConnection {
8584
}
8685
});
8786
_jsPc.onIceCandidate.listen((iceEvent) {
88-
if (onIceCandidate != null) {
87+
if (onIceCandidate != null && iceEvent.candidate != null) {
8988
onIceCandidate(RTCIceCandidate.fromJs(iceEvent.candidate));
9089
}
9190
});
@@ -186,7 +185,7 @@ class RTCPeerConnection {
186185
});
187186
}
188187

189-
F438 Future<List<StatsReport>> getStats(MediaStreamTrack track) async {
188+
Future<List<StatsReport>> getStats([MediaStreamTrack track]) async {
190189
final stats = await _jsPc.getStats();
191190
List<StatsReport> report = [];
192191
stats.forEach((key, value) {

‎lib/web/rtc_peerconnection_factory.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:async';
2-
// ignore: uri_does_not_exist
32
import 'dart:html' as HTML;
3+
44
import 'rtc_peerconnection.dart';
55

66
Future<RTCPeerConnection> createPeerConnection(

‎lib/web/rtc_session_description.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// ignore: uri_does_not_exist
21
import 'dart:js' as JS;
3-
// ignore: uri_does_not_exist
42
import 'dart:html' as HTML;
53

64
class RTCSessionDescription {

‎lib/web/rtc_video_view.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'dart:async';
22
import 'dart:ui' as ui;
33
import 'dart:html' as HTML;
44
import 'package:flutter/material.dart';
5-
// ignore: uri_does_not_exist
5+
66
import 'media_stream.dart';
77
import '../enums.dart';
88

@@ -68,8 +68,14 @@ class RTCVideoRenderer {
6868

6969
set srcObject(MediaStream stream) {
7070
_srcObject = stream;
71+
72+
if(_srcObject == null){
73+
findHtmlView()?.srcObject = null;
74+
return;
75+
}
76+
7177
if (htmlElementView != null) {
72-
findHtmlView()?.srcObject = stream.jsStream;
78+
findHtmlView()?.srcObject = stream?.jsStream;
7379
}
7480
// ignore: undefined_prefixed_name
7581
ui.platformViewRegistry.registerViewFactory(stream.id, (int viewId) {

0 commit comments

Comments
 (0)
0