Change RTCRtpSender.track to nullable.

cloudwebrtc · cloudwebrtc · commit 44fbefd7867d · 2021-04-03T15:46:59.000+08:00
diff --git a/lib/src/interface/rtc_rtp_receiver.dart b/lib/src/interface/rtc_rtp_receiver.dart
@@ -19,7 +19,7 @@ abstract class RTCRtpReceiver {
   /// http://ortc.org/wp-content/uploads/2016/03/ortc.html#rtcrtpparameters*.
   RTCRtpParameters get parameters;
 
-  MediaStreamTrack get track;
+  MediaStreamTrack? get track;
 
   String get receiverId;
 }
diff --git a/lib/src/interface/rtc_rtp_sender.dart b/lib/src/interface/rtc_rtp_sender.dart
@@ -20,7 +20,7 @@ abstract class RTCRtpSender {
 
   RTCRtpParameters get parameters;
 
-  MediaStreamTrack get track;
+  MediaStreamTrack? get track;
 
   String get senderId;
 
diff --git a/lib/src/native/rtc_rtp_sender_impl.dart b/lib/src/native/rtc_rtp_sender_impl.dart
@@ -18,9 +18,12 @@ class RTCRtpSenderNative extends RTCRtpSender {
 
   factory RTCRtpSenderNative.fromMap(Map<dynamic, dynamic> map,
       {required String peerConnectionId}) {
+    Map<dynamic, dynamic> trackMap = map['track'];
     return RTCRtpSenderNative(
         map['senderId'],
-        MediaStreamTrackNative.fromMap(map['track']),
+        (trackMap.isNotEmpty)
+            ? MediaStreamTrackNative.fromMap(map['track'])
+            : null,
         RTCDTMFSenderNative(peerConnectionId, map['senderId']),
         RTCRtpParameters.fromMap(map['rtpParameters']),
         map['ownsTrack'],
@@ -38,18 +41,18 @@ class RTCRtpSenderNative extends RTCRtpSender {
   final MethodChannel _channel = WebRTC.methodChannel();
   String _peerConnectionId;
   String _id;
-  MediaStreamTrack _track;
+  MediaStreamTrack? _track;
   RTCDTMFSender _dtmf;
   RTCRtpParameters _parameters;
   bool _ownsTrack = false;
 
   @override
   Future<List<StatsReport>> getStats() async {
     try {
-      final response = await _channel.invokeMethod<Map<dynamic, dynamic>>(
-          'getStats', <String, dynamic>{
+      final response = await _channel
+          .invokeMethod<Map<dynamic, dynamic>>('getStats', <String, dynamic>{
         'peerConnectionId': _peerConnectionId,
-        'track': track.id
+        if (track != null) 'track': track!.id,
       });
       var stats = <StatsReport>[];
       if (response != null) {
@@ -113,7 +116,7 @@ class RTCRtpSenderNative extends RTCRtpSender {
   RTCRtpParameters get parameters => _parameters;
 
   @override
-  MediaStreamTrack get track => _track;
+  MediaStreamTrack? get track => _track;
 
   @override
   String get senderId => _id;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ abstract class RTCRtpReceiver {`
`19`	`19`	`/// http://ortc.org/wp-content/uploads/2016/03/ortc.html#rtcrtpparameters*.`
`20`	`20`	`RTCRtpParameters get parameters;`
`21`	`21`
`22`		`- MediaStreamTrack get track;`
	`22`	`+ MediaStreamTrack? get track;`
`23`	`23`
`24`	`24`	`String get receiverId;`
`25`	`25`	`}`