blade/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2024-12-17 17:20:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

android, desktop: don't stop audio track on Android in calls (#5024)

Browse Source 
* android, desktop: don't stop audio track on Android in calls

There is a problem related to managing selected audio output device in
call. When microphone is disabled, WebView turns speaker on without
need. No way to prevent it was found yet. This is temporary workaround
that makes everything work except it makes microphone icon visible in
status bar (microphone is not used actually in that moment)

* enabled=false
This commit is contained in:
Stanislav Dmitrenko
2024-10-11 20:37:36 +07:00
committed by GitHub
parent e3528d3ffe
commit 2127c7dcce
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/resources/assets/www/call.js
+10 -3
View File
@@ -63,6 +63,7 @@ const allowSendScreenAudio = false;
// When one side of a call sends candidates tot fast (until local & remote descriptions are set), that candidates
// will be stored here and then set when the call will be ready to process them
let afterCallInitializedCandidates = [];
const stopTrackOnAndroid = false;
const processCommand = (function () {
const defaultIceServers = [
{ urls: ["stuns:stun.simplex.im:443"] },
@@ -844,7 +845,10 @@ const processCommand = (function () {
// doing it vice versa gives an error like "too many cameras were open" on some Android devices or webViews
// which means the second camera will never be opened
for (const t of source == CallMediaSource.Mic ? call.localStream.getAudioTracks() : call.localStream.getVideoTracks()) {
t.stop();
if (isDesktop || source != CallMediaSource.Mic || stopTrackOnAndroid)
t.stop();
else
t.enabled = false;
call.localStream.removeTrack(t);
}
let localStream;
@@ -894,7 +898,7 @@ const processCommand = (function () {
if (!localStream || !oldCamera || !videos)
return;
if (!inactiveCallMediaSources.mic) {
localStream.getAudioTracks().forEach((elem) => elem.stop());
localStream.getAudioTracks().forEach((elem) => (isDesktop || stopTrackOnAndroid ? elem.stop() : (elem.enabled = false)));
localStream.getAudioTracks().forEach((elem) => localStream.removeTrack(elem));
}
if (!inactiveCallMediaSources.camera || oldCamera != newCamera) {
@@ -1157,7 +1161,10 @@ const processCommand = (function () {
transceiver.sender.replaceTrack(t);
}
else {
t.stop();
if (isDesktop || t.kind == CallMediaType.Video || stopTrackOnAndroid)
t.stop();
else
t.enabled = false;
s.removeTrack(t);
transceiver.sender.replaceTrack(null);
}
packages/simplex-chat-webrtc/src/call.ts
+9 -4
View File
@@ -246,7 +246,7 @@ const callCrypto = callCryptoFunction()
declare var RTCRtpScriptTransform: {
prototype: RTCRtpScriptTransform
new (worker: Worker, options?: any): RTCRtpScriptTransform
new (worker: Worker, options?: any, transfer?: any[] | undefined): RTCRtpScriptTransform
}
enum TransformOperation {
@@ -316,6 +316,8 @@ const allowSendScreenAudio = false
// will be stored here and then set when the call will be ready to process them
let afterCallInitializedCandidates: RTCIceCandidateInit[] = []
const stopTrackOnAndroid = false
const processCommand = (function () {
type RTCRtpSenderWithEncryption = RTCRtpSender & {
createEncodedStreams: () => TransformStream
@@ -1141,7 +1143,8 @@ const processCommand = (function () {
// doing it vice versa gives an error like "too many cameras were open" on some Android devices or webViews
// which means the second camera will never be opened
for (const t of source == CallMediaSource.Mic ? call.localStream.getAudioTracks() : call.localStream.getVideoTracks()) {
t.stop()
if (isDesktop || source != CallMediaSource.Mic || stopTrackOnAndroid) t.stop()
else t.enabled = false
call.localStream.removeTrack(t)
}
let localStream: MediaStream
@@ -1200,7 +1203,7 @@ const processCommand = (function () {
if (!localStream || !oldCamera || !videos) return
if (!inactiveCallMediaSources.mic) {
localStream.getAudioTracks().forEach((elem) => elem.stop())
localStream.getAudioTracks().forEach((elem) => (isDesktop || stopTrackOnAndroid ? elem.stop() : (elem.enabled = false)))
localStream.getAudioTracks().forEach((elem) => localStream.removeTrack(elem))
}
if (!inactiveCallMediaSources.camera || oldCamera != newCamera) {
@@ -1474,7 +1477,9 @@ const processCommand = (function () {
if (enable) {
transceiver.sender.replaceTrack(t)
} else {
t.stop()
if (isDesktop || t.kind == CallMediaType.Video || stopTrackOnAndroid) t.stop()
else t.enabled = false
s.removeTrack(t)
transceiver.sender.replaceTrack(null)
}