Nekojimi
/
Chords
1
0
Fork 0
Code Issues 14 Pull Requests Projects Releases Wiki Activity

MusicHandler: rewrite to use circular byte buffer. 

Also now attempts to initially fill buffer in a single read.
This commit is contained in:
Nekojimi 2021-09-29 22:08:53 +01:00
parent 2412d57f4d
commit 42a9f0047b
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/moe/nekojimi/chords/MusicHandler.java
View File

@ -10,7 +10,6 @@ import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -19,6 +18,7 @@ import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem; import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException; import javax.sound.sampled.UnsupportedAudioFileException;
import net.dv8tion.jda.api.audio.AudioSendHandler; import net.dv8tion.jda.api.audio.AudioSendHandler;
import org.apache.commons.io.input.buffer.CircularByteBuffer;
/** /**
* *
@ -27,10 +27,13 @@ import net.dv8tion.jda.api.audio.AudioSendHandler;
public class MusicHandler implements AudioSendHandler, Closeable, Consumer<Song> public class MusicHandler implements AudioSendHandler, Closeable, Consumer<Song>
{ {
private static final int DESIRED_BUFFER_SIZE = 3840 * 500;
private final LinkedList<Song> songQueue = new LinkedList<>(); private final LinkedList<Song> songQueue = new LinkedList<>();
private Song currentSong; private Song currentSong;
private AudioInputStream din = null; private AudioInputStream din = null;
private final Queue<byte[]> queue = new ConcurrentLinkedQueue<>(); // private final Queue<byte[]> queue = new ConcurrentLinkedQueue<>();
private final CircularByteBuffer audioBuffer = new CircularByteBuffer(3840 * 1024);
private boolean playing = true; private boolean playing = true;
private int byteCount; private int byteCount;
@ -80,7 +83,7 @@ public class MusicHandler implements AudioSendHandler, Closeable, Consumer<Song>
public boolean nextSong(boolean immediate) public boolean nextSong(boolean immediate)
{ {
if (immediate) if (immediate)
queue.clear(); audioBuffer.clear();
AudioInputStream in = null; AudioInputStream in = null;
try try
@ -104,10 +107,8 @@ public class MusicHandler implements AudioSendHandler, Closeable, Consumer<Song>
AudioFormat decodedFormat = AudioSendHandler.INPUT_FORMAT; AudioFormat decodedFormat = AudioSendHandler.INPUT_FORMAT;
din = AudioSystem.getAudioInputStream(decodedFormat, in); din = AudioSystem.getAudioInputStream(decodedFormat, in);
byteCount = 3840; byteCount = 3840;
while (queue.size() < 500) fillBuffer(false);
if (!readData()) System.out.println("Queue filled to " + audioBuffer.getCurrentNumberOfBytes());
break;
System.out.println("Queue filled to " + queue.size());
return true; return true;
} catch (UnsupportedAudioFileException | IOException ex) } catch (UnsupportedAudioFileException | IOException ex)
{ {
@ -134,19 +135,26 @@ public class MusicHandler implements AudioSendHandler, Closeable, Consumer<Song>
public boolean canProvide() public boolean canProvide()
{ {
// If we have something in our buffer we can provide it to the send system // If we have something in our buffer we can provide it to the send system
return !queue.isEmpty() && playing; return audioBuffer.getCurrentNumberOfBytes() > byteCount && playing;
} }
@Override @Override
public ByteBuffer provide20MsAudio() public ByteBuffer provide20MsAudio()
{
fillBuffer(true);
byte[] data = new byte[byteCount];
audioBuffer.read(data, 0, data.length);
// byte[] data = queue.poll();
return ByteBuffer.wrap(data); // Wrap this in a java.nio.ByteBuffer
}
private void fillBuffer(boolean canSkip)
{ {
// use what we have in our buffer to send audio as PCM // use what we have in our buffer to send audio as PCM
while (queue.size() < 500) while (audioBuffer.getCurrentNumberOfBytes() < DESIRED_BUFFER_SIZE)
if (!readData()) if (!readData())
if (!nextSong()) if (!canSkip || !nextSong())
break; break;
byte[] data = queue.poll();
return data == null ? null : ByteBuffer.wrap(data); // Wrap this in a java.nio.ByteBuffer
} }
private boolean readData() private boolean readData()
@ -157,15 +165,23 @@ public class MusicHandler implements AudioSendHandler, Closeable, Consumer<Song>
{ {
// if (din.available() == 0) // if (din.available() == 0)
// return false; // return false;
int bytesToRead = byteCount; int bytesToRead = DESIRED_BUFFER_SIZE - audioBuffer.getCurrentNumberOfBytes();
int space = audioBuffer.getSpace();
if (din.available() > 0 && din.available() < bytesToRead) if (din.available() > 0 && din.available() < bytesToRead)
bytesToRead = din.available(); bytesToRead = din.available();
if (bytesToRead > space)
bytesToRead = space;
if (bytesToRead == 0)
return false;
byte[] bytes = new byte[bytesToRead]; byte[] bytes = new byte[bytesToRead];
// byte[] bytes = din.readNBytes(bytesToRead); // byte[] bytes = din.readNBytes(bytesToRead);
int read = din.read(bytes); int read = din.read(bytes);
System.out.println("Wanted: " + byteCount + " Space:" + space + " Available: " + din.available() + " To read: " + bytesToRead + " Read: " + read);
if (read < 0) if (read < 0)
return false; return false;
queue.add(bytes); // queue.add(bytes);
audioBuffer.add(bytes, 0, read);
} catch (IOException ex) } catch (IOException ex)
{ {
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);