Skip to content

fix: bug for rfc2833. #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2025
Merged

fix: bug for rfc2833. #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions lib/src/rtc_session.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import 'dart:async';

// Package imports:
import 'package:collection/collection.dart';
import 'package:flutter_webrtc/flutter_webrtc.dart';
import 'package:sdp_transform/sdp_transform.dart' as sdp_transform;

Expand Down Expand Up @@ -95,6 +96,9 @@ class RTCSession extends EventManager implements Owner {
// The RTCPeerConnection instance (public attribute).
RTCPeerConnection? _connection;

// RTPSender List
final List<RTCRtpSender> _senders = <RTCRtpSender>[];

// Incoming/Outgoing request being currently processed.
dynamic _request;

Expand Down Expand Up @@ -168,8 +172,10 @@ class RTCSession extends EventManager implements Owner {
@override
int get TerminatedCode => RtcSessionState.terminated.index;

RTCDTMFSender get dtmfSender =>
_connection!.createDtmfSender(_localMediaStream!.getAudioTracks()[0]);
RTCDTMFSender? get dtmfSender => _senders
.firstWhereOrNull((RTCRtpSender item) =>
item.track != null && item.track!.kind == 'audio')
?.dtmfSender;

String? get contact => _contact;

Expand Down Expand Up @@ -628,8 +634,9 @@ class RTCSession extends EventManager implements Owner {
if (stream != null) {
switch (sdpSemantics) {
case 'unified-plan':
stream.getTracks().forEach((MediaStreamTrack track) {
_connection!.addTrack(track, stream!);
stream.getTracks().forEach((MediaStreamTrack track) async {
RTCRtpSender sender = await _connection!.addTrack(track, stream!);
_senders.add(sender);
});
break;
case 'plan-b':
Expand Down Expand Up @@ -2395,8 +2402,9 @@ class RTCSession extends EventManager implements Owner {
if (stream != null) {
switch (sdpSemantics) {
case 'unified-plan':
stream.getTracks().forEach((MediaStreamTrack track) {
_connection!.addTrack(track, stream!);
stream.getTracks().forEach((MediaStreamTrack track) async {
RTCRtpSender sender = await _connection!.addTrack(track, stream!);
_senders.add(sender);
});
break;
case 'plan-b':
Expand Down
4 changes: 2 additions & 2 deletions lib/src/rtc_session/dtmf.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ class DTMF extends EventManager {
_interToneGap = options['interToneGap'];

if (_mode == DtmfMode.RFC2833) {
RTCDTMFSender dtmfSender = _session.dtmfSender;
dtmfSender.insertDTMF(_tone!,
RTCDTMFSender? dtmfSender = _session.dtmfSender;
dtmfSender?.insertDTMF(_tone!,
duration: _duration!, interToneGap: _interToneGap!);
} else if (_mode == DtmfMode.INFO) {
extraHeaders.add('Content-Type: application/dtmf-relay');
Expand Down
Loading