Skip to content

Commit 0c15fcc

Browse files
committed
Fix bug for simulcast.
1 parent 0a25577 commit 0c15fcc

File tree

4 files changed

+32
-12
lines changed

4 files changed

+32
-12
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
# Changelog
22

33
--------------------------------------------
4+
0.2.3
5+
6+
* Fix bug for simulcast.
7+
48
0.2.2
59

610
* Fix bug for unified-plan.
711

8-
912
0.2.1
1013

1114
* Fix getStats.

lib/src/rtc_rtcp_parameters.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ Map<String, dynamic> rtcpParametersToMap(RTCRTCPParameters parameters) {
2020
}
2121

2222
RTCRTCPParameters rtcpParametersFromMap(Map<String, dynamic> map) {
23-
return RTCRTCPParameters(cname: map['cnam'], reducedSize: map['reducedSize']);
23+
return RTCRTCPParameters(
24+
cname: map['cname'], reducedSize: map['reducedSize']);
2425
}

lib/src/rtc_rtp_parameters.dart

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ class RTCHeaderExtension {
9797
@anonymous
9898
class RTCRtpEncodingParameters {
9999
external factory RTCRtpEncodingParameters(
100-
{List<RTCRtpEncoding> encodings,
100+
{String transactionId,
101+
List<RTCRtpEncoding> encodings,
101102
List<RTCHeaderExtension> headerExtensions,
102103
List<RTCRTPCodec> codecs,
103104
RTCRTCPParameters rtcp});
@@ -106,14 +107,19 @@ class RTCRtpEncodingParameters {
106107

107108
external List<RTCHeaderExtension> get headerExtensions;
108109

110+
external set encodings(List<RTCRtpEncoding> encodings);
111+
109112
external List<RTCRtpEncoding> get encodings;
110113

111114
external List<RTCRTPCodec> get codecs;
115+
116+
external String get transactionId;
112117
}
113118

114119
Map<String, dynamic> rtpEncodingParametersToMap(
115120
RTCRtpEncodingParameters parameters) {
116121
return {
122+
'transactionId': parameters.transactionId,
117123
'rtcp': rtcpParametersToMap(parameters.rtcp),
118124
'headerExtensions': parameters.headerExtensions
119125
.map((e) => headerExtensionToMap(e))
@@ -126,13 +132,23 @@ Map<String, dynamic> rtpEncodingParametersToMap(
126132
RTCRtpEncodingParameters rtpEncodingParametersFromMap(
127133
Map<String, dynamic> map) {
128134
return RTCRtpEncodingParameters(
129-
rtcp: rtcpParametersFromMap(map['rtcp']),
130-
codecs: (map['codecs'] as List).map((e) => rtcCodecFromMap(e)).toList(),
131-
encodings:
132-
(map['encodings'] as List).map((e) => rtpEncodingFromMap(e)).toList(),
133-
headerExtensions: (map['headerExtensions'] as List)
134-
.map((e) => headerExtensionFromMap(e))
135-
.toList());
135+
transactionId: map['transactionId'],
136+
rtcp: map['rtcp'] != null
137+
? rtcpParametersFromMap(map['rtcp'])
138+
: RTCRTCPParameters(),
139+
codecs: map['codecs'] != null
140+
? (map['codecs'] as List).map((e) => rtcCodecFromMap(e)).toList()
141+
: [],
142+
encodings: map['codecs'] != null
143+
? (map['encodings'] as List)
144+
.map((e) => rtpEncodingFromMap(e))
145+
.toList()
146+
: [],
147+
headerExtensions: map['headerExtensions'] != null
148+
? (map['headerExtensions'] as List)
149+
.map((e) => headerExtensionFromMap(e))
150+
.toList()
151+
: []);
136152
}
137153

138154
Map<String, dynamic> rtpEncodingToMap(RTCRtpEncoding encoding) {
@@ -151,7 +167,7 @@ Map<String, dynamic> rtpEncodingToMap(RTCRtpEncoding encoding) {
151167
RTCRtpEncoding rtpEncodingFromMap(Map<String, dynamic> map) {
152168
return RTCRtpEncoding(
153169
rid: map['rid'],
154-
active: map['active'],
170+
active: map['active'] ?? true,
155171
maxBitrateBps: map['maxBitrateBps'],
156172
minBitrateBps: map['minBitrateBps'],
157173
numTemporalLayers: map['numTemporalLayers'],

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: dart_webrtc
22
description: Use the dart/js library to re-wrap the webrtc js interface of the browser, to adapted common browsers.
3-
version: 0.2.2
3+
version: 0.2.3
44
homepage: https://github.com/flutter-webrtc/dart-webrtc
55

66
environment:

0 commit comments

Comments
 (0)