Andromeda/jank-client-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Got audio!!!

Browse source
This commit is contained in:
MathMan05 2024-10-09 15:01:04 -05:00
parent bb37c83d2a
commit 90809492c8
1 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/webpage/voice.ts
View file

@ -107,15 +107,14 @@ a=msid-semantic: WMS *\r
a=group:BUNDLE ${bundles.join(" ")}\r` a=group:BUNDLE ${bundles.join(" ")}\r`
let i=0; let i=0;
for(const grouping of parsed.medias){ for(const grouping of parsed.medias){
let mode="inactive"; let mode="recvonly";
for(const thing of this.senders){ for(const _ of this.senders){
if(thing.mid===bundles[i]){ if(i<2){
mode="sendonly"; mode="sendrecv";
} }
} }
if(grouping.media==="audio"){ if(grouping.media==="audio"){
build+= build+=`
`
m=audio ${parsed1.port} UDP/TLS/RTP/SAVPF 111\r m=audio ${parsed1.port} UDP/TLS/RTP/SAVPF 111\r
${cline}\r ${cline}\r
a=rtpmap:111 opus/48000/2\r a=rtpmap:111 opus/48000/2\r
@ -134,8 +133,7 @@ a=fingerprint:${FINGERPRINT}\r
a=candidate:${candidate}\r a=candidate:${candidate}\r
a=rtcp-mux\r` a=rtcp-mux\r`
}else{ }else{
build+= build+=`
`
m=video ${rtcport} UDP/TLS/RTP/SAVPF 102 103\r m=video ${rtcport} UDP/TLS/RTP/SAVPF 102 103\r
${cline}\r ${cline}\r
a=rtpmap:102 H264/90000\r a=rtpmap:102 H264/90000\r
@ -187,7 +185,7 @@ a=rtcp-mux\r`;
await pc.setRemoteDescription(remote); await pc.setRemoteDescription(remote);
const senders=this.senders.difference(this.ssrcMap); const senders=this.senders.difference(this.ssrcMap);
for(const sender of senders){ for(const sender of senders){
for(const thing of (await sender.sender.getStats())){ for(const thing of (await sender.getStats())){
if(thing[1].ssrc){ if(thing[1].ssrc){
this.ssrcMap.set(sender,thing[1].ssrc); this.ssrcMap.set(sender,thing[1].ssrc);
this.makeOp12(sender) this.makeOp12(sender)
@ -198,7 +196,7 @@ a=rtcp-mux\r`;
}); });
} }
} }
async makeOp12(sender:RTCRtpTransceiver){ async makeOp12(sender:RTCRtpSender){
if(this.ws){ if(this.ws){
this.ws.send(JSON.stringify({ this.ws.send(JSON.stringify({
op: 12, op: 12,
@ -228,8 +226,8 @@ a=rtcp-mux\r`;
this.status="Sending audio streams"; this.status="Sending audio streams";
} }
} }
senders:Set<RTCRtpTransceiver>=new Set(); senders:Set<RTCRtpSender>=new Set();
ssrcMap:Map<RTCRtpTransceiver,string>=new Map(); ssrcMap:Map<RTCRtpSender,string>=new Map();
async continueWebRTC(data:sdpback){ async continueWebRTC(data:sdpback){
if(this.pc&&this.offer){ if(this.pc&&this.offer){
const pc=this.pc; const pc=this.pc;
@ -238,20 +236,33 @@ a=rtcp-mux\r`;
const audioStream = await navigator.mediaDevices.getUserMedia({video: false, audio: true} ); const audioStream = await navigator.mediaDevices.getUserMedia({video: false, audio: true} );
for (const track of audioStream.getTracks()){ for (const track of audioStream.getTracks()){
//Add track //Add track
const sender = pc.addTransceiver(track,{ console.log(track,audioStream);
direction:"sendonly", const sender = pc.addTrack(track);
streams:[audioStream],
sendEncodings:[{active:true,maxBitrate:this.channel.bitrate}]
});
this.channel
this.senders.add(sender); this.senders.add(sender);
console.log(sender) console.log(sender)
} }
for(let i=0;i<10;i++){
pc.addTransceiver("audio",{
direction:"recvonly",
streams:[],
sendEncodings:[{active:true,maxBitrate:this.channel.bitrate}]
});
}
for(let i=0;i<10;i++){
pc.addTransceiver("video",{
direction:"recvonly",
streams:[],
sendEncodings:[{active:true,maxBitrate:this.channel.bitrate}]
});
}
this.counter=data.d.sdp; this.counter=data.d.sdp;
pc.ontrack = ({ streams: [stream] }) => { pc.ontrack = async (e) => {
console.log("got audio stream", stream); console.log(e);
for(const track of e.streams[0].getTracks()){
console.log(track);
}
const audio = new Audio(); const audio = new Audio();
audio.srcObject = stream; audio.srcObject = e.streams[0];
audio.play() audio.play()
}; };