Lock codecs

Supersedes #2880

Author: freya022

opus-jna/src/main/java/net/dv8tion/jda/internal/audio/OpusJnaDecoder.java

@@ -48,29 +48,32 @@ public boolean isInOrder(char newSeq)
     @Override
     public short[] decode(@Nullable AudioPacket decryptedPacket)
     {
-        if (opusDecoder == null)
-            throw new IllegalStateException("Decoder is closed.");
-
         int result;
         ShortBuffer decoded = ShortBuffer.allocate(4096);
-        if (decryptedPacket == null)    //Flag for packet-loss
-        {
-            result = Opus.INSTANCE.opus_decode(opusDecoder, null, 0, decoded, OpusPacket.OPUS_FRAME_SIZE, 0);
-            lastSeq = (char) -1;
-            lastTimestamp = -1;
-        }
-        else
+        synchronized (this)
         {
-            this.lastSeq = decryptedPacket.getSequence();
-            this.lastTimestamp = decryptedPacket.getTimestamp();
+            if (opusDecoder == null)
+                throw new IllegalStateException("Decoder is closed.");
+
+            if (decryptedPacket == null)    //Flag for packet-loss
+            {
+                result = Opus.INSTANCE.opus_decode(opusDecoder, null, 0, decoded, OpusPacket.OPUS_FRAME_SIZE, 0);
+                lastSeq = (char) -1;
+                lastTimestamp = -1;
+            }
+            else
+            {
+                this.lastSeq = decryptedPacket.getSequence();
+                this.lastTimestamp = decryptedPacket.getTimestamp();
 
-            ByteBuffer encodedAudio = decryptedPacket.getEncodedAudio();
-            int length = encodedAudio.remaining();
-            int offset = encodedAudio.arrayOffset() + encodedAudio.position();
-            byte[] buf = new byte[length];
-            byte[] data = encodedAudio.array();
-            System.arraycopy(data, offset, buf, 0, length);
-            result = Opus.INSTANCE.opus_decode(opusDecoder, buf, buf.length, decoded, OpusPacket.OPUS_FRAME_SIZE, 0);
+                ByteBuffer encodedAudio = decryptedPacket.getEncodedAudio();
+                int length = encodedAudio.remaining();
+                int offset = encodedAudio.arrayOffset() + encodedAudio.position();
+                byte[] buf = new byte[length];
+                byte[] data = encodedAudio.array();
+                System.arraycopy(data, offset, buf, 0, length);
+                result = Opus.INSTANCE.opus_decode(opusDecoder, buf, buf.length, decoded, OpusPacket.OPUS_FRAME_SIZE, 0);
+            }
         }
 
         //If we get a result that is less than 0, then there was an error. Return null as a signifier.

opus-jna/src/main/java/net/dv8tion/jda/internal/audio/OpusJnaEncoder.java

@@ -43,24 +43,29 @@ protected OpusJnaEncoder(PointerByReference opusEncoder)
     @Override
     public ByteBuffer encode(@Nonnull ByteBuffer rawAudio)
     {
-        if (opusEncoder == null)
-            throw new IllegalStateException("Encoder is closed.");
-
-        ShortBuffer nonEncodedBuffer = ShortBuffer.allocate(rawAudio.remaining() / 2);
+        int result;
         ByteBuffer encoded = ByteBuffer.allocate(4096);
-        for (int i = rawAudio.position(); i < rawAudio.limit(); i += 2)
+        synchronized (this)
         {
-            int firstByte =  (0x000000FF & rawAudio.get(i));      //Promotes to int and handles the fact that it was unsigned.
-            int secondByte = (0x000000FF & rawAudio.get(i + 1));
+            if (opusEncoder == null)
+                throw new IllegalStateException("Encoder is closed.");
+
+            ShortBuffer nonEncodedBuffer = ShortBuffer.allocate(rawAudio.remaining() / 2);
+            for (int i = rawAudio.position(); i < rawAudio.limit(); i += 2)
+            {
+                int firstByte =  (0x000000FF & rawAudio.get(i));      //Promotes to int and handles the fact that it was unsigned.
+                int secondByte = (0x000000FF & rawAudio.get(i + 1));
+
+                //Combines the 2 bytes into a short. Opus deals with unsigned shorts, not bytes.
+                short toShort = (short) ((firstByte << 8) | secondByte);
 
-            //Combines the 2 bytes into a short. Opus deals with unsigned shorts, not bytes.
-            short toShort = (short) ((firstByte << 8) | secondByte);
+                nonEncodedBuffer.put(toShort);
+            }
+            ((Buffer) nonEncodedBuffer).flip();
 
-            nonEncodedBuffer.put(toShort);
+            result = Opus.INSTANCE.opus_encode(opusEncoder, nonEncodedBuffer, OpusPacket.OPUS_FRAME_SIZE, encoded, encoded.capacity());
         }
-        ((Buffer) nonEncodedBuffer).flip();
 
-        int result = Opus.INSTANCE.opus_encode(opusEncoder, nonEncodedBuffer, OpusPacket.OPUS_FRAME_SIZE, encoded, encoded.capacity());
         if (result <= 0)
         {
             LOG.error("Received error code from opus_encode(...): {}", result);