TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

Fixed an audio transmission bug

Browse source
This commit is contained in:
WolverinDEV 2020-04-03 15:59:32 +02:00
parent 09b78a9b37
commit 6a85e91f53
2 changed files with 48 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shared/js/voice/RecorderProfile.ts
View file

@ -46,7 +46,7 @@ export class RecorderProfile {
current_handler: ConnectionHandler;
callback_support_change: () => any;
callback_input_change: (old_input: AbstractInput, new_input: AbstractInput) => Promise<void>;
callback_start: () => any;
callback_stop: () => any;
@ -107,6 +107,9 @@ export class RecorderProfile {
if(this.callback_stop)
this.callback_stop();
};
//TODO: Await etc?
this.callback_input_change && this.callback_input_change(undefined, this.input);
}
private async load() {
@ -199,6 +202,7 @@ export class RecorderProfile {
}
}
this.callback_input_change = undefined;
this.callback_start = undefined;
this.callback_stop = undefined;
this.callback_unmount = undefined;

69
web/js/voice/VoiceHandler.ts
View file

@ -1,19 +1,19 @@
import * as log from "tc-shared/log";
import {LogCategory} from "tc-shared/log";
import * as loader from "tc-loader";
import * as aplayer from "../audio/player";
import * as elog from "tc-shared/ui/frames/server_log";
import {BasicCodec} from "../codec/BasicCodec";
import {CodecType} from "../codec/Codec";
import {LogCategory} from "tc-shared/log";
import {createErrorModal} from "tc-shared/ui/elements/Modal";
import {CodecWrapperWorker} from "../codec/CodecWrapperWorker";
import {ServerConnection} from "../connection/ServerConnection";
import {voice} from "tc-shared/connection/ConnectionBase";
import AbstractVoiceConnection = voice.AbstractVoiceConnection;
import {RecorderProfile} from "tc-shared/voice/RecorderProfile";
import {VoiceClientController} from "./VoiceClient";
import {settings} from "tc-shared/settings";
import {CallbackInputConsumer, InputConsumerType, NodeInputConsumer} from "tc-shared/voice/RecorderBase";
import AbstractVoiceConnection = voice.AbstractVoiceConnection;
import VoiceClient = voice.VoiceClient;
export namespace codec {
@ -258,31 +258,48 @@ export class VoiceConnection extends AbstractVoiceConnection {
recorder.callback_start = this.handle_local_voice_started.bind(this);
recorder.callback_stop = this.handle_local_voice_ended.bind(this);
if(this._type == VoiceEncodeType.NATIVE_ENCODE) {
if(!this.local_audio_stream)
this.setup_native(); /* requires initialized audio */
await recorder.input.set_consumer({
type: InputConsumerType.NODE,
callback_node: node => {
if(!this.local_audio_stream || !this.local_audio_mute)
return;
node.connect(this.local_audio_mute);
},
callback_disconnect: node => {
if(!this.local_audio_mute)
return;
node.disconnect(this.local_audio_mute);
recorder.callback_input_change = async (old_input, new_input) => {
if(old_input) {
try {
await old_input.set_consumer(undefined);
} catch(error) {
log.warn(LogCategory.VOICE, tr("Failed to release own consumer from old input: %o"), error);
}
} as NodeInputConsumer);
} else {
await recorder.input.set_consumer({
type: InputConsumerType.CALLBACK,
callback_audio: buffer => this.handle_local_voice(buffer, false)
} as CallbackInputConsumer);
}
}
if(new_input) {
if(this._type == VoiceEncodeType.NATIVE_ENCODE) {
if(!this.local_audio_stream)
this.setup_native(); /* requires initialized audio */
try {
await new_input.set_consumer({
type: InputConsumerType.NODE,
callback_node: node => {
if(!this.local_audio_stream || !this.local_audio_mute)
return;
node.connect(this.local_audio_mute);
},
callback_disconnect: node => {
if(!this.local_audio_mute)
return;
node.disconnect(this.local_audio_mute);
}
} as NodeInputConsumer);
log.debug(LogCategory.VOICE, tr("Successfully set/updated to the new input for the recorder"));
} catch (e) {
log.warn(LogCategory.VOICE, tr("Failed to set consumer to the new recorder input: %o"), e);
}
} else {
//TODO: Error handling?
await recorder.input.set_consumer({
type: InputConsumerType.CALLBACK,
callback_audio: buffer => this.handle_local_voice(buffer, false)
} as CallbackInputConsumer);
}
}
};
}
this.connection.client.update_voice_status(undefined);
}