8000 Using webrtc.dart to export all classes. · lineCode/flutter-webrtc@e825bc6 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit e825bc6

Browse files
cloudwebrtccloudwebrtc
committed
Using webrtc.dart to export all classes.
1 parent 621ba4a commit e825bc6

14 files changed

+52
-50
lines changed

‎example/lib/main.dart

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:webrtc/rtc_peerconnection.dart';
3-
import 'package:webrtc/rtc_peerconnection_factory.dart';
4-
import 'package:webrtc/media_stream.dart';
5-
import 'package:webrtc/get_user_media.dart';
6-
import 'package:webrtc/rtc_session_description.dart';
7-
import 'package:webrtc/rtc_video_view.dart';
8-
import 'package:webrtc/rtc_ice_candidate.dart';
9-
import 'package:webrtc/rtc_stats_report.dart';
2+
import 'package:webrtc/webrtc.dart';
103
import 'dart:core';
114
import 'dart:async';
125

@@ -142,10 +135,10 @@ class _MyAppState extends State<MyApp> {
142135
RTCSessionDescription description =
143136
await _peerConnection.createOffer(offer_sdp_constraints);
144137
print(description.sdp);
145-
_peerConnection.setLocalDescription(description);
138+
await _peerConnection.setLocalDescription(description);
146139
//change for loopback.
147140
description.type = 'answer';
148-
_peerConnection.setRemoteDescription(description);
141+
await _peerConnection.setRemoteDescription(description);
149142
} catch (e) {
150143
print(e.toString());
151144
}

‎ios/Classes/FlutterRTCDataChannel.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ -(void)createDataChannel:(nonnull NSString *)peerConnectionId
5959
RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
6060
RTCDataChannel *dataChannel = [peerConnection dataChannelForLabel:label configuration:config];
6161

62-
if (-1 != dataChannel.channelId) {
62+
if (nil != dataChannel && -1 != dataChannel.channelId) {
6363
dataChannel.peerConnectionId = peerConnectionId;
6464
NSNumber *dataChannelId = [NSNumber numberWithInteger:dataChannel.channelId];
6565
peerConnection.dataChannels[dataChannelId] = dataChannel;

‎ios/Classes/FlutterWebRTCPlugin.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ - (RTCDataChannelConfiguration *)RTCDataChannelConfiguration:(id)json
488488
init.isNegotiated = [json[@"negotiated"] boolValue];
489489
}
490490
if (json[@"protocol"]) {
491-
init.protocol = [json[@"protocol"] string];
491+
init.protocol = json[@"protocol"];
492492
}
493493
return init;
494494
}

‎lib/get_user_media.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import 'package:webrtc/webrtc.dart';
2-
import 'package:webrtc/media_stream.dart';
3-
import 'package:flutter/services.dart';
41
import 'dart:async';
2+
import 'package:flutter/services.dart';
3+
import 'package:webrtc/media_stream.dart';
4+
import 'package:webrtc/utils.dart';
55

66
Future<MediaStream> getUserMedia(Map<String, dynamic> mediaConstraints) async {
77
MethodChannel channel = WebRTC.methodChannel();

‎lib/media_stream.dart

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import 'package:webrtc/media_stream_track.dart';
2-
import 'package:webrtc/webrtc.dart';
3-
import 'package:flutter/services.dart';
41
import 'dart:async';
2+
import 'package:flutter/services.dart';
3+
import 'package:webrtc/media_stream_track.dart';
4+
import 'package:webrtc/utils.dart';
5+
6+
57

68
class MediaStream {
79
MethodChannel _channel = WebRTC.methodChannel();
A3E2

‎lib/media_stream_track.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/services.dart';
2-
import 'package:webrtc/webrtc.dart';
2+
import 'package:webrtc/utils.dart';
33

44
class MediaStreamTrack {
55
MethodChannel _channel = WebRTC.methodChannel();

‎lib/rtc_data_channel.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
import 'dart:async';
22
import 'package:flutter/services.dart';
3-
4-
import 'package:webrtc/webrtc.dart';
53
import 'package:webrtc/utils.dart';
64

7-
85
class RTCDataChannelInit {
96
bool ordered = true;
10-
int maxPacketLifeTime = 600;
11-
int maxRetransmits = 120;
7+
int maxRetransmitTime = 500;
8+
int maxRetransmits = 3;
129
String protocol = 'sctp'; //sctp | quic
13-
String binaryType = 'arraybuffer';
10+
String binaryType = 'text'; // "binary" || text
1411
bool negotiated = false;
1512
int id = 0;
1613
Map<String, dynamic> toMap() {
1714
return {
1815
'ordered': ordered,
19-
'maxPacketLifeTime': maxPacketLifeTime,
16+
'maxRetransmitTime': maxRetransmitTime,
2017
'maxRetransmits': maxRetransmits,
2118
'protocol': protocol,
2219
'negotiated': negotiated,

‎lib/rtc_ice_candidate.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
class RTCIceCandidate {
23
String candidate;
34
String sdpMid;

‎lib/rtc_peerconnection.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import 'package:webrtc/webrtc.dart' show WebRTC;
2-
import 'package:webrtc/rtc_data_channel.dart';
3-
import 'package:webrtc/rtc_session_description.dart';
4-
import 'package:webrtc/rtc_ice_candidate.dart';
1+
import 'dart:async';
2+
import 'package:flutter/services.dart';
53
import 'package:webrtc/media_stream.dart';
64
import 'package:webrtc/media_stream_track.dart';
5+
import 'package:webrtc/rtc_data_channel.dart';
6+
import 'package:webrtc/rtc_ice_candidate.dart';
7+
import 'package:webrtc/rtc_session_description.dart';
78
import 'package:webrtc/rtc_stats_report.dart';
8-
import 'package:flutter/services.dart';
99
import 'package:webrtc/utils.dart';
10-
import 'dart:async';
10000
10+
1111

1212
enum RTCSignalingState {
1313
RTCSignalingStateStable,
@@ -224,9 +224,9 @@ class RTCPeerConnection {
224224
});
225225
}
226226

227-
void setLocalDescription(RTCSessionDescription description) {
227+
Future<void> setLocalDescription(RTCSessionDescription description) async {
228228
try {
229-
_channel.invokeMethod('setLocalDescription', <String, dynamic>{
229+
await _channel.invokeMethod('setLocalDescription', <String, dynamic>{
230230
'peerConnectionId': this._peerConnectionId,
231231
'description': description.toMap(),
232232
});
@@ -235,9 +235,9 @@ class RTCPeerConnection {
235235
}
236236
}
237237

238-
void setRemoteDescription(RTCSessionDescription description) {
238+
Future<void> setRemoteDescription(RTCSessionDescription description) async {
239239
try {
240-
_channel.invokeMethod('setRemoteDescription', <String, dynamic>{
240+
await _channel.invokeMethod('setRemoteDescription', <String, dynamic>{
241241
'peerConnectionId': this._peerConnectionId,
242242
'description': description.toMap(),
243243
});

‎lib/rtc_peerconnection_factory.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import 'package:webrtc/webrtc.dart';
2-
import 'package:webrtc/rtc_peerconnection.dart';
3-
import 'package:flutter/services.dart';
41
import 'dart:async';
2+
import 'package:flutter/services.dart';
3+
import 'package:webrtc/rtc_peerconnection.dart';
4+
import 'package:webrtc/utils.dart';
55

66
Future<RTCPeerConnection> createPeerConnection(Map<String,dynamic> configuration, Map<String,dynamic> constraints) async {
77
MethodChannel channel = WebRTC.methodChannel();

0 commit comments

Comments
 (0
0