Skip to content
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

Jump to bottom

Remove extension from received audio packets #2721

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Remove extension from received audio packets #2721

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
15 changes: 13 additions & 2 deletions src/main/java/net/dv8tion/jda/internal/audio/AudioPacket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,16 @@ public AudioPacket(byte[] rawPacket)
for (int i = 0; i < cc; i++)
this.csrc[i] = buffer.getInt();

this.extension = this.hasExtension ? buffer.getInt() : 0;
// Extract extension length as described by https://datatracker.ietf.org/doc/html/rfc3550#section-5.3.1
if (this.hasExtension)
{
buffer.position(buffer.position() + 2);
this.extension = buffer.getShort();
}
else
{
this.extension = 0;
}

this.headerLength = buffer.position();
this.encodedAudio = buffer;
Expand Down Expand Up @@ -145,12 +154,14 @@ public static AudioPacket decryptAudioPacket(CryptoAdapter crypto, DatagramPacke
return null;

byte[] decryptedPayload = crypto.decrypt(encryptedPacket.encodedAudio);
int offset = 4 * encryptedPacket.extension;

return new AudioPacket(
null,
encryptedPacket.seq,
encryptedPacket.timestamp,
encryptedPacket.ssrc,
ByteBuffer.wrap(decryptedPayload)
ByteBuffer.wrap(decryptedPayload, offset, decryptedPayload.length - offset).slice()
);
}

Expand Down
Loading