decoderConfigurer) {
- this.context = context;
- this.decoderConfigurer = decoderConfigurer;
- }
-
- public void processInput(ByteBuffer inputBuffer) throws InterruptedException {
- if (decoder == null) {
- decoder = new AacDecoder();
- decoderConfigurer.accept(decoder);
- }
-
- decoder.fill(inputBuffer);
-
- if (downstream == null) {
- AacDecoder.StreamInfo streamInfo = decoder.resolveStreamInfo();
-
- if (streamInfo != null) {
- downstream = AudioPipelineFactory.create(context, new PcmFormat(streamInfo.channels, streamInfo.sampleRate));
- outputBuffer = ByteBuffer.allocateDirect(2 * streamInfo.frameSize * streamInfo.channels)
- .order(ByteOrder.nativeOrder()).asShortBuffer();
-
- if (initialRequestedTimecode != null) {
- downstream.seekPerformed(initialRequestedTimecode, initialProvidedTimecode);
- }
- }
- }
-
- if (downstream != null) {
- while (decoder.decode(outputBuffer, false)) {
- downstream.process(outputBuffer);
- outputBuffer.clear();
- }
- }
- }
-
- public void seekPerformed(long requestedTimecode, long providedTimecode) {
- if (downstream != null) {
- downstream.seekPerformed(requestedTimecode, providedTimecode);
- } else {
- this.initialRequestedTimecode = requestedTimecode;
- this.initialProvidedTimecode = providedTimecode;
- }
-
- if (decoder != null) {
- decoder.close();
- decoder = null;
- }
- }
-
- public void flush() throws InterruptedException {
- if (downstream != null) {
- while (decoder.decode(outputBuffer, true)) {
- downstream.process(outputBuffer);
- outputBuffer.clear();
- }
- }
- }
-
- public void close() {
- try {
- if (downstream != null) {
- downstream.close();
- }
- } finally {
- if (decoder != null) {
- decoder.close();
- }
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/common/OpusPacketRouter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/common/OpusPacketRouter.java
deleted file mode 100644
index c2ad0fe..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/common/OpusPacketRouter.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.common;
-
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipeline;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipelineFactory;
-import com.sedmelluq.discord.lavaplayer.filter.PcmFormat;
-import com.sedmelluq.discord.lavaplayer.filter.volume.AudioFrameVolumeChanger;
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.format.OpusAudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.natives.opus.OpusDecoder;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-import com.sedmelluq.discord.lavaplayer.track.playback.MutableAudioFrame;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.ShortBuffer;
-
-/**
- * A router for opus packets to the output specified by an audio processing context. It automatically detects if the
- * packets can go clean through to the output without any decoding and encoding steps on each packet and rebuilds the
- * pipeline of the output if necessary.
- */
-public class OpusPacketRouter {
- private static final Logger log = LoggerFactory.getLogger(OpusPacketRouter.class);
-
- private final AudioProcessingContext context;
- private final int inputFrequency;
- private final int inputChannels;
- private final byte[] headerBytes;
- private final MutableAudioFrame offeredFrame;
-
- private long currentTimecode;
- private OpusDecoder opusDecoder;
- private AudioPipeline downstream;
- private ByteBuffer directInput;
- private ShortBuffer frameBuffer;
- private AudioDataFormat inputFormat;
- private int lastFrameSize;
-
- /**
- * @param context Configuration and output information for processing
- * @param inputFrequency Sample rate of the opus track
- * @param inputChannels Number of channels in the opus track
- */
- public OpusPacketRouter(AudioProcessingContext context, int inputFrequency, int inputChannels) {
- this.context = context;
- this.inputFrequency = inputFrequency;
- this.inputChannels = inputChannels;
- this.headerBytes = new byte[2];
- this.offeredFrame = new MutableAudioFrame();
- this.lastFrameSize = 0;
-
- offeredFrame.setVolume(100);
- offeredFrame.setFormat(context.outputFormat);
- }
-
- /**
- * Notify downstream handlers about a seek.
- *
- * @param requestedTimecode Timecode in milliseconds to which the seek was requested to
- * @param providedTimecode Timecode in milliseconds to which the seek was actually performed to
- */
- public void seekPerformed(long requestedTimecode, long providedTimecode) {
- currentTimecode = providedTimecode;
-
- if (downstream != null) {
- downstream.seekPerformed(requestedTimecode, providedTimecode);
- }
- }
-
- /**
- * Indicates that no more input is coming. Flush any buffers to output.
- *
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- public void flush() throws InterruptedException {
- if (downstream != null) {
- downstream.flush();
- }
- }
-
- /**
- * Process one opus packet.
- *
- * @param buffer Byte buffer of the packet
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- public void process(ByteBuffer buffer) throws InterruptedException {
- int frameSize = processFrameSize(buffer);
-
- if (frameSize != 0) {
- checkDecoderNecessity();
-
- if (opusDecoder != null) {
- passDownstream(buffer, frameSize);
- } else {
- passThrough(buffer);
- }
- }
- }
-
- /**
- * Free all resources.
- */
- public void close() {
- if (opusDecoder != null) {
- destroyDecoder();
- }
- }
-
- private int processFrameSize(ByteBuffer buffer) {
- int frameSize;
-
- if (buffer.isDirect()) {
- buffer.mark();
- buffer.get(headerBytes);
- buffer.reset();
-
- frameSize = OpusDecoder.getPacketFrameSize(inputFrequency, headerBytes, 0, headerBytes.length);
- } else {
- frameSize = OpusDecoder.getPacketFrameSize(inputFrequency, buffer.array(), buffer.position(), buffer.remaining());
- }
-
- if (frameSize == 0) {
- return 0;
- } else if (frameSize != lastFrameSize) {
- lastFrameSize = frameSize;
- inputFormat = new OpusAudioDataFormat(inputChannels, inputFrequency, frameSize);
- }
-
- currentTimecode += frameSize * 1000 / inputFrequency;
- return frameSize;
- }
-
- private void passDownstream(ByteBuffer buffer, int frameSize) throws InterruptedException {
- ByteBuffer nativeBuffer;
-
- if (!buffer.isDirect()) {
- if (directInput == null || directInput.capacity() < buffer.remaining()) {
- directInput = ByteBuffer.allocateDirect(buffer.remaining() + 200);
- }
-
- directInput.clear();
- directInput.put(buffer);
- directInput.flip();
-
- nativeBuffer = directInput;
- } else {
- nativeBuffer = buffer;
- }
-
- if (frameBuffer == null || frameBuffer.capacity() < frameSize * inputChannels) {
- frameBuffer = ByteBuffer.allocateDirect(frameSize * inputChannels * 2).order(ByteOrder.nativeOrder()).asShortBuffer();
- }
-
- frameBuffer.clear();
- frameBuffer.limit(frameSize);
-
- opusDecoder.decode(nativeBuffer, frameBuffer);
- downstream.process(frameBuffer);
- }
-
- private void passThrough(ByteBuffer buffer) throws InterruptedException {
- offeredFrame.setTimecode(currentTimecode);
- offeredFrame.setBuffer(buffer);
-
- context.frameBuffer.consume(offeredFrame);
- }
-
- private void checkDecoderNecessity() {
- if (AudioPipelineFactory.isProcessingRequired(context, inputFormat)) {
- if (opusDecoder == null) {
- log.debug("Enabling reencode mode on opus track.");
-
- initialiseDecoder();
-
- AudioFrameVolumeChanger.apply(context);
- }
- } else {
- if (opusDecoder != null) {
- log.debug("Enabling passthrough mode on opus track.");
-
- destroyDecoder();
-
- AudioFrameVolumeChanger.apply(context);
- }
- }
- }
-
- private void initialiseDecoder() {
- opusDecoder = new OpusDecoder(inputFrequency, inputChannels);
- downstream = AudioPipelineFactory.create(context, new PcmFormat(inputChannels, inputFrequency));
- downstream.seekPerformed(currentTimecode, currentTimecode);
- }
-
- private void destroyDecoder() {
- opusDecoder.close();
- opusDecoder = null;
- downstream.close();
- downstream = null;
- directInput = null;
- frameBuffer = null;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacAudioTrack.java
deleted file mode 100644
index bc4f8b2..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacAudioTrack.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.BaseAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Audio track that handles a FLAC stream
- */
-public class FlacAudioTrack extends BaseAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(FlacAudioTrack.class);
-
- private final SeekableInputStream inputStream;
-
- /**
- * @param trackInfo Track info
- * @param inputStream Input stream for the FLAC file
- */
- public FlacAudioTrack(AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- super(trackInfo);
-
- this.inputStream = inputStream;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- FlacFileLoader file = new FlacFileLoader(inputStream);
- FlacTrackProvider trackProvider = file.loadTrack(localExecutor.getProcessingContext());
-
- try {
- log.debug("Starting to play FLAC track {}", getIdentifier());
- localExecutor.executeProcessingLoop(trackProvider::provideFrames, trackProvider::seekToTimecode);
- } finally {
- trackProvider.close();
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacContainerProbe.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacContainerProbe.java
deleted file mode 100644
index 1c30ed7..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacContainerProbe.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerHints;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.checkNextBytes;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.supportedFormat;
-
-/**
- * Container detection probe for MP3 format.
- */
-public class FlacContainerProbe implements MediaContainerProbe {
- private static final Logger log = LoggerFactory.getLogger(FlacContainerProbe.class);
-
- private static final String TITLE_TAG = "TITLE";
- private static final String ARTIST_TAG = "ARTIST";
-
- @Override
- public String getName() {
- return "flac";
- }
-
- @Override
- public boolean matchesHints(MediaContainerHints hints) {
- return false;
- }
-
- @Override
- public MediaContainerDetectionResult probe(AudioReference reference, SeekableInputStream inputStream) throws IOException {
- if (!checkNextBytes(inputStream, FlacFileLoader.FLAC_CC)) {
- return null;
- }
-
- log.debug("Track {} is a FLAC file.", reference.identifier);
-
- FlacTrackInfo fileInfo = new FlacFileLoader(inputStream).parseHeaders();
-
- AudioTrackInfo trackInfo = AudioTrackInfoBuilder.create(reference, inputStream)
- .setTitle(fileInfo.tags.get(TITLE_TAG))
- .setAuthor(fileInfo.tags.get(ARTIST_TAG))
- .setLength(fileInfo.duration)
- .build();
-
- return supportedFormat(this, null, trackInfo);
- }
-
- @Override
- public AudioTrack createTrack(String parameters, AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- return new FlacAudioTrack(trackInfo, inputStream);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacFileLoader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacFileLoader.java
deleted file mode 100644
index b272495..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacFileLoader.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.checkNextBytes;
-
-/**
- * Loads either FLAC header information or a FLAC track object from a stream.
- */
-public class FlacFileLoader {
- static final int[] FLAC_CC = new int[]{0x66, 0x4C, 0x61, 0x43};
-
- private final SeekableInputStream inputStream;
- private final DataInput dataInput;
-
- /**
- * @param inputStream Input stream to read the FLAC data from. This must be positioned right before FLAC FourCC.
- */
- public FlacFileLoader(SeekableInputStream inputStream) {
- this.inputStream = inputStream;
- this.dataInput = new DataInputStream(inputStream);
- }
-
- /**
- * Read all metadata from a FLAC file. Stream position is at the beginning of the first frame after this call.
- *
- * @return FLAC track information
- * @throws IOException On IO Error
- */
- public FlacTrackInfo parseHeaders() throws IOException {
- if (!checkNextBytes(inputStream, FLAC_CC, false)) {
- throw new IllegalStateException("Not a FLAC file");
- }
-
- FlacTrackInfoBuilder trackInfoBuilder = new FlacTrackInfoBuilder(FlacMetadataReader.readStreamInfoBlock(dataInput));
- readMetadataBlocks(trackInfoBuilder);
- trackInfoBuilder.setFirstFramePosition(inputStream.getPosition());
- return trackInfoBuilder.build();
- }
-
- /**
- * Initialise a FLAC track stream.
- *
- * @param context Configuration and output information for processing
- * @return The FLAC track stream which can produce frames.
- * @throws IOException On IO error
- */
- public FlacTrackProvider loadTrack(AudioProcessingContext context) throws IOException {
- return new FlacTrackProvider(context, parseHeaders(), inputStream);
- }
-
- private void readMetadataBlocks(FlacTrackInfoBuilder trackInfoBuilder) throws IOException {
- boolean hasMoreBlocks = trackInfoBuilder.getStreamInfo().hasMetadataBlocks;
-
- while (hasMoreBlocks) {
- hasMoreBlocks = FlacMetadataReader.readMetadataBlock(dataInput, inputStream, trackInfoBuilder);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacMetadataHeader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacMetadataHeader.java
deleted file mode 100644
index 812190c..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacMetadataHeader.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.BitBufferReader;
-
-import java.nio.ByteBuffer;
-
-/**
- * A header of FLAC metadata.
- */
-public class FlacMetadataHeader {
- public static final int LENGTH = 4;
-
- public static final int BLOCK_SEEKTABLE = 3;
- public static final int BLOCK_COMMENT = 4;
-
- /**
- * If this header is for the last metadata block. If this is true, then the current metadata block is followed by
- * frames.
- */
- public final boolean isLastBlock;
-
- /**
- * Block type, see: https://xiph.org/flac/format.html#metadata_block_header
- */
- public final int blockType;
-
- /**
- * Length of the block, current header excluded
- */
- public final int blockLength;
-
- /**
- * @param data The raw header data
- */
- public FlacMetadataHeader(byte[] data) {
- BitBufferReader bitReader = new BitBufferReader(ByteBuffer.wrap(data));
- isLastBlock = bitReader.asInteger(1) == 1;
- blockType = bitReader.asInteger(7);
- blockLength = bitReader.asInteger(24);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacMetadataReader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacMetadataReader.java
deleted file mode 100644
index 9579f17..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacMetadataReader.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac;
-
-import org.apache.commons.io.IOUtils;
-
-import java.io.DataInput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
-import static com.sedmelluq.discord.lavaplayer.container.flac.FlacMetadataHeader.BLOCK_COMMENT;
-import static com.sedmelluq.discord.lavaplayer.container.flac.FlacMetadataHeader.BLOCK_SEEKTABLE;
-
-/**
- * Handles reading one FLAC metadata blocks.
- */
-public class FlacMetadataReader {
- private static final Charset CHARSET = StandardCharsets.UTF_8;
-
- /**
- * Reads FLAC stream info metadata block.
- *
- * @param dataInput Data input where the block is read from
- * @return Stream information
- * @throws IOException On read error
- */
- public static FlacStreamInfo readStreamInfoBlock(DataInput dataInput) throws IOException {
- FlacMetadataHeader header = readMetadataHeader(dataInput);
-
- if (header.blockType != 0) {
- throw new IllegalStateException("Wrong metadata block, should be stream info.");
- } else if (header.blockLength != FlacStreamInfo.LENGTH) {
- throw new IllegalStateException("Invalid stream info block size.");
- }
-
- byte[] streamInfoData = new byte[FlacStreamInfo.LENGTH];
- dataInput.readFully(streamInfoData);
- return new FlacStreamInfo(streamInfoData, !header.isLastBlock);
- }
-
- private static FlacMetadataHeader readMetadataHeader(DataInput dataInput) throws IOException {
- byte[] headerBytes = new byte[FlacMetadataHeader.LENGTH];
- dataInput.readFully(headerBytes);
- return new FlacMetadataHeader(headerBytes);
- }
-
- /**
- * @param dataInput Data input where the block is read from
- * @param inputStream Input stream matching the data input
- * @param trackInfoBuilder Track info builder object where detected metadata is stored in
- * @return True if there are more metadata blocks available
- * @throws IOException On read error
- */
- public static boolean readMetadataBlock(DataInput dataInput, InputStream inputStream, FlacTrackInfoBuilder trackInfoBuilder) throws IOException {
- FlacMetadataHeader header = readMetadataHeader(dataInput);
-
- if (header.blockType == BLOCK_SEEKTABLE) {
- readSeekTableBlock(dataInput, trackInfoBuilder, header.blockLength);
- } else if (header.blockType == BLOCK_COMMENT) {
- readCommentBlock(dataInput, inputStream, trackInfoBuilder);
- } else {
- IOUtils.skipFully(inputStream, header.blockLength);
- }
-
- return !header.isLastBlock;
- }
-
- private static void readCommentBlock(DataInput dataInput, InputStream inputStream, FlacTrackInfoBuilder trackInfoBuilder) throws IOException {
- int vendorLength = Integer.reverseBytes(dataInput.readInt());
- IOUtils.skipFully(inputStream, vendorLength);
-
- int listLength = Integer.reverseBytes(dataInput.readInt());
-
- for (int i = 0; i < listLength; i++) {
- int itemLength = Integer.reverseBytes(dataInput.readInt());
-
- byte[] textBytes = new byte[itemLength];
- dataInput.readFully(textBytes);
-
- String text = new String(textBytes, 0, textBytes.length, CHARSET);
- String[] keyAndValue = text.split("=", 2);
-
- if (keyAndValue.length > 1) {
- trackInfoBuilder.addTag(keyAndValue[0].toUpperCase(), keyAndValue[1]);
- }
- }
- }
-
- private static void readSeekTableBlock(DataInput dataInput, FlacTrackInfoBuilder trackInfoBuilder, int length) throws IOException {
- FlacSeekPoint[] seekPoints = new FlacSeekPoint[length / FlacSeekPoint.LENGTH];
- int seekPointCount = 0;
-
- for (int i = 0; i < seekPoints.length; i++) {
- long sampleIndex = dataInput.readLong();
- long byteOffset = dataInput.readLong();
- int sampleCount = dataInput.readUnsignedShort();
-
- seekPoints[i] = new FlacSeekPoint(sampleIndex, byteOffset, sampleCount);
-
- if (sampleIndex != -1) {
- seekPointCount = i + 1;
- }
- }
-
- trackInfoBuilder.setSeekPoints(seekPoints, seekPointCount);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacSeekPoint.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacSeekPoint.java
deleted file mode 100644
index d94940a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacSeekPoint.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac;
-
-/**
- * FLAC seek point info. Field descriptions are from:
- * https://xiph.org/flac/format.html#seekpoint
- *
- * - For placeholder points, the second and third field values are undefined.
- * - Seek points within a table must be sorted in ascending order by sample number.
- * - Seek points within a table must be unique by sample number, with the exception of placeholder points.
- * - The previous two notes imply that there may be any number of placeholder points, but they must all occur at the end
- * of the table.
- */
-public class FlacSeekPoint {
- public static final int LENGTH = 18;
-
- /**
- * Sample number of first sample in the target frame, or 0xFFFFFFFFFFFFFFFF for a placeholder point.
- */
- public final long sampleIndex;
-
- /**
- * Offset (in bytes) from the first byte of the first frame header to the first byte of the target frame's header.
- */
- public final long byteOffset;
-
- /**
- * Number of samples in the target frame.
- */
- public final int sampleCount;
-
- /**
- * @param sampleIndex Index of the first sample in the frame
- * @param byteOffset Offset in bytes from first frame start to target frame start
- * @param sampleCount Number of samples in the frame
- */
- public FlacSeekPoint(long sampleIndex, long byteOffset, int sampleCount) {
- this.sampleIndex = sampleIndex;
- this.byteOffset = byteOffset;
- this.sampleCount = sampleCount;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacStreamInfo.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacStreamInfo.java
deleted file mode 100644
index 9c1bc77..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacStreamInfo.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.BitBufferReader;
-
-import java.nio.ByteBuffer;
-
-/**
- * FLAC stream info metadata block contents. Field descriptions are from:
- * https://xiph.org/flac/format.html#metadata_block_streaminfo
- *
- * FLAC specifies a minimum block size of 16 and a maximum block size of 65535, meaning the bit patterns corresponding
- * to the numbers 0-15 in the minimum blocksize and maximum blocksize fields are invalid.
- */
-public class FlacStreamInfo {
- public static final int LENGTH = 34;
-
- /**
- * The minimum block size (in samples) used in the stream.
- */
- public final int minimumBlockSize;
- /**
- * The maximum block size (in samples) used in the stream. (Minimum blocksize == maximum blocksize) implies a
- * fixed-blocksize stream.
- */
- public final int maximumBlockSize;
- /**
- * The minimum frame size (in bytes) used in the stream. May be 0 to imply the value is not known.
- */
- public final int minimumFrameSize;
- /**
- * The maximum frame size (in bytes) used in the stream. May be 0 to imply the value is not known.
- */
- public final int maximumFrameSize;
- /**
- * Sample rate in Hz. Though 20 bits are available, the maximum sample rate is limited by the structure of frame
- * headers to 655350Hz. Also, a value of 0 is invalid.
- */
- public final int sampleRate;
- /**
- * FLAC supports from 1 to 8 channels
- */
- public final int channelCount;
- /**
- * FLAC supports from 4 to 32 bits per sample. Currently the reference encoder and decoders only support up to 24 bits
- * per sample.
- */
- public final int bitsPerSample;
- /**
- * Total samples in stream. 'Samples' means inter-channel sample, i.e. one second of 44.1Khz audio will have 44100
- * samples regardless of the number of channels. A value of zero here means the number of total samples is unknown.
- */
- public final long sampleCount;
- /**
- * MD5 signature of the unencoded audio data. This allows the decoder to determine if an error exists in the audio
- * data even when the error does not result in an invalid bitstream.
- */
- public final byte[] md5Signature;
- /**
- * Whether the file has any metadata blocks after the stream info.
- */
- public final boolean hasMetadataBlocks;
-
- /**
- * @param blockData The raw block data.
- * @param hasMetadataBlocks Whether the file has any metadata blocks after the stream info.
- */
- public FlacStreamInfo(byte[] blockData, boolean hasMetadataBlocks) {
- BitBufferReader bitReader = new BitBufferReader(ByteBuffer.wrap(blockData));
- minimumBlockSize = bitReader.asInteger(16);
- maximumBlockSize = bitReader.asInteger(16);
- minimumFrameSize = bitReader.asInteger(24);
- maximumFrameSize = bitReader.asInteger(24);
- sampleRate = bitReader.asInteger(20);
- channelCount = bitReader.asInteger(3) + 1;
- bitsPerSample = bitReader.asInteger(5) + 1;
- sampleCount = bitReader.asLong(36);
-
- md5Signature = new byte[16];
- System.arraycopy(blockData, 18, md5Signature, 0, 16);
-
- this.hasMetadataBlocks = hasMetadataBlocks;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacTrackInfo.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacTrackInfo.java
deleted file mode 100644
index 734a612..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacTrackInfo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac;
-
-import java.util.Map;
-
-/**
- * All relevant information about a FLAC track from its metadata.
- */
-public class FlacTrackInfo {
- /**
- * FLAC stream information.
- */
- public final FlacStreamInfo stream;
- /**
- * An array of seek points.
- */
- public final FlacSeekPoint[] seekPoints;
- /**
- * The actual number of seek points that are not placeholders. The end of the array may contain empty seek points,
- * which is why this value should be used to determine how far into the array to look.
- */
- public final int seekPointCount;
- /**
- * The map of tag values from comment metadata block.
- */
- public final Map tags;
- /**
- * The position in the stream where the first frame starts.
- */
- public final long firstFramePosition;
- /**
- * The duration of the track in milliseconds
- */
- public final long duration;
-
- /**
- * @param stream FLAC stream information.
- * @param seekPoints An array of seek points.
- * @param seekPointCount The actual number of seek points that are not placeholders.
- * @param tags The map of tag values from comment metadata block.
- * @param firstFramePosition The position in the stream where the first frame starts.
- */
- public FlacTrackInfo(FlacStreamInfo stream, FlacSeekPoint[] seekPoints, int seekPointCount, Map tags,
- long firstFramePosition) {
-
- this.stream = stream;
- this.seekPoints = seekPoints;
- this.seekPointCount = seekPointCount;
- this.tags = tags;
- this.firstFramePosition = firstFramePosition;
- this.duration = stream.sampleCount * 1000L / stream.sampleRate;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacTrackInfoBuilder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacTrackInfoBuilder.java
deleted file mode 100644
index faee6be..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacTrackInfoBuilder.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Builder for FLAC track info.
- */
-public class FlacTrackInfoBuilder {
- private final FlacStreamInfo streamInfo;
- private final Map tags;
- private FlacSeekPoint[] seekPoints;
- private int seekPointCount;
- private long firstFramePosition;
-
- /**
- * @param streamInfo Stream info metadata block.
- */
- public FlacTrackInfoBuilder(FlacStreamInfo streamInfo) {
- this.streamInfo = streamInfo;
- this.tags = new HashMap<>();
- }
-
- /**
- * @return Stream info metadata block.
- */
- public FlacStreamInfo getStreamInfo() {
- return streamInfo;
- }
-
- /**
- * @param seekPoints Seek point array.
- * @param seekPointCount The number of seek points which are not placeholders.
- */
- public void setSeekPoints(FlacSeekPoint[] seekPoints, int seekPointCount) {
- this.seekPoints = seekPoints;
- this.seekPointCount = seekPointCount;
- }
-
- /**
- * @param key Name of the tag
- * @param value Value of the tag
- */
- public void addTag(String key, String value) {
- tags.put(key, value);
- }
-
- /**
- * @param firstFramePosition File position of the first frame
- */
- public void setFirstFramePosition(long firstFramePosition) {
- this.firstFramePosition = firstFramePosition;
- }
-
- /**
- * @return Track info object.
- */
- public FlacTrackInfo build() {
- return new FlacTrackInfo(streamInfo, seekPoints, seekPointCount, tags, firstFramePosition);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacTrackProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacTrackProvider.java
deleted file mode 100644
index 3bfadca..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/FlacTrackProvider.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac;
-
-import com.sedmelluq.discord.lavaplayer.container.flac.frame.FlacFrameReader;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipeline;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipelineFactory;
-import com.sedmelluq.discord.lavaplayer.filter.PcmFormat;
-import com.sedmelluq.discord.lavaplayer.tools.io.BitStreamReader;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.io.IOException;
-
-/**
- * A provider of audio frames from a FLAC track.
- */
-public class FlacTrackProvider {
- private final FlacTrackInfo info;
- private final SeekableInputStream inputStream;
- private final AudioPipeline downstream;
- private final BitStreamReader bitStreamReader;
- private final int[] decodingBuffer;
- private final int[][] rawSampleBuffers;
- private final short[][] sampleBuffers;
-
- /**
- * @param context Configuration and output information for processing
- * @param info Track information from FLAC metadata
- * @param inputStream Input stream to use
- */
- public FlacTrackProvider(AudioProcessingContext context, FlacTrackInfo info, SeekableInputStream inputStream) {
- this.info = info;
- this.inputStream = inputStream;
- this.downstream = AudioPipelineFactory.create(context,
- new PcmFormat(info.stream.channelCount, info.stream.sampleRate));
- this.bitStreamReader = new BitStreamReader(inputStream);
- this.decodingBuffer = new int[FlacFrameReader.TEMPORARY_BUFFER_SIZE];
- this.rawSampleBuffers = new int[info.stream.channelCount][];
- this.sampleBuffers = new short[info.stream.channelCount][];
-
- for (int i = 0; i < rawSampleBuffers.length; i++) {
- rawSampleBuffers[i] = new int[info.stream.maximumBlockSize];
- sampleBuffers[i] = new short[info.stream.maximumBlockSize];
- }
- }
-
- /**
- * Decodes audio frames and sends them to frame consumer
- *
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- public void provideFrames() throws InterruptedException {
- try {
- int sampleCount;
-
- while ((sampleCount = readFlacFrame()) != 0) {
- downstream.process(sampleBuffers, 0, sampleCount);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private int readFlacFrame() throws IOException {
- return FlacFrameReader.readFlacFrame(inputStream, bitStreamReader, info.stream, rawSampleBuffers, sampleBuffers, decodingBuffer);
- }
-
- /**
- * Seeks to the specified timecode.
- *
- * @param timecode The timecode in milliseconds
- */
- public void seekToTimecode(long timecode) {
- try {
- FlacSeekPoint seekPoint = findSeekPointForTime(timecode);
- inputStream.seek(info.firstFramePosition + seekPoint.byteOffset);
- downstream.seekPerformed(timecode, seekPoint.sampleIndex * 1000 / info.stream.sampleRate);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private FlacSeekPoint findSeekPointForTime(long timecode) {
- if (info.seekPointCount == 0) {
- return new FlacSeekPoint(0, 0, 0);
- }
-
- long targetSampleIndex = timecode * info.stream.sampleRate / 1000L;
- return binarySearchSeekPoints(info.seekPoints, info.seekPointCount, targetSampleIndex);
- }
-
- private FlacSeekPoint binarySearchSeekPoints(FlacSeekPoint[] seekPoints, int length, long targetSampleIndex) {
- int low = 0;
- int high = length - 1;
-
- while (high > low) {
- int mid = (low + high + 1) / 2;
-
- if (info.seekPoints[mid].sampleIndex > targetSampleIndex) {
- high = mid - 1;
- } else {
- low = mid;
- }
- }
-
- return seekPoints[low];
- }
-
- /**
- * Free all resources associated to processing the track.
- */
- public void close() {
- downstream.close();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacFrameHeaderReader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacFrameHeaderReader.java
deleted file mode 100644
index fb0cf22..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacFrameHeaderReader.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac.frame;
-
-import com.sedmelluq.discord.lavaplayer.container.flac.FlacStreamInfo;
-import com.sedmelluq.discord.lavaplayer.container.flac.frame.FlacFrameInfo.ChannelDelta;
-import com.sedmelluq.discord.lavaplayer.tools.io.BitStreamReader;
-
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.container.flac.frame.FlacFrameInfo.ChannelDelta.*;
-
-/**
- * Contains methods for reading a frame header.
- */
-public class FlacFrameHeaderReader {
- private static final int VALUE_INVALID = Integer.MIN_VALUE;
- private static final int VALUE_INHERITED = -1024;
-
- private static final int BLOCK_SIZE_EXPLICIT_8_BIT = -2;
- private static final int BLOCK_SIZE_EXPLICIT_16_BIT = -1;
-
- private static final int SAMPLE_RATE_EXPLICIT_8_BIT = -3;
- private static final int SAMPLE_RATE_EXPLICIT_16_BIT = -2;
- private static final int SAMPLE_RATE_EXPLICIT_10X_16_BIT = -1;
-
- private static final int[] blockSizeMapping = new int[]{
- VALUE_INVALID, 192, 576, 1152, 2304, 4608, BLOCK_SIZE_EXPLICIT_8_BIT, BLOCK_SIZE_EXPLICIT_16_BIT,
- 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
- };
-
- private static final int[] sampleRateMapping = new int[]{
- VALUE_INHERITED, 88200, 176400, 192000, 8000, 16000, 22050, 24000,
- 32000, 44100, 48000, 96000, SAMPLE_RATE_EXPLICIT_8_BIT, SAMPLE_RATE_EXPLICIT_16_BIT, SAMPLE_RATE_EXPLICIT_10X_16_BIT, VALUE_INVALID
- };
-
- private static final int[] channelCountMapping = new int[]{
- 1, 2, 3, 4, 5, 6, 7, 8,
- 2, 2, 2, VALUE_INVALID, VALUE_INVALID, VALUE_INVALID, VALUE_INVALID, VALUE_INVALID
- };
-
- private static final ChannelDelta[] channelDeltaMapping = new ChannelDelta[]{
- NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
- LEFT_SIDE, RIGHT_SIDE, MID_SIDE, NONE, NONE, NONE, NONE, NONE
- };
-
- private static final int[] sampleSizeMapping = new int[]{VALUE_INHERITED, 8, 12, VALUE_INVALID, 16, 20, 24, VALUE_INVALID};
-
- /**
- * Reads a frame header. At this point the first two bytes of the frame have actually been read during the frame sync
- * scanning already. This means that this method expects there to be no EOF in the middle of the header. The frame
- * information must match that of the stream, as changing sample rates, channel counts and sample sizes are not
- * supported.
- *
- * @param bitStreamReader Bit stream reader for input
- * @param streamInfo Information about the stream from metadata headers
- * @param variableBlock If this is a variable block header. This information was included in the frame sync bytes
- * consumed before calling this method.
- * @return The frame information.
- * @throws IOException On read error.
- */
- public static FlacFrameInfo readFrameHeader(BitStreamReader bitStreamReader, FlacStreamInfo streamInfo,
- boolean variableBlock) throws IOException {
-
- int blockSize = blockSizeMapping[bitStreamReader.asInteger(4)];
- int sampleRate = sampleRateMapping[bitStreamReader.asInteger(4)];
- int channelAssignment = bitStreamReader.asInteger(4);
- int channelCount = channelCountMapping[channelAssignment];
- ChannelDelta channelDelta = channelDeltaMapping[channelAssignment];
- int sampleSize = sampleSizeMapping[bitStreamReader.asInteger(3)];
-
- bitStreamReader.asInteger(1);
-
- readUtf8Value(variableBlock, bitStreamReader);
-
- if (blockSize == BLOCK_SIZE_EXPLICIT_8_BIT) {
- blockSize = bitStreamReader.asInteger(8) + 1;
- } else if (blockSize == BLOCK_SIZE_EXPLICIT_16_BIT) {
- blockSize = bitStreamReader.asInteger(16) + 1;
- }
-
- verifyNotInvalid(blockSize, "block size");
-
- if (blockSize == SAMPLE_RATE_EXPLICIT_8_BIT) {
- sampleRate = bitStreamReader.asInteger(8);
- } else if (blockSize == SAMPLE_RATE_EXPLICIT_16_BIT) {
- sampleRate = bitStreamReader.asInteger(16);
- } else if (blockSize == SAMPLE_RATE_EXPLICIT_10X_16_BIT) {
- sampleRate = bitStreamReader.asInteger(16) * 10;
- }
-
- verifyMatchesExpected(sampleRate, streamInfo.sampleRate, "sample rate");
- verifyMatchesExpected(channelCount, streamInfo.channelCount, "channel count");
- verifyMatchesExpected(sampleSize, streamInfo.bitsPerSample, "bits per sample");
-
- // Ignore CRC for now
- bitStreamReader.asInteger(8);
-
- return new FlacFrameInfo(blockSize, channelDelta);
- }
-
- private static void verifyNotInvalid(int value, String description) {
- if (value < 0) {
- throw new IllegalStateException("Invalid value " + value + " for " + description);
- }
- }
-
- private static void verifyMatchesExpected(int value, int expected, String description) {
- if (value != VALUE_INHERITED && value != expected) {
- throw new IllegalStateException("Invalid value " + value + " for " + description + ", should match value " + expected + " in stream.");
- }
- }
-
- private static long readUtf8Value(boolean isLong, BitStreamReader bitStreamReader) throws IOException {
- int maximumSize = isLong ? 7 : 6;
- int firstByte = bitStreamReader.asInteger(8);
- int leadingOnes = Integer.numberOfLeadingZeros((~firstByte) & 0xFF) - 24;
-
- if (leadingOnes > maximumSize || leadingOnes == 1) {
- throw new IllegalStateException("Invalid number of leading ones in UTF encoded integer");
- } else if (leadingOnes == 0) {
- return firstByte;
- }
-
- long value = firstByte - (1L << (7 - leadingOnes)) - 1L;
-
- for (int i = 0; i < leadingOnes - 1; i++) {
- int currentByte = bitStreamReader.asInteger(8);
- if ((currentByte & 0xC0) != 0x80) {
- throw new IllegalStateException("Invalid content of payload byte, first bits must be 1 and 0.");
- }
-
- value = (value << 6) | (currentByte & 0x3F);
- }
-
- return value;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacFrameInfo.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacFrameInfo.java
deleted file mode 100644
index 357ab31..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacFrameInfo.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac.frame;
-
-/**
- * Information of a FLAC frame that is required for reading its subframes. Most of the fields in the frame info are not
- * actually needed, since it is an error if they differ from the ones specified in the file metadata.
- */
-public class FlacFrameInfo {
- /**
- * Number of samples in each subframe of this frame.
- */
- public final int sampleCount;
-
- /**
- * The way stereo channel data is related. With stereo frames, one channel can contain its original data and the other
- * just the difference from the first one, which allows for better compression for the other channel.
- */
- public final ChannelDelta channelDelta;
-
- /**
- * @param sampleCount Number of samples in each subframe of this frame
- * @param channelDelta Channel data delta setting
- */
- public FlacFrameInfo(int sampleCount, ChannelDelta channelDelta) {
- this.sampleCount = sampleCount;
- this.channelDelta = channelDelta;
- }
-
- /**
- * The relationship between stereo channels.
- */
- public enum ChannelDelta {
- NONE(-1),
- LEFT_SIDE(1),
- RIGHT_SIDE(0),
- MID_SIDE(1);
-
- /**
- * The index of the channel containing delta values.
- */
- public final int deltaChannel;
-
- ChannelDelta(int deltaChannel) {
- this.deltaChannel = deltaChannel;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacFrameReader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacFrameReader.java
deleted file mode 100644
index d7f15c3..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacFrameReader.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac.frame;
-
-import com.sedmelluq.discord.lavaplayer.container.flac.FlacStreamInfo;
-import com.sedmelluq.discord.lavaplayer.container.flac.frame.FlacFrameInfo.ChannelDelta;
-import com.sedmelluq.discord.lavaplayer.tools.io.BitStreamReader;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Handles reading one FLAC audio frame.
- */
-public class FlacFrameReader {
- public static final int TEMPORARY_BUFFER_SIZE = 32;
-
- /**
- * Reads one frame, returning the number of samples written to sampleBuffers. A return value of 0 indicates that EOF
- * was reached in the frame, which happens when the track ends.
- *
- * @param inputStream Input stream for reading the track
- * @param reader Bit stream reader for the same underlying stream as inputStream
- * @param streamInfo Global stream information
- * @param rawSampleBuffers Intermediate sample decoding buffers. FlacStreamInfo#channelCount integer buffers of size
- * at least FlacStreamInfo#maximumBlockSize.
- * @param sampleBuffers The sample buffers where the final decoding result is written to. FlacStreamInfo#channelCount
- * short buffers of size at least FlacStreamInfo#maximumBlockSize.
- * @param temporaryBuffer Temporary working buffer of size at least TEMPORARY_BUFFER_SIZE. No state is held in this
- * between separate calls.
- * @return The number of samples read, zero on EOF
- * @throws IOException On read error
- */
- public static int readFlacFrame(InputStream inputStream, BitStreamReader reader, FlacStreamInfo streamInfo,
- int[][] rawSampleBuffers, short[][] sampleBuffers, int[] temporaryBuffer) throws IOException {
- FlacFrameInfo frameInfo = findAndParseFrameHeader(inputStream, reader, streamInfo);
-
- if (frameInfo == null) {
- return 0;
- }
-
- for (int i = 0; i < streamInfo.channelCount; i++) {
- FlacSubFrameReader.readSubFrame(reader, streamInfo, frameInfo, rawSampleBuffers[i], i, temporaryBuffer);
- }
-
- reader.readRemainingBits();
- reader.asInteger(16);
-
- applyChannelDelta(frameInfo.channelDelta, rawSampleBuffers, frameInfo.sampleCount);
- convertToShortPcm(streamInfo, frameInfo.sampleCount, rawSampleBuffers, sampleBuffers);
-
- return frameInfo.sampleCount;
- }
-
- private static FlacFrameInfo findAndParseFrameHeader(InputStream inputStream, BitStreamReader reader,
- FlacStreamInfo streamInfo) throws IOException {
- int blockingStrategy;
-
- if ((blockingStrategy = skipToFrameSync(inputStream)) == -1) {
- return null;
- }
-
- return FlacFrameHeaderReader.readFrameHeader(reader, streamInfo, blockingStrategy == 1);
- }
-
- private static int skipToFrameSync(InputStream inputStream) throws IOException {
- int lastByte = -1;
- int currentByte;
-
- while ((currentByte = inputStream.read()) != -1) {
- if (lastByte == 0xFF && (currentByte & 0xFE) == 0xF8) {
- return currentByte & 0x01;
- }
- lastByte = currentByte;
- }
-
- return -1;
- }
-
- private static void applyChannelDelta(ChannelDelta channelDelta, int[][] rawSampleBuffers, int sampleCount) {
- switch (channelDelta) {
- case LEFT_SIDE:
- applyLeftSideDelta(rawSampleBuffers, sampleCount);
- break;
- case RIGHT_SIDE:
- applyRightSideDelta(rawSampleBuffers, sampleCount);
- break;
- case MID_SIDE:
- applyMidDelta(rawSampleBuffers, sampleCount);
- break;
- case NONE:
- default:
- break;
- }
- }
-
- private static void applyLeftSideDelta(int[][] rawSampleBuffers, int sampleCount) {
- for (int i = 0; i < sampleCount; i++) {
- rawSampleBuffers[1][i] = rawSampleBuffers[0][i] - rawSampleBuffers[1][i];
- }
- }
-
- private static void applyRightSideDelta(int[][] rawSampleBuffers, int sampleCount) {
- for (int i = 0; i < sampleCount; i++) {
- rawSampleBuffers[0][i] += rawSampleBuffers[1][i];
- }
- }
-
- private static void applyMidDelta(int[][] rawSampleBuffers, int sampleCount) {
- for (int i = 0; i < sampleCount; i++) {
- int delta = rawSampleBuffers[1][i];
- int middle = (rawSampleBuffers[0][i] << 1) + (delta & 1);
-
- rawSampleBuffers[0][i] = (middle + delta) >> 1;
- rawSampleBuffers[1][i] = (middle - delta) >> 1;
- }
- }
-
- private static void convertToShortPcm(FlacStreamInfo streamInfo, int sampleCount, int[][] rawSampleBuffers, short[][] sampleBuffers) {
- if (streamInfo.bitsPerSample < 16) {
- increaseSampleSize(streamInfo, sampleCount, rawSampleBuffers, sampleBuffers);
- } else if (streamInfo.bitsPerSample > 16) {
- decreaseSampleSize(streamInfo, sampleCount, rawSampleBuffers, sampleBuffers);
- } else {
- for (int channel = 0; channel < streamInfo.channelCount; channel++) {
- for (int i = 0; i < sampleCount; i++) {
- sampleBuffers[channel][i] = (short) rawSampleBuffers[channel][i];
- }
- }
- }
- }
-
- private static void increaseSampleSize(FlacStreamInfo streamInfo, int sampleCount, int[][] rawSampleBuffers, short[][] sampleBuffers) {
- int shiftLeft = 16 - streamInfo.bitsPerSample;
-
- for (int channel = 0; channel < streamInfo.channelCount; channel++) {
- for (int i = 0; i < sampleCount; i++) {
- sampleBuffers[channel][i] = (short) (rawSampleBuffers[channel][i] << shiftLeft);
- }
- }
- }
-
- private static void decreaseSampleSize(FlacStreamInfo streamInfo, int sampleCount, int[][] rawSampleBuffers, short[][] sampleBuffers) {
- int shiftRight = streamInfo.bitsPerSample - 16;
-
- for (int channel = 0; channel < streamInfo.channelCount; channel++) {
- for (int i = 0; i < sampleCount; i++) {
- sampleBuffers[channel][i] = (short) (rawSampleBuffers[channel][i] >> shiftRight);
- }
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacSubFrameReader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacSubFrameReader.java
deleted file mode 100644
index cbf16f5..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/flac/frame/FlacSubFrameReader.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.flac.frame;
-
-import com.sedmelluq.discord.lavaplayer.container.flac.FlacStreamInfo;
-import com.sedmelluq.discord.lavaplayer.tools.io.BitStreamReader;
-
-import java.io.IOException;
-
-/**
- * Contains methods for reading a FLAC subframe
- */
-public class FlacSubFrameReader {
- private static final Encoding[] encodingMapping = new Encoding[]{
- Encoding.LPC, null, Encoding.FIXED, null, null, Encoding.VERBATIM, Encoding.CONSTANT
- };
-
- /**
- * Reads and decodes one subframe (a channel of a frame)
- *
- * @param reader Bit stream reader
- * @param streamInfo Stream global info
- * @param frameInfo Current frame info
- * @param sampleBuffer Output buffer for the (possibly delta) decoded samples of this subframe
- * @param channel The index of the current channel
- * @param temporaryBuffer Temporary working buffer of size at least 32
- * @throws IOException On read error
- */
- public static void readSubFrame(BitStreamReader reader, FlacStreamInfo streamInfo, FlacFrameInfo frameInfo,
- int[] sampleBuffer, int channel, int[] temporaryBuffer) throws IOException {
-
- if (reader.asInteger(1) == 1) {
- throw new IllegalStateException("Subframe header must start with 0 bit.");
- }
-
- boolean isDeltaChannel = frameInfo.channelDelta.deltaChannel == channel;
-
- int subFrameDescriptor = reader.asInteger(6);
-
- int wastedBitCount = reader.asInteger(1) == 1 ? reader.readAllZeroes() + 1 : 0;
- int bitsPerSample = streamInfo.bitsPerSample - wastedBitCount + (isDeltaChannel ? 1 : 0);
-
- readSubFrameSamples(reader, subFrameDescriptor, bitsPerSample, sampleBuffer, frameInfo.sampleCount, temporaryBuffer);
-
- if (wastedBitCount > 0) {
- for (int i = 0; i < frameInfo.sampleCount; i++) {
- sampleBuffer[i] <<= wastedBitCount;
- }
- }
- }
-
- private static void readSubFrameSamples(BitStreamReader reader, int subFrameDescriptor, int bitsPerSample, int[] sampleBuffer,
- int sampleCount, int[] temporaryBuffer) throws IOException {
-
- Encoding subframeEncoding = encodingMapping[Integer.numberOfLeadingZeros(subFrameDescriptor) - 26];
-
- if (subframeEncoding == null) {
- throw new RuntimeException("Invalid subframe type.");
- } else if (subframeEncoding == Encoding.LPC) {
- readSubFrameLpcData(reader, (subFrameDescriptor & 0x1F) + 1, bitsPerSample, sampleBuffer, sampleCount, temporaryBuffer);
- } else if (subframeEncoding == Encoding.FIXED) {
- readSubFrameFixedData(reader, subFrameDescriptor & 0x07, bitsPerSample, sampleBuffer, sampleCount);
- } else if (subframeEncoding == Encoding.VERBATIM) {
- readSubFrameVerbatimData(reader, bitsPerSample, sampleBuffer, sampleCount);
- } else if (subframeEncoding == Encoding.CONSTANT) {
- readSubFrameConstantData(reader, bitsPerSample, sampleBuffer, sampleCount);
- }
- }
-
- private static void readSubFrameConstantData(BitStreamReader reader, int bitsPerSample, int[] sampleBuffer,
- int sampleCount) throws IOException {
-
- int value = reader.asSignedInteger(bitsPerSample);
-
- for (int i = 0; i < sampleCount; i++) {
- sampleBuffer[i] = value;
- }
- }
-
- private static void readSubFrameVerbatimData(BitStreamReader reader, int bitsPerSample, int[] sampleBuffer,
- int sampleCount) throws IOException {
- for (int i = 0; i < sampleCount; i++) {
- sampleBuffer[i] = reader.asSignedInteger(bitsPerSample);
- }
- }
-
- private static void readSubFrameFixedData(BitStreamReader reader, int order, int bitsPerSample, int[] sampleBuffer,
- int sampleCount) throws IOException {
- for (int i = 0; i < order; i++) {
- sampleBuffer[i] = reader.asSignedInteger(bitsPerSample);
- }
-
- readResidual(reader, order, sampleBuffer, order, sampleCount);
- restoreFixedSignal(sampleBuffer, sampleCount, order);
- }
-
- private static void restoreFixedSignal(int[] buffer, int sampleCount, int order) {
- switch (order) {
- case 1:
- for (int i = order; i < sampleCount; i++) {
- buffer[i] += buffer[i - 1];
- }
- break;
- case 2:
- for (int i = order; i < sampleCount; i++) {
- buffer[i] += (buffer[i - 1] << 1) - buffer[i - 2];
- }
- break;
- case 3:
- for (int i = order; i < sampleCount; i++) {
- buffer[i] += (((buffer[i - 1] - buffer[i - 2]) << 1) + (buffer[i - 1] - buffer[i - 2])) + buffer[i - 3];
- }
- break;
- case 4:
- for (int i = order; i < sampleCount; i++) {
- buffer[i] += ((buffer[i - 1] + buffer[i - 3]) << 2) - ((buffer[i - 2] << 2) + (buffer[i - 2] << 1)) - buffer[i - 4];
- }
- break;
- default:
- break;
- }
- }
-
- private static void readSubFrameLpcData(BitStreamReader reader, int order, int bitsPerSample, int[] sampleBuffer,
- int sampleCount, int[] coefficients) throws IOException {
- for (int i = 0; i < order; i++) {
- sampleBuffer[i] = reader.asSignedInteger(bitsPerSample);
- }
-
- int precision = reader.asInteger(4) + 1;
- int shift = reader.asInteger(5);
-
- for (int i = 0; i < order; i++) {
- coefficients[i] = reader.asSignedInteger(precision);
- }
-
- readResidual(reader, order, sampleBuffer, order, sampleCount);
- restoreLpcSignal(sampleBuffer, sampleCount, order, shift, coefficients);
- }
-
- private static void restoreLpcSignal(int[] buffer, int sampleCount, int order, int shift, int[] coefficients) {
- for (int i = order; i < sampleCount; i++) {
- long sum = 0;
-
- for (int j = 0; j < order; j++) {
- sum += (long) coefficients[j] * buffer[i - j - 1];
- }
-
- buffer[i] += (int) (sum >> shift);
- }
- }
-
- private static void readResidual(BitStreamReader reader, int order, int[] buffer, int startOffset, int endOffset) throws IOException {
- int method = reader.asInteger(2);
-
- if (method > 1) {
- throw new RuntimeException("Invalid residual coding method " + method);
- }
-
- int partitionOrder = reader.asInteger(4);
- int partitions = 1 << partitionOrder;
- int partitionSamples = partitionOrder > 0 ? endOffset >> partitionOrder : endOffset - order;
- int parameterLength = method == 0 ? 4 : 5;
- int parameterMaximum = (1 << parameterLength) - 1;
-
- int sample = startOffset;
-
- for (int partition = 0; partition < partitions; partition++) {
- int parameter = reader.asInteger(parameterLength);
- int value = (partitionOrder == 0 || partition > 0) ? 0 : order;
-
- if (parameter < parameterMaximum) {
- value = partitionSamples - value;
- readResidualBlock(reader, buffer, sample, sample + value, parameter);
- sample += value;
- } else {
- parameter = reader.asInteger(5);
-
- for (int i = value; i < partitionSamples; i++, sample++) {
- buffer[sample] = reader.asSignedInteger(parameter);
- }
- }
- }
- }
-
- private static void readResidualBlock(BitStreamReader reader, int[] buffer, int offset, int endOffset, int parameter) throws IOException {
- for (int i = offset; i < endOffset; i++) {
- int lowOrderSigned = (reader.readAllZeroes() << parameter) | reader.asInteger(parameter);
- buffer[i] = (lowOrderSigned & 1) == 0 ? lowOrderSigned >> 1 : -(lowOrderSigned >> 1) - 1;
- }
- }
-
- private enum Encoding {
- CONSTANT,
- VERBATIM,
- FIXED,
- LPC
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaAacTrackConsumer.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaAacTrackConsumer.java
deleted file mode 100644
index 1a19f88..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaAacTrackConsumer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska;
-
-import com.sedmelluq.discord.lavaplayer.container.common.AacPacketRouter;
-import com.sedmelluq.discord.lavaplayer.container.matroska.format.MatroskaFileTrack;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegAacTrackConsumer;
-import com.sedmelluq.discord.lavaplayer.natives.aac.AacDecoder;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-
-/**
- * Consumes AAC track data from a matroska file.
- */
-public class MatroskaAacTrackConsumer implements MatroskaTrackConsumer {
- private static final Logger log = LoggerFactory.getLogger(MpegAacTrackConsumer.class);
-
- private final MatroskaFileTrack track;
- private final ByteBuffer inputBuffer;
- private final AacPacketRouter packetRouter;
-
- /**
- * @param context Configuration and output information for processing
- * @param track The MP4 audio track descriptor
- */
- public MatroskaAacTrackConsumer(AudioProcessingContext context, MatroskaFileTrack track) {
- this.track = track;
- this.inputBuffer = ByteBuffer.allocateDirect(4096);
- this.packetRouter = new AacPacketRouter(context, this::configureDecoder);
- }
-
- @Override
- public void initialise() {
- log.debug("Initialising AAC track with expected frequency {} and channel count {}.",
- track.audio.samplingFrequency, track.audio.channels);
- }
-
- @Override
- public MatroskaFileTrack getTrack() {
- return track;
- }
-
- @Override
- public void seekPerformed(long requestedTimecode, long providedTimecode) {
- packetRouter.seekPerformed(requestedTimecode, providedTimecode);
- }
-
- @Override
- public void flush() throws InterruptedException {
- packetRouter.flush();
- }
-
- @Override
- public void consume(ByteBuffer data) throws InterruptedException {
- while (data.hasRemaining()) {
- int chunk = Math.min(data.remaining(), inputBuffer.capacity());
- ByteBuffer chunkBuffer = data.duplicate();
- chunkBuffer.limit(chunkBuffer.position() + chunk);
-
- inputBuffer.clear();
- inputBuffer.put(chunkBuffer);
- inputBuffer.flip();
-
- packetRouter.processInput(inputBuffer);
-
- data.position(chunkBuffer.position());
- }
- }
-
- @Override
- public void close() {
- packetRouter.close();
- }
-
- private void configureDecoder(AacDecoder decoder) {
- decoder.configure(track.codecPrivate);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaAudioTrack.java
deleted file mode 100644
index 2b0c6ee..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaAudioTrack.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska;
-
-import com.sedmelluq.discord.lavaplayer.container.matroska.format.MatroskaFileTrack;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.BaseAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-/**
- * Audio track that handles the processing of MKV and WEBM formats
- */
-public class MatroskaAudioTrack extends BaseAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(MatroskaAudioTrack.class);
-
- private final SeekableInputStream inputStream;
-
- /**
- * @param trackInfo Track info
- * @param inputStream Input stream for the file
- */
- public MatroskaAudioTrack(AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- super(trackInfo);
-
- this.inputStream = inputStream;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) {
- MatroskaStreamingFile file = loadMatroskaFile();
- MatroskaTrackConsumer trackConsumer = loadAudioTrack(file, localExecutor.getProcessingContext());
-
- try {
- localExecutor.executeProcessingLoop(() -> {
- file.provideFrames(trackConsumer);
- }, position -> {
- file.seekToTimecode(trackConsumer.getTrack().index, position);
- });
- } finally {
- trackConsumer.close();
- }
- }
-
- private MatroskaStreamingFile loadMatroskaFile() {
- try {
- MatroskaStreamingFile file = new MatroskaStreamingFile(inputStream);
- file.readFile();
-
- accurateDuration.set((int) file.getDuration());
- return file;
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private MatroskaTrackConsumer loadAudioTrack(MatroskaStreamingFile file, AudioProcessingContext context) {
- MatroskaTrackConsumer trackConsumer = null;
- boolean success = false;
-
- try {
- trackConsumer = selectAudioTrack(file.getTrackList(), context);
-
- if (trackConsumer == null) {
- throw new IllegalStateException("No supported audio tracks in the file.");
- } else {
- log.debug("Starting to play track with codec {}", trackConsumer.getTrack().codecId);
- }
-
- trackConsumer.initialise();
- success = true;
- } finally {
- if (!success && trackConsumer != null) {
- trackConsumer.close();
- }
- }
-
- return trackConsumer;
- }
-
- private MatroskaTrackConsumer selectAudioTrack(MatroskaFileTrack[] tracks, AudioProcessingContext context) {
- MatroskaTrackConsumer trackConsumer = null;
-
- for (MatroskaFileTrack track : tracks) {
- if (track.type == MatroskaFileTrack.Type.AUDIO) {
- if (MatroskaContainerProbe.OPUS_CODEC.equals(track.codecId)) {
- trackConsumer = new MatroskaOpusTrackConsumer(context, track);
- break;
- } else if (MatroskaContainerProbe.VORBIS_CODEC.equals(track.codecId)) {
- trackConsumer = new MatroskaVorbisTrackConsumer(context, track);
- } else if (MatroskaContainerProbe.AAC_CODEC.equals(track.codecId)) {
- trackConsumer = new MatroskaAacTrackConsumer(context, track);
- }
- }
- }
-
- return trackConsumer;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaContainerProbe.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaContainerProbe.java
deleted file mode 100644
index 55c1ab0..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaContainerProbe.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerHints;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.container.matroska.format.MatroskaFileTrack;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.*;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.supportedFormat;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.unsupportedFormat;
-
-/**
- * Container detection probe for matroska format.
- */
-public class MatroskaContainerProbe implements MediaContainerProbe {
- private static final Logger log = LoggerFactory.getLogger(MatroskaContainerProbe.class);
-
- static final String OPUS_CODEC = "A_OPUS";
- static final String VORBIS_CODEC = "A_VORBIS";
- static final String AAC_CODEC = "A_AAC";
-
- private static final int[] EBML_TAG = new int[]{0x1A, 0x45, 0xDF, 0xA3};
- private static final List supportedCodecs = Arrays.asList(OPUS_CODEC, VORBIS_CODEC, AAC_CODEC);
-
- @Override
- public String getName() {
- return "matroska/webm";
- }
-
- @Override
- public boolean matchesHints(MediaContainerHints hints) {
- return false;
- }
-
- @Override
- public MediaContainerDetectionResult probe(AudioReference reference, SeekableInputStream inputStream) throws IOException {
- if (!checkNextBytes(inputStream, EBML_TAG)) {
- return null;
- }
-
- log.debug("Track {} is a matroska file.", reference.identifier);
-
- MatroskaStreamingFile file = new MatroskaStreamingFile(inputStream);
- file.readFile();
-
- if (!hasSupportedAudioTrack(file)) {
- return unsupportedFormat(this, "No supported audio tracks present in the file.");
- }
-
- return supportedFormat(this, null, new AudioTrackInfo(UNKNOWN_TITLE, UNKNOWN_ARTIST,
- (long) file.getDuration(), reference.identifier, false, reference.identifier));
- }
-
- private boolean hasSupportedAudioTrack(MatroskaStreamingFile file) {
- for (MatroskaFileTrack track : file.getTrackList()) {
- if (track.type == MatroskaFileTrack.Type.AUDIO && supportedCodecs.contains(track.codecId)) {
- return true;
- }
- }
-
- return false;
- }
-
- @Override
- public AudioTrack createTrack(String parameters, AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- return new MatroskaAudioTrack(trackInfo, inputStream);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaOpusTrackConsumer.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaOpusTrackConsumer.java
deleted file mode 100644
index aa929fe..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaOpusTrackConsumer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska;
-
-import com.sedmelluq.discord.lavaplayer.container.common.OpusPacketRouter;
-import com.sedmelluq.discord.lavaplayer.container.matroska.format.MatroskaFileTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.nio.ByteBuffer;
-
-/**
- * Consumes OPUS track data from a matroska file.
- */
-public class MatroskaOpusTrackConsumer implements MatroskaTrackConsumer {
- private final MatroskaFileTrack track;
- private final OpusPacketRouter opusPacketRouter;
-
- /**
- * @param context Configuration and output information for processing
- * @param track The associated matroska track
- */
- public MatroskaOpusTrackConsumer(AudioProcessingContext context, MatroskaFileTrack track) {
- this.track = track;
- this.opusPacketRouter = new OpusPacketRouter(context, (int) track.audio.samplingFrequency, track.audio.channels);
- }
-
- @Override
- public MatroskaFileTrack getTrack() {
- return track;
- }
-
- @Override
- public void initialise() {
- // Nothing to do here
- }
-
- @Override
- public void seekPerformed(long requestedTimecode, long providedTimecode) {
- opusPacketRouter.seekPerformed(requestedTimecode, providedTimecode);
- }
-
- @Override
- public void flush() throws InterruptedException {
- opusPacketRouter.flush();
- }
-
- @Override
- public void consume(ByteBuffer data) throws InterruptedException {
- opusPacketRouter.process(data);
- }
-
- @Override
- public void close() {
- opusPacketRouter.close();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaStreamingFile.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaStreamingFile.java
deleted file mode 100644
index 4e85bff..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaStreamingFile.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska;
-
-import com.sedmelluq.discord.lavaplayer.container.matroska.format.*;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Handles processing an MKV/WEBM file for the purpose of streaming one specific track from it. Only performs seeks when
- * absolutely necessary, as the stream may be a network connection, in which case each seek may require a new connection.
- */
-public class MatroskaStreamingFile {
- private final MatroskaFileReader reader;
-
- private long timecodeScale = 1000000;
- private double duration;
- private final ArrayList trackList = new ArrayList<>();
- private MatroskaElement segmentElement = null;
- private MatroskaElement firstClusterElement = null;
-
- private long minimumTimecode = 0;
- private boolean seeking = false;
-
- private Long cueElementPosition = null;
- private List cuePoints = null;
-
- /**
- * @param inputStream The input stream for the file
- */
- public MatroskaStreamingFile(SeekableInputStream inputStream) {
- this.reader = new MatroskaFileReader(inputStream);
- }
-
- /**
- * @return Timescale for the durations used in this file
- */
- public long getTimecodeScale() {
- return timecodeScale;
- }
-
- /**
- * @return Total duration of the file
- */
- public double getDuration() {
- return duration;
- }
-
- /**
- * @return Array of tracks in this file
- */
- public MatroskaFileTrack[] getTrackList() {
- if (!trackList.isEmpty()) {
- MatroskaFileTrack[] tracks = new MatroskaFileTrack[trackList.size()];
-
- for (int t = 0; t < trackList.size(); t++) {
- tracks[t] = trackList.get(t);
- }
- return tracks;
- } else {
- return new MatroskaFileTrack[0];
- }
- }
-
- /**
- * Read the headers and tracks from the file.
- *
- * @throws IOException On read error.
- */
- public void readFile() throws IOException {
- MatroskaElement ebmlElement = reader.readNextElement(null);
- if (ebmlElement == null) {
- throw new RuntimeException("Unable to scan for EBML elements");
- }
-
- if (ebmlElement.is(MatroskaElementType.Ebml)) {
- parseEbmlElement(ebmlElement);
- } else {
- throw new RuntimeException("EBML Header not the first element in the file");
- }
-
- segmentElement = reader.readNextElement(null).frozen();
-
- if (segmentElement.is(MatroskaElementType.Segment)) {
- parseSegmentElement(segmentElement);
- } else {
- throw new RuntimeException(String.format("Segment not the second element in the file: was %s (%d) instead",
- segmentElement.getType().name(), segmentElement.getId()));
- }
- }
-
- private void parseEbmlElement(MatroskaElement ebmlElement) throws IOException {
- MatroskaElement child;
-
- while ((child = reader.readNextElement(ebmlElement)) != null) {
- if (child.is(MatroskaElementType.DocType)) {
- String docType = reader.asString(child);
-
- if (docType.compareTo("matroska") != 0 && docType.compareTo("webm") != 0) {
- throw new RuntimeException("Error: DocType is not matroska, \"" + docType + "\"");
- }
- }
-
- reader.skip(child);
- }
- }
-
- private void parseSegmentElement(MatroskaElement segmentElement) throws IOException {
- MatroskaElement child;
-
- while ((child = reader.readNextElement(segmentElement)) != null) {
- if (child.is(MatroskaElementType.Info)) {
- parseSegmentInfo(child);
- } else if (child.is(MatroskaElementType.Tracks)) {
- parseTracks(child);
- } else if (child.is(MatroskaElementType.Cluster)) {
- firstClusterElement = child.frozen();
- break;
- } else if (child.is(MatroskaElementType.SeekHead)) {
- parseSeekInfoForCuePosition(child);
- } else if (child.is(MatroskaElementType.Cues)) {
- cuePoints = parseCues(child);
- }
-
- reader.skip(child);
- }
- }
-
- private void parseSeekInfoForCuePosition(MatroskaElement seekHeadElement) throws IOException {
- MatroskaElement child;
-
- while ((child = reader.readNextElement(seekHeadElement)) != null) {
- if (child.is(MatroskaElementType.Seek)) {
- parseSeekElement(child);
- }
-
- reader.skip(child);
- }
- }
-
- private void parseSeekElement(MatroskaElement seekElement) throws IOException {
- MatroskaElement child;
- boolean isCueElement = false;
-
- while ((child = reader.readNextElement(seekElement)) != null) {
- if (child.is(MatroskaElementType.SeekId)) {
- isCueElement = ByteBuffer.wrap(reader.asBytes(child)).equals(ByteBuffer.wrap(MatroskaElementType.Cues.bytes));
- } else if (child.is(MatroskaElementType.SeekPosition) && isCueElement) {
- cueElementPosition = reader.asLong(child);
- }
-
- reader.skip(child);
- }
- }
-
- private List parseCues(MatroskaElement cuesElement) throws IOException {
- List parsedCuePoints = new ArrayList<>();
- MatroskaElement child;
-
- while ((child = reader.readNextElement(cuesElement)) != null) {
- if (child.is(MatroskaElementType.CuePoint)) {
- MatroskaCuePoint cuePoint = parseCuePoint(child);
-
- if (cuePoint != null) {
- parsedCuePoints.add(cuePoint);
- }
- }
-
- reader.skip(child);
- }
-
- return parsedCuePoints.isEmpty() ? null : parsedCuePoints;
- }
-
- private MatroskaCuePoint parseCuePoint(MatroskaElement cuePointElement) throws IOException {
- MatroskaElement child;
-
- Long cueTime = null;
- long[] positions = null;
-
- while ((child = reader.readNextElement(cuePointElement)) != null) {
- if (child.is(MatroskaElementType.CueTime)) {
- cueTime = reader.asLong(child);
- } else if (child.is(MatroskaElementType.CueTrackPositions)) {
- positions = parseCueTrackPositions(child);
- }
-
- reader.skip(child);
- }
-
- if (cueTime != null && positions != null) {
- return new MatroskaCuePoint(cueTime, positions);
- } else {
- return null;
- }
- }
-
- private long[] parseCueTrackPositions(MatroskaElement positionsElement) throws IOException {
- Long currentTrackId = null;
- MatroskaElement child;
-
- long[] positions = new long[trackList.size() + 1];
- Arrays.fill(positions, -1);
-
- while ((child = reader.readNextElement(positionsElement)) != null) {
- if (child.is(MatroskaElementType.CueTrack)) {
- currentTrackId = reader.asLong(child);
- } else if (child.is(MatroskaElementType.CueClusterPosition) && currentTrackId != null) {
- positions[currentTrackId.intValue()] = reader.asLong(child);
- }
-
- reader.skip(child);
- }
-
- return positions;
- }
-
- /**
- * Perform a seek to a specified timecode
- *
- * @param trackId ID of the reference track
- * @param timecode Timecode using the timescale of the file
- */
- public void seekToTimecode(int trackId, long timecode) {
- try {
- seekToTimecodeInternal(trackId, timecode);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private void seekToTimecodeInternal(int trackId, long timecode) throws IOException {
- minimumTimecode = timecode;
- seeking = true;
-
- if (cuePoints == null && cueElementPosition != null) {
- reader.seek(segmentElement.getPosition() + cueElementPosition);
-
- MatroskaElement cuesElement = reader.readNextElement(segmentElement);
- if (!cuesElement.is(MatroskaElementType.Cues)) {
- throw new IllegalStateException("The element here should be cue.");
- }
-
- cuePoints = parseCues(cuesElement);
- }
-
- if (cuePoints != null) {
- MatroskaCuePoint cuePoint = lastCueNotAfterTimecode(timecode);
-
- if (cuePoint != null && cuePoint.trackClusterOffsets[trackId] >= 0) {
- reader.seek(segmentElement.getDataPosition() + cuePoint.trackClusterOffsets[trackId]);
- return;
- }
- }
-
- // If there were no cues available, just seek to the beginning and discard until the right timecode
- reader.seek(firstClusterElement.getPosition());
- }
-
- private MatroskaCuePoint lastCueNotAfterTimecode(long timecode) {
- int largerTimecodeIndex;
-
- for (largerTimecodeIndex = 0; largerTimecodeIndex < cuePoints.size(); largerTimecodeIndex++) {
- if (cuePoints.get(largerTimecodeIndex).timecode > timecode) {
- break;
- }
- }
-
- if (largerTimecodeIndex > 0) {
- return cuePoints.get(largerTimecodeIndex - 1);
- } else {
- return null;
- }
- }
-
- /**
- * Provide data chunks for the specified track consumer
- *
- * @param consumer Track data consumer
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- public void provideFrames(MatroskaTrackConsumer consumer) throws InterruptedException {
- try {
- long position = reader.getPosition();
- MatroskaElement child = position == firstClusterElement.getDataPosition()
- ? firstClusterElement : reader.readNextElement(segmentElement);
-
- while (child != null) {
- if (child.is(MatroskaElementType.Cluster)) {
- parseNextCluster(child, consumer);
- }
-
- reader.skip(child);
-
- if (segmentElement.getRemaining(reader.getPosition()) <= 0) {
- break;
- }
-
- child = reader.readNextElement(segmentElement);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private void parseNextCluster(MatroskaElement clusterElement, MatroskaTrackConsumer consumer) throws InterruptedException, IOException {
- MatroskaElement child;
- long clusterTimecode = 0;
-
- while ((child = reader.readNextElement(clusterElement)) != null) {
- if (child.is(MatroskaElementType.Timecode)) {
- clusterTimecode = reader.asLong(child);
- } else if (child.is(MatroskaElementType.SimpleBlock)) {
- parseClusterSimpleBlock(child, consumer, clusterTimecode);
- } else if (child.is(MatroskaElementType.BlockGroup)) {
- parseClusterBlockGroup(child, consumer, clusterTimecode);
- }
-
- reader.skip(child);
- }
- }
-
- private void parseClusterSimpleBlock(MatroskaElement simpleBlock, MatroskaTrackConsumer consumer, long clusterTimecode)
- throws InterruptedException, IOException {
-
- MatroskaBlock block = reader.readBlockHeader(simpleBlock, consumer.getTrack().index);
-
- if (block != null) {
- processFrameInBlock(block, consumer, clusterTimecode);
- }
- }
-
- private void parseClusterBlockGroup(MatroskaElement blockGroup, MatroskaTrackConsumer consumer, long clusterTimecode)
- throws InterruptedException, IOException {
-
- MatroskaElement child;
-
- while ((child = reader.readNextElement(blockGroup)) != null) {
- if (child.is(MatroskaElementType.Block)) {
- MatroskaBlock block = reader.readBlockHeader(child, consumer.getTrack().index);
-
- if (block != null) {
- processFrameInBlock(block, consumer, clusterTimecode);
- }
- }
-
- reader.skip(child);
- }
- }
-
- private void processFrameInBlock(MatroskaBlock block, MatroskaTrackConsumer consumer, long clusterTimecode)
- throws InterruptedException, IOException {
-
- long timecode = clusterTimecode + block.getTimecode();
-
- if (timecode >= minimumTimecode) {
- int frameCount = block.getFrameCount();
-
- if (seeking) {
- consumer.seekPerformed(minimumTimecode, timecode);
- seeking = false;
- }
-
- for (int i = 0; i < frameCount; i++) {
- consumer.consume(block.getNextFrameBuffer(reader, i));
- }
- }
- }
-
- private void parseSegmentInfo(MatroskaElement infoElement) throws IOException {
- MatroskaElement child;
-
- while ((child = reader.readNextElement(infoElement)) != null) {
- if (child.is(MatroskaElementType.Duration)) {
- duration = reader.asDouble(child);
- } else if (child.is(MatroskaElementType.TimecodeScale)) {
- timecodeScale = reader.asLong(child);
- }
-
- reader.skip(child);
- }
- }
-
- private void parseTracks(MatroskaElement tracksElement) throws IOException {
- MatroskaElement child;
-
- while ((child = reader.readNextElement(tracksElement)) != null) {
- if (child.is(MatroskaElementType.TrackEntry)) {
- trackList.add(MatroskaFileTrack.parse(child, reader));
- }
-
- reader.skip(child);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaTrackConsumer.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaTrackConsumer.java
deleted file mode 100644
index d0ea0c1..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaTrackConsumer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska;
-
-import com.sedmelluq.discord.lavaplayer.container.matroska.format.MatroskaFileTrack;
-
-import java.nio.ByteBuffer;
-
-/**
- * Consumer for the file frames of a specific matroska file track
- */
-public interface MatroskaTrackConsumer {
- /**
- * @return The associated matroska file track
- */
- MatroskaFileTrack getTrack();
-
- /**
- * Initialise the consumer, called before first consume()
- */
- void initialise();
-
- /**
- * Indicates that the next frame is not a direct continuation of the previous one
- *
- * @param requestedTimecode Timecode in milliseconds to which the seek was requested to
- * @param providedTimecode Timecode in milliseconds to which the seek was actually performed to
- */
- void seekPerformed(long requestedTimecode, long providedTimecode);
-
- /**
- * Indicates that no more input will come, all remaining buffers should be flushed
- *
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void flush() throws InterruptedException;
-
- /**
- * Consume one frame from the track
- *
- * @param data The data of the frame
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void consume(ByteBuffer data) throws InterruptedException;
-
- /**
- * Already flushed, no more input coming. Free all resources
- */
- void close();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaVorbisTrackConsumer.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaVorbisTrackConsumer.java
deleted file mode 100644
index 64f108a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaVorbisTrackConsumer.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska;
-
-import com.sedmelluq.discord.lavaplayer.container.matroska.format.MatroskaFileTrack;
-import com.sedmelluq.discord.lavaplayer.container.matroska.format.MatroskaFileTrack.AudioDetails;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipeline;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipelineFactory;
-import com.sedmelluq.discord.lavaplayer.filter.PcmFormat;
-import com.sedmelluq.discord.lavaplayer.natives.vorbis.VorbisDecoder;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.nio.ByteBuffer;
-
-/**
- * Consumes Vorbis track data from a matroska file.
- */
-public class MatroskaVorbisTrackConsumer implements MatroskaTrackConsumer {
- private static final int PCM_BUFFER_SIZE = 4096;
- private static final int COPY_BUFFER_SIZE = 256;
-
- private final MatroskaFileTrack track;
- private final VorbisDecoder decoder;
- private final byte[] copyBuffer;
- private final AudioPipeline downstream;
- private ByteBuffer inputBuffer;
- private float[][] channelPcmBuffers;
-
- /**
- * @param context Configuration and output information for processing
- * @param track The associated matroska track
- */
- public MatroskaVorbisTrackConsumer(AudioProcessingContext context, MatroskaFileTrack track) {
-
- this.track = track;
- this.decoder = new VorbisDecoder();
- this.copyBuffer = new byte[COPY_BUFFER_SIZE];
-
- AudioDetails audioTrack = fillMissingDetails(track.audio, track.codecPrivate);
- this.downstream = AudioPipelineFactory.create(context,
- new PcmFormat(audioTrack.channels, (int) audioTrack.samplingFrequency));
- }
-
- @Override
- public MatroskaFileTrack getTrack() {
- return track;
- }
-
- @Override
- public void initialise() {
- ByteBuffer directPrivateData = ByteBuffer.allocateDirect(track.codecPrivate.length);
-
- directPrivateData.put(track.codecPrivate);
- directPrivateData.flip();
-
- try {
- int lengthInfoSize = directPrivateData.get();
-
- if (lengthInfoSize != 2) {
- throw new IllegalStateException("Unexpected lacing count.");
- }
-
- int firstHeaderSize = readLacingValue(directPrivateData);
- int secondHeaderSize = readLacingValue(directPrivateData);
-
- ByteBuffer infoBuffer = directPrivateData.duplicate();
- infoBuffer.limit(infoBuffer.position() + firstHeaderSize);
-
- directPrivateData.position(directPrivateData.position() + firstHeaderSize + secondHeaderSize);
-
- decoder.initialise(infoBuffer, directPrivateData);
-
- channelPcmBuffers = new float[decoder.getChannelCount()][];
-
- for (int i = 0; i < channelPcmBuffers.length; i++) {
- channelPcmBuffers[i] = new float[PCM_BUFFER_SIZE];
- }
- } catch (Exception e) {
- throw new RuntimeException("Reading Vorbis header failed.", e);
- }
- }
-
- private static int readLacingValue(ByteBuffer buffer) {
- int value = 0;
- int current;
-
- do {
- current = buffer.get() & 0xFF;
- value += current;
- } while (current == 255);
-
- return value;
- }
-
- private static AudioDetails fillMissingDetails(AudioDetails details, byte[] headers) {
- if (details.channels != 0) {
- return details;
- }
-
- ByteBuffer buffer = ByteBuffer.wrap(headers);
- readLacingValue(buffer); // first header size
- readLacingValue(buffer); // second header size
-
- buffer.getInt(); // vorbis version
- int channelCount = buffer.get() & 0xFF;
-
- return new AudioDetails(details.samplingFrequency, details.outputSamplingFrequency, channelCount, details.bitDepth);
- }
-
- @Override
- public void seekPerformed(long requestedTimecode, long providedTimecode) {
- downstream.seekPerformed(requestedTimecode, providedTimecode);
- }
-
- @Override
- public void flush() throws InterruptedException {
- downstream.flush();
- }
-
- private ByteBuffer getDirectBuffer(int size) {
- if (inputBuffer == null || inputBuffer.capacity() < size) {
- inputBuffer = ByteBuffer.allocateDirect(size * 3 / 2);
- }
-
- inputBuffer.clear();
- return inputBuffer;
- }
-
- private ByteBuffer getAsDirectBuffer(ByteBuffer data) {
- ByteBuffer buffer = getDirectBuffer(data.remaining());
-
- while (data.remaining() > 0) {
- int chunk = Math.min(copyBuffer.length, data.remaining());
- data.get(copyBuffer, 0, chunk);
- buffer.put(copyBuffer, 0, chunk);
- }
-
- buffer.flip();
- return buffer;
- }
-
- @Override
- public void consume(ByteBuffer data) throws InterruptedException {
- ByteBuffer directBuffer = getAsDirectBuffer(data);
- decoder.input(directBuffer);
-
- int output;
-
- do {
- output = decoder.output(channelPcmBuffers);
-
- if (output > 0) {
- downstream.process(channelPcmBuffers, 0, output);
- }
- } while (output == PCM_BUFFER_SIZE);
- }
-
- @Override
- public void close() {
- downstream.close();
- decoder.close();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaBlock.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaBlock.java
deleted file mode 100644
index d35d14b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaBlock.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska.format;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * Provides information and buffer to read from for a Matroska block.
- */
-public interface MatroskaBlock {
- /**
- * @return The timecode of this block relative to its cluster
- */
- int getTimecode();
-
- /**
- * @return The track number which this block is for
- */
- int getTrackNumber();
-
- /**
- * @return Whether this block is a keyframe
- */
- boolean isKeyFrame();
-
- /**
- * @return The number of frames in this block
- */
- int getFrameCount();
-
- /**
- * The reader must already be positioned at the frame that is to be read next.
- *
- * @param reader The reader to use to read the block contents into a buffer.
- * @param index The index of the frame to get the buffer for.
- * @return A buffer where the range between position and limit contains the data for the specific frame. The contents
- * of this buffer are only valid until the next call to this method.
- * @throws IOException On read error.
- */
- ByteBuffer getNextFrameBuffer(MatroskaFileReader reader, int index) throws IOException;
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaCuePoint.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaCuePoint.java
deleted file mode 100644
index 129b26a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaCuePoint.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska.format;
-
-/**
- * Matroska file cue point. Provides the offsets at a specific timecode for each track
- */
-public class MatroskaCuePoint {
- /**
- * Timecode using the file timescale
- */
- public final long timecode;
- /**
- * Absolute offset to the cluster
- */
- public final long[] trackClusterOffsets;
-
- /**
- * @param timecode Timecode using the file timescale
- * @param trackClusterOffsets Absolute offset to the cluster
- */
- public MatroskaCuePoint(long timecode, long[] trackClusterOffsets) {
- this.timecode = timecode;
- this.trackClusterOffsets = trackClusterOffsets;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaEbmlReader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaEbmlReader.java
deleted file mode 100644
index e946f4b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaEbmlReader.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska.format;
-
-import java.io.DataInput;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * Handles reading various different EBML code formats.
- */
-public class MatroskaEbmlReader {
- /**
- * Read an EBML code from data input with fixed size - no size encoded in the data.
- *
- * @param input Data input to read bytes from
- * @param codeLength Length of the code in bytes
- * @param type Method of sign handling (null is unsigned)
- * @return Read EBML code
- * @throws IOException On read error
- */
- public static long readFixedSizeEbmlInteger(DataInput input, int codeLength, Type type) throws IOException {
- long code = 0;
-
- for (int i = 1; i <= codeLength; i++) {
- code |= applyNextByte(codeLength, input.readByte() & 0xFF, i);
- }
-
- return applyType(code, codeLength, type);
- }
-
- /**
- * Read an EBML code from data input.
- *
- * @param input Data input to read bytes from
- * @param type Method of sign handling (null is unsigned)
- * @return Read EBML code
- * @throws IOException On read error
- */
- public static long readEbmlInteger(DataInput input, Type type) throws IOException {
- int firstByte = input.readByte() & 0xFF;
- int codeLength = getCodeLength(firstByte);
-
- long code = applyFirstByte(firstByte, codeLength);
-
- for (int i = 2; i <= codeLength; i++) {
- code |= applyNextByte(codeLength, input.readByte() & 0xFF, i);
- }
-
- return applyType(code, codeLength, type);
- }
-
- /**
- * Read an EBML code from byte buffer.
- *
- * @param buffer Buffer to read bytes from
- * @param type Method of sign handling (null is unsigned)
- * @return Read EBML code
- */
- public static long readEbmlInteger(ByteBuffer buffer, Type type) {
- int firstByte = buffer.get() & 0xFF;
- int codeLength = getCodeLength(firstByte);
-
- long code = applyFirstByte(firstByte, codeLength);
-
- for (int i = 2; i <= codeLength; i++) {
- code |= applyNextByte(codeLength, buffer.get() & 0xFF, i);
- }
-
- return applyType(code, codeLength, type);
- }
-
- private static int getCodeLength(int firstByte) {
- int codeLength = Integer.numberOfLeadingZeros(firstByte) - 23;
- if (codeLength > 8) {
- throw new IllegalStateException("More than 4 bytes for length, probably invalid data");
- }
-
- return codeLength;
- }
-
- private static long applyFirstByte(long firstByte, int codeLength) {
- return (firstByte & (0xFFL >> codeLength)) << ((codeLength - 1) << 3);
- }
-
- private static long applyNextByte(int codeLength, int value, int index) {
- return value << ((codeLength - index) << 3);
- }
-
- private static long applyType(long code, int codeLength, Type type) {
- if (type != null) {
- switch (type) {
- case SIGNED:
- return signEbmlInteger(code, codeLength);
- case LACE_SIGNED:
- return laceSignEbmlInteger(code, codeLength);
- case UNSIGNED:
- default:
- return code;
- }
- } else {
- return code;
- }
- }
-
- private static long laceSignEbmlInteger(long code, int codeLength) {
- switch (codeLength) {
- case 1:
- return code - 63;
- case 2:
- return code - 8191;
- case 3:
- return code - 1048575;
- case 4:
- return code - 134217727;
- default:
- throw new IllegalStateException("Code length out of bounds.");
- }
- }
-
- private static long signEbmlInteger(long code, int codeLength) {
- long mask = getSignMask(codeLength);
-
- if ((code & mask) != 0) {
- return code | mask;
- } else {
- return code;
- }
- }
-
- private static long getSignMask(int codeLength) {
- switch (codeLength) {
- case 1:
- return ~0x000000000000003FL;
- case 2:
- return ~0x0000000000001FFFL;
- case 3:
- return ~0x00000000000FFFFFL;
- case 4:
- return ~0x0000000007FFFFFFL;
- case 5:
- return ~0x00000003FFFFFFFFL;
- case 6:
- return ~0x000001FFFFFFFFFFL;
- case 7:
- return ~0x0000FFFFFFFFFFFFL;
- case 8:
- return ~0x007FFFFFFFFFFFFFL;
- default:
- throw new IllegalStateException("Code length out of bounds.");
- }
- }
-
- /**
- * EBML code type (sign handling method).
- */
- public enum Type {
- /**
- * Signed value with first bit marking the sign.
- */
- SIGNED,
- /**
- * Signed value where where sign is applied via subtraction.
- */
- LACE_SIGNED,
- /**
- * Unsigned value.
- */
- UNSIGNED
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaElement.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaElement.java
deleted file mode 100644
index 303d7c3..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaElement.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska.format;
-
-/**
- * Matroska container element.
- */
-public class MatroskaElement {
- protected final int level;
- protected long id;
- protected MatroskaElementType type;
- protected long position;
- protected int headerSize;
- protected int dataSize;
-
- protected MatroskaElement(int level) {
- this.level = level;
- }
-
- /**
- * @return The depth of the element in the element tree.
- */
- public int getLevel() {
- return level;
- }
-
- /**
- * @return The EBML code of the element.
- */
- public long getId() {
- return id;
- }
-
- /**
- * @return Element type, Unknown if not listed in the enum.
- */
- public MatroskaElementType getType() {
- return type;
- }
-
- /**
- * @return Absolute position of the element in the file.
- */
- public long getPosition() {
- return position;
- }
-
- /**
- * @return Size of the header in bytes.
- */
- public int getHeaderSize() {
- return headerSize;
- }
-
- /**
- * @return Size of the payload in bytes.
- */
- public int getDataSize() {
- return dataSize;
- }
-
- /**
- * @param type Element type.
- * @return True if this element is of the specified type.
- */
- public boolean is(MatroskaElementType type) {
- return type.id == this.id;
- }
-
- /**
- * @param dataType Element data type.
- * @return True if the type of the element uses the specified data type.
- */
- public boolean is(MatroskaElementType.DataType dataType) {
- return dataType == type.dataType;
- }
-
- /**
- * @param currentPosition Absolute position to check against.
- * @return The number of bytes from the specified position to the end of this element.
- */
- public long getRemaining(long currentPosition) {
- return (position + headerSize + dataSize) - currentPosition;
- }
-
- /**
- * @return The absolute position of the data of this element.
- */
- public long getDataPosition() {
- return position + headerSize;
- }
-
- /**
- * @return A frozen version of the element safe to keep for later use.
- */
- public MatroskaElement frozen() {
- MatroskaElement element = new MatroskaElement(level);
- element.id = id;
- element.type = type;
- element.position = position;
- element.headerSize = headerSize;
- element.dataSize = dataSize;
- return element;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaElementType.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaElementType.java
deleted file mode 100644
index ef79522..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaElementType.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska.format;
-
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Registry of all required element types. This is not the complete set.
- */
-@SuppressWarnings("squid:S00115")
-public enum MatroskaElementType {
- Ebml(DataType.MASTER, new int[]{0x1A, 0x45, 0xDF, 0xA3}),
- DocType(DataType.STRING, new int[]{0x42, 0x82}),
- Segment(DataType.MASTER, new int[]{0x18, 0x53, 0x80, 0x67}),
- SeekHead(DataType.MASTER, new int[]{0x11, 0x4D, 0x9B, 0x74}),
- Seek(DataType.MASTER, new int[]{0x4D, 0xBB}),
- SeekId(DataType.BINARY, new int[]{0x53, 0xAB}),
- SeekPosition(DataType.UNSIGNED_INTEGER, new int[]{0x53, 0xAC}),
- Info(DataType.MASTER, new int[]{0x15, 0x49, 0xA9, 0x66}),
- Duration(DataType.FLOAT, new int[]{0x44, 0x89}),
- TimecodeScale(DataType.UNSIGNED_INTEGER, new int[]{0x2A, 0xD7, 0xB1}),
- Cluster(DataType.MASTER, new int[]{0x1F, 0x43, 0xB6, 0x75}),
- Timecode(DataType.UNSIGNED_INTEGER, new int[]{0xE7}),
- SimpleBlock(DataType.BINARY, new int[]{0xA3}),
- BlockGroup(DataType.MASTER, new int[]{0xA0}),
- Block(DataType.BINARY, new int[]{0xA1}),
- BlockDuration(DataType.UNSIGNED_INTEGER, new int[]{0x9B}),
- ReferenceBlock(DataType.SIGNED_INTEGER, new int[]{0xFB}),
- Tracks(DataType.MASTER, new int[]{0x16, 0x54, 0xAE, 0x6B}),
- TrackEntry(DataType.MASTER, new int[]{0xAE}),
- TrackNumber(DataType.UNSIGNED_INTEGER, new int[]{0xD7}),
- TrackUid(DataType.UNSIGNED_INTEGER, new int[]{0x73, 0xC5}),
- TrackType(DataType.UNSIGNED_INTEGER, new int[]{0x83}),
- Name(DataType.UTF8_STRING, new int[]{0x53, 0x6E}),
- CodecId(DataType.STRING, new int[]{0x86}),
- CodecPrivate(DataType.BINARY, new int[]{0x63, 0xA2}),
- Audio(DataType.MASTER, new int[]{0xE1}),
- SamplingFrequency(DataType.FLOAT, new int[]{0xB5}),
- OutputSamplingFrequency(DataType.FLOAT, new int[]{0x78, 0xB5}),
- Channels(DataType.UNSIGNED_INTEGER, new int[]{0x9F}),
- BitDepth(DataType.UNSIGNED_INTEGER, new int[]{0x62, 0x64}),
- Cues(DataType.MASTER, new int[]{0x1C, 0x53, 0xBB, 0x6B}),
- CuePoint(DataType.MASTER, new int[]{0xBB}),
- CueTime(DataType.UNSIGNED_INTEGER, new int[]{0xB3}),
- CueTrackPositions(DataType.MASTER, new int[]{0xB7}),
- CueTrack(DataType.UNSIGNED_INTEGER, new int[]{0xF7}),
- CueClusterPosition(DataType.UNSIGNED_INTEGER, new int[]{0xF1}),
- Unknown(DataType.BINARY, new int[]{});
-
- private static Map mapping;
-
- /**
- * The ID as EBML code bytes.
- */
- public final byte[] bytes;
- /**
- * The ID of the element type.
- */
- public final long id;
- /**
- * Data type of the element type.
- */
- public final DataType dataType;
-
- static {
- Map codeMapping = new HashMap<>();
-
- for (MatroskaElementType code : MatroskaElementType.class.getEnumConstants()) {
- if (code != Unknown) {
- codeMapping.put(code.id, code);
- }
- }
-
- mapping = codeMapping;
- }
-
- MatroskaElementType(DataType dataType, int[] integers) {
- this.dataType = dataType;
- this.bytes = asByteArray(integers);
- this.id = bytes.length > 0 ? MatroskaEbmlReader.readEbmlInteger(ByteBuffer.wrap(bytes), null) : -1;
- }
-
- /**
- * Data type of an element.
- */
- public enum DataType {
- /**
- * Contains child elements.
- */
- MASTER,
- /**
- * Unsigned EBML integer.
- */
- UNSIGNED_INTEGER,
- /**
- * Signed EBML integer.
- */
- SIGNED_INTEGER,
- /**
- * ASCII-encoded string.
- */
- STRING,
- /**
- * UTF8-encoded string.
- */
- UTF8_STRING,
- /**
- * Raw binary data.
- */
- BINARY,
- /**
- * Float (either 4 or 8 byte)
- */
- FLOAT,
- /**
- * Nanosecond timestamp since 2001.
- */
- DATE
- }
-
- private static byte[] asByteArray(int[] integers) {
- byte[] bytes = new byte[integers.length];
-
- for (int i = 0; i < integers.length; i++) {
- bytes[i] = (byte) integers[i];
- }
-
- return bytes;
- }
-
- /**
- * @param id Code of the element type to find
- * @return The element type, Unknown if not present.
- */
- public static MatroskaElementType find(long id) {
- MatroskaElementType code = mapping.get(id);
- if (code == null) {
- code = Unknown;
- }
- return code;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaFileReader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaFileReader.java
deleted file mode 100644
index 2fee82c..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaFileReader.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska.format;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-/**
- * Handles reading of elements and their content from an MKV file.
- */
-public class MatroskaFileReader {
- private final SeekableInputStream inputStream;
- private final DataInput dataInput;
- private final MutableMatroskaElement[] levels;
- private final MutableMatroskaBlock mutableBlock;
-
- /**
- * @param inputStream Input stream to read from.
- */
- public MatroskaFileReader(SeekableInputStream inputStream) {
- this.inputStream = inputStream;
- this.dataInput = new DataInputStream(inputStream);
- this.levels = new MutableMatroskaElement[8];
- this.mutableBlock = new MutableMatroskaBlock();
- }
-
- /**
- * @param parent The parent element to use for bounds checking, null is valid.
- * @return The element whose header was read. Null if the parent/file has ended. The contents of this element are only
- * valid until the next element at the same level is read, use {@link MatroskaElement#frozen()} to get a
- * permanent instance.
- * @throws IOException On read error
- */
- public MatroskaElement readNextElement(MatroskaElement parent) throws IOException {
- long position = inputStream.getPosition();
- long remaining = parent != null ? parent.getRemaining(position) : inputStream.getContentLength() - position;
-
- if (remaining == 0) {
- return null;
- } else if (remaining < 0) {
- throw new IllegalStateException("Current position is beyond this element");
- }
-
- long id = MatroskaEbmlReader.readEbmlInteger(dataInput, null);
- long dataSize = MatroskaEbmlReader.readEbmlInteger(dataInput, null);
- long dataPosition = inputStream.getPosition();
-
- int level = parent == null ? 0 : parent.getLevel() + 1;
- MutableMatroskaElement element = levels[level];
-
- if (element == null) {
- element = levels[level] = new MutableMatroskaElement(level);
- }
-
- element.setId(id);
- element.setType(MatroskaElementType.find(id));
- element.setPosition(position);
- element.setHeaderSize((int) (dataPosition - position));
- element.setDataSize((int) dataSize);
- return element;
- }
-
- /**
- * Reads one Matroska block header. The data is of the block is not read, but can be read frame by frame using
- * {@link MatroskaBlock#getNextFrameBuffer(MatroskaFileReader, int)}.
- *
- * @param parent The block parent element.
- * @param trackFilter The ID of the track to read data for from the block.
- * @return An instance of a block if it contains data for the requested track, null otherwise.
- * @throws IOException On read error.
- */
- public MatroskaBlock readBlockHeader(MatroskaElement parent, int trackFilter) throws IOException {
- if (!mutableBlock.parseHeader(this, parent, trackFilter)) {
- return null;
- }
-
- return mutableBlock;
- }
-
- /**
- * @param element Element to read from
- * @return The contents of the element as an integer
- * @throws IOException On read error
- */
- public int asInteger(MatroskaElement element) throws IOException {
- if (element.is(MatroskaElementType.DataType.UNSIGNED_INTEGER)) {
- long value = MatroskaEbmlReader.readFixedSizeEbmlInteger(dataInput, element.dataSize, null);
-
- if (value < 0 || value > Integer.MAX_VALUE) {
- throw new ArithmeticException("Cannot convert unsigned value to integer.");
- } else {
- return (int) value;
- }
- } else if (element.is(MatroskaElementType.DataType.SIGNED_INTEGER)) {
- return Math.toIntExact(MatroskaEbmlReader.readFixedSizeEbmlInteger(dataInput, element.dataSize, MatroskaEbmlReader.Type.SIGNED));
- } else {
- throw new IllegalArgumentException("Not an integer element.");
- }
- }
-
- /**
- * @param element Element to read from
- * @return The contents of the element as a long
- * @throws IOException On read error
- */
- public long asLong(MatroskaElement element) throws IOException {
- if (element.is(MatroskaElementType.DataType.UNSIGNED_INTEGER)) {
- return MatroskaEbmlReader.readFixedSizeEbmlInteger(dataInput, element.dataSize, null);
- } else if (element.is(MatroskaElementType.DataType.SIGNED_INTEGER)) {
- return MatroskaEbmlReader.readFixedSizeEbmlInteger(dataInput, element.dataSize, MatroskaEbmlReader.Type.SIGNED);
- } else {
- throw new IllegalArgumentException("Not an integer element.");
- }
- }
-
- /**
- * @param element Element to read from
- * @return The contents of the element as a float
- * @throws IOException On read error
- */
- public float asFloat(MatroskaElement element) throws IOException {
- if (element.is(MatroskaElementType.DataType.FLOAT)) {
- if (element.dataSize == 4) {
- return dataInput.readFloat();
- } else if (element.dataSize == 8) {
- return (float) dataInput.readDouble();
- } else {
- throw new IllegalStateException("Float element has invalid size.");
- }
- } else {
- throw new IllegalArgumentException("Not a float element.");
- }
- }
-
- /**
- * @param element Element to read from
- * @return The contents of the element as a double
- * @throws IOException On read error
- */
- public double asDouble(MatroskaElement element) throws IOException {
- if (element.is(MatroskaElementType.DataType.FLOAT)) {
- if (element.dataSize == 4) {
- return dataInput.readFloat();
- } else if (element.dataSize == 8) {
- return dataInput.readDouble();
- } else {
- throw new IllegalStateException("Float element has invalid size.");
- }
- } else {
- throw new IllegalArgumentException("Not a float element.");
- }
- }
-
- /**
- * @param element Element to read from
- * @return The contents of the element as a string
- * @throws IOException On read error
- */
- public String asString(MatroskaElement element) throws IOException {
- if (element.is(MatroskaElementType.DataType.STRING)) {
- return new String(asBytes(element), StandardCharsets.US_ASCII);
- } else if (element.is(MatroskaElementType.DataType.UTF8_STRING)) {
- return new String(asBytes(element), StandardCharsets.UTF_8);
- } else {
- throw new IllegalArgumentException("Not a string element.");
- }
- }
-
- /**
- * @param element Element to read from
- * @return The contents of the element as a byte array
- * @throws IOException On read error
- */
- public byte[] asBytes(MatroskaElement element) throws IOException {
- byte[] bytes = new byte[element.dataSize];
- dataInput.readFully(bytes);
- return bytes;
- }
-
- /**
- * @param element Element to skip over
- * @throws IOException On read error
- */
- public void skip(MatroskaElement element) throws IOException {
- long remaining = element.getRemaining(inputStream.getPosition());
-
- if (remaining > 0) {
- inputStream.skipFully(remaining);
- } else if (remaining < 0) {
- throw new IllegalStateException("Current position is beyond this element");
- }
- }
-
- /**
- * @return Returns the current absolute position of the file.
- */
- public long getPosition() {
- return inputStream.getPosition();
- }
-
- /**
- * Seeks to the specified position.
- *
- * @param position The position in bytes.
- * @throws IOException On read error
- */
- public void seek(long position) throws IOException {
- inputStream.seek(position);
- }
-
- public DataInput getDataInput() {
- return dataInput;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaFileTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaFileTrack.java
deleted file mode 100644
index d74c0bd..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaFileTrack.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska.format;
-
-import java.io.IOException;
-
-/**
- * Describes one track in a matroska file.
- */
-public class MatroskaFileTrack {
- /**
- * Track index/number.
- */
- public final int index;
- /**
- * Type of the track.
- */
- public final Type type;
- /**
- * The unique track UID.
- */
- public final long trackUid;
- /**
- * Name of the track.
- */
- public final String name;
- /**
- * ID of the codec.
- */
- public final String codecId;
- /**
- * Custom data for the codec (header).
- */
- public final byte[] codecPrivate;
- /**
- * Information specific to audio tracks (null for non-audio tracks).
- */
- public final AudioDetails audio;
-
- /**
- * @param index Track index/number.
- * @param type Type of the track.
- * @param trackUid The unique track UID.
- * @param name Name of the track.
- * @param codecId ID of the codec.
- * @param codecPrivate Custom data for the codec (header).
- * @param audio Information specific to audio tracks (null for non-audio tracks).
- */
- public MatroskaFileTrack(int index, Type type, long trackUid, String name, String codecId, byte[] codecPrivate, AudioDetails audio) {
- this.index = index;
- this.type = type;
- this.trackUid = trackUid;
- this.name = name;
- this.codecId = codecId;
- this.codecPrivate = codecPrivate;
- this.audio = audio;
- }
-
- /**
- * Track type list.
- */
- public enum Type {
- VIDEO(1),
- AUDIO(2),
- COMPLEX(3),
- LOGO(0x10),
- SUBTITLE(0x11),
- BUTTONS(0x12),
- CONTROL(0x20);
-
- /**
- * ID which is used in the track type field in the file.
- */
- public final long id;
-
- Type(long id) {
- this.id = id;
- }
-
- /**
- * @param id ID to look up.
- * @return Track type for that ID, null if not found.
- */
- public static Type fromId(long id) {
- for (Type entry : Type.class.getEnumConstants()) {
- if (entry.id == id) {
- return entry;
- }
- }
-
- return null;
- }
- }
-
- /**
- * Fields specific to an audio track.
- */
- public static class AudioDetails {
- /**
- * Sampling frequency in Hz.
- */
- public final float samplingFrequency;
- /**
- * Real output sampling frequency in Hz.
- */
- public final float outputSamplingFrequency;
- /**
- * Number of channels in the track.
- */
- public final int channels;
- /**
- * Number of bits per sample.
- */
- public final int bitDepth;
-
- /**
- * @param samplingFrequency Sampling frequency in Hz.
- * @param outputSamplingFrequency Real output sampling frequency in Hz.
- * @param channels Number of channels in the track.
- * @param bitDepth Number of bits per sample.
- */
- public AudioDetails(float samplingFrequency, float outputSamplingFrequency, int channels, int bitDepth) {
- this.samplingFrequency = samplingFrequency;
- this.outputSamplingFrequency = outputSamplingFrequency;
- this.channels = channels;
- this.bitDepth = bitDepth;
- }
- }
-
- /**
- * @param trackElement The track element
- * @param reader Matroska file reader
- * @return The parsed track
- * @throws IOException On read error
- */
- public static MatroskaFileTrack parse(MatroskaElement trackElement, MatroskaFileReader reader) throws IOException {
- Builder builder = new Builder();
- MatroskaElement child;
-
- while ((child = reader.readNextElement(trackElement)) != null) {
- if (child.is(MatroskaElementType.TrackNumber)) {
- builder.index = reader.asInteger(child);
- } else if (child.is(MatroskaElementType.TrackUid)) {
- builder.trackUid = reader.asLong(child);
- } else if (child.is(MatroskaElementType.TrackType)) {
- builder.type = Type.fromId(reader.asInteger(child));
- } else if (child.is(MatroskaElementType.Name)) {
- builder.name = reader.asString(child);
- } else if (child.is(MatroskaElementType.CodecId)) {
- builder.codecId = reader.asString(child);
- } else if (child.is(MatroskaElementType.CodecPrivate)) {
- builder.codecPrivate = reader.asBytes(child);
- } else if (child.is(MatroskaElementType.Audio)) {
- builder.audio = parseAudioElement(child, reader);
- }
-
- // Unused fields: DefaultDuration, Language, Video, etc
- reader.skip(child);
- }
-
- return builder.build();
- }
-
- private static AudioDetails parseAudioElement(MatroskaElement audioElement, MatroskaFileReader reader) throws IOException {
- AudioBuilder builder = new AudioBuilder();
- MatroskaElement child;
-
- while ((child = reader.readNextElement(audioElement)) != null) {
- if (child.is(MatroskaElementType.SamplingFrequency)) {
- builder.samplingFrequency = reader.asFloat(child);
- } else if (child.is(MatroskaElementType.OutputSamplingFrequency)) {
- builder.outputSamplingFrequency = reader.asFloat(child);
- } else if (child.is(MatroskaElementType.Channels)) {
- builder.channels = reader.asInteger(child);
- } else if (child.is(MatroskaElementType.BitDepth)) {
- builder.bitDepth = reader.asInteger(child);
- }
-
- reader.skip(child);
- }
-
- return builder.build();
- }
-
- private static class Builder {
- private int index;
- private Type type;
- private long trackUid;
- private String name;
- private String codecId;
- private byte[] codecPrivate;
- private AudioDetails audio;
-
- private MatroskaFileTrack build() {
- return new MatroskaFileTrack(index, type, trackUid, name, codecId, codecPrivate, audio);
- }
- }
-
- private static class AudioBuilder {
- private float samplingFrequency;
- private float outputSamplingFrequency;
- private int channels;
- private int bitDepth;
-
- private AudioDetails build() {
- return new AudioDetails(samplingFrequency, outputSamplingFrequency, channels, bitDepth);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MutableMatroskaBlock.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MutableMatroskaBlock.java
deleted file mode 100644
index 4a85fd0..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MutableMatroskaBlock.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska.format;
-
-import java.io.DataInput;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * An implementation of {@link MatroskaBlock} which can be reused by loading the next block into it by calling
- * {@link #parseHeader(MatroskaFileReader, MatroskaElement, int)}. Does not reallocate any objects unless it encounters
- * a block with more than twice as many frames as seen before, or a frame more than twice as long as before.
- */
-public class MutableMatroskaBlock implements MatroskaBlock {
- private int timecode;
- private int trackNumber;
- private boolean keyFrame;
- private int[] frameSizes;
- private int frameCount;
- private ByteBuffer buffer;
- private byte[] bufferArray;
-
- @Override
- public int getTimecode() {
- return timecode;
- }
-
- @Override
- public int getTrackNumber() {
- return trackNumber;
- }
-
- @Override
- public boolean isKeyFrame() {
- return keyFrame;
- }
-
- @Override
- public int getFrameCount() {
- return frameCount;
- }
-
- @Override
- public ByteBuffer getNextFrameBuffer(MatroskaFileReader reader, int index) throws IOException {
- if (index >= frameCount) {
- throw new IllegalArgumentException("Frame index out of bounds.");
- }
-
- int frameSize = frameSizes[index];
-
- if (buffer == null || frameSize > buffer.capacity()) {
- buffer = ByteBuffer.allocate(frameSizes[index] * 2);
- bufferArray = buffer.array();
- }
-
- reader.getDataInput().readFully(bufferArray, 0, frameSize);
-
- buffer.position(0);
- buffer.limit(frameSize);
- return buffer;
- }
-
- /**
- * Parses the Matroska block header data into the fields of this instance. On success of this method, this instance
- * effectively represents that block.
- *
- * @param reader The reader to use.
- * @param element The block EBML element.
- * @param trackFilter The ID of the track to read data for from the block.
- * @return true of a block if it contains data for the requested track, false otherwise.
- * @throws IOException On read error.
- */
- public boolean parseHeader(MatroskaFileReader reader, MatroskaElement element, int trackFilter) throws IOException {
- DataInput input = reader.getDataInput();
- trackNumber = (int) MatroskaEbmlReader.readEbmlInteger(input, null);
-
- if (trackFilter >= 0 && trackNumber != trackFilter) {
- return false;
- }
-
- timecode = input.readShort();
-
- int flags = input.readByte() & 0xFF;
- keyFrame = (flags & 0x80) != 0;
-
- int laceType = (flags & 0x06) >> 1;
-
- if (laceType != 0) {
- setFrameCount((input.readByte() & 0xFF) + 1);
- parseLacing(reader, element, laceType);
- } else {
- setFrameCount(1);
- frameSizes[0] = (int) element.getRemaining(reader.getPosition());
- }
-
- return true;
- }
-
- private void parseLacing(MatroskaFileReader reader, MatroskaElement element, int laceType) throws IOException {
- setFrameCount(frameCount);
-
- switch (laceType) {
- case 1:
- parseXiphLaceSizes(reader, element);
- break;
- case 2:
- parseFixedLaceSizes(reader, element);
- break;
- case 3:
- default:
- parseEbmlLaceSizes(reader, element);
- }
- }
-
- private void setFrameCount(int frameCount) {
- if (frameSizes == null || frameSizes.length < frameCount) {
- frameSizes = new int[frameCount * 2];
- }
-
- this.frameCount = frameCount;
- }
-
- private void parseXiphLaceSizes(MatroskaFileReader reader, MatroskaElement element) throws IOException {
- int sizeTotal = 0;
- DataInput input = reader.getDataInput();
-
- for (int i = 0; i < frameCount - 1; i++) {
- int value;
-
- do {
- value = input.readByte() & 0xFF;
- frameSizes[i] += value;
- } while (value == 255);
-
- sizeTotal += frameSizes[i];
- }
-
- frameSizes[frameCount - 1] = (int) element.getRemaining(reader.getPosition()) - sizeTotal;
- }
-
- private void parseFixedLaceSizes(MatroskaFileReader reader, MatroskaElement element) {
- int size = (int) element.getRemaining(reader.getPosition()) / frameCount;
-
- for (int i = 0; i < frameCount; i++) {
- frameSizes[i] = size;
- }
- }
-
- private void parseEbmlLaceSizes(MatroskaFileReader reader, MatroskaElement element) throws IOException {
- DataInput input = reader.getDataInput();
-
- frameSizes[0] = (int) MatroskaEbmlReader.readEbmlInteger(input, null);
- int sizeTotal = frameSizes[0];
-
- for (int i = 1; i < frameCount - 1; i++) {
- frameSizes[i] = frameSizes[i - 1] + (int) MatroskaEbmlReader.readEbmlInteger(input, MatroskaEbmlReader.Type.LACE_SIGNED);
- sizeTotal += frameSizes[i];
- }
-
- frameSizes[frameCount - 1] = (int) element.getRemaining(reader.getPosition()) - sizeTotal;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MutableMatroskaElement.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MutableMatroskaElement.java
deleted file mode 100644
index 42b97fa..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MutableMatroskaElement.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.matroska.format;
-
-/**
- * Mutable instance of {@link MatroskaElement} for reducing allocation rate during parsing.
- */
-public class MutableMatroskaElement extends MatroskaElement {
- protected MutableMatroskaElement(int level) {
- super(level);
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public void setType(MatroskaElementType type) {
- this.type = type;
- }
-
- public void setPosition(long position) {
- this.position = position;
- }
-
- public void setHeaderSize(int headerSize) {
- this.headerSize = headerSize;
- }
-
- public void setDataSize(int dataSize) {
- this.dataSize = dataSize;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3AudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3AudioTrack.java
deleted file mode 100644
index a687d87..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3AudioTrack.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mp3;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.BaseAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Audio track that handles an MP3 stream
- */
-public class Mp3AudioTrack extends BaseAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(Mp3AudioTrack.class);
-
- private final SeekableInputStream inputStream;
-
- /**
- * @param trackInfo Track info
- * @param inputStream Input stream for the MP3 file
- */
- public Mp3AudioTrack(AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- super(trackInfo);
-
- this.inputStream = inputStream;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- Mp3TrackProvider provider = new Mp3TrackProvider(localExecutor.getProcessingContext(), inputStream);
-
- try {
- provider.parseHeaders();
-
- log.debug("Starting to play MP3 track {}", getIdentifier());
- localExecutor.executeProcessingLoop(provider::provideFrames, provider::seekToTimecode);
- } finally {
- provider.close();
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3ConstantRateSeeker.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3ConstantRateSeeker.java
deleted file mode 100644
index 5c262c5..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3ConstantRateSeeker.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mp3;
-
-import com.sedmelluq.discord.lavaplayer.natives.mp3.Mp3Decoder;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.natives.mp3.Mp3Decoder.MPEG1_SAMPLES_PER_FRAME;
-
-/**
- * MP3 seeking support for constant bitrate files or in cases where the variable bitrate format used by the file is not
- * supported. In case the file is not actually CBR, this being used as a fallback may cause inaccurate seeking.
- */
-public class Mp3ConstantRateSeeker implements Mp3Seeker {
- private static final int META_TAG_OFFSET = 36;
- private static final byte[][] META_TAGS = new byte[][]{
- new byte[]{'I', 'n', 'f', 'o'},
- new byte[]{'L', 'A', 'M', 'E'}
- };
-
- private final double averageFrameSize;
- private final int sampleRate;
- private final long firstFramePosition;
- private final long contentLength;
-
- private Mp3ConstantRateSeeker(double averageFrameSize, int sampleRate, long firstFramePosition, long contentLength) {
- this.averageFrameSize = averageFrameSize;
- this.sampleRate = sampleRate;
- this.firstFramePosition = firstFramePosition;
- this.contentLength = contentLength;
- }
-
- /**
- * @param firstFramePosition Position of the first frame in the file
- * @param contentLength Total length of the file
- * @param frameBuffer Buffer of the first frame
- * @return Constant rate seeker, will always succeed, never null.
- */
- public static Mp3ConstantRateSeeker createFromFrame(long firstFramePosition, long contentLength, byte[] frameBuffer) {
- int sampleRate = Mp3Decoder.getFrameSampleRate(frameBuffer, 0);
- double averageFrameSize = Mp3Decoder.getAverageFrameSize(frameBuffer, 0);
-
- return new Mp3ConstantRateSeeker(averageFrameSize, sampleRate, firstFramePosition, contentLength);
- }
-
- public static boolean isMetaFrame(byte[] frameBuffer) {
- for (byte[] metaTag : META_TAGS) {
- if (DataFormatTools.arrayRangeEquals(frameBuffer, META_TAG_OFFSET, metaTag)) {
- return true;
- }
- }
-
- return false;
- }
-
- @Override
- public long getDuration() {
- return getMaximumFrameCount() * MPEG1_SAMPLES_PER_FRAME * 1000 / sampleRate;
- }
-
- @Override
- public boolean isSeekable() {
- return true;
- }
-
- @Override
- public long seekAndGetFrameIndex(long timecode, SeekableInputStream inputStream) throws IOException {
- long maximumFrameCount = getMaximumFrameCount();
-
- long sampleIndex = timecode * sampleRate / 1000;
- long frameIndex = Math.min(sampleIndex / MPEG1_SAMPLES_PER_FRAME, maximumFrameCount);
-
- long seekPosition = (long) (frameIndex * averageFrameSize) - 8;
- inputStream.seek(firstFramePosition + seekPosition);
-
- return frameIndex;
- }
-
- private long getMaximumFrameCount() {
- return (long) ((contentLength - firstFramePosition + 8) / averageFrameSize);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3ContainerProbe.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3ContainerProbe.java
deleted file mode 100644
index 494c2c1..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3ContainerProbe.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mp3;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerHints;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.STREAM_SCAN_DISTANCE;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.checkNextBytes;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.supportedFormat;
-
-/**
- * Container detection probe for MP3 format.
- */
-public class Mp3ContainerProbe implements MediaContainerProbe {
- private static final Logger log = LoggerFactory.getLogger(Mp3ContainerProbe.class);
-
- private static final int[] ID3_TAG = new int[]{0x49, 0x44, 0x33};
-
- @Override
- public String getName() {
- return "mp3";
- }
-
- @Override
- public boolean matchesHints(MediaContainerHints hints) {
- boolean invalidMimeType = hints.mimeType != null && !"audio/mpeg".equalsIgnoreCase(hints.mimeType);
- boolean invalidFileExtension = hints.fileExtension != null && !"mp3".equalsIgnoreCase(hints.fileExtension);
- return hints.present() && !invalidMimeType && !invalidFileExtension;
- }
-
- @Override
- public MediaContainerDetectionResult probe(AudioReference reference, SeekableInputStream inputStream) throws IOException {
- if (!checkNextBytes(inputStream, ID3_TAG)) {
- byte[] frameHeader = new byte[4];
- Mp3FrameReader frameReader = new Mp3FrameReader(inputStream, frameHeader);
- if (!frameReader.scanForFrame(STREAM_SCAN_DISTANCE, false)) {
- return null;
- }
-
- inputStream.seek(0);
- }
-
- log.debug("Track {} is an MP3 file.", reference.identifier);
-
- Mp3TrackProvider file = new Mp3TrackProvider(null, inputStream);
-
- try {
- file.parseHeaders();
-
- return supportedFormat(this, null, AudioTrackInfoBuilder.create(reference, inputStream)
- .apply(file).setIsStream(!file.isSeekable()).build());
- } finally {
- file.close();
- }
- }
-
- @Override
- public AudioTrack createTrack(String parameters, AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- return new Mp3AudioTrack(trackInfo, inputStream);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3FrameReader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3FrameReader.java
deleted file mode 100644
index 8ecfab6..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3FrameReader.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mp3;
-
-import com.sedmelluq.discord.lavaplayer.natives.mp3.Mp3Decoder;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.natives.mp3.Mp3Decoder.HEADER_SIZE;
-
-/**
- * Handles reading MP3 frames from a stream.
- */
-public class Mp3FrameReader {
- private final SeekableInputStream inputStream;
- private final DataInput dataInput;
- private final byte[] scanBuffer;
- private final byte[] frameBuffer;
- private int frameSize;
- private int frameBufferPosition;
- private int scanBufferPosition;
- private boolean frameHeaderRead;
-
- /**
- * @param inputStream Input buffer to read from
- * @param frameBuffer Array to store the frame data in
- */
- public Mp3FrameReader(SeekableInputStream inputStream, byte[] frameBuffer) {
- this.inputStream = inputStream;
- this.dataInput = new DataInputStream(inputStream);
- this.scanBuffer = new byte[16];
- this.frameBuffer = frameBuffer;
- }
-
- /**
- * @param bytesToCheck The maximum number of bytes to check before throwing an IllegalStateException
- * @param throwOnLimit Whether to throw an exception when maximum number of bytes is reached, but no frame has been
- * found and EOF has not been reached.
- * @return True if a frame was found, false if EOF was encountered.
- * @throws IOException On IO error
- * @throws IllegalStateException If the maximum number of bytes to check was reached before a frame was found
- */
- public boolean scanForFrame(int bytesToCheck, boolean throwOnLimit) throws IOException {
- int bytesInBuffer = scanBufferPosition;
- scanBufferPosition = 0;
-
- if (parseFrameAt(bytesInBuffer)) {
- frameHeaderRead = true;
- return true;
- }
-
- return runFrameScanLoop(bytesToCheck - bytesInBuffer, bytesInBuffer, throwOnLimit);
- }
-
- private boolean runFrameScanLoop(int bytesToCheck, int bytesInBuffer, boolean throwOnLimit) throws IOException {
- while (bytesToCheck > 0) {
- for (int i = bytesInBuffer; i < scanBuffer.length && bytesToCheck > 0; i++, bytesToCheck--) {
- int next = inputStream.read();
- if (next == -1) {
- return false;
- }
-
- scanBuffer[i] = (byte) (next & 0xFF);
-
- if (parseFrameAt(i + 1)) {
- frameHeaderRead = true;
- return true;
- }
- }
-
- bytesInBuffer = copyScanBufferEndToBeginning();
- }
-
- if (throwOnLimit) {
- throw new IllegalStateException("Mp3 frame not found.");
- }
-
- return false;
- }
-
- private int copyScanBufferEndToBeginning() {
- for (int i = 0; i < HEADER_SIZE - 1; i++) {
- scanBuffer[i] = scanBuffer[scanBuffer.length - HEADER_SIZE + i + 1];
- }
-
- return HEADER_SIZE - 1;
- }
-
- private boolean parseFrameAt(int scanOffset) {
- if (scanOffset >= HEADER_SIZE && (frameSize = Mp3Decoder.getFrameSize(scanBuffer, scanOffset - HEADER_SIZE)) > 0) {
- for (int i = 0; i < HEADER_SIZE; i++) {
- frameBuffer[i] = scanBuffer[scanOffset - HEADER_SIZE + i];
- }
-
- frameBufferPosition = HEADER_SIZE;
- return true;
- }
-
- return false;
- }
-
- /**
- * Fills the buffer for the current frame. If no frame header has been read previously, it will first scan for the
- * sync bytes of the next frame in the stream.
- *
- * @return False if EOF was encountered while looking for the next frame, true otherwise
- * @throws IOException On IO error
- */
- public boolean fillFrameBuffer() throws IOException {
- if (!frameHeaderRead && !scanForFrame(Integer.MAX_VALUE, true)) {
- return false;
- }
-
- dataInput.readFully(frameBuffer, frameBufferPosition, frameSize - frameBufferPosition);
- frameBufferPosition = frameSize;
- return true;
- }
-
- /**
- * Forget the current frame and make next calls look for the next frame.
- */
- public void nextFrame() {
- frameHeaderRead = false;
- frameBufferPosition = 0;
- }
-
- /**
- * @return The start position of the current frame in the stream.
- */
- public long getFrameStartPosition() {
- return inputStream.getPosition() - frameBufferPosition;
- }
-
- /**
- * @return Size of the current frame in bytes.
- */
- public int getFrameSize() {
- return frameSize;
- }
-
- /**
- * Append some bytes to the frame sync scan buffer. This must be called when some bytes have been read externally that
- * may actually be part of the next frame header.
- *
- * @param data The buffer to copy from
- * @param offset The offset in the buffer
- * @param length The length of the region to copy
- */
- public void appendToScanBuffer(byte[] data, int offset, int length) {
- System.arraycopy(data, offset, scanBuffer, 0, length);
- scanBufferPosition = length;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3Seeker.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3Seeker.java
deleted file mode 100644
index b2f49d7..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3Seeker.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mp3;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-
-import java.io.IOException;
-
-/**
- * A seeking handler for MP3 files.
- */
-public interface Mp3Seeker {
- /**
- * @return The duration of the file in milliseconds. May be an estimate.
- */
- long getDuration();
-
- /**
- * @return True if the track is seekable.
- */
- boolean isSeekable();
-
- /**
- * @param timecode The timecode that the seek is requested to
- * @param inputStream The input stream to perform the seek on
- * @return The index of the frame that the seek was performed to
- * @throws IOException On IO error
- */
- long seekAndGetFrameIndex(long timecode, SeekableInputStream inputStream) throws IOException;
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3StreamSeeker.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3StreamSeeker.java
deleted file mode 100644
index ef3a1b5..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3StreamSeeker.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mp3;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-
-import java.io.IOException;
-
-/**
- * Seeker for an MP3 stream, which actually does not allow seeking and reports Long.MAX_VALUE as duration.
- */
-public class Mp3StreamSeeker implements Mp3Seeker {
- @Override
- public long getDuration() {
- return Long.MAX_VALUE;
- }
-
- @Override
- public boolean isSeekable() {
- return false;
- }
-
- @Override
- public long seekAndGetFrameIndex(long timecode, SeekableInputStream inputStream) throws IOException {
- throw new UnsupportedOperationException("Cannot seek on a stream.");
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3TrackProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3TrackProvider.java
deleted file mode 100644
index e3c5897..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3TrackProvider.java
+++ /dev/null
@@ -1,395 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mp3;
-
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipeline;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipelineFactory;
-import com.sedmelluq.discord.lavaplayer.filter.PcmFormat;
-import com.sedmelluq.discord.lavaplayer.natives.mp3.Mp3Decoder;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoProvider;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.ShortBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.sedmelluq.discord.lavaplayer.natives.mp3.Mp3Decoder.MPEG1_SAMPLES_PER_FRAME;
-
-/**
- * Handles parsing MP3 files, seeking and sending the decoded frames to the specified frame consumer.
- */
-public class Mp3TrackProvider implements AudioTrackInfoProvider {
- private static final byte[] IDV3_TAG = new byte[]{0x49, 0x44, 0x33};
- private static final int IDV3_FLAG_EXTENDED = 0x40;
-
- private static final String TITLE_TAG = "TIT2";
- private static final String ARTIST_TAG = "TPE1";
-
- private static final List knownTextExtensions = Arrays.asList(TITLE_TAG, ARTIST_TAG);
-
- private final AudioProcessingContext context;
- private final SeekableInputStream inputStream;
- private final DataInputStream dataInput;
- private final Mp3Decoder mp3Decoder;
- private final ShortBuffer outputBuffer;
- private final ByteBuffer inputBuffer;
- private final byte[] frameBuffer;
- private final byte[] tagHeaderBuffer;
- private final Mp3FrameReader frameReader;
- private final Map tags;
-
- private int sampleRate;
- private int channelCount;
- private AudioPipeline downstream;
- private Mp3Seeker seeker;
-
- /**
- * @param context Configuration and output information for processing. May be null in case no frames are read and this
- * instance is only used to retrieve information about the track.
- * @param inputStream Stream to read the file from
- */
- public Mp3TrackProvider(AudioProcessingContext context, SeekableInputStream inputStream) {
- this.context = context;
- this.inputStream = inputStream;
- this.dataInput = new DataInputStream(inputStream);
- this.outputBuffer = ByteBuffer.allocateDirect((int) MPEG1_SAMPLES_PER_FRAME * 4).order(ByteOrder.nativeOrder()).asShortBuffer();
- this.inputBuffer = ByteBuffer.allocateDirect(Mp3Decoder.getMaximumFrameSize());
- this.frameBuffer = new byte[Mp3Decoder.getMaximumFrameSize()];
- this.tagHeaderBuffer = new byte[4];
- this.frameReader = new Mp3FrameReader(inputStream, frameBuffer);
- this.mp3Decoder = new Mp3Decoder();
- this.tags = new HashMap<>();
- }
-
- /**
- * Parses file headers to find the first MP3 frame and to get the settings for initialising the filter chain.
- *
- * @throws IOException On read error
- */
- public void parseHeaders() throws IOException {
- skipIdv3Tags();
-
- if (!frameReader.scanForFrame(2048, true)) {
- throw new IllegalStateException("File ended before the first frame was found.");
- }
-
- sampleRate = Mp3Decoder.getFrameSampleRate(frameBuffer, 0);
- channelCount = Mp3Decoder.getFrameChannelCount(frameBuffer, 0);
- downstream = context != null ? AudioPipelineFactory.create(context, new PcmFormat(channelCount, sampleRate)) : null;
-
- initialiseSeeker();
- }
-
- private void initialiseSeeker() throws IOException {
- long startPosition = frameReader.getFrameStartPosition();
- frameReader.fillFrameBuffer();
-
- seeker = Mp3XingSeeker.createFromFrame(startPosition, inputStream.getContentLength(), frameBuffer);
-
- if (seeker == null) {
- if (inputStream.getContentLength() == Long.MAX_VALUE) {
- seeker = new Mp3StreamSeeker();
- } else {
- if (context == null) {
- // Skip meta frames if this provider is created only for reading metadata.
- for (int i = 0; Mp3ConstantRateSeeker.isMetaFrame(frameBuffer) && i < 2; i++) {
- frameReader.nextFrame();
- frameReader.fillFrameBuffer();
- }
- }
-
- seeker = Mp3ConstantRateSeeker.createFromFrame(startPosition, inputStream.getContentLength(), frameBuffer);
- }
- }
- }
-
- /**
- * Decodes audio frames and sends them to frame consumer
- *
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- public void provideFrames() throws InterruptedException {
- try {
- while (true) {
- if (!frameReader.fillFrameBuffer()) {
- break;
- }
-
- inputBuffer.clear();
- inputBuffer.put(frameBuffer, 0, frameReader.getFrameSize());
- inputBuffer.flip();
-
- outputBuffer.clear();
- outputBuffer.limit(channelCount * (int) Mp3Decoder.getSamplesPerFrame(frameBuffer, 0));
-
- int produced = mp3Decoder.decode(inputBuffer, outputBuffer);
-
- if (produced > 0) {
- downstream.process(outputBuffer);
- }
-
- frameReader.nextFrame();
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Seeks to the specified timecode.
- *
- * @param timecode The timecode in milliseconds
- */
- public void seekToTimecode(long timecode) {
- try {
- long frameIndex = seeker.seekAndGetFrameIndex(timecode, inputStream);
- long actualTimecode = frameIndex * MPEG1_SAMPLES_PER_FRAME * 1000 / sampleRate;
- downstream.seekPerformed(timecode, actualTimecode);
-
- frameReader.nextFrame();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * @return True if the track is seekable (false for streams for example).
- */
- public boolean isSeekable() {
- return seeker.isSeekable();
- }
-
- /**
- * @return An estimated duration of the file in milliseconds
- */
- public long getDuration() {
- return seeker.getDuration();
- }
-
- /**
- * Gets an ID3 tag. These are loaded when parsing headers and only for a fixed list of tags.
- *
- * @param tagId The FourCC of the tag
- * @return The value of the tag if present, otherwise null
- */
- public String getIdv3Tag(String tagId) {
- return tags.get(tagId);
- }
-
- /**
- * Closes resources.
- */
- public void close() {
- if (downstream != null) {
- downstream.close();
- }
-
- mp3Decoder.close();
- }
-
- private void skipIdv3Tags() throws IOException {
- dataInput.readFully(tagHeaderBuffer, 0, 3);
-
- for (int i = 0; i < 3; i++) {
- if (tagHeaderBuffer[i] != IDV3_TAG[i]) {
- frameReader.appendToScanBuffer(tagHeaderBuffer, 0, 3);
- return;
- }
- }
-
- int majorVersion = dataInput.readByte() & 0xFF;
- // Minor version
- dataInput.readByte();
-
- if (majorVersion < 2 || majorVersion > 5) {
- return;
- }
-
- int flags = dataInput.readByte() & 0xFF;
- int tagsSize = readSyncProofInteger();
-
- long tagsEndPosition = inputStream.getPosition() + tagsSize;
-
- skipExtendedHeader(flags);
-
- if (majorVersion < 5) {
- parseIdv3Frames(majorVersion, tagsEndPosition);
- }
-
- inputStream.seek(tagsEndPosition);
- }
-
- private int readSyncProofInteger() throws IOException {
- return (dataInput.readByte() & 0xFF) << 21
- | (dataInput.readByte() & 0xFF) << 14
- | (dataInput.readByte() & 0xFF) << 7
- | (dataInput.readByte() & 0xFF);
- }
-
- private int readSyncProof3ByteInteger() throws IOException {
- return (dataInput.readByte() & 0xFF) << 14
- | (dataInput.readByte() & 0xFF) << 7
- | (dataInput.readByte() & 0xFF);
- }
-
- private void skipExtendedHeader(int flags) throws IOException {
- if ((flags & IDV3_FLAG_EXTENDED) != 0) {
- int size = readSyncProofInteger();
-
- inputStream.seek(inputStream.getPosition() + size - 4);
- }
- }
-
- private void parseIdv3Frames(int version, long tagsEndPosition) throws IOException {
- FrameHeader header;
-
- while (inputStream.getPosition() + 10 <= tagsEndPosition && (header = readFrameHeader(version)) != null) {
- long nextTagPosition = inputStream.getPosition() + header.size;
-
- if (header.hasRawFormat() && knownTextExtensions.contains(header.id)) {
- String text = parseIdv3TextContent(header.size);
-
- if (text != null) {
- tags.put(header.id, text);
- }
- }
-
- inputStream.seek(nextTagPosition);
- }
- }
-
- private String parseIdv3TextContent(int size) throws IOException {
- int encoding = dataInput.readByte() & 0xFF;
-
- byte[] data = new byte[size - 1];
- dataInput.readFully(data);
-
- boolean shortTerminator = data.length > 0 && data[data.length - 1] == 0;
- boolean wideTerminator = data.length > 1 && data[data.length - 2] == 0 && shortTerminator;
-
- switch (encoding) {
- case 0:
- return new String(data, 0, size - (shortTerminator ? 2 : 1), "ISO-8859-1");
- case 1:
- return new String(data, 0, size - (wideTerminator ? 3 : 1), "UTF-16");
- case 2:
- return new String(data, 0, size - (wideTerminator ? 3 : 1), "UTF-16BE");
- case 3:
- return new String(data, 0, size - (shortTerminator ? 2 : 1), "UTF-8");
- default:
- return null;
- }
- }
-
- private String readId3v22TagName() throws IOException {
- dataInput.readFully(tagHeaderBuffer, 0, 3);
-
- if (tagHeaderBuffer[0] == 0) {
- return null;
- }
-
- String shortName = new String(tagHeaderBuffer, 0, 3, StandardCharsets.ISO_8859_1);
-
- if ("TT2".equals(shortName)) {
- return "TIT2";
- } else if ("TP1".equals(shortName)) {
- return "TPE1";
- } else {
- return shortName;
- }
- }
-
- private String readTagName() throws IOException {
- dataInput.readFully(tagHeaderBuffer, 0, 4);
-
- if (tagHeaderBuffer[0] == 0) {
- return null;
- }
-
- return new String(tagHeaderBuffer, 0, 4, StandardCharsets.ISO_8859_1);
- }
-
- private FrameHeader readFrameHeader(int version) throws IOException {
- if (version == 2) {
- String tagName = readId3v22TagName();
-
- if (tagName != null) {
- return new FrameHeader(tagName, readSyncProof3ByteInteger(), 0);
- }
- } else {
- String tagName = readTagName();
-
- if (tagName != null) {
- int size = version == 3 ? dataInput.readInt() : readSyncProofInteger();
- return new FrameHeader(tagName, size, dataInput.readUnsignedShort());
- }
- }
-
- return null;
- }
-
- @Override
- public String getTitle() {
- return getIdv3Tag(TITLE_TAG);
- }
-
- @Override
- public String getAuthor() {
- return getIdv3Tag(ARTIST_TAG);
- }
-
- @Override
- public Long getLength() {
- return getDuration();
- }
-
- @Override
- public String getIdentifier() {
- return null;
- }
-
- @Override
- public String getUri() {
- return null;
- }
-
- private static class FrameHeader {
- private final String id;
- private final int size;
- @SuppressWarnings("unused")
- private final boolean tagAlterPreservation;
- @SuppressWarnings("unused")
- private final boolean fileAlterPreservation;
- @SuppressWarnings("unused")
- private final boolean readOnly;
- @SuppressWarnings("unused")
- private final boolean groupingIdentity;
- private final boolean compression;
- private final boolean encryption;
- private final boolean unsynchronization;
- private final boolean dataLengthIndicator;
-
- private FrameHeader(String id, int size, int flags) {
- this.id = id;
- this.size = size;
- this.tagAlterPreservation = (flags & 0x4000) != 0;
- this.fileAlterPreservation = (flags & 0x2000) != 0;
- this.readOnly = (flags & 0x1000) != 0;
- this.groupingIdentity = (flags & 0x0040) != 0;
- this.compression = (flags & 0x0008) != 0;
- this.encryption = (flags & 0x0004) != 0;
- this.unsynchronization = (flags & 0x0002) != 0;
- this.dataLengthIndicator = (flags & 0x0001) != 0;
- }
-
- private boolean hasRawFormat() {
- return !compression && !encryption && !unsynchronization && !dataLengthIndicator;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3XingSeeker.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3XingSeeker.java
deleted file mode 100644
index aaa3c25..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mp3/Mp3XingSeeker.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mp3;
-
-import com.sedmelluq.discord.lavaplayer.natives.mp3.Mp3Decoder;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import static com.sedmelluq.discord.lavaplayer.natives.mp3.Mp3Decoder.MPEG1_SAMPLES_PER_FRAME;
-
-/**
- * Seeking support for VBR files with Xing header.
- */
-public class Mp3XingSeeker implements Mp3Seeker {
- private static final Logger log = LoggerFactory.getLogger(Mp3XingSeeker.class);
-
- private static final int XING_OFFSET = 36;
- private static final int ALL_FLAGS = 0x7;
- private static final ByteBuffer xingTagBuffer = ByteBuffer.wrap(new byte[]{0x58, 0x69, 0x6E, 0x67});
-
- private final long firstFramePosition;
- private final long contentLength;
- private final long frameCount;
- private final long dataSize;
- private final byte[] seekMapping;
- private final long duration;
-
- private Mp3XingSeeker(int sampleRate, long firstFramePosition, long contentLength, long frameCount, long dataSize, byte[] seekMapping) {
- this.firstFramePosition = firstFramePosition;
- this.contentLength = contentLength;
- this.frameCount = frameCount;
- this.dataSize = dataSize;
- this.seekMapping = seekMapping;
- this.duration = frameCount * MPEG1_SAMPLES_PER_FRAME * 1000L / sampleRate;
- }
-
- /**
- * @param firstFramePosition Position of the first frame in the file
- * @param contentLength Total length of the file
- * @param frameBuffer Buffer of the first frame
- * @return Xing seeker, if its header is found in the first frame and has all the necessary fields
- */
- public static Mp3XingSeeker createFromFrame(long firstFramePosition, long contentLength, byte[] frameBuffer) {
- ByteBuffer frame = ByteBuffer.wrap(frameBuffer);
-
- if (frame.getInt(XING_OFFSET) != xingTagBuffer.getInt(0)) {
- return null;
- } else if ((frame.getInt(XING_OFFSET + 4) & ALL_FLAGS) != ALL_FLAGS) {
- log.debug("Xing tag is present, but is missing some required fields.");
- return null;
- }
-
- int sampleRate = Mp3Decoder.getFrameSampleRate(frameBuffer, 0);
- long frameCount = frame.getInt(XING_OFFSET + 8);
- long dataSize = frame.getInt(XING_OFFSET + 12);
-
- byte[] seekMapping = new byte[100];
- frame.position(XING_OFFSET + 16);
- frame.get(seekMapping);
-
- return new Mp3XingSeeker(sampleRate, firstFramePosition, contentLength, frameCount, dataSize, seekMapping);
- }
-
- @Override
- public long getDuration() {
- return duration;
- }
-
- @Override
- public boolean isSeekable() {
- return true;
- }
-
- @Override
- public long seekAndGetFrameIndex(long timecode, SeekableInputStream inputStream) throws IOException {
- int percentile = (int) (timecode * 100L / duration);
- long frameIndex = frameCount * percentile / 100L;
-
- long seekPosition = Math.min(firstFramePosition + dataSize * (seekMapping[percentile] & 0xFF) / 256, contentLength);
- inputStream.seek(seekPosition);
-
- return frameIndex;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegAacTrackConsumer.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegAacTrackConsumer.java
deleted file mode 100644
index bc0a4d5..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegAacTrackConsumer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg;
-
-import com.sedmelluq.discord.lavaplayer.container.common.AacPacketRouter;
-import com.sedmelluq.discord.lavaplayer.natives.aac.AacDecoder;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.ClosedByInterruptException;
-import java.nio.channels.ReadableByteChannel;
-
-/**
- * Handles processing MP4 AAC frames. Passes the decoded frames to the specified frame consumer. Currently only AAC LC
- * format is supported, although the underlying decoder can handler other types as well.
- */
-public class MpegAacTrackConsumer implements MpegTrackConsumer {
- private static final Logger log = LoggerFactory.getLogger(MpegAacTrackConsumer.class);
-
- private final MpegTrackInfo track;
- private final ByteBuffer inputBuffer;
- private final AacPacketRouter packetRouter;
-
- /**
- * @param context Configuration and output information for processing
- * @param track The MP4 audio track descriptor
- */
- public MpegAacTrackConsumer(AudioProcessingContext context, MpegTrackInfo track) {
- this.track = track;
- this.inputBuffer = ByteBuffer.allocateDirect(4096);
- this.packetRouter = new AacPacketRouter(context, this::configureDecoder);
- }
-
- @Override
- public void initialise() {
- log.debug("Initialising AAC track with expected frequency {} and channel count {}.",
- track.sampleRate, track.channelCount);
- }
-
- @Override
- public MpegTrackInfo getTrack() {
- return track;
- }
-
- @Override
- public void seekPerformed(long requestedTimecode, long providedTimecode) {
- packetRouter.seekPerformed(requestedTimecode, providedTimecode);
- }
-
- @Override
- public void flush() throws InterruptedException {
- packetRouter.flush();
- }
-
- @Override
- public void consume(ReadableByteChannel channel, int length) throws InterruptedException {
- int remaining = length;
-
- while (remaining > 0) {
- int chunk = Math.min(remaining, inputBuffer.capacity());
-
- inputBuffer.clear();
- inputBuffer.limit(chunk);
-
- try {
- IOUtils.readFully(channel, inputBuffer);
- } catch (ClosedByInterruptException e) {
- log.trace("Interrupt received while reading channel", e);
-
- Thread.currentThread().interrupt();
- throw new InterruptedException();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- inputBuffer.flip();
- packetRouter.processInput(inputBuffer);
-
- remaining -= chunk;
- }
- }
-
- @Override
- public void close() {
- packetRouter.close();
- }
-
- private void configureDecoder(AacDecoder decoder) {
- decoder.configure(AacDecoder.AAC_LC, track.sampleRate, track.channelCount);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegAudioTrack.java
deleted file mode 100644
index 172847b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegAudioTrack.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg;
-
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.MpegFileTrackProvider;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.BaseAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.FAULT;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio track that handles the processing of MP4 format
- */
-public class MpegAudioTrack extends BaseAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(MpegAudioTrack.class);
-
- private final SeekableInputStream inputStream;
-
- /**
- * @param trackInfo Track info
- * @param inputStream Input stream for the MP4 file
- */
- public MpegAudioTrack(AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- super(trackInfo);
-
- this.inputStream = inputStream;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) {
- MpegFileLoader file = new MpegFileLoader(inputStream);
- file.parseHeaders();
-
- MpegTrackConsumer trackConsumer = loadAudioTrack(file, localExecutor.getProcessingContext());
-
- try {
- MpegFileTrackProvider fileReader = file.loadReader(trackConsumer);
- if (fileReader == null) {
- throw new FriendlyException("Unknown MP4 format.", SUSPICIOUS, null);
- }
-
- accurateDuration.set(fileReader.getDuration());
-
- localExecutor.executeProcessingLoop(fileReader::provideFrames, fileReader::seekToTimecode);
- } finally {
- trackConsumer.close();
- }
- }
-
- protected MpegTrackConsumer loadAudioTrack(MpegFileLoader file, AudioProcessingContext context) {
- MpegTrackConsumer trackConsumer = null;
- boolean success = false;
-
- try {
- trackConsumer = selectAudioTrack(file.getTrackList(), context);
-
- if (trackConsumer == null) {
- throw new FriendlyException("The audio codec used in the track is not supported.", SUSPICIOUS, null);
- } else {
- log.debug("Starting to play track with codec {}", trackConsumer.getTrack().codecName);
- }
-
- trackConsumer.initialise();
- success = true;
- return trackConsumer;
- } catch (Exception e) {
- throw ExceptionTools.wrapUnfriendlyExceptions("Something went wrong when loading an MP4 format track.", FAULT, e);
- } finally {
- if (!success && trackConsumer != null) {
- trackConsumer.close();
- }
- }
- }
-
- private MpegTrackConsumer selectAudioTrack(List tracks, AudioProcessingContext context) {
- for (MpegTrackInfo track : tracks) {
- if ("soun".equals(track.handler) && "mp4a".equals(track.codecName)) {
- return new MpegAacTrackConsumer(context, track);
- }
- }
-
- return null;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegContainerProbe.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegContainerProbe.java
deleted file mode 100644
index a8ca3f0..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegContainerProbe.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerHints;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.MpegFileTrackProvider;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.checkNextBytes;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.supportedFormat;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.unsupportedFormat;
-
-/**
- * Container detection probe for MP4 format.
- */
-public class MpegContainerProbe implements MediaContainerProbe {
- private static final Logger log = LoggerFactory.getLogger(MpegContainerProbe.class);
-
- private static final int[] ISO_TAG = new int[]{0x00, 0x00, 0x00, -1, 0x66, 0x74, 0x79, 0x70};
-
- @Override
- public String getName() {
- return "mp4";
- }
-
- @Override
- public boolean matchesHints(MediaContainerHints hints) {
- return false;
- }
-
- @Override
- public MediaContainerDetectionResult probe(AudioReference reference, SeekableInputStream inputStream) throws IOException {
- if (!checkNextBytes(inputStream, ISO_TAG)) {
- return null;
- }
-
- log.debug("Track {} is an MP4 file.", reference.identifier);
-
- MpegFileLoader file = new MpegFileLoader(inputStream);
- file.parseHeaders();
-
- MpegTrackInfo audioTrack = getSupportedAudioTrack(file);
-
- if (audioTrack == null) {
- return unsupportedFormat(this, "No supported audio format in the MP4 file.");
- }
-
- MpegTrackConsumer trackConsumer = new MpegNoopTrackConsumer(audioTrack);
- MpegFileTrackProvider fileReader = file.loadReader(trackConsumer);
-
- if (fileReader == null) {
- return unsupportedFormat(this, "MP4 file uses an unsupported format.");
- }
-
- AudioTrackInfo trackInfo = AudioTrackInfoBuilder.create(reference, inputStream)
- .setTitle(file.getTextMetadata("Title"))
- .setAuthor(file.getTextMetadata("Artist"))
- .setLength(fileReader.getDuration())
- .build();
-
- return supportedFormat(this, null, trackInfo);
- }
-
- @Override
- public AudioTrack createTrack(String parameters, AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- return new MpegAudioTrack(trackInfo, inputStream);
- }
-
- private MpegTrackInfo getSupportedAudioTrack(MpegFileLoader file) {
- for (MpegTrackInfo track : file.getTrackList()) {
- if ("soun".equals(track.handler) && "mp4a".equals(track.codecName)) {
- return track;
- }
- }
-
- return null;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegFileLoader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegFileLoader.java
deleted file mode 100644
index e072bca..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegFileLoader.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg;
-
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.*;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.fragmented.MpegFragmentedFileTrackProvider;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.standard.MpegStandardFileTrackProvider;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Handles processing an MP4 file for the purpose of streaming one specific track from it. Only performs seeks when
- * absolutely necessary, as the stream may be a network connection, in which case each seek may require a new connection.
- */
-public class MpegFileLoader {
- private final List tracks;
- private final MpegFragmentedFileTrackProvider fragmentedFileReader;
- private final MpegStandardFileTrackProvider standardFileReader;
- private final MpegReader reader;
- private final MpegSectionInfo root;
- private final Map metadata;
- private byte[] lastEventMessage;
-
- /**
- * @param inputStream Stream to read the file from
- */
- public MpegFileLoader(SeekableInputStream inputStream) {
- this.tracks = new ArrayList<>();
- this.reader = new MpegReader(inputStream);
- this.root = new MpegSectionInfo(0, inputStream.getContentLength(), "root");
- this.fragmentedFileReader = new MpegFragmentedFileTrackProvider(reader, root);
- this.standardFileReader = new MpegStandardFileTrackProvider(reader);
- this.metadata = new HashMap<>();
- }
-
- /**
- * @return List of tracks found in the file
- */
- public List getTrackList() {
- return tracks;
- }
-
- /**
- * Read the headers of the file to get the list of tracks and data required for seeking.
- */
- public void parseHeaders() {
- try {
- final AtomicBoolean movieBoxSeen = new AtomicBoolean();
-
- reader.in(root).handle("moov", moov -> {
- movieBoxSeen.set(true);
-
- reader.in(moov).handle("trak",
- this::parseTrackInfo
- ).handle("mvex",
- fragmentedFileReader::parseMovieExtended
- ).handle("udta",
- this::parseMetadata
- ).run();
- }).handleVersioned("emsg",
- this::parseEventMessage
- ).handleVersioned("sidx", true,
- fragmentedFileReader::parseSegmentIndex
- ).stopChecker(getRootStopChecker(movieBoxSeen)).run();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * @param name Name of the text metadata field.
- * @return Value of the metadata field, or null if no value or not a string.
- */
- public String getTextMetadata(String name) {
- Object data = metadata.get(name);
- return data instanceof String ? (String) data : null;
- }
-
- /**
- * @return Payload from the last emsg message encountered.
- */
- public byte[] getLastEventMessage() {
- return lastEventMessage;
- }
-
- private void parseMetadata(MpegSectionInfo udta) throws IOException {
- reader.in(udta).handleVersioned("meta", meta -> {
- reader.in(meta).handle("ilst", ilst -> {
- MpegSectionInfo entry;
-
- while ((entry = reader.nextChild(ilst)) != null) {
- parseMetadataEntry(entry);
- }
- }).run();
- }).run();
- }
-
- private void parseMetadataEntry(MpegSectionInfo entry) throws IOException {
- MpegSectionInfo dataHeader = reader.nextChild(entry);
-
- if (dataHeader != null && "data".equals(dataHeader.type)) {
- MpegVersionedSectionInfo data = reader.parseFlags(dataHeader);
-
- // Skip next 4 bytes
- reader.data.readInt();
-
- if (data.flags == 1) {
- storeMetadata(entry.type, reader.readUtfString((int) data.length - 16));
- }
- }
-
- reader.skip(entry);
- }
-
- private void storeMetadata(String code, Object value) {
- String name = getMetadataName(code);
-
- if (name != null && value != null) {
- metadata.put(name, value);
- }
- }
-
- private static String getMetadataName(String code) {
- switch (code.toLowerCase()) {
- case "\u00a9art":
- return "Artist";
- case "\u00a9nam":
- return "Title";
- default:
- return null;
- }
- }
-
- private MpegParseStopChecker getRootStopChecker(final AtomicBoolean movieBoxSeen) {
- return (child, start) -> {
- if (!start && "sidx".equals(child.type)) {
- return true;
- } else if (start && ("mdat".equals(child.type) || "free".equals(child.type))) {
- return movieBoxSeen.get();
- } else {
- return false;
- }
- };
- }
-
- /**
- * @param consumer Track information consumer that the track provider passes the raw packets to.
- * @return Track audio provider.
- */
- public MpegFileTrackProvider loadReader(MpegTrackConsumer consumer) {
- if (fragmentedFileReader.initialise(consumer)) {
- return fragmentedFileReader;
- } else if (standardFileReader.initialise(consumer)) {
- return standardFileReader;
- } else {
- return null;
- }
- }
-
- private void parseTrackInfo(MpegSectionInfo trak) throws IOException {
- final MpegTrackInfo.Builder trackInfo = new MpegTrackInfo.Builder();
-
- reader.in(trak).handleVersioned("tkhd", tkhd -> {
- reader.data.skipBytes(tkhd.version == 1 ? 16 : 8);
-
- trackInfo.setTrackId(reader.data.readInt());
- }).handle("mdia", mdia -> {
- reader.in(mdia).handleVersioned("hdlr", hdlr -> {
- reader.data.skipBytes(4);
-
- trackInfo.setHandler(reader.readFourCC());
- }).handleVersioned("mdhd", mdhd ->
- standardFileReader.readMediaHeaders(mdhd, trackInfo.getTrackId())
- ).handle("minf", minf -> {
- reader.in(minf).handle("stbl", stbl -> {
- MpegReader.Chain chain = reader.in(stbl);
- parseTrackCodecInfo(chain, trackInfo);
- standardFileReader.attachSampleTableParsers(chain, trackInfo.getTrackId());
- chain.run();
- }).run();
- }).run();
- }).run();
-
- tracks.add(trackInfo.build());
- }
-
- private void parseTrackCodecInfo(MpegReader.Chain chain, MpegTrackInfo.Builder trackInfo) {
- chain.handleVersioned("stsd", stsd -> {
- int entryCount = reader.data.readInt();
- if (entryCount > 0) {
- MpegSectionInfo codec = reader.nextChild(stsd);
- trackInfo.setCodecName(codec.type);
-
- if ("soun".equals(trackInfo.getHandler())) {
- parseSoundTrackCodec(codec, trackInfo);
- }
- }
- });
- }
-
- private void parseSoundTrackCodec(MpegSectionInfo codec, MpegTrackInfo.Builder trackInfo) throws IOException {
- reader.parseFlags(codec);
-
- reader.data.readUnsignedShort(); // data_reference_index
- reader.data.readUnsignedShort(); // apple: sound_version
- reader.data.skipBytes(8); // reserved
-
- trackInfo.setChannelCount(reader.data.readUnsignedShort());
-
- reader.data.readUnsignedShort(); // sample_size
- reader.data.readUnsignedShort(); // apple stuff
-
- trackInfo.setSampleRate(reader.data.readInt());
- }
-
- private void parseEventMessage(MpegSectionInfo emsg) throws IOException {
- reader.readTerminatedString(); // scheme_id_uri
- reader.readTerminatedString(); // value
- reader.data.readInt(); // timescale
- reader.data.readInt(); // presentation_time_delta
- reader.data.readInt(); // event_duration
-
- int remaining = (int) ((emsg.offset + emsg.length) - reader.seek.getPosition());
-
- lastEventMessage = new byte[remaining];
- reader.data.readFully(lastEventMessage);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegNoopTrackConsumer.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegNoopTrackConsumer.java
deleted file mode 100644
index 7e60265..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegNoopTrackConsumer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg;
-
-import java.nio.channels.ReadableByteChannel;
-
-/**
- * No-op MP4 track consumer, for probing purposes.
- */
-public class MpegNoopTrackConsumer implements MpegTrackConsumer {
- private final MpegTrackInfo trackInfo;
-
- /**
- * @param trackInfo Track info.
- */
- public MpegNoopTrackConsumer(MpegTrackInfo trackInfo) {
- this.trackInfo = trackInfo;
- }
-
- @Override
- public MpegTrackInfo getTrack() {
- return trackInfo;
- }
-
- @Override
- public void initialise() {
- // Nothing to do
- }
-
- @Override
- public void seekPerformed(long requestedTimecode, long providedTimecode) {
- // Nothing to do
- }
-
- @Override
- public void flush() throws InterruptedException {
- // Nothing to do
- }
-
- @Override
- public void consume(ReadableByteChannel channel, int length) throws InterruptedException {
- // Nothing to do
- }
-
- @Override
- public void close() {
- // Nothing to do
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegTrackConsumer.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegTrackConsumer.java
deleted file mode 100644
index bbbe3fa..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegTrackConsumer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg;
-
-import java.nio.channels.ReadableByteChannel;
-
-/**
- * Consumer for the data of one MP4 track
- */
-public interface MpegTrackConsumer {
- /**
- * @return The associated MP4 track
- */
- MpegTrackInfo getTrack();
-
- /**
- * Initialise the consumer, called before first consume()
- */
- void initialise();
-
- /**
- * Indicates that the next frame is not a direct continuation of the previous one
- *
- * @param requestedTimecode Timecode in milliseconds to which the seek was requested to
- * @param providedTimecode Timecode in milliseconds to which the seek was actually performed to
- */
- void seekPerformed(long requestedTimecode, long providedTimecode);
-
- /**
- * Indicates that no more input is coming. Flush any buffers to output.
- *
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void flush() throws InterruptedException;
-
- /**
- * Consume one chunk from the track
- *
- * @param channel Byte channel to consume from
- * @param length Lenth of the chunk in bytes
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void consume(ReadableByteChannel channel, int length) throws InterruptedException;
-
- /**
- * Free all resources
- */
- void close();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegTrackInfo.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegTrackInfo.java
deleted file mode 100644
index c91e58d..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/MpegTrackInfo.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg;
-
-/**
- * Codec information for an MP4 track
- */
-public class MpegTrackInfo {
- /**
- * ID of the track
- */
- public final int trackId;
- /**
- * Handler type (soun for audio)
- */
- public final String handler;
- /**
- * Name of the codec
- */
- public final String codecName;
- /**
- * Number of audio channels
- */
- public final int channelCount;
- /**
- * Sample rate for audio
- */
- public final int sampleRate;
-
- /**
- * @param trackId ID of the track
- * @param handler Handler type (soun for audio)
- * @param codecName Name of the codec
- * @param channelCount Number of audio channels
- * @param sampleRate Sample rate for audio
- */
- public MpegTrackInfo(int trackId, String handler, String codecName, int channelCount, int sampleRate) {
- this.trackId = trackId;
- this.handler = handler;
- this.codecName = codecName;
- this.channelCount = channelCount;
- this.sampleRate = sampleRate;
- }
-
- /**
- * Helper class for constructing a track info instance.
- */
- public static class Builder {
- private int trackId;
- private String handler;
- private String codecName;
- private int channelCount;
- private int sampleRate;
-
- public void setTrackId(int trackId) {
- this.trackId = trackId;
- }
-
- public int getTrackId() {
- return trackId;
- }
-
- public String getHandler() {
- return handler;
- }
-
- public void setHandler(String handler) {
- this.handler = handler;
- }
-
- public void setCodecName(String codecName) {
- this.codecName = codecName;
- }
-
- public void setChannelCount(int channelCount) {
- this.channelCount = channelCount;
- }
-
- public void setSampleRate(int sampleRate) {
- this.sampleRate = sampleRate;
- }
-
- /**
- * @return The final track info
- */
- public MpegTrackInfo build() {
- return new MpegTrackInfo(trackId, handler, codecName, channelCount, sampleRate);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegFileTrackProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegFileTrackProvider.java
deleted file mode 100644
index 6c1846a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegFileTrackProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader;
-
-import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegTrackConsumer;
-
-/**
- * Track provider for a type of MP4 file.
- */
-public interface MpegFileTrackProvider {
- /**
- * @param trackConsumer Track consumer which defines the track this will provide and the consumer for packets.
- * @return Returns true if it had enough information for initialisation.
- */
- boolean initialise(MpegTrackConsumer trackConsumer);
-
- /**
- * @return Total duration of the file in milliseconds
- */
- long getDuration();
-
- /**
- * Provide audio frames to the frame consumer until the end of the track or interruption.
- *
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void provideFrames() throws InterruptedException;
-
- /**
- * Perform a seek to the given timecode (ms). On the next call to provideFrames, the seekPerformed method of frame
- * consumer is called with the position where it actually seeked to and the position where the seek was requested to
- * as arguments.
- *
- * @param timecode The timecode to seek to in milliseconds
- */
- void seekToTimecode(long timecode);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegParseStopChecker.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegParseStopChecker.java
deleted file mode 100644
index 7f1bbdd..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegParseStopChecker.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader;
-
-/**
- * Stop checker which is called before and after parsing each section in an MP4 file to check if parsing should be
- * stopped.
- */
-public interface MpegParseStopChecker {
- /**
- * @param child Section before or after which this is called.
- * @param start Whether this is called before (true) or after (false).
- * @return True to stop, false to continue.
- */
- boolean check(MpegSectionInfo child, boolean start);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegReader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegReader.java
deleted file mode 100644
index 55fdcbb..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegReader.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Handles reading parts of an MP4 file
- */
-public class MpegReader {
- /**
- * The input as a DataInput
- */
- public final DataInput data;
-
- /**
- * The input as a seekable stream
- */
- public final SeekableInputStream seek;
-
- private final byte[] fourCcBuffer;
- private final ByteBuffer readAttemptBuffer;
-
- /**
- * @param inputStream Input as a seekable stream
- */
- public MpegReader(SeekableInputStream inputStream) {
- seek = inputStream;
- data = new DataInputStream(inputStream);
- fourCcBuffer = new byte[4];
- readAttemptBuffer = ByteBuffer.allocate(4);
- }
-
- /**
- * Reads the header of the next child element. Assumes position is at the start of a header or at the end of the section.
- *
- * @param parent The section from which to read child sections from
- * @return The element if there were any more child elements
- */
- public MpegSectionInfo nextChild(MpegSectionInfo parent) {
- if (parent.offset + parent.length <= seek.getPosition() + 8) {
- return null;
- }
-
- try {
- long offset = seek.getPosition();
- Integer lengthField = tryReadInt();
-
- if (lengthField == null) {
- return null;
- }
-
- long length = Integer.toUnsignedLong(lengthField);
- return new MpegSectionInfo(offset, length, readFourCC());
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Skip to the end of a section.
- *
- * @param section The section to skip
- */
- public void skip(MpegSectionInfo section) {
- try {
- seek.seek(section.offset + section.length);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Read a FourCC as a string
- *
- * @return The FourCC string
- * @throws IOException When reading the bytes from input fails
- */
- public String readFourCC() throws IOException {
- data.readFully(fourCcBuffer);
- return new String(fourCcBuffer, "ISO-8859-1");
- }
-
- /**
- * Read an UTF string with a specified size.
- *
- * @param size Size in bytes.
- * @return The string read from the stream
- * @throws IOException On read error
- */
- public String readUtfString(int size) throws IOException {
- byte[] bytes = new byte[size];
- data.readFully(bytes);
-
- return new String(bytes, StandardCharsets.UTF_8);
- }
-
- /**
- * Read a null-terminated UTF string.
- *
- * @return The string read from the stream
- * @throws IOException On read error
- */
- public String readTerminatedString() throws IOException {
- ByteArrayOutputStream bytes = new ByteArrayOutputStream();
- byte nextByte;
-
- while ((nextByte = data.readByte()) != 0) {
- bytes.write(nextByte);
- }
-
- return new String(bytes.toByteArray(), StandardCharsets.UTF_8);
- }
-
- /**
- * Parse the flags and version for the specified section
- *
- * @param section The section where the flags and version should be parsed
- * @return The section info with version info
- * @throws IOException On a read error
- */
- public MpegVersionedSectionInfo parseFlags(MpegSectionInfo section) throws IOException {
- return parseFlagsForSection(data, section);
- }
-
- private static MpegVersionedSectionInfo parseFlagsForSection(DataInput in, MpegSectionInfo section) throws IOException {
- int versionAndFlags = in.readInt();
- return new MpegVersionedSectionInfo(section, versionAndFlags >>> 24, versionAndFlags & 0xffffff);
- }
-
- private Integer tryReadInt() throws IOException {
- int firstByte = seek.read();
-
- if (firstByte == -1) {
- return null;
- }
-
- readAttemptBuffer.put(0, (byte) firstByte);
- data.readFully(readAttemptBuffer.array(), 1, 3);
- return readAttemptBuffer.getInt(0);
- }
-
- /**
- * Start a child element handling chain
- *
- * @param parent The parent chain
- * @return The chain
- */
- public Chain in(MpegSectionInfo parent) {
- return new Chain(parent, this);
- }
-
- /**
- * Child element processing helper class.
- */
- public static class Chain {
- private final MpegSectionInfo parent;
- private final List handlers;
- private final MpegReader reader;
- private MpegParseStopChecker stopChecker;
-
- private Chain(MpegSectionInfo parent, MpegReader reader) {
- this.parent = parent;
- this.reader = reader;
- handlers = new ArrayList<>();
- }
-
- /**
- * @param type The FourCC of the section for which a handler is specified
- * @param handler The handler
- * @return this
- */
- public Chain handle(String type, MpegSectionHandler handler) {
- handle(type, false, handler);
- return this;
- }
-
- /**
- * @param type The FourCC of the section for which a handler is specified
- * @param finish Whether to stop reading after this section
- * @param handler The handler
- * @return this
- */
- public Chain handle(String type, boolean finish, MpegSectionHandler handler) {
- handlers.add(new Handler(type, finish, handler));
- return this;
- }
-
- /**
- * @param type The FourCC of the section for which a handler is specified
- * @param handler The handler which expects versioned section info
- * @return this
- */
- public Chain handleVersioned(String type, MpegVersionedSectionHandler handler) {
- handlers.add(new Handler(type, false, handler));
- return this;
- }
-
- /**
- * @param type The FourCC of the section for which a handler is specified
- * @param finish Whether to stop reading after this section
- * @param handler The handler which expects versioned section info
- * @return this
- */
- public Chain handleVersioned(String type, boolean finish, MpegVersionedSectionHandler handler) {
- handlers.add(new Handler(type, finish, handler));
- return this;
- }
-
- /**
- * Assign a parsing stop checker to this chain.
- *
- * @param stopChecker Stop checker.
- * @return this
- */
- public Chain stopChecker(MpegParseStopChecker stopChecker) {
- this.stopChecker = stopChecker;
- return this;
- }
-
- /**
- * Process the current section with all the handlers specified so far
- *
- * @throws IOException On read error
- */
- public void run() throws IOException {
- MpegSectionInfo child;
- boolean finished = false;
-
- while (!finished && (child = reader.nextChild(parent)) != null) {
- finished = stopChecker != null && stopChecker.check(child, true);
-
- if (!finished) {
- processHandlers(child);
-
- finished = stopChecker != null && stopChecker.check(child, false);
- }
-
- reader.skip(child);
- }
- }
-
- private void processHandlers(MpegSectionInfo child) throws IOException {
- for (Handler handler : handlers) {
- if (handler.type.equals(child.type)) {
- handleSection(child, handler);
- }
- }
- }
-
- private boolean handleSection(MpegSectionInfo child, Handler handler) throws IOException {
- if (handler.sectionHandler instanceof MpegVersionedSectionHandler) {
- MpegVersionedSectionInfo versioned = parseFlagsForSection(reader.data, child);
- ((MpegVersionedSectionHandler) handler.sectionHandler).handle(versioned);
- } else {
- ((MpegSectionHandler) handler.sectionHandler).handle(child);
- }
-
- return !handler.terminator;
- }
- }
-
- private static class Handler {
- private final String type;
- private final boolean terminator;
- private final Object sectionHandler;
-
- private Handler(String type, boolean terminator, Object sectionHandler) {
- this.type = type;
- this.terminator = terminator;
- this.sectionHandler = sectionHandler;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegSectionHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegSectionHandler.java
deleted file mode 100644
index 224b766..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegSectionHandler.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader;
-
-import java.io.IOException;
-
-/**
- * Handles one MPEG section which has no version info
- */
-public interface MpegSectionHandler {
- /**
- * @param child The section
- * @throws IOException On read error
- */
- void handle(MpegSectionInfo child) throws IOException;
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegSectionInfo.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegSectionInfo.java
deleted file mode 100644
index 9a49bc7..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegSectionInfo.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader;
-
-/**
- * Information for one MP4 section (aka box)
- */
-public class MpegSectionInfo {
- /**
- * Absolute offset of the section
- */
- public final long offset;
- /**
- * Length of the section
- */
- public final long length;
- /**
- * Type (fourCC) of the section
- */
- public final String type;
-
- /**
- * @param offset Absolute offset of the section
- * @param length Length of the section
- * @param type Type (fourCC) of the section
- */
- public MpegSectionInfo(long offset, long length, String type) {
- this.offset = offset;
- this.length = length;
- this.type = type;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegVersionedSectionHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegVersionedSectionHandler.java
deleted file mode 100644
index 207ad2f..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegVersionedSectionHandler.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader;
-
-import java.io.IOException;
-
-/**
- * Handles one MPEG section which has version info
- */
-public interface MpegVersionedSectionHandler {
- /**
- * @param child The versioned section
- * @throws IOException On read error
- */
- void handle(MpegVersionedSectionInfo child) throws IOException;
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegVersionedSectionInfo.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegVersionedSectionInfo.java
deleted file mode 100644
index 464931b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegVersionedSectionInfo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader;
-
-/**
- * Information for one MP4 section (aka box) including version and flags
- */
-public class MpegVersionedSectionInfo extends MpegSectionInfo {
- /**
- * Version of the section
- */
- public final int version;
- /**
- * Flags of the section
- */
- public final int flags;
-
- /**
- * @param sectionInfo Basic info for the section
- * @param version Version of the section
- * @param flags Flags of the section
- */
- public MpegVersionedSectionInfo(MpegSectionInfo sectionInfo, int version, int flags) {
- super(sectionInfo.offset, sectionInfo.length, sectionInfo.type);
-
- this.version = version;
- this.flags = flags;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegFragmentedFileTrackProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegFragmentedFileTrackProvider.java
deleted file mode 100644
index 1e2a878..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegFragmentedFileTrackProvider.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader.fragmented;
-
-import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegTrackConsumer;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.MpegFileTrackProvider;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.MpegReader;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.MpegSectionInfo;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.MpegVersionedSectionInfo;
-import com.sedmelluq.discord.lavaplayer.tools.io.DetachedByteChannel;
-
-import java.io.IOException;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * Track provider for fragmented MP4 file format.
- */
-public class MpegFragmentedFileTrackProvider implements MpegFileTrackProvider {
- private final MpegReader reader;
- private final MpegSectionInfo root;
-
- private MpegTrackConsumer consumer;
- private boolean isFragmented;
- private long totalDuration;
- private MpegGlobalSeekInfo globalSeekInfo;
- private boolean seeking;
- private long minimumTimecode;
-
- /**
- * @param reader MP4-specific reader
- * @param root Root section info (synthetic section wrapping the entire file)
- */
- public MpegFragmentedFileTrackProvider(MpegReader reader, MpegSectionInfo root) {
- this.reader = reader;
- this.root = root;
- }
-
- @Override
- public boolean initialise(MpegTrackConsumer consumer) {
- if (!isFragmented || globalSeekInfo == null) {
- return false;
- }
-
- this.consumer = consumer;
- return true;
- }
-
- @Override
- public void provideFrames() throws InterruptedException {
- MpegSectionInfo moof;
-
- try (ReadableByteChannel channel = new DetachedByteChannel(Channels.newChannel(reader.seek))) {
- while ((moof = reader.nextChild(root)) != null) {
- if (!"moof".equals(moof.type)) {
- reader.skip(moof);
- continue;
- }
-
- MpegTrackFragmentHeader fragment = parseTrackMovieFragment(moof, consumer.getTrack().trackId);
- MpegSectionInfo mdat = reader.nextChild(root);
-
- long timecode = fragment.baseTimecode;
- reader.seek.seek(moof.offset + fragment.dataOffset);
-
- for (int i = 0; i < fragment.sampleSizes.length; i++) {
- handleSeeking(consumer, timecode);
-
- consumer.consume(channel, fragment.sampleSizes[i]);
- }
-
- reader.skip(mdat);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void seekToTimecode(long timecode) {
- minimumTimecode = timecode * globalSeekInfo.timescale / 1000;
- seeking = true;
-
- int segmentIndex;
-
- for (segmentIndex = 0; segmentIndex < globalSeekInfo.entries.length - 1; segmentIndex++) {
- if (globalSeekInfo.timeOffsets[segmentIndex + 1] > minimumTimecode) {
- break;
- }
- }
-
- try {
- reader.seek.seek(globalSeekInfo.fileOffsets[segmentIndex]);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public long getDuration() {
- return totalDuration * 1000 / globalSeekInfo.timescale;
- }
-
- /**
- * Handle mvex section.
- *
- * @param mvex Section header.
- * @throws IOException On read error
- */
- public void parseMovieExtended(MpegSectionInfo mvex) throws IOException {
- reader.in(mvex).handleVersioned("trex", trex -> {
- isFragmented = true;
- }).run();
- }
-
- /**
- * Handle segment index section.
- *
- * @param sbix Section header.
- * @throws IOException On read error
- */
- public void parseSegmentIndex(MpegVersionedSectionInfo sbix) throws IOException {
- reader.data.readInt(); // referenceId
- int timescale = reader.data.readInt();
-
- if (sbix.version == 0) {
- reader.data.readInt(); // earliestPresentationTime
- reader.data.readInt(); // firstOffset
- } else {
- reader.data.readLong(); // earliestPresentationTime
- reader.data.readLong(); // firstOffset
- }
-
- reader.data.readShort(); // reserved
-
- MpegSegmentEntry[] entries = new MpegSegmentEntry[reader.data.readUnsignedShort()];
-
- for (int i = 0; i < entries.length; i++) {
- int typeAndSize = reader.data.readInt();
- int duration = reader.data.readInt();
- reader.data.readInt(); // startsWithSap + sapType + sapDeltaTime
-
- entries[i] = new MpegSegmentEntry(typeAndSize >>> 31, typeAndSize & 0x7fffffff, duration);
-
- totalDuration += duration;
- }
-
- globalSeekInfo = new MpegGlobalSeekInfo(timescale, sbix.offset + sbix.length, entries);
- }
-
- private void handleSeeking(MpegTrackConsumer consumer, long timecode) {
- if (seeking) {
- // Even though sample durations may be available, decoding doesn't work if we don't start from the beginning
- // of a fragment. Therefore skipping within the fragment is handled by skipping decoded samples later.
- consumer.seekPerformed(minimumTimecode * 1000 / globalSeekInfo.timescale, timecode * 1000 / globalSeekInfo.timescale);
- seeking = false;
- }
- }
-
- private MpegTrackFragmentHeader parseTrackMovieFragment(MpegSectionInfo moof, int trackId) throws IOException {
- final AtomicReference header = new AtomicReference<>();
-
- reader.in(moof).handle("traf", traf -> {
- final MpegTrackFragmentHeader.Builder builder = new MpegTrackFragmentHeader.Builder();
-
- reader.in(traf).handleVersioned("tfhd", tfhd -> {
- parseTrackFragmentHeader(tfhd, builder);
- }).handleVersioned("tfdt", tfdt -> {
- builder.setBaseTimecode((tfdt.version == 1) ? reader.data.readLong() : reader.data.readInt());
- }).handleVersioned("trun", trun -> {
- if (builder.getTrackId() == trackId) {
- parseTrackRunInfo(trun, builder);
- }
- }).run();
-
- if (builder.getTrackId() == trackId) {
- header.set(builder.build());
- }
- }).run();
-
- return header.get();
- }
-
- private void parseTrackFragmentHeader(MpegVersionedSectionInfo tfhd, MpegTrackFragmentHeader.Builder builder) throws IOException {
- builder.setTrackId(reader.data.readInt());
-
- if ((tfhd.flags & 0x000010) != 0) {
- // Need to read default sample size, but first must skip the fields before it
- if ((tfhd.flags & 0x000001) != 0) {
- // Skip baseDataOffset
- reader.data.readLong();
- }
-
- if ((tfhd.flags & 0x000002) != 0) {
- // Skip sampleDescriptionIndex
- reader.data.readInt();
- }
-
- if ((tfhd.flags & 0x000008) != 0) {
- // Skip defaultSampleDuration
- reader.data.readInt();
- }
-
- builder.setDefaultSampleSize(reader.data.readInt());
- }
- }
-
- private void parseTrackRunInfo(MpegVersionedSectionInfo trun, MpegTrackFragmentHeader.Builder builder) throws IOException {
- int sampleCount = reader.data.readInt();
- builder.setDataOffset(((trun.flags & 0x01) != 0) ? reader.data.readInt() : -1);
-
- if ((trun.flags & 0x04) != 0) {
- reader.data.skipBytes(4); // first sample flags
- }
-
- boolean hasDurations = (trun.flags & 0x100) != 0;
- boolean hasSizes = (trun.flags & 0x200) != 0;
-
- builder.createSampleArrays(hasDurations, hasSizes, sampleCount);
-
- for (int i = 0; i < sampleCount; i++) {
- if (hasDurations) {
- builder.setDuration(i, reader.data.readInt());
- }
- if (hasSizes) {
- builder.setSize(i, reader.data.readInt());
- }
- if ((trun.flags & 0x400) != 0) {
- reader.data.skipBytes(4);
- }
- if ((trun.flags & 0x800) != 0) {
- reader.data.skipBytes(4);
- }
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegGlobalSeekInfo.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegGlobalSeekInfo.java
deleted file mode 100644
index 7246481..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegGlobalSeekInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader.fragmented;
-
-/**
- * Describes the seek info for a fragmented MP4 file
- */
-public class MpegGlobalSeekInfo {
- /**
- * The value of the internal timecodes that corresponds to one second
- */
- public final int timescale;
- /**
- * Size and duration information for each segment
- */
- public final MpegSegmentEntry[] entries;
- /**
- * Absolute timecode offset of each segment
- */
- public final long[] timeOffsets;
- /**
- * Absolute file offset of each segment
- */
- public final long[] fileOffsets;
-
- /**
- * @param timescale The value of the internal timecodes that corresponds to one second
- * @param baseOffset The file offset of the first segment
- * @param entries Size and duration information for each segment
- */
- public MpegGlobalSeekInfo(int timescale, long baseOffset, MpegSegmentEntry[] entries) {
- this.timescale = timescale;
- this.entries = entries;
-
- timeOffsets = new long[entries.length];
- fileOffsets = new long[entries.length];
- fileOffsets[0] = baseOffset;
-
- for (int i = 1; i < entries.length; i++) {
- timeOffsets[i] = timeOffsets[i - 1] + entries[i - 1].duration;
- fileOffsets[i] = fileOffsets[i - 1] + entries[i - 1].size;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegSegmentEntry.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegSegmentEntry.java
deleted file mode 100644
index 224fcbe..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegSegmentEntry.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader.fragmented;
-
-/**
- * Information about one MP4 segment aka fragment
- */
-public class MpegSegmentEntry {
- /**
- * Type of the segment
- */
- public final int type;
- /**
- * Size in bytes
- */
- public final int size;
- /**
- * Duration using the timescale of the file
- */
- public final int duration;
-
- /**
- * @param type Type of the segment
- * @param size Size in bytes
- * @param duration Duration using the timescale of the file
- */
- public MpegSegmentEntry(int type, int size, int duration) {
- this.type = type;
- this.size = size;
- this.duration = duration;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegTrackFragmentHeader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegTrackFragmentHeader.java
deleted file mode 100644
index 7d9217a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/fragmented/MpegTrackFragmentHeader.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader.fragmented;
-
-/**
- * Header for an MP4 track in a fragment.
- */
-public class MpegTrackFragmentHeader {
- /**
- * Track ID which this header is for
- */
- public final int trackId;
- /**
- * The timecode at which this track is at the start of this fragment
- */
- public final long baseTimecode;
- /**
- * The offset of the data for this track in this fragment
- */
- public final int dataOffset;
- /**
- * Duration of each sample for this track in this fragment using file timescale
- */
- public final int[] sampleDurations;
- /**
- * Size of each sample for this track in this fragment
- */
- public final int[] sampleSizes;
-
- /**
- * @param trackId Track ID which this header is for
- * @param baseTimecode The timecode at which this track is at the start of this fragment
- * @param dataOffset The offset of the data for this track in this fragment
- * @param sampleDurations Duration of each sample for this track in this fragment using file timescale
- * @param sampleSizes Size of each sample for this track in this fragment
- */
- public MpegTrackFragmentHeader(int trackId, long baseTimecode, int dataOffset, int[] sampleDurations, int[] sampleSizes) {
- this.trackId = trackId;
- this.baseTimecode = baseTimecode;
- this.dataOffset = dataOffset;
- this.sampleDurations = sampleDurations;
- this.sampleSizes = sampleSizes;
- }
-
- /**
- * A helper for building an instance of this class.
- */
- public static class Builder {
- private int trackId;
- private long baseTimecode;
- private int dataOffset;
- private int defaultSampleSize;
- private int sampleCount;
- private int[] sampleDurations;
- private int[] sampleSizes;
-
- /**
- * Create an empty builder.
- */
- public Builder() {
- trackId = -1;
- }
-
- /**
- * @return Previously assigned track ID, or -1 if not assigned
- */
- public int getTrackId() {
- return trackId;
- }
-
- public void setTrackId(int trackId) {
- this.trackId = trackId;
- }
-
- public void setBaseTimecode(long baseTimecode) {
- this.baseTimecode = baseTimecode;
- }
-
- public void setDataOffset(int dataOffset) {
- this.dataOffset = dataOffset;
- }
-
- public void setDefaultSampleSize(int defaultSampleSize) {
- this.defaultSampleSize = defaultSampleSize;
- }
-
- /**
- * Create sample duration and size arrays
- *
- * @param hasDurations If duration data is present
- * @param hasSizes If size data is present
- * @param sampleCount Number of samples
- */
- public void createSampleArrays(boolean hasDurations, boolean hasSizes, int sampleCount) {
- this.sampleCount = sampleCount;
-
- if (hasDurations) {
- sampleDurations = new int[sampleCount];
- }
-
- if (hasSizes) {
- sampleSizes = new int[sampleCount];
- }
- }
-
- /**
- * Set the duration of a specific sample
- *
- * @param i Sample index
- * @param value Duration using the file timescale
- */
- public void setDuration(int i, int value) {
- sampleDurations[i] = value;
- }
-
- /**
- * Set the size of a specific sample
- *
- * @param i Sample index
- * @param value Size
- */
- public void setSize(int i, int value) {
- sampleSizes[i] = value;
- }
-
- /**
- * @return The final header
- */
- public MpegTrackFragmentHeader build() {
- int[] finalSampleSizes = sampleSizes;
-
- if (defaultSampleSize != 0) {
- finalSampleSizes = new int[sampleCount];
-
- for (int i = 0; i < sampleCount; i++) {
- finalSampleSizes[i] = defaultSampleSize;
- }
- }
-
- return new MpegTrackFragmentHeader(trackId, baseTimecode, dataOffset, sampleDurations, finalSampleSizes);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/standard/MpegStandardFileTrackProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/standard/MpegStandardFileTrackProvider.java
deleted file mode 100644
index 7fc2970..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/standard/MpegStandardFileTrackProvider.java
+++ /dev/null
@@ -1,335 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpeg.reader.standard;
-
-import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegTrackConsumer;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.MpegFileTrackProvider;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.MpegReader;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.MpegVersionedSectionInfo;
-import com.sedmelluq.discord.lavaplayer.tools.io.DetachedByteChannel;
-
-import java.io.IOException;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Track provider for the standard (non-fragmented) MP4 file format.
- */
-public class MpegStandardFileTrackProvider implements MpegFileTrackProvider {
- private final MpegReader reader;
- private final List builders = new ArrayList<>();
- private final Map trackTimescales = new HashMap<>();
- private int timescale;
- private int currentChunk;
- private MpegTrackConsumer consumer;
- private TrackSeekInfo seekInfo;
-
- /**
- * @param reader MP4-specific reader
- */
- public MpegStandardFileTrackProvider(MpegReader reader) {
- this.reader = reader;
- this.currentChunk = 0;
- }
-
- @Override
- public boolean initialise(MpegTrackConsumer consumer) {
- this.consumer = consumer;
-
- int trackId = consumer.getTrack().trackId;
-
- if (!trackTimescales.containsKey(trackId)) {
- return false;
- }
-
- try {
- for (TrackSeekInfoBuilder builder : builders) {
- if (builder.trackId == trackId) {
- seekInfo = builder.build();
- timescale = trackTimescales.get(trackId);
- return true;
- }
- }
- } finally {
- builders.clear();
- }
-
- return false;
- }
-
- @Override
- public long getDuration() {
- return seekInfo.totalDuration * 1000L / timescale;
- }
-
- @Override
- public void provideFrames() throws InterruptedException {
- try (ReadableByteChannel channel = new DetachedByteChannel(Channels.newChannel(reader.seek))) {
- while (currentChunk < seekInfo.chunkOffsets.length) {
- reader.seek.seek(seekInfo.chunkOffsets[currentChunk]);
-
- int[] samples = seekInfo.chunkSamples[currentChunk];
- for (int i = 0; i < samples.length; i++) {
- consumer.consume(channel, samples[i]);
- }
-
- currentChunk++;
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void seekToTimecode(long timecode) {
- long scaledTimecode = timecode * timescale / 1000;
- int length = seekInfo.chunkOffsets.length;
-
- if (scaledTimecode >= seekInfo.totalDuration) {
- currentChunk = length;
- consumer.seekPerformed(timecode, seekInfo.totalDuration * 1000 / timescale);
- } else {
- for (int i = 0; i < length; i++) {
- long nextTimecode = i < length - 1 ? seekInfo.chunkTimecodes[i + 1] : seekInfo.totalDuration;
-
- if (scaledTimecode < nextTimecode) {
- consumer.seekPerformed(timecode, seekInfo.chunkTimecodes[i] * 1000 / timescale);
- currentChunk = i;
- break;
- }
- }
- }
- }
-
- /**
- * Read the mdhd section for a track.
- *
- * @param mdhd The section header
- * @param trackId Track ID
- * @throws IOException On read error.
- */
- public void readMediaHeaders(MpegVersionedSectionInfo mdhd, int trackId) throws IOException {
- int trackTimescale;
-
- if (mdhd.version == 1) {
- reader.data.readLong(); // creation time
- reader.data.readLong(); // modification time
- trackTimescale = reader.data.readInt();
- reader.data.readLong(); // duration
- } else {
- reader.data.readInt(); // creation time
- reader.data.readInt(); // modification time
- trackTimescale = reader.data.readInt();
- reader.data.readInt(); // duration
- }
-
- trackTimescales.put(trackId, trackTimescale);
- }
-
- /**
- * Attaches standard format specific handlers to sample table section handle chain.
- *
- * @param sampleTableChain Sample table child section handler chain.
- * @param trackId Track ID
- */
- public void attachSampleTableParsers(MpegReader.Chain sampleTableChain, int trackId) {
- final TrackSeekInfoBuilder seekInfoBuilder = new TrackSeekInfoBuilder(trackId);
-
- sampleTableChain
- .handleVersioned("stts", stts -> parseTimeToSample(seekInfoBuilder))
- .handleVersioned("stsc", stsc -> parseSampleToChunk(seekInfoBuilder))
- .handleVersioned("stsz", stsz -> parseSampleSizes(seekInfoBuilder))
- .handleVersioned("stco", stco -> parseChunkOffsets32(seekInfoBuilder))
- .handleVersioned("co64", co64 -> parseChunkOffsets64(seekInfoBuilder));
-
- builders.add(seekInfoBuilder);
- }
-
- private void parseTimeToSample(TrackSeekInfoBuilder seekInfoBuilder) throws IOException {
- int entries = reader.data.readInt();
- seekInfoBuilder.sampleTimeCounts = new int[entries];
- seekInfoBuilder.sampleTimeDeltas = new int[entries];
- seekInfoBuilder.presence |= 1;
-
- for (int i = 0; i < entries; i++) {
- seekInfoBuilder.sampleTimeCounts[i] = reader.data.readInt();
- seekInfoBuilder.sampleTimeDeltas[i] = reader.data.readInt();
- }
- }
-
- private void parseSampleToChunk(TrackSeekInfoBuilder seekInfoBuilder) throws IOException {
- int entries = reader.data.readInt();
- seekInfoBuilder.sampleChunkingFirst = new int[entries];
- seekInfoBuilder.sampleChunkingCount = new int[entries];
- seekInfoBuilder.presence |= 2;
-
- for (int i = 0; i < entries; i++) {
- seekInfoBuilder.sampleChunkingFirst[i] = reader.data.readInt();
- seekInfoBuilder.sampleChunkingCount[i] = reader.data.readInt();
- reader.data.readInt();
- }
- }
-
- private void parseSampleSizes(TrackSeekInfoBuilder seekInfoBuilder) throws IOException {
- seekInfoBuilder.sampleSize = reader.data.readInt();
- seekInfoBuilder.sampleCount = reader.data.readInt();
- seekInfoBuilder.presence |= 4;
-
- if (seekInfoBuilder.sampleSize == 0) {
- seekInfoBuilder.sampleSizes = new int[seekInfoBuilder.sampleCount];
-
- for (int i = 0; i < seekInfoBuilder.sampleCount; i++) {
- seekInfoBuilder.sampleSizes[i] = reader.data.readInt();
- }
- }
- }
-
- private void parseChunkOffsets32(TrackSeekInfoBuilder seekInfoBuilder) throws IOException {
- int chunks = reader.data.readInt();
- seekInfoBuilder.chunkOffsets = new long[chunks];
- seekInfoBuilder.presence |= 8;
-
- for (int i = 0; i < chunks; i++) {
- seekInfoBuilder.chunkOffsets[i] = reader.data.readInt();
- }
- }
-
- private void parseChunkOffsets64(TrackSeekInfoBuilder seekInfoBuilder) throws IOException {
- int chunks = reader.data.readInt();
- seekInfoBuilder.chunkOffsets = new long[chunks];
- seekInfoBuilder.presence |= 8;
-
- for (int i = 0; i < chunks; i++) {
- seekInfoBuilder.chunkOffsets[i] = reader.data.readLong();
- }
- }
-
- private static class TrackSeekInfo {
- private final long totalDuration;
- private final long[] chunkOffsets;
- private final long[] chunkTimecodes;
- private final int[][] chunkSamples;
-
- private TrackSeekInfo(long totalDuration, long[] chunkOffsets, long[] chunkTimecodes, int[][] chunkSamples) {
- this.totalDuration = totalDuration;
- this.chunkOffsets = chunkOffsets;
- this.chunkTimecodes = chunkTimecodes;
- this.chunkSamples = chunkSamples;
- }
- }
-
- private static class TrackSeekInfoBuilder {
- private final int trackId;
- private int presence;
- private int[] sampleTimeCounts;
- private int[] sampleTimeDeltas;
- private int[] sampleChunkingFirst;
- private int[] sampleChunkingCount;
- private long[] chunkOffsets;
- private int sampleSize;
- private int sampleCount;
- private int[] sampleSizes;
-
- private TrackSeekInfoBuilder(int trackId) {
- this.trackId = trackId;
- }
-
- private TrackSeekInfo build() {
- if (presence != 15) {
- return null;
- }
-
- long[] chunkTimecodes = new long[chunkOffsets.length];
- int[][] chunkSamples = new int[chunkOffsets.length][];
-
- SampleChunkingIterator chunkingIterator = new SampleChunkingIterator(sampleChunkingFirst, sampleChunkingCount);
- SampleDurationIterator durationIterator = new SampleDurationIterator(sampleTimeCounts, sampleTimeDeltas);
-
- int sampleOffset = 0;
- long timeOffset = 0;
-
- for (int chunk = 0; chunk < chunkOffsets.length; chunk++) {
- int chunkSampleCount = chunkingIterator.nextSampleCount();
-
- chunkSamples[chunk] = buildChunkSampleSizes(chunkSampleCount, sampleOffset, sampleSize, sampleSizes);
- chunkTimecodes[chunk] = timeOffset;
-
- timeOffset += calculateChunkDuration(chunkSampleCount, durationIterator);
- sampleOffset += chunkSampleCount;
- }
-
- return new TrackSeekInfo(timeOffset, chunkOffsets, chunkTimecodes, chunkSamples);
- }
-
- private static int[] buildChunkSampleSizes(int sampleCount, int sampleOffset, int sampleSize, int[] sampleSizes) {
- int[] chunkSampleSizes = new int[sampleCount];
-
- if (sampleSize != 0) {
- for (int i = 0; i < sampleCount; i++) {
- chunkSampleSizes[i] = sampleSize;
- }
- } else {
- System.arraycopy(sampleSizes, sampleOffset, chunkSampleSizes, 0, sampleCount);
- }
-
- return chunkSampleSizes;
- }
-
- private static int calculateChunkDuration(int sampleCount, SampleDurationIterator durationIterator) {
- int duration = 0;
-
- for (int i = 0; i < sampleCount; i++) {
- duration += durationIterator.nextSampleDuration();
- }
-
- return duration;
- }
- }
-
- private static class SampleChunkingIterator {
- private final int[] sampleChunkingFirst;
- private final int[] sampleChunkingCount;
- private int chunkIndex = 1;
- private int entryIndex = 0;
-
- private SampleChunkingIterator(int[] sampleChunkingFirst, int[] sampleChunkingCount) {
- this.sampleChunkingFirst = sampleChunkingFirst;
- this.sampleChunkingCount = sampleChunkingCount;
- }
-
- private int nextSampleCount() {
- int result = sampleChunkingCount[entryIndex];
- chunkIndex++;
-
- if (entryIndex + 1 < sampleChunkingFirst.length && chunkIndex == sampleChunkingFirst[entryIndex + 1]) {
- entryIndex++;
- }
-
- return result;
- }
- }
-
- private static class SampleDurationIterator {
- private final int[] sampleTimeCounts;
- private final int[] sampleTimeDeltas;
- private int relativeSampleIndex = 0;
- private int entryIndex = 0;
-
- private SampleDurationIterator(int[] sampleTimeCounts, int[] sampleTimeDeltas) {
- this.sampleTimeCounts = sampleTimeCounts;
- this.sampleTimeDeltas = sampleTimeDeltas;
- }
-
- private int nextSampleDuration() {
- int result = sampleTimeDeltas[entryIndex];
-
- if (entryIndex + 1 < sampleTimeCounts.length && ++relativeSampleIndex >= sampleTimeCounts[entryIndex]) {
- entryIndex++;
- }
-
- return result;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/MpegAdtsAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/MpegAdtsAudioTrack.java
deleted file mode 100644
index 198d1f6..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/MpegAdtsAudioTrack.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpegts;
-
-import com.sedmelluq.discord.lavaplayer.container.adts.AdtsAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-
-import java.io.InputStream;
-
-import static com.sedmelluq.discord.lavaplayer.container.mpegts.MpegTsElementaryInputStream.ADTS_ELEMENTARY_STREAM;
-
-public class MpegAdtsAudioTrack extends DelegatedAudioTrack {
- private final InputStream inputStream;
-
- /**
- * @param trackInfo Track info
- */
- public MpegAdtsAudioTrack(AudioTrackInfo trackInfo, InputStream inputStream) {
- super(trackInfo);
-
- this.inputStream = inputStream;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor executor) throws Exception {
- MpegTsElementaryInputStream elementaryInputStream = new MpegTsElementaryInputStream(inputStream, ADTS_ELEMENTARY_STREAM);
- PesPacketInputStream pesPacketInputStream = new PesPacketInputStream(elementaryInputStream);
- processDelegate(new AdtsAudioTrack(trackInfo, pesPacketInputStream), executor);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/MpegAdtsContainerProbe.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/MpegAdtsContainerProbe.java
deleted file mode 100644
index aca5903..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/MpegAdtsContainerProbe.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpegts;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerHints;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.container.adts.AdtsStreamReader;
-import com.sedmelluq.discord.lavaplayer.tools.io.SavedHeadSeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.supportedFormat;
-import static com.sedmelluq.discord.lavaplayer.container.mpegts.MpegTsElementaryInputStream.ADTS_ELEMENTARY_STREAM;
-
-public class MpegAdtsContainerProbe implements MediaContainerProbe {
- private static final Logger log = LoggerFactory.getLogger(MpegAdtsContainerProbe.class);
-
- @Override
- public String getName() {
- return "mpegts-adts";
- }
-
- @Override
- public boolean matchesHints(MediaContainerHints hints) {
- boolean invalidFileExtension = hints.fileExtension != null && !"ts".equalsIgnoreCase(hints.fileExtension);
- return hints.present() && !invalidFileExtension;
- }
-
- @Override
- public MediaContainerDetectionResult probe(AudioReference reference, SeekableInputStream inputStream)
- throws IOException {
-
- SavedHeadSeekableInputStream head = inputStream instanceof SavedHeadSeekableInputStream ?
- (SavedHeadSeekableInputStream) inputStream : null;
-
- if (head != null) {
- head.setAllowDirectReads(false);
- }
-
- MpegTsElementaryInputStream tsStream = new MpegTsElementaryInputStream(inputStream, ADTS_ELEMENTARY_STREAM);
- PesPacketInputStream pesStream = new PesPacketInputStream(tsStream);
- AdtsStreamReader reader = new AdtsStreamReader(pesStream);
-
- try {
- if (reader.findPacketHeader() != null) {
- log.debug("Track {} is an MPEG-TS stream with an ADTS track.", reference.identifier);
-
- return supportedFormat(this, null,
- AudioTrackInfoBuilder.create(reference, inputStream)
- .apply(tsStream.getLoadedMetadata())
- .build()
- );
- }
- } catch (IndexOutOfBoundsException ignored) {
- // TS stream read too far and still did not find required elementary stream - SavedHeadSeekableInputStream throws
- // this because we disabled reads past the loaded "head".
- } finally {
- if (head != null) {
- head.setAllowDirectReads(true);
- }
- }
-
- return null;
- }
-
- @Override
- public AudioTrack createTrack(String parameters, AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- return new MpegAdtsAudioTrack(trackInfo, inputStream);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/MpegTsElementaryInputStream.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/MpegTsElementaryInputStream.java
deleted file mode 100644
index 213b742..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/MpegTsElementaryInputStream.java
+++ /dev/null
@@ -1,332 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpegts;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.BitBufferReader;
-import com.sedmelluq.discord.lavaplayer.tools.io.GreedyInputStream;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-
-/**
- * Input stream which takes in a stream providing MPEG TS data and outputs a single track from it specified by the
- * elementary data type.
- */
-public class MpegTsElementaryInputStream extends InputStream {
- private static final Logger log = LoggerFactory.getLogger(MpegTsElementaryInputStream.class);
-
- public static final int ADTS_ELEMENTARY_STREAM = 0x0F;
-
- private static final int PID_UNKNOWN = -1;
- private static final int PID_NOT_PRESENT = -2;
-
- private static final int PACKET_IDENTIFIER_SDT = 0x11;
-
- private static final int TS_PACKET_SIZE = 188;
-
- private final InputStream inputStream;
- private final int elementaryDataType;
- private final byte[] packet;
- private final ByteBuffer packetBuffer;
- private final BitBufferReader bufferReader;
- private int elementaryStreamIdentifier;
- private int programMapIdentifier;
- private boolean elementaryDataInPacket;
- private boolean streamEndReached;
-
- private String serviceProviderName;
- private String serviceName;
-
- /**
- * @param inputStream Underlying input stream
- * @param elementaryDataType ID of the media type to pass upstream
- */
- public MpegTsElementaryInputStream(InputStream inputStream, int elementaryDataType) {
- this.inputStream = new GreedyInputStream(inputStream);
- this.elementaryDataType = elementaryDataType;
- this.packet = new byte[TS_PACKET_SIZE];
- this.packetBuffer = ByteBuffer.wrap(packet);
- this.bufferReader = new BitBufferReader(packetBuffer);
- this.elementaryStreamIdentifier = PID_UNKNOWN;
- this.programMapIdentifier = PID_UNKNOWN;
- }
-
- public AudioTrackInfoProvider getLoadedMetadata() {
- return new AudioTrackInfoProvider() {
- @Override
- public String getTitle() {
- return serviceName;
- }
-
- @Override
- public String getAuthor() {
- return serviceProviderName;
- }
-
- @Override
- public Long getLength() {
- return null;
- }
-
- @Override
- public String getIdentifier() {
- return null;
- }
-
- @Override
- public String getUri() {
- return null;
- }
- };
- }
-
- @Override
- public int read() throws IOException {
- if (!findElementaryData()) {
- return -1;
- }
-
- int result = packetBuffer.get() & 0xFF;
-
- checkElementaryDataEnd();
- return result;
- }
-
- @Override
- public int read(byte[] buffer, int offset, int length) throws IOException {
- if (!findElementaryData()) {
- return -1;
- }
-
- int chunk = Math.min(length, packetBuffer.remaining());
- packetBuffer.get(buffer, offset, chunk);
-
- checkElementaryDataEnd();
-
- return chunk;
- }
-
- private boolean findElementaryData() throws IOException {
- if (!elementaryDataInPacket) {
- while (processPacket()) {
- if (elementaryDataInPacket) {
- return true;
- }
- }
- }
-
- return elementaryDataInPacket;
- }
-
- private void checkElementaryDataEnd() {
- if (packetBuffer.remaining() == 0) {
- elementaryDataInPacket = false;
- }
- }
-
- private boolean processPacket() throws IOException {
- if (!isContinuable()) {
- return false;
- } else if (inputStream.read(packet) < packet.length) {
- streamEndReached = true;
- return false;
- }
-
- packetBuffer.clear();
- bufferReader.readRemainingBits();
-
- int identifier = verifyPacket(bufferReader, packetBuffer);
- if (identifier == -1) {
- return false;
- }
-
- processPacketContent(identifier);
- return isContinuable();
- }
-
- private void processPacketContent(int identifier) {
- if (identifier == 0 || identifier == programMapIdentifier) {
- if (identifier == 0) {
- programMapIdentifier = PID_NOT_PRESENT;
- }
-
- processProgramPacket();
- } else if (identifier == elementaryStreamIdentifier) {
- elementaryDataInPacket = true;
- } else if (identifier == PACKET_IDENTIFIER_SDT) {
- try {
- parseSdtTable();
- } catch (RuntimeException e) {
- log.warn("Exception when parsing MPEG-TS SDT table.", e);
- }
- }
- }
-
- private void parseSdtTable() {
- bufferReader.asLong(20);
- int sectionLength = bufferReader.asInteger(12);
- bufferReader.asLong(64);
-
- if (sectionLength > 0) {
- bufferReader.asLong(28);
- int loopLength = bufferReader.asInteger(12);
-
- if (loopLength > 0) {
- int descriptorTag = bufferReader.asInteger(8);
-
- if (descriptorTag == 0x48) {
- bufferReader.asLong(16);
-
- serviceProviderName = parseSdtAsciiString();
- serviceName = parseSdtAsciiString();
- }
- }
- }
- }
-
- private String parseSdtAsciiString() {
- int length = packetBuffer.get() & 0xFF;
-
- if (length > 0) {
- byte[] textBytes = new byte[length];
- packetBuffer.get(textBytes);
-
- return new String(textBytes, 0, textBytes.length, StandardCharsets.US_ASCII);
- } else {
- return null;
- }
- }
-
- private boolean isContinuable() {
- return !streamEndReached || programMapIdentifier != PID_NOT_PRESENT && elementaryStreamIdentifier != PID_NOT_PRESENT;
- }
-
- private void processProgramPacket() {
- discardPointerField();
-
- while (packetBuffer.hasRemaining()) {
- int tableIdentifier = packetBuffer.get() & 0xFF;
- if (tableIdentifier == 0xFF) {
- break;
- }
-
- int sectionInfo = bufferReader.asInteger(6);
- int sectionLength = bufferReader.asInteger(10);
- int position = packetBuffer.position();
- bufferReader.readRemainingBits();
-
- if (tableIdentifier == 0) {
- processPatTable(sectionInfo);
- } else if (tableIdentifier == 2) {
- processPmtTable(sectionInfo, sectionLength);
- }
-
- packetBuffer.position(position + sectionLength);
- }
- }
-
- private boolean processPatPmtCommon(int sectionInfo) {
- if (sectionInfo != 0x2C) {
- return false;
- }
-
- // Table syntax section, boring.
- bufferReader.asLong(40);
- return true;
- }
-
- private void processPatTable(int sectionInfo) {
- if (!processPatPmtCommon(sectionInfo)) {
- return;
- }
-
- // Program number
- bufferReader.asLong(16);
-
- if (bufferReader.asLong(3) == 0x07) {
- programMapIdentifier = bufferReader.asInteger(13);
- }
- }
-
- private void processPmtTable(int sectionInfo, int sectionLength) {
- int endPosition = packetBuffer.position() + sectionLength;
-
- if (!processPatPmtCommon(sectionInfo) || bufferReader.asInteger(3) != 0x07) {
- return;
- }
-
- // Clock packet identifier (PCR PID)
- bufferReader.asLong(13);
- // Reserved bits (must be 1111) and program info length unused bits (must be 00)
- if (bufferReader.asLong(6) != 0x3C) {
- return;
- }
-
- // Skip program descriptors
- int programInfoLength = bufferReader.asInteger(10);
- packetBuffer.position(packetBuffer.position() + programInfoLength);
-
- processElementaryStreams(endPosition);
- }
-
- private void processElementaryStreams(int endPosition) {
- elementaryStreamIdentifier = PID_NOT_PRESENT;
-
- while (packetBuffer.position() < endPosition - 4) {
- int streamType = bufferReader.asInteger(8);
- // Reserved bits (must be 111)
- bufferReader.asInteger(3);
-
- int streamPid = bufferReader.asInteger(13);
- // 4 reserved bits (1111) and 2 ES Info length unused bits (00)
- bufferReader.asLong(6);
-
- int infoLength = bufferReader.asInteger(10);
- packetBuffer.position(packetBuffer.position() + infoLength);
-
- if (streamType == elementaryDataType) {
- elementaryStreamIdentifier = streamPid;
- }
- }
- }
-
- private void discardPointerField() {
- int pointerField = packetBuffer.get();
-
- for (int i = 0; i < pointerField; i++) {
- packetBuffer.get();
- }
- }
-
- private static int verifyPacket(BitBufferReader reader, ByteBuffer rawBuffer) {
- if (reader.asLong(8) != 'G') {
- return -1;
- }
-
- // Not important for this case
- reader.asLong(3);
-
- int identifier = reader.asInteger(13);
- long scrambling = reader.asLong(2);
-
- // Adaptation
- long adaptation = reader.asLong(2);
-
- if (scrambling != 0) {
- return -1;
- }
-
- // Continuity counter
- reader.asLong(4);
-
- if (adaptation == 2 || adaptation == 3) {
- int adaptationSize = reader.asInteger(8);
- rawBuffer.position(rawBuffer.position() + adaptationSize);
- }
-
- return identifier;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/PesPacketInputStream.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/PesPacketInputStream.java
deleted file mode 100644
index 49d8812..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpegts/PesPacketInputStream.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.mpegts;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.GreedyInputStream;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Input stream which takes in a stream providing PES-wrapped media packets and outputs provides the raw content of it
- * upstream.
- */
-public class PesPacketInputStream extends InputStream {
- private static final byte[] SYNC_BYTES = new byte[]{0x00, 0x00, 0x01};
-
- private final InputStream inputStream;
- private final byte[] lengthBufferBytes;
- private final ByteBuffer lengthBuffer;
- private int packetBytesLeft;
-
- /**
- * @param inputStream Underlying input stream.
- */
- public PesPacketInputStream(InputStream inputStream) {
- this.inputStream = new GreedyInputStream(inputStream);
- this.lengthBufferBytes = new byte[2];
- this.lengthBuffer = ByteBuffer.wrap(lengthBufferBytes);
- }
-
- private boolean makeBytesAvailable() throws IOException {
- if (packetBytesLeft > 0) {
- return true;
- }
-
- int streamByte;
- int matched = 0;
- boolean packetFound = false;
-
- while (!packetFound && (streamByte = inputStream.read()) != -1) {
- if (streamByte == SYNC_BYTES[matched]) {
- if (++matched == SYNC_BYTES.length) {
- matched = 0;
- packetFound = processPacketHeader();
- }
- } else {
- matched = 0;
- }
- }
-
- return packetFound;
- }
-
- private boolean processPacketHeader() throws IOException {
- // No need to check stream ID value
- if (inputStream.read() == -1 || inputStream.read(lengthBufferBytes) != lengthBufferBytes.length) {
- return false;
- }
-
- int length = lengthBuffer.getShort(0);
- if (inputStream.skip(2) != 2) {
- return false;
- }
-
- int headerLength = inputStream.read();
- if (headerLength == -1 || inputStream.skip(headerLength) != headerLength) {
- return false;
- }
-
- packetBytesLeft = length - 3 - headerLength;
- return packetBytesLeft > 0;
- }
-
- @Override
- public int read() throws IOException {
- if (!makeBytesAvailable()) {
- return -1;
- }
-
- int result = inputStream.read();
- if (result >= 0) {
- packetBytesLeft--;
- }
-
- return result;
- }
-
- @Override
- public int read(byte[] buffer, int offset, int length) throws IOException {
- if (!makeBytesAvailable()) {
- return -1;
- }
-
- int chunk = Math.min(packetBytesLeft, length);
- int result = inputStream.read(buffer, offset, chunk);
- if (result > 0) {
- packetBytesLeft -= result;
- }
-
- return result;
- }
-
- @Override
- public int available() throws IOException {
- return packetBytesLeft;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggAudioTrack.java
deleted file mode 100644
index f12209a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggAudioTrack.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg;
-
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.BaseAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio track which handles an OGG stream.
- */
-public class OggAudioTrack extends BaseAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(OggAudioTrack.class);
-
- private final SeekableInputStream inputStream;
-
- /**
- * @param trackInfo Track info
- * @param inputStream Input stream for the OGG stream
- */
- public OggAudioTrack(AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- super(trackInfo);
-
- this.inputStream = inputStream;
- }
-
- @Override
- public void process(final LocalAudioTrackExecutor localExecutor) {
- OggPacketInputStream packetInputStream = new OggPacketInputStream(inputStream);
-
- log.debug("Starting to play an OGG stream track {}", getIdentifier());
-
- localExecutor.executeProcessingLoop(() -> {
- try {
- processTrackLoop(packetInputStream, localExecutor.getProcessingContext());
- } catch (IOException e) {
- throw new FriendlyException("Stream broke when playing OGG track.", SUSPICIOUS, e);
- }
- }, null);
- }
-
- private void processTrackLoop(OggPacketInputStream packetInputStream, AudioProcessingContext context) throws IOException, InterruptedException {
- OggTrackHandler track = OggTrackLoader.loadTrackHandler(packetInputStream);
-
- if (track == null) {
- throw new IOException("Stream terminated before the first packet.");
- }
-
- while (track != null) {
- try {
- track.initialise(context);
- track.provideFrames();
- } finally {
- track.close();
- }
-
- track = OggTrackLoader.loadTrackHandler(packetInputStream);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggCodecHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggCodecHandler.java
deleted file mode 100644
index 44a0fbb..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggCodecHandler.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.DirectBufferStreamBroker;
-
-import java.io.IOException;
-
-public interface OggCodecHandler {
- boolean isMatchingIdentifier(int identifier);
-
- int getMaximumFirstPacketLength();
-
- OggTrackHandler loadTrackHandler(OggPacketInputStream stream, DirectBufferStreamBroker broker) throws IOException;
-
- OggMetadata loadMetadata(OggPacketInputStream stream, DirectBufferStreamBroker broker) throws IOException;
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggContainerProbe.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggContainerProbe.java
deleted file mode 100644
index a33164d..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggContainerProbe.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerHints;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.checkNextBytes;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.supportedFormat;
-import static com.sedmelluq.discord.lavaplayer.container.ogg.OggPacketInputStream.OGG_PAGE_HEADER;
-
-/**
- * Container detection probe for OGG stream.
- */
-public class OggContainerProbe implements MediaContainerProbe {
- private static final Logger log = LoggerFactory.getLogger(OggContainerProbe.class);
-
- @Override
- public String getName() {
- return "ogg";
- }
-
- @Override
- public boolean matchesHints(MediaContainerHints hints) {
- return false;
- }
-
- @Override
- public MediaContainerDetectionResult probe(AudioReference reference, SeekableInputStream stream) throws IOException {
- if (!checkNextBytes(stream, OGG_PAGE_HEADER)) {
- return null;
- }
-
- log.debug("Track {} is an OGG stream.", reference.identifier);
-
- AudioTrackInfoBuilder infoBuilder = AudioTrackInfoBuilder.create(reference, stream).setIsStream(true);
-
- try {
- collectStreamInformation(stream, infoBuilder);
- } catch (Exception e) {
- log.warn("Failed to collect additional information on OGG stream.", e);
- }
-
- return supportedFormat(this, null, infoBuilder.build());
- }
-
- @Override
- public AudioTrack createTrack(String parameters, AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- return new OggAudioTrack(trackInfo, inputStream);
- }
-
- private void collectStreamInformation(SeekableInputStream stream, AudioTrackInfoBuilder infoBuilder) throws IOException {
- OggPacketInputStream packetInputStream = new OggPacketInputStream(stream);
- OggMetadata metadata = OggTrackLoader.loadMetadata(packetInputStream);
-
- if (metadata != null) {
- infoBuilder.apply(metadata);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggMetadata.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggMetadata.java
deleted file mode 100644
index 20f4326..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggMetadata.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg;
-
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoProvider;
-
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * Audio track info provider based on OGG metadata map.
- */
-public class OggMetadata implements AudioTrackInfoProvider {
- public static final OggMetadata EMPTY = new OggMetadata(Collections.emptyMap(), Long.MAX_VALUE);
-
- private static final String TITLE_FIELD = "TITLE";
- private static final String ARTIST_FIELD = "ARTIST";
-
- private final Map tags;
-
- /**
- * @param tags Map of OGG metadata with OGG-specific keys.
- */
- public OggMetadata(Map tags, Long length) {
- this.tags = tags;
- }
-
- @Override
- public String getTitle() {
- return tags.get(TITLE_FIELD);
- }
-
- @Override
- public String getAuthor() {
- return tags.get(ARTIST_FIELD);
- }
-
- @Override
- public Long getLength() {
- return null;
- }
-
- @Override
- public String getIdentifier() {
- return null;
- }
-
- @Override
- public String getUri() {
- return null;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggPacketInputStream.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggPacketInputStream.java
deleted file mode 100644
index f75ab82..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggPacketInputStream.java
+++ /dev/null
@@ -1,336 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.tools.io.StreamTools;
-
-import java.io.*;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.checkNextBytes;
-
-/**
- * This provides a stream for OGG packets where the stream is always bounded to the current packet, and the next packet
- * can be started with startNewPacket(). The same way it is bound to a specific track and the next track can be started
- * with startNewTrack() when the previous one has ended (startNewPacket() has returned false).
- */
-public class OggPacketInputStream extends InputStream {
- static final int[] OGG_PAGE_HEADER = new int[]{0x4F, 0x67, 0x67, 0x53};
-
- private static final int SHORT_SCAN = 10240;
- private static final int LONG_SCAN = 65307;
-
- private final SeekableInputStream inputStream;
- private final DataInput dataInput;
- private final int[] segmentSizes;
-
- private OggPageHeader pageHeader;
- private int bytesLeftInPacket;
- private boolean packetContinues;
- private int nextPacketSegmentIndex;
- private State state;
-
- /**
- * @param inputStream Input stream to read in as OGG packets
- */
- public OggPacketInputStream(SeekableInputStream inputStream) {
- this.inputStream = inputStream;
- this.dataInput = new DataInputStream(inputStream);
- this.segmentSizes = new int[256];
- this.state = State.TRACK_BOUNDARY;
- }
-
- /**
- * Load the next track from the stream. This is only valid when the stream is in a track boundary state.
- *
- * @return True if next track is present in the stream, false if the stream has terminated.
- */
- public boolean startNewTrack() {
- if (state == State.TERMINATED) {
- return false;
- } else if (state != State.TRACK_BOUNDARY) {
- throw new IllegalStateException("Cannot load the next track while the previous one has not been consumed.");
- }
-
- pageHeader = null;
- state = State.PACKET_BOUNDARY;
- return true;
- }
-
- /**
- * Load the next packet from the stream. This is only valid when the stream is in a packet boundary state.
- *
- * @return True if next packet is present in the track. State is PACKET_READ.
- * False if the track is finished. State is either TRACK_BOUNDARY or TERMINATED.
- * @throws IOException On read error.
- */
- public boolean startNewPacket() throws IOException {
- if (state == State.TRACK_BOUNDARY) {
- return false;
- } else if (state != State.PACKET_BOUNDARY) {
- throw new IllegalStateException("Cannot start a new packet while the previous one has not been consumed.");
- }
-
- if ((pageHeader == null || nextPacketSegmentIndex == pageHeader.segmentCount) && !loadNextNonEmptyPage()) {
- return false;
- }
-
- if (!initialisePacket()) {
- return loadNextNonEmptyPage();
- }
-
- return true;
- }
-
- public boolean isPacketComplete() {
- return state == State.PACKET_READ;
- }
-
- private boolean readPageHeader() throws IOException {
- if (!checkNextBytes(inputStream, OGG_PAGE_HEADER, false)) {
- if (inputStream.read() == -1) {
- return false;
- }
-
- throw new IllegalStateException("Stream is not positioned at a page header.");
- } else if ((dataInput.readByte() & 0xFF) != 0) {
- throw new IllegalStateException("Unknown OGG stream version.");
- }
-
- int flags = dataInput.readByte() & 0xFF;
- long position = Long.reverseBytes(dataInput.readLong());
- int streamIdentifier = Integer.reverseBytes(dataInput.readInt());
- int pageSequence = Integer.reverseBytes(dataInput.readInt());
- int checksum = Integer.reverseBytes(dataInput.readInt());
- int segmentCount = dataInput.readByte() & 0xFF;
- long byteStreamPosition = inputStream.getPosition() - 27;
-
- pageHeader = new OggPageHeader(flags, position, streamIdentifier, pageSequence, checksum, segmentCount,
- byteStreamPosition);
-
- for (int i = 0; i < segmentCount; i++) {
- segmentSizes[i] = dataInput.readByte() & 0xFF;
- }
-
- return true;
- }
-
- /**
- * Load pages until a non-empty page is reached. Valid to call in states PACKET_BOUNDARY (page starts a new packet) or
- * PACKET_READ (page starts with a continuation).
- *
- * @return True if a page belonging to the same track was loaded, state is PACKET_READ.
- * False if the next page cannot be loaded because the current one ended the track, state is TRACK_BOUNDARY
- * or TERMINATED.
- * @throws IOException On read error.
- */
- private boolean loadNextNonEmptyPage() throws IOException {
- do {
- if (!loadNextPage()) {
- return false;
- }
- } while (pageHeader.segmentCount == 0);
-
- return true;
- }
-
- /**
- * Load the next page from the stream. Valid to call in states PACKET_BOUNDARY (page starts a new packet) or
- * PACKET_READ (page starts with a continuation).
- *
- * @return True if a page belonging to the same track was loaded, state is PACKET_READ.
- * False if the next page cannot be loaded because the current one ended the track, state is TRACK_BOUNDARY
- * or TERMINATED.
- * @throws IOException On read error.
- */
- private boolean loadNextPage() throws IOException {
- if (pageHeader != null && pageHeader.isLastPage) {
- if (packetContinues) {
- throw new IllegalStateException("Track finished in the middle of a packet.");
- }
-
- state = State.TRACK_BOUNDARY;
- return false;
- }
-
- if (!readPageHeader()) {
- if (packetContinues) {
- throw new IllegalStateException("Stream ended in the middle of a packet.");
- }
- return false;
- }
-
- nextPacketSegmentIndex = 0;
- state = State.PACKET_READ;
- return true;
- }
-
- /**
- * Initialise the (remainder of the) current packet in the stream. This may be called either to initialise a new
- * packet or a continuation of the previous one. Call only in state PACKET_READ.
- *
- * @return Returns false if the remaining size of the packet was zero, state is PACKET_BOUNDARY.
- * Returns true if the initialised packet has any bytes in it, state is PACKET_READ.
- */
- private boolean initialisePacket() {
- while (nextPacketSegmentIndex < pageHeader.segmentCount) {
- int size = segmentSizes[nextPacketSegmentIndex++];
- bytesLeftInPacket += size;
-
- if (size < 255) {
- // Anything below 255 is also a packet end marker.
- if (bytesLeftInPacket == 0) {
- // We reached packet end without getting any additional bytes, set state to packet boundary
- state = State.PACKET_BOUNDARY;
- return false;
- }
-
- // We reached packet end and got some more bytes.
- packetContinues = false;
- return true;
- }
- }
-
- // Packet does not end within this page.
- packetContinues = true;
- return true;
- }
-
- @Override
- public int read() throws IOException {
- if (bytesLeftInPacket == 0) {
- return -1;
- }
-
- int value = inputStream.read();
- if (value == -1) {
- return -1;
- }
-
- if (--bytesLeftInPacket == 0) {
- continuePacket();
- }
-
- return value;
- }
-
- @Override
- public int read(byte[] buffer, int initialOffset, int length) throws IOException {
- int currentOffset = initialOffset;
- int maximumOffset = initialOffset + length;
-
- // Terminates when we have read as much as we needed
- while (currentOffset < maximumOffset) {
- // If there is nothing left in the current packet, stream is in EOF state
- if (bytesLeftInPacket == 0) {
- return -1;
- }
-
- // Limit the read size to the number of bytes that are definitely still left in the packet
- int chunk = Math.min(maximumOffset - currentOffset, bytesLeftInPacket);
- int read = inputStream.read(buffer, currentOffset, chunk);
-
- if (read == -1) {
- // EOF in the underlying stream before the end of a packet. Throw an exception, the consumer should not need
- // to check for partial packets.
- throw new EOFException("Underlying stream ended before the end of a packet.");
- }
-
- currentOffset += read;
- bytesLeftInPacket -= read;
-
- if (bytesLeftInPacket == 0) {
- // We got everything from our chunk of size min(leftInPacket, requested) and also exhausted the bytes that we
- // know the packet had left. Check if the packet continues so we could continue fetching from the same packet.
- // Otherwise, bugger out.
-
- if (!continuePacket()) {
- break;
- }
- } else if (read < chunk) {
- // The underlying stream cannot provide more right now. Let it rest.
- return currentOffset - initialOffset;
- }
- }
-
- return currentOffset - initialOffset;
- }
-
- @Override
- public int available() throws IOException {
- if (state != State.PACKET_READ) {
- return 0;
- }
-
- return Math.min(inputStream.available(), bytesLeftInPacket);
- }
-
- /**
- * If it is possible to seek backwards on this stream, and the length of the stream is known, seeks to the end of the
- * track to determine the stream length both in bytes and samples.
- *
- * @param sampleRate Sample rate of the track in this stream.
- * @return OGG stream size information.
- * @throws IOException On read error.
- */
- public OggStreamSizeInfo seekForSizeInfo(int sampleRate) throws IOException {
- if (!inputStream.canSeekHard()) {
- return null;
- }
-
- long savedPosition = inputStream.getPosition();
-
- OggStreamSizeInfo sizeInfo = scanForSizeInfo(SHORT_SCAN, sampleRate);
-
- if (sizeInfo == null) {
- sizeInfo = scanForSizeInfo(LONG_SCAN, sampleRate);
- }
-
- inputStream.seek(savedPosition);
- return sizeInfo;
- }
-
- private OggStreamSizeInfo scanForSizeInfo(int tailLength, int sampleRate) throws IOException {
- if (pageHeader == null) {
- return null;
- }
-
- long absoluteOffset = Math.max(pageHeader.byteStreamPosition, inputStream.getContentLength() - tailLength);
- inputStream.seek(absoluteOffset);
-
- byte[] data = new byte[tailLength];
- int dataLength = StreamTools.readUntilEnd(inputStream, data, 0, data.length);
-
- return new OggPageScanner(absoluteOffset, data, dataLength).scanForSizeInfo(pageHeader.byteStreamPosition,
- sampleRate);
- }
-
- /**
- * Process request for more bytes for the packet. Call only when the state is PACKET_READ.
- *
- * @return Returns false if no more bytes for the packet are available, state is PACKET_BOUNDARY.
- * Returns true if more bytes were fetched for this packet, state is PACKET_READ.
- * @throws IOException On read error.
- */
- private boolean continuePacket() throws IOException {
- if (!packetContinues) {
- // We have reached the end of the packet.
- state = State.PACKET_BOUNDARY;
- return false;
- }
-
- // Load more segments for this packet from the next page.
- if (!loadNextNonEmptyPage()) {
- throw new IllegalStateException("Track or stream end reached within an incomplete packet.");
- } else if (!initialisePacket()) {
- return false;
- }
-
- return true;
- }
-
- private enum State {
- TRACK_BOUNDARY,
- PACKET_BOUNDARY,
- PACKET_READ,
- TERMINATED
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggPageHeader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggPageHeader.java
deleted file mode 100644
index 4e93489..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggPageHeader.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg;
-
-/**
- * Header of an OGG stream page.
- */
-public class OggPageHeader {
- public static final int FLAG_CONTINUATION = 0x01;
- public static final int FLAG_FIRST_PAGE = 0x02;
- public static final int FLAG_LAST_PAGE = 0x04;
-
- /**
- * If this page starts in the middle of a packet that was left incomplete in the previous page.
- */
- public final boolean isContinuation;
- /**
- * If this is the first page of the track.
- */
- public final boolean isFirstPage;
- /**
- * If this is the last page of the track.
- */
- public final boolean isLastPage;
- /**
- * The absolute position in the number of samples of this packet relative to the track start.
- */
- public final long absolutePosition;
- /**
- * Unique identifier of this track in the stream.
- */
- public final int streamIdentifier;
- /**
- * The index of the page within a track.
- */
- public final int pageSequence;
- /**
- * The checksum of the page.
- */
- public final int pageChecksum;
- /**
- * Number of segments in the page.
- */
- public final int segmentCount;
- /**
- * The absolute position of the start of this page in the underlying bytestream.
- */
- public final long byteStreamPosition;
-
- /**
- * @param flags Page flags.
- * @param absolutePosition The absolute position in the number of samples of this packet relative to the track start.
- * @param streamIdentifier Unique identifier of this track in the stream.
- * @param pageSequence The index of the page within a track.
- * @param checksum The checksum of the page.
- * @param segmentCount Number of segments in the page.
- * @param byteStreamPosition The absolute position in bytes of this page in the stream.
- */
- public OggPageHeader(int flags, long absolutePosition, int streamIdentifier, int pageSequence, int checksum,
- int segmentCount, long byteStreamPosition) {
-
- this.isContinuation = (flags & FLAG_CONTINUATION) != 0;
- this.isFirstPage = (flags & FLAG_FIRST_PAGE) != 0;
- this.isLastPage = (flags & FLAG_LAST_PAGE) != 0;
- this.absolutePosition = absolutePosition;
- this.streamIdentifier = streamIdentifier;
- this.pageSequence = pageSequence;
- this.pageChecksum = checksum;
- this.segmentCount = segmentCount;
- this.byteStreamPosition = byteStreamPosition;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggPageScanner.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggPageScanner.java
deleted file mode 100644
index ef1a4aa..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggPageScanner.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg;
-
-import java.nio.ByteBuffer;
-
-/**
- * Scanner for determining OGG stream information by seeking around in it.
- */
-public class OggPageScanner {
- private static final int OGG_PAGE_HEADER_INT = ByteBuffer.wrap(new byte[]{0x4F, 0x67, 0x67, 0x53}).getInt(0);
-
- private final long absoluteOffset;
- private final byte[] data;
- private final int dataLength;
-
- private int flags;
- private long reversedPosition;
- private int pageSize;
- private long byteStreamPosition;
-
- /**
- * @param absoluteOffset Current position of the stream in bytes.
- * @param data Byte array with data starting at that position.
- * @param dataLength Length of data.
- */
- public OggPageScanner(long absoluteOffset, byte[] data, int dataLength) {
- this.absoluteOffset = absoluteOffset;
- this.data = data;
- this.dataLength = dataLength;
- }
-
- /**
- * @param firstPageOffset Absolute position of the first page in the stream.
- * @param sampleRate Sample rate of the track in the stream.
- * @return If the data contains the header of the last page in the OGG stream, then stream size information,
- * otherwise null.
- */
- public OggStreamSizeInfo scanForSizeInfo(long firstPageOffset, int sampleRate) {
- ByteBuffer buffer = ByteBuffer.wrap(data, 0, dataLength);
- int head = buffer.getInt(0);
-
- for (int i = 0; i < dataLength - 27; i++) {
- if (head == OGG_PAGE_HEADER_INT) {
- buffer.position(i);
-
- if (attemptReadHeader(buffer)) {
- do {
- if ((flags & OggPageHeader.FLAG_LAST_PAGE) != 0) {
- return new OggStreamSizeInfo((byteStreamPosition - firstPageOffset) + pageSize,
- Long.reverseBytes(reversedPosition), firstPageOffset, byteStreamPosition, sampleRate);
- }
- } while (attemptReadHeader(buffer));
- }
- }
-
- head <<= 8;
- head |= data[i + 4] & 0xFF;
- }
-
- return null;
- }
-
- private boolean attemptReadHeader(ByteBuffer buffer) {
- int start = buffer.position();
-
- if (buffer.limit() < start + 27) {
- return false;
- } else if (buffer.getInt(start) != OGG_PAGE_HEADER_INT) {
- return false;
- } else if (buffer.get(start + 4) != 0) {
- return false;
- }
-
- int segmentCount = buffer.get(start + 26) & 0xFF;
- int minimumCapacity = start + segmentCount + 27;
-
- if (buffer.limit() < minimumCapacity) {
- return false;
- }
-
- int segmentBase = start + 27;
-
- for (int i = 0; i < segmentCount; i++) {
- minimumCapacity += buffer.get(segmentBase + i) & 0xFF;
- }
-
- if (buffer.limit() < minimumCapacity) {
- return false;
- }
-
- flags = buffer.get(start + 5) & 0xFF;
- reversedPosition = buffer.getLong(start + 6);
- byteStreamPosition = absoluteOffset + start;
- pageSize = minimumCapacity;
-
- buffer.position(minimumCapacity);
- return true;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggStreamSizeInfo.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggStreamSizeInfo.java
deleted file mode 100644
index cb77888..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggStreamSizeInfo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg;
-
-/**
- * Describes the size information of an OGG stream.
- */
-public class OggStreamSizeInfo {
- /**
- * Total number of bytes in the stream.
- */
- public final long totalBytes;
- /**
- * Total number of samples in the stream.
- */
- public final long totalSamples;
- /**
- * Absolute offset of the first page in the stream.
- */
- public final long firstPageOffset;
- /**
- * Absolute offset of the last page in the stream.
- */
- public final long lastPageOffset;
- /**
- * Sample rate of the track in this stream, useful for calculating duration in milliseconds.
- */
- public final int sampleRate;
-
- /**
- * @param totalBytes See {@link #totalBytes}.
- * @param totalSamples See {@link #totalSamples}.
- * @param firstPageOffset See {@link #firstPageOffset}.
- * @param lastPageOffset See {@link #lastPageOffset}.
- * @param sampleRate See {@link #sampleRate}.
- */
- public OggStreamSizeInfo(long totalBytes, long totalSamples, long firstPageOffset, long lastPageOffset,
- int sampleRate) {
-
- this.totalBytes = totalBytes;
- this.totalSamples = totalSamples;
- this.firstPageOffset = firstPageOffset;
- this.lastPageOffset = lastPageOffset;
- this.sampleRate = sampleRate;
- }
-
- /**
- * @return Duration calculated from size info in milliseconds (rounded down).
- */
- public long getDuration() {
- return totalSamples * 1000 / sampleRate;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggTrackHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggTrackHandler.java
deleted file mode 100644
index deeed5c..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggTrackHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg;
-
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.io.IOException;
-
-/**
- * A handler for a specific codec for an OGG stream.
- */
-public interface OggTrackHandler {
- /**
- * Initialises the track stream.
- *
- * @param context Configuration and output information for processing
- * @throws IOException On read error.
- */
- void initialise(AudioProcessingContext context) throws IOException;
-
- /**
- * Decodes audio frames and sends them to frame consumer.
- *
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void provideFrames() throws InterruptedException;
-
- /**
- * Seeks to the specified timecode.
- *
- * @param timecode The timecode in milliseconds
- */
- void seekToTimecode(long timecode);
-
- /**
- * Free all resources associated to processing the track.
- */
- void close();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggTrackLoader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggTrackLoader.java
deleted file mode 100644
index 6d59650..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggTrackLoader.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg;
-
-import com.sedmelluq.discord.lavaplayer.container.ogg.flac.OggFlacCodecHandler;
-import com.sedmelluq.discord.lavaplayer.container.ogg.opus.OggOpusCodecHandler;
-import com.sedmelluq.discord.lavaplayer.container.ogg.vorbis.OggVorbisCodecHandler;
-import com.sedmelluq.discord.lavaplayer.tools.io.DirectBufferStreamBroker;
-
-import java.io.IOException;
-import java.util.stream.Stream;
-
-/**
- * Track loader for an OGG packet stream. Automatically detects the track codec and loads the specific track handler.
- */
-public class OggTrackLoader {
- private static final OggCodecHandler[] TRACK_PROVIDERS = new OggCodecHandler[]{
- new OggOpusCodecHandler(),
- new OggFlacCodecHandler(),
- new OggVorbisCodecHandler()
- };
-
- private static final int MAXIMUM_FIRST_PACKET_LENGTH = Stream.of(TRACK_PROVIDERS)
- .mapToInt(OggCodecHandler::getMaximumFirstPacketLength).max().getAsInt();
-
- /**
- * @param packetInputStream OGG packet input stream
- * @return The track handler detected from this packet input stream. Returns null if the stream ended.
- * @throws IOException On read error
- * @throws IllegalStateException If the track uses an unknown codec.
- */
- public static OggTrackHandler loadTrackHandler(OggPacketInputStream packetInputStream) throws IOException {
- CodecDetection result = detectCodec(packetInputStream);
- return result != null ? result.provider.loadTrackHandler(packetInputStream, result.broker) : null;
- }
-
- public static OggMetadata loadMetadata(OggPacketInputStream packetInputStream) throws IOException {
- CodecDetection result = detectCodec(packetInputStream);
- return result != null ? result.provider.loadMetadata(packetInputStream, result.broker) : null;
- }
-
- private static CodecDetection detectCodec(OggPacketInputStream stream) throws IOException {
- if (!stream.startNewTrack() || !stream.startNewPacket()) {
- return null;
- }
-
- DirectBufferStreamBroker broker = new DirectBufferStreamBroker(1024);
- int maximumLength = MAXIMUM_FIRST_PACKET_LENGTH + 1;
-
- if (!broker.consumeNext(stream, maximumLength, maximumLength)) {
- throw new IOException("First packet is too large for any known OGG codec.");
- }
-
- int headerIdentifier = broker.getBuffer().getInt();
-
- for (OggCodecHandler trackProvider : TRACK_PROVIDERS) {
- if (trackProvider.isMatchingIdentifier(headerIdentifier)) {
- return new CodecDetection(trackProvider, broker);
- }
- }
-
- throw new IllegalStateException("Unsupported track in OGG stream.");
- }
-
- private static class CodecDetection {
- private final OggCodecHandler provider;
- private final DirectBufferStreamBroker broker;
-
- private CodecDetection(OggCodecHandler provider, DirectBufferStreamBroker broker) {
- this.provider = provider;
- this.broker = broker;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/flac/OggFlacCodecHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/flac/OggFlacCodecHandler.java
deleted file mode 100644
index 1e338da..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/flac/OggFlacCodecHandler.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg.flac;
-
-import com.sedmelluq.discord.lavaplayer.container.flac.*;
-import com.sedmelluq.discord.lavaplayer.container.ogg.*;
-import com.sedmelluq.discord.lavaplayer.tools.io.ByteBufferInputStream;
-import com.sedmelluq.discord.lavaplayer.tools.io.DirectBufferStreamBroker;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * Loader for an OGG FLAC track from an OGG packet stream.
- */
-public class OggFlacCodecHandler implements OggCodecHandler {
- private static final int FLAC_IDENTIFIER = ByteBuffer.wrap(new byte[]{0x7F, 'F', 'L', 'A'}).getInt();
-
- private static final int NATIVE_FLAC_HEADER_OFFSET = 9;
- private static final int NATIVE_FLAC_HEADER = ByteBuffer.wrap(new byte[]{'f', 'L', 'a', 'C'}).getInt();
-
- @Override
- public boolean isMatchingIdentifier(int identifier) {
- return identifier == FLAC_IDENTIFIER;
- }
-
- @Override
- public int getMaximumFirstPacketLength() {
- return NATIVE_FLAC_HEADER_OFFSET + 4 + FlacMetadataHeader.LENGTH + FlacStreamInfo.LENGTH;
- }
-
- @Override
- public OggTrackHandler loadTrackHandler(OggPacketInputStream stream, DirectBufferStreamBroker broker) throws IOException {
- return new OggFlacTrackHandler(load(stream, broker), stream);
- }
-
- @Override
- public OggMetadata loadMetadata(OggPacketInputStream stream, DirectBufferStreamBroker broker) throws IOException {
- FlacTrackInfo info = load(stream, broker);
- return new OggMetadata(info.tags, detectLength(info, stream));
- }
-
- private FlacTrackInfo load(OggPacketInputStream stream, DirectBufferStreamBroker broker) throws IOException {
- ByteBuffer buffer = broker.getBuffer();
-
- if (buffer.getInt(NATIVE_FLAC_HEADER_OFFSET) != NATIVE_FLAC_HEADER) {
- throw new IllegalStateException("Native flac header not found.");
- }
-
- buffer.position(NATIVE_FLAC_HEADER_OFFSET + 4);
-
- return readHeaders(buffer, stream);
- }
-
- private Long detectLength(FlacTrackInfo info, OggPacketInputStream stream) throws IOException {
- OggStreamSizeInfo sizeInfo;
-
- if (info.stream.sampleCount > 0) {
- sizeInfo = new OggStreamSizeInfo(0, info.stream.sampleCount, 0, 0, info.stream.sampleRate);
- } else {
- sizeInfo = stream.seekForSizeInfo(info.stream.sampleRate);
- }
-
- return sizeInfo != null ? sizeInfo.getDuration() : null;
- }
-
- private FlacTrackInfo readHeaders(ByteBuffer firstPacketBuffer, OggPacketInputStream packetInputStream) throws IOException {
- FlacStreamInfo streamInfo = FlacMetadataReader.readStreamInfoBlock(new DataInputStream(new ByteBufferInputStream(firstPacketBuffer)));
- FlacTrackInfoBuilder trackInfoBuilder = new FlacTrackInfoBuilder(streamInfo);
-
- DataInputStream dataInputStream = new DataInputStream(packetInputStream);
-
- boolean hasMoreMetadata = trackInfoBuilder.getStreamInfo().hasMetadataBlocks;
-
- while (hasMoreMetadata) {
- if (!packetInputStream.startNewPacket()) {
- throw new IllegalStateException("Track ended when more metadata was expected.");
- }
-
- hasMoreMetadata = FlacMetadataReader.readMetadataBlock(dataInputStream, packetInputStream, trackInfoBuilder);
- }
-
- return trackInfoBuilder.build();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/flac/OggFlacTrackHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/flac/OggFlacTrackHandler.java
deleted file mode 100644
index 45b47d4..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/flac/OggFlacTrackHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg.flac;
-
-import com.sedmelluq.discord.lavaplayer.container.flac.FlacTrackInfo;
-import com.sedmelluq.discord.lavaplayer.container.flac.frame.FlacFrameReader;
-import com.sedmelluq.discord.lavaplayer.container.ogg.OggPacketInputStream;
-import com.sedmelluq.discord.lavaplayer.container.ogg.OggTrackHandler;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipeline;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipelineFactory;
-import com.sedmelluq.discord.lavaplayer.filter.PcmFormat;
-import com.sedmelluq.discord.lavaplayer.tools.io.BitStreamReader;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.io.IOException;
-
-/**
- * OGG stream handler for FLAC codec.
- */
-public class OggFlacTrackHandler implements OggTrackHandler {
- private final FlacTrackInfo info;
- private final OggPacketInputStream packetInputStream;
- private final BitStreamReader bitStreamReader;
- private final int[] decodingBuffer;
- private final int[][] rawSampleBuffers;
- private final short[][] sampleBuffers;
- private AudioPipeline downstream;
-
- /**
- * @param info FLAC track info
- * @param packetInputStream OGG packet input stream
- */
- public OggFlacTrackHandler(FlacTrackInfo info, OggPacketInputStream packetInputStream) {
- this.info = info;
- this.packetInputStream = packetInputStream;
- this.bitStreamReader = new BitStreamReader(packetInputStream);
- this.decodingBuffer = new int[FlacFrameReader.TEMPORARY_BUFFER_SIZE];
- this.rawSampleBuffers = new int[info.stream.channelCount][];
- this.sampleBuffers = new short[info.stream.channelCount][];
-
- for (int i = 0; i < rawSampleBuffers.length; i++) {
- rawSampleBuffers[i] = new int[info.stream.maximumBlockSize];
- sampleBuffers[i] = new short[info.stream.maximumBlockSize];
- }
- }
-
- @Override
- public void initialise(AudioProcessingContext context) {
- downstream = AudioPipelineFactory.create(context,
- new PcmFormat(info.stream.channelCount, info.stream.sampleRate));
- }
-
- @Override
- public void provideFrames() throws InterruptedException {
- try {
- while (packetInputStream.startNewPacket()) {
- int sampleCount = readFlacFrame();
-
- if (sampleCount == 0) {
- throw new IllegalStateException("Not enough bytes in packet.");
- }
-
- downstream.process(sampleBuffers, 0, sampleCount);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private int readFlacFrame() throws IOException {
- return FlacFrameReader.readFlacFrame(packetInputStream, bitStreamReader, info.stream, rawSampleBuffers, sampleBuffers, decodingBuffer);
- }
-
- @Override
- public void seekToTimecode(long timecode) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void close() {
- if (downstream != null) {
- downstream.close();
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/opus/OggOpusCodecHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/opus/OggOpusCodecHandler.java
deleted file mode 100644
index 30447c0..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/opus/OggOpusCodecHandler.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg.opus;
-
-import com.sedmelluq.discord.lavaplayer.container.ogg.*;
-import com.sedmelluq.discord.lavaplayer.container.ogg.vorbis.VorbisCommentParser;
-import com.sedmelluq.discord.lavaplayer.tools.io.DirectBufferStreamBroker;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * Loader for Opus track providers from an OGG stream.
- */
-public class OggOpusCodecHandler implements OggCodecHandler {
- private static final int OPUS_IDENTIFIER = ByteBuffer.wrap(new byte[]{'O', 'p', 'u', 's'}).getInt();
- private static final int HEAD_TAG_HALF = ByteBuffer.wrap(new byte[]{'H', 'e', 'a', 'd'}).getInt();
-
- private static final int OPUS_TAG_HALF = ByteBuffer.wrap(new byte[]{'O', 'p', 'u', 's'}).getInt();
- private static final int TAGS_TAG_HALF = ByteBuffer.wrap(new byte[]{'T', 'a', 'g', 's'}).getInt();
-
- private static final int MAX_COMMENTS_SAVED_LENGTH = 1024 * 60; // 60 KB
- private static final int MAX_COMMENTS_READ_LENGTH = 1024 * 1024 * 120; // 120 MB
-
- @Override
- public boolean isMatchingIdentifier(int identifier) {
- return identifier == OPUS_IDENTIFIER;
- }
-
- @Override
- public int getMaximumFirstPacketLength() {
- return 276;
- }
-
- @Override
- public OggTrackHandler loadTrackHandler(OggPacketInputStream stream, DirectBufferStreamBroker broker) throws IOException {
- ByteBuffer firstPacket = broker.getBuffer();
- verifyFirstPacket(firstPacket);
-
- loadCommentsHeader(stream, broker, true);
-
- int channelCount = firstPacket.get(9) & 0xFF;
- return new OggOpusTrackHandler(stream, broker, channelCount, getSampleRate(firstPacket));
- }
-
- @Override
- public OggMetadata loadMetadata(OggPacketInputStream stream, DirectBufferStreamBroker broker) throws IOException {
- ByteBuffer firstPacket = broker.getBuffer();
- verifyFirstPacket(firstPacket);
-
- loadCommentsHeader(stream, broker, false);
-
- return new OggMetadata(
- parseTags(broker.getBuffer(), broker.isTruncated()),
- detectLength(stream, getSampleRate(firstPacket))
- );
- }
-
- private Map parseTags(ByteBuffer tagBuffer, boolean truncated) {
- if (tagBuffer.getInt() != OPUS_TAG_HALF || tagBuffer.getInt() != TAGS_TAG_HALF) {
- return Collections.emptyMap();
- }
-
- return VorbisCommentParser.parse(tagBuffer, truncated);
- }
-
- private Long detectLength(OggPacketInputStream stream, int sampleRate) throws IOException {
- OggStreamSizeInfo sizeInfo = stream.seekForSizeInfo(sampleRate);
-
- if (sizeInfo != null) {
- return sizeInfo.totalSamples * 1000 / sizeInfo.sampleRate;
- } else {
- return null;
- }
- }
-
- private void verifyFirstPacket(ByteBuffer firstPacket) {
- if (firstPacket.getInt(4) != HEAD_TAG_HALF) {
- throw new IllegalStateException("First packet is not an OpusHead.");
- }
- }
-
- private int getSampleRate(ByteBuffer firstPacket) {
- return Integer.reverseBytes(firstPacket.getInt(12));
- }
-
- private void loadCommentsHeader(OggPacketInputStream stream, DirectBufferStreamBroker broker, boolean skip)
- throws IOException {
-
- if (!stream.startNewPacket()) {
- throw new IllegalStateException("No OpusTags packet in track.");
- } else if (!broker.consumeNext(stream, skip ? 0 : MAX_COMMENTS_SAVED_LENGTH, MAX_COMMENTS_READ_LENGTH)) {
- if (!stream.isPacketComplete()) {
- throw new IllegalStateException("Opus comments header packet longer than allowed.");
- }
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/opus/OggOpusTrackHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/opus/OggOpusTrackHandler.java
deleted file mode 100644
index 9942e06..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/opus/OggOpusTrackHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg.opus;
-
-import com.sedmelluq.discord.lavaplayer.container.common.OpusPacketRouter;
-import com.sedmelluq.discord.lavaplayer.container.ogg.OggPacketInputStream;
-import com.sedmelluq.discord.lavaplayer.container.ogg.OggTrackHandler;
-import com.sedmelluq.discord.lavaplayer.tools.io.DirectBufferStreamBroker;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * OGG stream handler for Opus codec.
- */
-public class OggOpusTrackHandler implements OggTrackHandler {
- private final OggPacketInputStream packetInputStream;
- private final DirectBufferStreamBroker broker;
- private final int channelCount;
- private final int sampleRate;
- private OpusPacketRouter opusPacketRouter;
-
- /**
- * @param packetInputStream OGG packet input stream
- * @param broker Broker for loading stream data into direct byte buffer.
- * @param channelCount Number of channels in the track.
- * @param sampleRate Sample rate of the track.
- */
- public OggOpusTrackHandler(OggPacketInputStream packetInputStream, DirectBufferStreamBroker broker, int channelCount,
- int sampleRate) {
-
- this.packetInputStream = packetInputStream;
- this.broker = broker;
- this.channelCount = channelCount;
- this.sampleRate = sampleRate;
- }
-
- @Override
- public void initialise(AudioProcessingContext context) {
- opusPacketRouter = new OpusPacketRouter(context, sampleRate, channelCount);
- }
-
- @Override
- public void provideFrames() throws InterruptedException {
- try {
- while (packetInputStream.startNewPacket()) {
- broker.consumeNext(packetInputStream, Integer.MAX_VALUE, Integer.MAX_VALUE);
-
- ByteBuffer buffer = broker.getBuffer();
-
- if (buffer.remaining() > 0) {
- opusPacketRouter.process(buffer);
- }
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void seekToTimecode(long timecode) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void close() {
- if (opusPacketRouter != null) {
- opusPacketRouter.close();
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/OggVorbisCodecHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/OggVorbisCodecHandler.java
deleted file mode 100644
index 6821d3c..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/OggVorbisCodecHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg.vorbis;
-
-import com.sedmelluq.discord.lavaplayer.container.ogg.OggCodecHandler;
-import com.sedmelluq.discord.lavaplayer.container.ogg.OggMetadata;
-import com.sedmelluq.discord.lavaplayer.container.ogg.OggPacketInputStream;
-import com.sedmelluq.discord.lavaplayer.container.ogg.OggTrackHandler;
-import com.sedmelluq.discord.lavaplayer.tools.io.DirectBufferStreamBroker;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-public class OggVorbisCodecHandler implements OggCodecHandler {
- private static final int VORBIS_IDENTIFIER = ByteBuffer.wrap(new byte[]{0x01, 'v', 'o', 'r'}).getInt();
-
- // These are arbitrary - there is no limit specified in Vorbis specification, Opus limit used as reference.
- private static final int MAX_COMMENTS_SAVED_LENGTH = 1024 * 128; // 128 KB
- private static final int MAX_COMMENTS_READ_LENGTH = 1024 * 1024 * 120; // 120 MB
-
- private static final byte[] COMMENT_PACKET_START = new byte[]{0x03, 'v', 'o', 'r', 'b', 'i', 's'};
-
- @Override
- public boolean isMatchingIdentifier(int identifier) {
- return identifier == VORBIS_IDENTIFIER;
- }
-
- @Override
- public int getMaximumFirstPacketLength() {
- return 64;
- }
-
- @Override
- public OggTrackHandler loadTrackHandler(OggPacketInputStream stream, DirectBufferStreamBroker broker) throws IOException {
- byte[] infoPacket = broker.extractBytes();
- loadCommentsHeader(stream, broker, true);
- return new OggVorbisTrackHandler(infoPacket, stream, broker);
- }
-
- @Override
- public OggMetadata loadMetadata(OggPacketInputStream stream, DirectBufferStreamBroker broker) throws IOException {
- loadCommentsHeader(stream, broker, false);
-
- ByteBuffer commentsPacket = broker.getBuffer();
- byte[] packetStart = new byte[COMMENT_PACKET_START.length];
- commentsPacket.get(packetStart);
-
- if (!Arrays.equals(packetStart, COMMENT_PACKET_START)) {
- return OggMetadata.EMPTY;
- }
-
- return new OggMetadata(VorbisCommentParser.parse(commentsPacket, broker.isTruncated()), null);
- }
-
- private void loadCommentsHeader(OggPacketInputStream stream, DirectBufferStreamBroker broker, boolean skip)
- throws IOException {
-
- if (!stream.startNewPacket()) {
- throw new IllegalStateException("No comments packet in track.");
- } else if (!broker.consumeNext(stream, skip ? 0 : MAX_COMMENTS_SAVED_LENGTH, MAX_COMMENTS_READ_LENGTH)) {
- if (!stream.isPacketComplete()) {
- throw new IllegalStateException("Vorbis comments header packet longer than allowed.");
- }
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/OggVorbisTrackHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/OggVorbisTrackHandler.java
deleted file mode 100644
index 2ec9646..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/OggVorbisTrackHandler.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg.vorbis;
-
-import com.sedmelluq.discord.lavaplayer.container.ogg.OggPacketInputStream;
-import com.sedmelluq.discord.lavaplayer.container.ogg.OggTrackHandler;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipeline;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipelineFactory;
-import com.sedmelluq.discord.lavaplayer.filter.PcmFormat;
-import com.sedmelluq.discord.lavaplayer.natives.vorbis.VorbisDecoder;
-import com.sedmelluq.discord.lavaplayer.tools.io.DirectBufferStreamBroker;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * OGG stream handler for Vorbis codec.
- */
-public class OggVorbisTrackHandler implements OggTrackHandler {
- private static final int PCM_BUFFER_SIZE = 4096;
-
- private final byte[] infoPacket;
- private final OggPacketInputStream packetInputStream;
- private final DirectBufferStreamBroker broker;
- private final VorbisDecoder decoder;
- private final int sampleRate;
- private float[][] channelPcmBuffers;
- private AudioPipeline downstream;
-
- /**
- * @param packetInputStream OGG packet input stream
- * @param broker Broker for loading stream data into direct byte buffer, it has already loaded the first two packets
- * (info and comments) and should be in the state where we should request the next - the setup packet.
- */
- public OggVorbisTrackHandler(byte[] infoPacket, OggPacketInputStream packetInputStream,
- DirectBufferStreamBroker broker) {
-
- this.infoPacket = infoPacket;
- this.packetInputStream = packetInputStream;
- this.broker = broker;
- this.decoder = new VorbisDecoder();
-
- ByteBuffer infoBuffer = ByteBuffer.wrap(infoPacket);
- this.sampleRate = Integer.reverseBytes(infoBuffer.getInt(12));
-
- int channelCount = infoBuffer.get(11) & 0xFF;
- channelPcmBuffers = new float[channelCount][];
-
- for (int i = 0; i < channelPcmBuffers.length; i++) {
- channelPcmBuffers[i] = new float[PCM_BUFFER_SIZE];
- }
- }
-
- @Override
- public void initialise(AudioProcessingContext context) throws IOException {
- ByteBuffer infoBuffer = ByteBuffer.allocateDirect(infoPacket.length);
- infoBuffer.put(infoPacket);
- infoBuffer.flip();
-
- if (!packetInputStream.startNewPacket()) {
- throw new IllegalStateException("End of track before header setup header.");
- }
-
- broker.consumeNext(packetInputStream, Integer.MAX_VALUE, Integer.MAX_VALUE);
- decoder.initialise(infoBuffer, broker.getBuffer());
-
- broker.resetAndCompact();
-
- downstream = AudioPipelineFactory.create(context, new PcmFormat(decoder.getChannelCount(), sampleRate));
- }
-
- @Override
- public void provideFrames() throws InterruptedException {
- try {
- while (packetInputStream.startNewPacket()) {
- broker.consumeNext(packetInputStream, Integer.MAX_VALUE, Integer.MAX_VALUE);
- provideFromBuffer(broker.getBuffer());
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private void provideFromBuffer(ByteBuffer buffer) throws InterruptedException {
- decoder.input(buffer);
- int output;
-
- do {
- output = decoder.output(channelPcmBuffers);
-
- if (output > 0) {
- downstream.process(channelPcmBuffers, 0, output);
- }
- } while (output == PCM_BUFFER_SIZE);
- }
-
- @Override
- public void seekToTimecode(long timecode) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void close() {
- if (downstream != null) {
- downstream.close();
- }
-
- decoder.close();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/VorbisCommentParser.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/VorbisCommentParser.java
deleted file mode 100644
index 4145590..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/VorbisCommentParser.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.ogg.vorbis;
-
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-public class VorbisCommentParser {
- public static Map parse(ByteBuffer tagBuffer, boolean truncated) {
- Map tags = new HashMap<>();
-
- int vendorLength = Integer.reverseBytes(tagBuffer.getInt());
- if (vendorLength < 0) {
- throw new IllegalStateException("Ogg comments vendor length is negative.");
- }
-
- tagBuffer.position(tagBuffer.position() + vendorLength);
-
- int itemCount = Integer.reverseBytes(tagBuffer.getInt());
-
- for (int itemIndex = 0; itemIndex < itemCount; itemIndex++) {
- if (tagBuffer.remaining() < Integer.BYTES) {
- if (!truncated) {
- throw new IllegalArgumentException("Invalid tag buffer - tag size field out of bounds.");
- } else {
- // The buffer is truncated, it may cut off at an arbitrary point.
- break;
- }
- }
-
- int itemLength = Integer.reverseBytes(tagBuffer.getInt());
-
- if (itemLength < 0) {
- throw new IllegalStateException("Ogg comments tag item length is negative.");
- } else if (tagBuffer.remaining() < itemLength) {
- if (!truncated) {
- throw new IllegalArgumentException("Invalid tag buffer - tag size field out of bounds.");
- } else {
- // The buffer is truncated, it may cut off at an arbitrary point.
- break;
- }
- }
-
- byte[] data = new byte[itemLength];
- tagBuffer.get(data);
-
- storeTagToMap(tags, data);
- }
-
- return tags;
- }
-
- private static void storeTagToMap(Map tags, byte[] data) {
- for (int i = 0; i < data.length; i++) {
- if (data[i] == '=') {
- tags.put(new String(data, 0, i, UTF_8), new String(data, i + 1, data.length - i - 1, UTF_8));
- break;
- }
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/HlsStreamSegmentUrlProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/HlsStreamSegmentUrlProvider.java
deleted file mode 100644
index 93f1de6..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/HlsStreamSegmentUrlProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.playlists;
-
-import com.sedmelluq.discord.lavaplayer.source.stream.ExtendedM3uParser;
-import com.sedmelluq.discord.lavaplayer.source.stream.M3uStreamSegmentUrlProvider;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.List;
-
-import static com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools.fetchResponseLines;
-
-public class HlsStreamSegmentUrlProvider extends M3uStreamSegmentUrlProvider {
- private static final Logger log = LoggerFactory.getLogger(HlsStreamSegmentUrlProvider.class);
-
- private final String streamListUrl;
- private volatile String segmentPlaylistUrl;
-
- public HlsStreamSegmentUrlProvider(String streamListUrl, String segmentPlaylistUrl) {
- this.streamListUrl = streamListUrl;
- this.segmentPlaylistUrl = segmentPlaylistUrl;
- }
-
- @Override
- protected String getQualityFromM3uDirective(ExtendedM3uParser.Line directiveLine) {
- return "default";
- }
-
- @Override
- protected String fetchSegmentPlaylistUrl(HttpInterface httpInterface) throws IOException {
- if (segmentPlaylistUrl != null) {
- return segmentPlaylistUrl;
- }
-
- HttpUriRequest request = new HttpGet(streamListUrl);
- List streams = loadChannelStreamsList(fetchResponseLines(httpInterface, request,
- "HLS stream list"));
-
- if (streams.isEmpty()) {
- throw new IllegalStateException("No streams listed in HLS stream list.");
- }
-
- ChannelStreamInfo stream = streams.get(0);
-
- log.debug("Chose stream with url {}", stream.quality, stream.url);
- segmentPlaylistUrl = stream.url;
- return segmentPlaylistUrl;
- }
-
- @Override
- protected HttpUriRequest createSegmentGetRequest(String url) {
- return new HttpGet(url);
- }
-
- public static String findHlsEntryUrl(String[] lines) {
- List streams = new HlsStreamSegmentUrlProvider(null, null)
- .loadChannelStreamsList(lines);
-
- return streams.isEmpty() ? null : streams.get(0).url;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/HlsStreamTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/HlsStreamTrack.java
deleted file mode 100644
index 9260c1c..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/HlsStreamTrack.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.playlists;
-
-import com.sedmelluq.discord.lavaplayer.source.stream.M3uStreamAudioTrack;
-import com.sedmelluq.discord.lavaplayer.source.stream.M3uStreamSegmentUrlProvider;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-
-public class HlsStreamTrack extends M3uStreamAudioTrack {
- private final HlsStreamSegmentUrlProvider segmentUrlProvider;
- private final HttpInterfaceManager httpInterfaceManager;
-
- /**
- * @param trackInfo Track info
- * @param httpInterfaceManager
- */
- public HlsStreamTrack(AudioTrackInfo trackInfo, String streamUrl, HttpInterfaceManager httpInterfaceManager,
- boolean isInnerUrl) {
-
- super(trackInfo);
-
- segmentUrlProvider = isInnerUrl ?
- new HlsStreamSegmentUrlProvider(null, streamUrl) :
- new HlsStreamSegmentUrlProvider(streamUrl, null);
-
- this.httpInterfaceManager = httpInterfaceManager;
- }
-
- @Override
- protected M3uStreamSegmentUrlProvider getSegmentUrlProvider() {
- return segmentUrlProvider;
- }
-
- @Override
- protected HttpInterface getHttpInterface() {
- return httpInterfaceManager.getInterface();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/M3uPlaylistContainerProbe.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/M3uPlaylistContainerProbe.java
deleted file mode 100644
index a59b9b7..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/M3uPlaylistContainerProbe.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.playlists;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDescriptor;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerHints;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.tools.io.ThreadLocalHttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.checkNextBytes;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.*;
-
-/**
- * Probe for M3U playlist.
- */
-public class M3uPlaylistContainerProbe implements MediaContainerProbe {
- private static final Logger log = LoggerFactory.getLogger(M3uPlaylistContainerProbe.class);
-
- private static final String TYPE_HLS_OUTER = "hls-outer";
- private static final String TYPE_HLS_INNER = "hls-inner";
-
- private static final int[] M3U_HEADER_TAG = new int[]{'#', 'E', 'X', 'T', 'M', '3', 'U'};
- private static final int[] M3U_ENTRY_TAG = new int[]{'#', 'E', 'X', 'T', 'I', 'N', 'F'};
-
- private final HttpInterfaceManager httpInterfaceManager = new ThreadLocalHttpInterfaceManager(
- HttpClientTools
- .createSharedCookiesHttpBuilder()
- .setRedirectStrategy(new HttpClientTools.NoRedirectsStrategy()),
- HttpClientTools.DEFAULT_REQUEST_CONFIG
- );
-
- @Override
- public String getName() {
- return "m3u";
- }
-
- @Override
- public boolean matchesHints(MediaContainerHints hints) {
- return false;
- }
-
- @Override
- public MediaContainerDetectionResult probe(AudioReference reference, SeekableInputStream inputStream) throws IOException {
- if (!checkNextBytes(inputStream, M3U_HEADER_TAG) && !checkNextBytes(inputStream, M3U_ENTRY_TAG)) {
- return null;
- }
-
- log.debug("Track {} is an M3U playlist file.", reference.identifier);
- String[] lines = DataFormatTools.streamToLines(inputStream, StandardCharsets.UTF_8);
-
- String hlsStreamUrl = HlsStreamSegmentUrlProvider.findHlsEntryUrl(lines);
-
- if (hlsStreamUrl != null) {
- AudioTrackInfoBuilder infoBuilder = AudioTrackInfoBuilder.create(reference, inputStream);
- AudioReference httpReference = HttpAudioSourceManager.getAsHttpReference(reference);
-
- if (httpReference != null) {
- return supportedFormat(this, TYPE_HLS_OUTER, infoBuilder.setIdentifier(httpReference.identifier).build());
- } else {
- return refer(this, new AudioReference(hlsStreamUrl, infoBuilder.getTitle(),
- new MediaContainerDescriptor(this, TYPE_HLS_INNER)));
- }
- }
-
- MediaContainerDetectionResult result = loadSingleItemPlaylist(lines);
- if (result != null) {
- return result;
- }
-
- return unsupportedFormat(this, "The playlist file contains no links.");
- }
-
- private MediaContainerDetectionResult loadSingleItemPlaylist(String[] lines) {
- String trackTitle = null;
-
- for (String line : lines) {
- if (line.startsWith("#EXTINF")) {
- trackTitle = extractTitleFromInfo(line);
- } else if (!line.startsWith("#") && line.length() > 0) {
- if (line.startsWith("http://") || line.startsWith("https://") || line.startsWith("icy://")) {
- return refer(this, new AudioReference(line.trim(), trackTitle));
- }
-
- trackTitle = null;
- }
- }
-
- return null;
- }
-
- private String extractTitleFromInfo(String infoLine) {
- String[] splitInfo = infoLine.split(",", 2);
- return splitInfo.length == 2 ? splitInfo[1] : null;
- }
-
- @Override
- public AudioTrack createTrack(String parameters, AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- if (parameters.equals(TYPE_HLS_INNER)) {
- return new HlsStreamTrack(trackInfo, trackInfo.identifier, httpInterfaceManager, true);
- } else if (parameters.equals(TYPE_HLS_OUTER)) {
- return new HlsStreamTrack(trackInfo, trackInfo.identifier, httpInterfaceManager, false);
- } else {
- throw new IllegalArgumentException("Unsupported parameters: " + parameters);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/PlainPlaylistContainerProbe.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/PlainPlaylistContainerProbe.java
deleted file mode 100644
index 1e93b11..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/PlainPlaylistContainerProbe.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.playlists;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerHints;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.STREAM_SCAN_DISTANCE;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.matchNextBytesAsRegex;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.refer;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.unsupportedFormat;
-
-/**
- * Probe for a playlist containing the raw link without any format.
- */
-public class PlainPlaylistContainerProbe implements MediaContainerProbe {
- private static final Logger log = LoggerFactory.getLogger(PlainPlaylistContainerProbe.class);
-
- private static final Pattern linkPattern = Pattern.compile("^(?:https?|icy)://.*");
-
- @Override
- public String getName() {
- return "plain";
- }
-
- @Override
- public boolean matchesHints(MediaContainerHints hints) {
- return false;
- }
-
- @Override
- public MediaContainerDetectionResult probe(AudioReference reference, SeekableInputStream inputStream) throws IOException {
- if (!matchNextBytesAsRegex(inputStream, STREAM_SCAN_DISTANCE, linkPattern, StandardCharsets.UTF_8)) {
- return null;
- }
-
- log.debug("Track {} is a plain playlist file.", reference.identifier);
- return loadFromLines(DataFormatTools.streamToLines(inputStream, StandardCharsets.UTF_8));
- }
-
- private MediaContainerDetectionResult loadFromLines(String[] lines) {
- for (String line : lines) {
- Matcher matcher = linkPattern.matcher(line);
-
- if (matcher.matches()) {
- return refer(this, new AudioReference(matcher.group(0), null));
- }
- }
-
- return unsupportedFormat(this, "The playlist file contains no links.");
- }
-
- @Override
- public AudioTrack createTrack(String parameters, AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/PlsPlaylistContainerProbe.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/PlsPlaylistContainerProbe.java
deleted file mode 100644
index 47eb79d..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/playlists/PlsPlaylistContainerProbe.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.playlists;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerHints;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.UNKNOWN_TITLE;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.checkNextBytes;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.refer;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.unsupportedFormat;
-
-/**
- * Probe for PLS playlist.
- */
-public class PlsPlaylistContainerProbe implements MediaContainerProbe {
- private static final Logger log = LoggerFactory.getLogger(PlsPlaylistContainerProbe.class);
-
- private static final int[] PLS_HEADER = new int[]{'[', -1, 'l', 'a', 'y', 'l', 'i', 's', 't', ']'};
-
- private static Pattern filePattern = Pattern.compile("\\s*File([0-9]+)=((?:https?|icy)://.*)\\s*");
- private static Pattern titlePattern = Pattern.compile("\\s*Title([0-9]+)=(.*)\\s*");
-
- @Override
- public String getName() {
- return "pls";
- }
-
- @Override
- public boolean matchesHints(MediaContainerHints hints) {
- return false;
- }
-
- @Override
- public MediaContainerDetectionResult probe(AudioReference reference, SeekableInputStream inputStream) throws IOException {
- if (!checkNextBytes(inputStream, PLS_HEADER)) {
- return null;
- }
-
- log.debug("Track {} is a PLS playlist file.", reference.identifier);
- return loadFromLines(DataFormatTools.streamToLines(inputStream, StandardCharsets.UTF_8));
- }
-
- private MediaContainerDetectionResult loadFromLines(String[] lines) {
- Map trackFiles = new HashMap<>();
- Map trackTitles = new HashMap<>();
-
- for (String line : lines) {
- Matcher fileMatcher = filePattern.matcher(line);
-
- if (fileMatcher.matches()) {
- trackFiles.put(fileMatcher.group(1), fileMatcher.group(2));
- continue;
- }
-
- Matcher titleMatcher = titlePattern.matcher(line);
- if (titleMatcher.matches()) {
- trackTitles.put(titleMatcher.group(1), titleMatcher.group(2));
- }
- }
-
- for (Map.Entry entry : trackFiles.entrySet()) {
- String title = trackTitles.get(entry.getKey());
- return refer(this, new AudioReference(entry.getValue(), title != null ? title : UNKNOWN_TITLE));
- }
-
- return unsupportedFormat(this, "The playlist file contains no links.");
- }
-
- @Override
- public AudioTrack createTrack(String parameters, AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavAudioTrack.java
deleted file mode 100644
index bf65652..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavAudioTrack.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.wav;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.BaseAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Audio track that handles a WAV stream
- */
-public class WavAudioTrack extends BaseAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(WavAudioTrack.class);
-
- private final SeekableInputStream inputStream;
-
- /**
- * @param trackInfo Track info
- * @param inputStream Input stream for the WAV file
- */
- public WavAudioTrack(AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- super(trackInfo);
-
- this.inputStream = inputStream;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- WavTrackProvider trackProvider = new WavFileLoader(inputStream).loadTrack(localExecutor.getProcessingContext());
-
- try {
- log.debug("Starting to play WAV track {}", getIdentifier());
- localExecutor.executeProcessingLoop(trackProvider::provideFrames, trackProvider::seekToTimecode);
- } finally {
- trackProvider.close();
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavContainerProbe.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavContainerProbe.java
deleted file mode 100644
index b72ccef..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavContainerProbe.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.wav;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerHints;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.*;
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.supportedFormat;
-import static com.sedmelluq.discord.lavaplayer.container.wav.WavFileLoader.WAV_RIFF_HEADER;
-import static com.sedmelluq.discord.lavaplayer.tools.DataFormatTools.defaultOnNull;
-
-/**
- * Container detection probe for WAV format.
- */
-public class WavContainerProbe implements MediaContainerProbe {
- private static final Logger log = LoggerFactory.getLogger(WavContainerProbe.class);
-
- @Override
- public String getName() {
- return "wav";
- }
-
- @Override
- public boolean matchesHints(MediaContainerHints hints) {
- return false;
- }
-
- @Override
- public MediaContainerDetectionResult probe(AudioReference reference, SeekableInputStream inputStream) throws IOException {
- if (!checkNextBytes(inputStream, WAV_RIFF_HEADER)) {
- return null;
- }
-
- log.debug("Track {} is a WAV file.", reference.identifier);
-
- WavFileInfo fileInfo = new WavFileLoader(inputStream).parseHeaders();
-
- return supportedFormat(this, null, new AudioTrackInfo(
- defaultOnNull(reference.title, UNKNOWN_TITLE),
- UNKNOWN_ARTIST,
- fileInfo.getDuration(),
- reference.identifier,
- false,
- reference.identifier
- ));
- }
-
- @Override
- public AudioTrack createTrack(String parameters, AudioTrackInfo trackInfo, SeekableInputStream inputStream) {
- return new WavAudioTrack(trackInfo, inputStream);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavFileInfo.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavFileInfo.java
deleted file mode 100644
index f6306bc..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavFileInfo.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.wav;
-
-/**
- * WAV file format information.
- */
-public class WavFileInfo {
- /**
- * Number of channels.
- */
- public final int channelCount;
- /**
- * Sample rate.
- */
- public final int sampleRate;
- /**
- * Bits per sample (currently only 16 supported).
- */
- public final int bitsPerSample;
- /**
- * Size of a block (one sample for each channel + padding).
- */
- public final int blockAlign;
- /**
- * Number of blocks in the file.
- */
- public final long blockCount;
- /**
- * Starting position of the raw PCM samples in the file.
- */
- public final long startOffset;
-
- /**
- * @param channelCount Number of channels.
- * @param sampleRate Sample rate.
- * @param bitsPerSample Bits per sample (currently only 16 supported).
- * @param blockAlign Size of a block (one sample for each channel + padding).
- * @param blockCount Number of blocks in the file.
- * @param startOffset Starting position of the raw PCM samples in the file.
- */
- public WavFileInfo(int channelCount, int sampleRate, int bitsPerSample, int blockAlign, long blockCount, long startOffset) {
- this.channelCount = channelCount;
- this.sampleRate = sampleRate;
- this.bitsPerSample = bitsPerSample;
- this.blockAlign = blockAlign;
- this.blockCount = blockCount;
- this.startOffset = startOffset;
- }
-
- /**
- * @return Duration of the file in milliseconds.
- */
- public long getDuration() {
- return blockCount * 1000L / sampleRate;
- }
-
- /**
- * @return The size of padding in a sample block in bytes.
- */
- public int getPadding() {
- return blockAlign - channelCount * (bitsPerSample >> 3);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavFileLoader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavFileLoader.java
deleted file mode 100644
index c338c70..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavFileLoader.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.wav;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetection.checkNextBytes;
-
-/**
- * Loads either WAV header information or a WAV track provider from a stream.
- */
-public class WavFileLoader {
- static final int[] WAV_RIFF_HEADER = new int[]{0x52, 0x49, 0x46, 0x46, -1, -1, -1, -1, 0x57, 0x41, 0x56, 0x45};
-
- private final SeekableInputStream inputStream;
-
- /**
- * @param inputStream Input stream to read the WAV data from. This must be positioned right before WAV RIFF header.
- */
- public WavFileLoader(SeekableInputStream inputStream) {
- this.inputStream = inputStream;
- }
-
- /**
- * Parses the headers of the file.
- *
- * @return Format description of the WAV file
- * @throws IOException On read error
- */
- public WavFileInfo parseHeaders() throws IOException {
- if (!checkNextBytes(inputStream, WAV_RIFF_HEADER, false)) {
- throw new IllegalStateException("Not a WAV header.");
- }
-
- InfoBuilder builder = new InfoBuilder();
- DataInput dataInput = new DataInputStream(inputStream);
-
- while (true) {
- String chunkName = readChunkName(dataInput);
- long chunkSize = Integer.toUnsignedLong(Integer.reverseBytes(dataInput.readInt()));
-
- if ("fmt ".equals(chunkName)) {
- readFormatChunk(builder, dataInput);
-
- if (chunkSize > 16) {
- inputStream.skipFully(chunkSize - 16);
- }
- } else if ("data".equals(chunkName)) {
- builder.sampleAreaSize = chunkSize;
- builder.startOffset = inputStream.getPosition();
- return builder.build();
- } else {
- inputStream.skipFully(chunkSize);
- }
- }
- }
-
- private String readChunkName(DataInput dataInput) throws IOException {
- byte[] buffer = new byte[4];
- dataInput.readFully(buffer);
- return new String(buffer, StandardCharsets.US_ASCII);
- }
-
- private void readFormatChunk(InfoBuilder builder, DataInput dataInput) throws IOException {
- builder.audioFormat = Short.reverseBytes(dataInput.readShort()) & 0xFFFF;
- builder.channelCount = Short.reverseBytes(dataInput.readShort()) & 0xFFFF;
- builder.sampleRate = Integer.reverseBytes(dataInput.readInt());
-
- // Skip bitrate
- dataInput.readInt();
-
- builder.blockAlign = Short.reverseBytes(dataInput.readShort()) & 0xFFFF;
- builder.bitsPerSample = Short.reverseBytes(dataInput.readShort()) & 0xFFFF;
- }
-
- /**
- * Initialise a WAV track stream.
- *
- * @param context Configuration and output information for processing
- * @return The WAV track stream which can produce frames.
- * @throws IOException On read error
- */
- public WavTrackProvider loadTrack(AudioProcessingContext context) throws IOException {
- return new WavTrackProvider(context, inputStream, parseHeaders());
- }
-
- private static class InfoBuilder {
- private int audioFormat;
- private int channelCount;
- private int sampleRate;
- private int bitsPerSample;
- private int blockAlign;
- private long sampleAreaSize;
- private long startOffset;
-
- private WavFileInfo build() {
- validateFormat();
- validateAlignment();
-
- return new WavFileInfo(channelCount, sampleRate, bitsPerSample, blockAlign, sampleAreaSize / blockAlign, startOffset);
- }
-
- private void validateFormat() {
- if (audioFormat != 1) {
- throw new IllegalStateException("Invalid audio format " + audioFormat + ", must be 1 (PCM)");
- } else if (channelCount < 1 || channelCount > 16) {
- throw new IllegalStateException("Invalid channel count: " + channelCount);
- } else if (sampleRate < 100 || sampleRate > 384000) {
- throw new IllegalStateException("Invalid sample rate: " + sampleRate);
- } else if (bitsPerSample != 16) {
- throw new IllegalStateException("Unsupported bits per sample: " + bitsPerSample);
- }
- }
-
- private void validateAlignment() {
- int minimumBlockAlign = channelCount * (bitsPerSample >> 3);
-
- if (blockAlign < minimumBlockAlign || blockAlign > minimumBlockAlign + 32) {
- throw new IllegalStateException("Block align is not valid: " + blockAlign);
- } else if (blockAlign % (bitsPerSample >> 3) != 0) {
- throw new IllegalStateException("Block align is not a multiple of bits per sample: " + blockAlign);
- } else if (sampleAreaSize < 0) {
- throw new IllegalStateException("Negative sample area size: " + sampleAreaSize);
- }
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavTrackProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavTrackProvider.java
deleted file mode 100644
index a6e0ba7..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/container/wav/WavTrackProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.container.wav;
-
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipeline;
-import com.sedmelluq.discord.lavaplayer.filter.AudioPipelineFactory;
-import com.sedmelluq.discord.lavaplayer.filter.PcmFormat;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-import static java.nio.ByteOrder.LITTLE_ENDIAN;
-
-/**
- * A provider of audio frames from a WAV track.
- */
-public class WavTrackProvider {
- private static final int BLOCKS_IN_BUFFER = 4096;
-
- private final SeekableInputStream inputStream;
- private final DataInput dataInput;
- private final WavFileInfo info;
- private final AudioPipeline downstream;
- private final short[] buffer;
- private final ShortBuffer nioBuffer;
- private final byte[] rawBuffer;
-
- /**
- * @param context Configuration and output information for processing
- * @param inputStream Input stream to use
- * @param info Information about the WAV file
- */
- public WavTrackProvider(AudioProcessingContext context, SeekableInputStream inputStream, WavFileInfo info) {
- this.inputStream = inputStream;
- this.dataInput = new DataInputStream(inputStream);
- this.info = info;
- this.downstream = AudioPipelineFactory.create(context, new PcmFormat(info.channelCount, info.sampleRate));
- this.buffer = info.getPadding() > 0 ? new short[info.channelCount * BLOCKS_IN_BUFFER] : null;
-
- ByteBuffer byteBuffer = ByteBuffer.allocate(info.blockAlign * BLOCKS_IN_BUFFER).order(LITTLE_ENDIAN);
- this.rawBuffer = byteBuffer.array();
- this.nioBuffer = byteBuffer.asShortBuffer();
- }
-
- /**
- * Seeks to the specified timecode.
- *
- * @param timecode The timecode in milliseconds
- */
- public void seekToTimecode(long timecode) {
- try {
- long fileOffset = (timecode * info.sampleRate / 1000L) * info.blockAlign + info.startOffset;
- inputStream.seek(fileOffset);
- downstream.seekPerformed(timecode, timecode);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Reads audio frames and sends them to frame consumer
- *
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- public void provideFrames() throws InterruptedException {
- try {
- int blockCount;
-
- while ((blockCount = getNextChunkBlocks()) > 0) {
- if (buffer != null) {
- processChunkWithPadding(blockCount);
- } else {
- processChunk(blockCount);
- }
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Free all resources associated to processing the track.
- */
- public void close() {
- downstream.close();
- }
-
- private void processChunkWithPadding(int blockCount) throws IOException, InterruptedException {
- readChunkToBuffer(blockCount);
-
- int padding = info.getPadding() / 2;
- int sampleCount = blockCount * info.channelCount;
- int indexInBlock = 0;
-
- for (int i = 0; i < sampleCount; i++) {
- buffer[i] = nioBuffer.get();
-
- if (++indexInBlock == info.channelCount) {
- nioBuffer.position(nioBuffer.position() + padding);
- indexInBlock = 0;
- }
- }
-
- downstream.process(buffer, 0, blockCount * info.channelCount);
- }
-
- private void processChunk(int blockCount) throws IOException, InterruptedException {
- readChunkToBuffer(blockCount);
- downstream.process(nioBuffer);
- }
-
- private void readChunkToBuffer(int blockCount) throws IOException {
- int bytesToRead = blockCount * info.blockAlign;
- dataInput.readFully(rawBuffer, 0, bytesToRead);
-
- nioBuffer.position(0);
- nioBuffer.limit(bytesToRead / 2);
- }
-
- private int getNextChunkBlocks() {
- long endOffset = info.startOffset + info.blockAlign * info.blockCount;
- return (int) Math.min((endOffset - inputStream.getPosition()) / info.blockAlign, BLOCKS_IN_BUFFER);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioFilter.java
deleted file mode 100644
index 876ea26..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioFilter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-/**
- * A filter for audio samples
- */
-public interface AudioFilter {
- /**
- * Indicates that the next samples are not a continuation from the previous ones and gives the timecode for the
- * next incoming sample.
- *
- * @param requestedTime Timecode in milliseconds to which the seek was requested to
- * @param providedTime Timecode in milliseconds to which the seek was actually performed to
- */
- void seekPerformed(long requestedTime, long providedTime);
-
- /**
- * Flush everything to output.
- *
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void flush() throws InterruptedException;
-
- /**
- * Free all resources. No more input is expected.
- */
- void close();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioFilterChain.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioFilterChain.java
deleted file mode 100644
index f6ef08f..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioFilterChain.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import java.util.List;
-
-/**
- * A chain of audio filters.
- */
-public class AudioFilterChain {
- /**
- * The first filter in the stream. Separate field as unlike other filters, this must be an instance of
- * {@link UniversalPcmAudioFilter} as the input data may be in any representation.
- */
- public final UniversalPcmAudioFilter input;
-
- /**
- * All filters in this chain.
- */
- public final List filters;
-
- /**
- * Immutable context/configuration instance that this filter was generated from. May be null.
- */
- public final Object context;
-
- /**
- * @param input See {@link #input}.
- * @param filters See {@link #filters}.
- * @param context See {@link #context}.
- */
- public AudioFilterChain(UniversalPcmAudioFilter input, List filters, Object context) {
- this.input = input;
- this.filters = filters;
- this.context = context;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioPipeline.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioPipeline.java
deleted file mode 100644
index 4663e9c..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioPipeline.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import java.nio.ShortBuffer;
-import java.util.List;
-
-/**
- * Represents an audio pipeline (top-level audio filter chain).
- */
-public class AudioPipeline extends CompositeAudioFilter {
- private final List filters;
- private final UniversalPcmAudioFilter first;
-
- /**
- * @param chain The top-level filter chain.
- */
- public AudioPipeline(AudioFilterChain chain) {
- this.filters = chain.filters;
- this.first = chain.input;
- }
-
- @Override
- public void process(float[][] input, int offset, int length) throws InterruptedException {
- first.process(input, offset, length);
- }
-
- @Override
- public void process(short[] input, int offset, int length) throws InterruptedException {
- first.process(input, offset, length);
- }
-
- @Override
- public void process(ShortBuffer buffer) throws InterruptedException {
- first.process(buffer);
- }
-
- @Override
- public void process(short[][] input, int offset, int length) throws InterruptedException {
- first.process(input, offset, length);
- }
-
- @Override
- protected List getFilters() {
- return filters;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioPipelineFactory.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioPipelineFactory.java
deleted file mode 100644
index b747d4e..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioPipelineFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import com.sedmelluq.discord.lavaplayer.filter.volume.VolumePostProcessor;
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.format.transcoder.AudioChunkEncoder;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * Factory for audio pipelines. Contains helper methods to determine whether an audio pipeline is even required.
- */
-public class AudioPipelineFactory {
- /**
- * @param context Audio processing context to check output format from
- * @param inputFormat Input format of the audio
- * @return True if no audio processing is currently required with this context and input format combination.
- */
- public static boolean isProcessingRequired(AudioProcessingContext context, AudioDataFormat inputFormat) {
- return !context.outputFormat.equals(inputFormat) || context.playerOptions.volumeLevel.get() != 100 ||
- context.playerOptions.filterFactory.get() != null;
- }
-
- /**
- * Creates an audio pipeline instance based on provided settings.
- *
- * @param context Configuration and output information for processing
- * @param inputFormat The parameters of the PCM input.
- * @return A pipeline which delivers the input to the final frame destination.
- */
- public static AudioPipeline create(AudioProcessingContext context, PcmFormat inputFormat) {
- int inputChannels = inputFormat.channelCount;
- int outputChannels = context.outputFormat.channelCount;
-
- UniversalPcmAudioFilter end = new FinalPcmAudioFilter(context, createPostProcessors(context));
- FilterChainBuilder builder = new FilterChainBuilder();
- builder.addFirst(end);
-
- if (context.filterHotSwapEnabled || context.playerOptions.filterFactory.get() != null) {
- UserProvidedAudioFilters userFilters = new UserProvidedAudioFilters(context, end);
- builder.addFirst(userFilters);
- }
-
- if (inputFormat.sampleRate != context.outputFormat.sampleRate) {
- builder.addFirst(new ResamplingPcmAudioFilter(context.configuration, outputChannels,
- builder.makeFirstFloat(outputChannels), inputFormat.sampleRate, context.outputFormat.sampleRate));
- }
-
- if (inputChannels != outputChannels) {
- builder.addFirst(new ChannelCountPcmAudioFilter(inputChannels, outputChannels,
- builder.makeFirstUniversal(outputChannels)));
- }
-
- return new AudioPipeline(builder.build(null, inputChannels));
- }
-
- private static Collection createPostProcessors(AudioProcessingContext context) {
- AudioChunkEncoder chunkEncoder = context.outputFormat.createEncoder(context.configuration);
-
- return Arrays.asList(
- new VolumePostProcessor(context),
- new BufferingPostProcessor(context, chunkEncoder)
- );
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioPostProcessor.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioPostProcessor.java
deleted file mode 100644
index 7b7583f..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/AudioPostProcessor.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import java.nio.ShortBuffer;
-
-/**
- * Audio chunk post processor.
- */
-public interface AudioPostProcessor {
- /**
- * Receives chunk buffer in its final PCM format with the sample count, sample rate and channel count matching that of
- * the output format.
- *
- * @param timecode Absolute starting timecode of the chunk in milliseconds
- * @param buffer PCM buffer of samples in the chunk
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void process(long timecode, ShortBuffer buffer) throws InterruptedException;
-
- /**
- * Frees up all resources this processor is holding internally.
- */
- void close();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/BufferingPostProcessor.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/BufferingPostProcessor.java
deleted file mode 100644
index 85fb312..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/BufferingPostProcessor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import com.sedmelluq.discord.lavaplayer.format.transcoder.AudioChunkEncoder;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-import com.sedmelluq.discord.lavaplayer.track.playback.MutableAudioFrame;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-/**
- * Post processor which encodes audio chunks and passes them as audio frames to the frame buffer.
- */
-public class BufferingPostProcessor implements AudioPostProcessor {
- private final AudioProcessingContext context;
- private final AudioChunkEncoder encoder;
- private final MutableAudioFrame offeredFrame;
- private final ByteBuffer outputBuffer;
-
- /**
- * @param context Processing context to determine the destination buffer from.
- * @param encoder Encoder to encode the chunk with.
- */
- public BufferingPostProcessor(AudioProcessingContext context, AudioChunkEncoder encoder) {
- this.encoder = encoder;
- this.context = context;
- this.offeredFrame = new MutableAudioFrame();
- this.outputBuffer = ByteBuffer.allocateDirect(context.outputFormat.maximumChunkSize());
-
- offeredFrame.setFormat(context.outputFormat);
- }
-
- @Override
- public void process(long timecode, ShortBuffer buffer) throws InterruptedException {
- outputBuffer.clear();
- encoder.encode(buffer, outputBuffer);
-
- offeredFrame.setTimecode(timecode);
- offeredFrame.setVolume(context.playerOptions.volumeLevel.get());
-
- offeredFrame.setBuffer(outputBuffer);
- context.frameBuffer.consume(offeredFrame);
- }
-
- @Override
- public void close() {
- encoder.close();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/ChannelCountPcmAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/ChannelCountPcmAudioFilter.java
deleted file mode 100644
index 47f327e..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/ChannelCountPcmAudioFilter.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import java.nio.ShortBuffer;
-
-/**
- * For short PCM buffers, guarantees that the output has the required number of channels and that no outgoing
- * buffer contains any partial frames.
- *
- * For example if the input is three channels, and output is two channels, then:
- * in [0, 1, 2, 0, 1, 2, 0, 1] out [0, 1, 0, 1] saved [0, 1]
- * in [2, 0, 1, 2] out [0, 1, 0, 1] saved []
- */
-public class ChannelCountPcmAudioFilter implements UniversalPcmAudioFilter {
- private final UniversalPcmAudioFilter downstream;
- private final int outputChannels;
- private final ShortBuffer outputBuffer;
- private final int inputChannels;
- private final int commonChannels;
- private final int channelsToAdd;
- private final short[] inputSet;
- private final float[][] splitFloatOutput;
- private final short[][] splitShortOutput;
- private int inputIndex;
-
- /**
- * @param inputChannels Number of input channels
- * @param outputChannels Number of output channels
- * @param downstream The next filter in line
- */
- public ChannelCountPcmAudioFilter(int inputChannels, int outputChannels, UniversalPcmAudioFilter downstream) {
- this.downstream = downstream;
- this.inputChannels = inputChannels;
- this.outputChannels = outputChannels;
- this.outputBuffer = ShortBuffer.allocate(2048 * inputChannels);
- this.commonChannels = Math.min(outputChannels, inputChannels);
- this.channelsToAdd = outputChannels - commonChannels;
- this.inputSet = new short[inputChannels];
- this.splitFloatOutput = new float[outputChannels][];
- this.splitShortOutput = new short[outputChannels][];
- this.inputIndex = 0;
- }
-
- @Override
- public void process(short[] input, int offset, int length) throws InterruptedException {
- if (canPassThrough(length)) {
- downstream.process(input, offset, length);
- } else {
- if (inputChannels == 1 && outputChannels == 2) {
- processMonoToStereo(ShortBuffer.wrap(input, offset, length));
- } else {
- processNormalizer(ShortBuffer.wrap(input, offset, length));
- }
- }
- }
-
- @Override
- public void process(ShortBuffer buffer) throws InterruptedException {
- if (canPassThrough(buffer.remaining())) {
- downstream.process(buffer);
- } else {
- if (inputChannels == 1 && outputChannels == 2) {
- processMonoToStereo(buffer);
- } else {
- processNormalizer(buffer);
- }
- }
- }
-
- private void processNormalizer(ShortBuffer buffer) throws InterruptedException {
- while (buffer.hasRemaining()) {
- inputSet[inputIndex++] = buffer.get();
-
- if (inputIndex == inputChannels) {
- outputBuffer.put(inputSet, 0, commonChannels);
-
- for (int i = 0; i < channelsToAdd; i++) {
- outputBuffer.put(inputSet[0]);
- }
-
- if (!outputBuffer.hasRemaining()) {
- outputBuffer.flip();
- downstream.process(outputBuffer);
- outputBuffer.clear();
- }
-
- inputIndex = 0;
- }
- }
- }
-
- private void processMonoToStereo(ShortBuffer buffer) throws InterruptedException {
- while (buffer.hasRemaining()) {
- short sample = buffer.get();
- outputBuffer.put(sample);
- outputBuffer.put(sample);
-
- if (!outputBuffer.hasRemaining()) {
- outputBuffer.flip();
- downstream.process(outputBuffer);
- outputBuffer.clear();
- }
- }
- }
-
- private boolean canPassThrough(int length) {
- return inputIndex == 0 && inputChannels == outputChannels && (length % inputChannels) == 0;
- }
-
- @Override
- public void process(float[][] input, int offset, int length) throws InterruptedException {
- for (int i = 0; i < commonChannels; i++) {
- splitFloatOutput[i] = input[i];
- }
-
- for (int i = commonChannels; i < outputChannels; i++) {
- splitFloatOutput[i] = input[0];
- }
-
- downstream.process(splitFloatOutput, offset, length);
- }
-
- @Override
- public void process(short[][] input, int offset, int length) throws InterruptedException {
- for (int i = 0; i < commonChannels; i++) {
- splitShortOutput[i] = input[i];
- }
-
- for (int i = commonChannels; i < outputChannels; i++) {
- splitShortOutput[i] = input[0];
- }
-
- downstream.process(splitShortOutput, offset, length);
- }
-
- @Override
- public void seekPerformed(long requestedTime, long providedTime) {
- outputBuffer.clear();
- }
-
- @Override
- public void flush() throws InterruptedException {
- // Nothing to do.
- }
-
- @Override
- public void close() {
- // Nothing to do.
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/CompositeAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/CompositeAudioFilter.java
deleted file mode 100644
index 97ba984..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/CompositeAudioFilter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-/**
- * An audio filter which may consist of a number of other filters.
- */
-public abstract class CompositeAudioFilter implements UniversalPcmAudioFilter {
- private static final Logger log = LoggerFactory.getLogger(CompositeAudioFilter.class);
-
- @Override
- public void seekPerformed(long requestedTime, long providedTime) {
- for (AudioFilter filter : getFilters()) {
- try {
- filter.seekPerformed(requestedTime, providedTime);
- } catch (Exception e) {
- log.error("Notifying filter {} of seek failed with exception.", filter.getClass(), e);
- }
- }
- }
-
- @Override
- public void flush() throws InterruptedException {
- for (AudioFilter filter : getFilters()) {
- try {
- filter.flush();
- } catch (Exception e) {
- log.error("Flushing filter {} failed with exception.", filter.getClass(), e);
- }
- }
- }
-
- @Override
- public void close() {
- for (AudioFilter filter : getFilters()) {
- try {
- filter.close();
- } catch (Exception e) {
- log.error("Closing filter {} failed with exception.", filter.getClass(), e);
- }
- }
- }
-
- protected abstract List getFilters();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/FilterChainBuilder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/FilterChainBuilder.java
deleted file mode 100644
index ab6bedc..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/FilterChainBuilder.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import com.sedmelluq.discord.lavaplayer.filter.converter.ToFloatAudioFilter;
-import com.sedmelluq.discord.lavaplayer.filter.converter.ToShortAudioFilter;
-import com.sedmelluq.discord.lavaplayer.filter.converter.ToSplitShortAudioFilter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Builder for audio filter chains.
- */
-public class FilterChainBuilder {
- private final List filters = new ArrayList<>();
-
- /**
- * @param filter The filter to add as the first one in the chain.
- */
- public void addFirst(AudioFilter filter) {
- filters.add(filter);
- }
-
- /**
- * @return The first chain in the filter.
- */
- public AudioFilter first() {
- return filters.get(filters.size() - 1);
- }
-
- /**
- * @param channelCount Number of input channels expected by the current head of the chain.
- * @return The first chain in the filter as a float PCM filter, or if it is not, then adds an adapter filter to the
- * beginning and returns that.
- */
- public FloatPcmAudioFilter makeFirstFloat(int channelCount) {
- AudioFilter first = first();
-
- if (first instanceof FloatPcmAudioFilter) {
- return (FloatPcmAudioFilter) first;
- } else {
- return prependUniversalFilter(first, channelCount);
- }
- }
-
- /**
- * @param channelCount Number of input channels expected by the current head of the chain.
- * @return The first chain in the filter as an universal PCM filter, or if it is not, then adds an adapter filter to
- * the beginning and returns that.
- */
- public UniversalPcmAudioFilter makeFirstUniversal(int channelCount) {
- AudioFilter first = first();
-
- if (first instanceof UniversalPcmAudioFilter) {
- return (UniversalPcmAudioFilter) first;
- } else {
- return prependUniversalFilter(first, channelCount);
- }
- }
-
- /**
- * @param context See {@link AudioFilterChain#context}.
- * @param channelCount Number of input channels expected by the current head of the chain.
- * @return The built filter chain. Adds an adapter to the beginning of the chain if the first filter is not universal.
- */
- public AudioFilterChain build(Object context, int channelCount) {
- UniversalPcmAudioFilter firstFilter = makeFirstUniversal(channelCount);
- return new AudioFilterChain(firstFilter, filters, context);
- }
-
- private UniversalPcmAudioFilter prependUniversalFilter(AudioFilter first, int channelCount) {
- UniversalPcmAudioFilter universalInput;
-
- if (first instanceof SplitShortPcmAudioFilter) {
- universalInput = new ToSplitShortAudioFilter((SplitShortPcmAudioFilter) first, channelCount);
- } else if (first instanceof FloatPcmAudioFilter) {
- universalInput = new ToFloatAudioFilter((FloatPcmAudioFilter) first, channelCount);
- } else if (first instanceof ShortPcmAudioFilter) {
- universalInput = new ToShortAudioFilter((ShortPcmAudioFilter) first, channelCount);
- } else {
- throw new RuntimeException("Filter must implement at least one data type.");
- }
-
- addFirst(universalInput);
- return universalInput;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/FinalPcmAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/FinalPcmAudioFilter.java
deleted file mode 100644
index d807677..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/FinalPcmAudioFilter.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.ShortBuffer;
-import java.util.Collection;
-
-/**
- * Collects buffers of the required chunk size and passes them on to audio post processors.
- */
-public class FinalPcmAudioFilter implements UniversalPcmAudioFilter {
- private static final Logger log = LoggerFactory.getLogger(FinalPcmAudioFilter.class);
- private static final short[] zeroPadding = new short[128];
-
- private final AudioDataFormat format;
- private final ShortBuffer frameBuffer;
- private final Collection postProcessors;
-
- private long ignoredFrames;
- private long timecodeBase;
- private long timecodeSampleOffset;
-
- /**
- * @param context Configuration and output information for processing
- * @param postProcessors Post processors to pass the final audio buffers to
- */
- public FinalPcmAudioFilter(AudioProcessingContext context, Collection postProcessors) {
- this.format = context.outputFormat;
- this.frameBuffer = ByteBuffer
- .allocateDirect(format.totalSampleCount() * 2)
- .order(ByteOrder.nativeOrder())
- .asShortBuffer();
- this.postProcessors = postProcessors;
-
- timecodeBase = 0;
- timecodeSampleOffset = 0;
- }
-
- private short decodeSample(float sample) {
- return (short) Math.min(Math.max((int) (sample * 32768.f), -32768), 32767);
- }
-
- @Override
- public void seekPerformed(long requestedTime, long providedTime) {
- frameBuffer.clear();
- ignoredFrames = requestedTime > providedTime ? (requestedTime - providedTime) * format.channelCount * format.sampleRate / 1000L : 0;
- timecodeBase = Math.max(requestedTime, providedTime);
- timecodeSampleOffset = 0;
-
- if (ignoredFrames > 0) {
- log.debug("Ignoring {} frames due to inaccurate seek (requested {}, provided {}).", ignoredFrames, requestedTime, providedTime);
- }
- }
-
- @Override
- public void flush() throws InterruptedException {
- if (frameBuffer.position() > 0) {
- fillFrameBuffer();
- dispatch();
- }
- }
-
- @Override
- public void close() {
- for (AudioPostProcessor postProcessor : postProcessors) {
- postProcessor.close();
- }
- }
-
- private void fillFrameBuffer() {
- while (frameBuffer.remaining() >= zeroPadding.length) {
- frameBuffer.put(zeroPadding);
- }
-
- while (frameBuffer.remaining() > 0) {
- frameBuffer.put((short) 0);
- }
- }
-
- @Override
- public void process(short[] input, int offset, int length) throws InterruptedException {
- for (int i = 0; i < length; i++) {
- if (ignoredFrames > 0) {
- ignoredFrames--;
- } else {
- frameBuffer.put(input[offset + i]);
-
- dispatch();
- }
- }
- }
-
- @Override
- public void process(short[][] input, int offset, int length) throws InterruptedException {
- int secondChannelIndex = Math.min(1, input.length - 1);
-
- for (int i = 0; i < length; i++) {
- if (ignoredFrames > 0) {
- ignoredFrames -= format.channelCount;
- } else {
- frameBuffer.put(input[0][offset + i]);
- frameBuffer.put(input[secondChannelIndex][offset + i]);
-
- dispatch();
- }
- }
- }
-
- @Override
- public void process(ShortBuffer buffer) throws InterruptedException {
- if (ignoredFrames > 0) {
- long skipped = Math.min(buffer.remaining(), ignoredFrames);
- buffer.position(buffer.position() + (int) skipped);
- ignoredFrames -= skipped;
- }
-
- ShortBuffer local = buffer.duplicate();
-
- while (buffer.remaining() > 0) {
- int chunk = Math.min(buffer.remaining(), frameBuffer.remaining());
- local.position(buffer.position());
- local.limit(local.position() + chunk);
-
- frameBuffer.put(local);
- dispatch();
-
- buffer.position(buffer.position() + chunk);
- }
- }
-
- @Override
- public void process(float[][] buffer, int offset, int length) throws InterruptedException {
- int secondChannelIndex = Math.min(1, buffer.length - 1);
-
- for (int i = 0; i < length; i++) {
- if (ignoredFrames > 0) {
- ignoredFrames -= 2;
- } else {
- frameBuffer.put(decodeSample(buffer[0][offset + i]));
- frameBuffer.put(decodeSample(buffer[secondChannelIndex][offset + i]));
-
- dispatch();
- }
- }
- }
-
- private void dispatch() throws InterruptedException {
- if (!frameBuffer.hasRemaining()) {
- long timecode = timecodeBase + timecodeSampleOffset * 1000 / format.sampleRate;
- frameBuffer.clear();
-
- for (AudioPostProcessor postProcessor : postProcessors) {
- postProcessor.process(timecode, frameBuffer);
- }
-
- frameBuffer.clear();
-
- timecodeSampleOffset += format.chunkSampleCount;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/FloatPcmAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/FloatPcmAudioFilter.java
deleted file mode 100644
index df5889e..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/FloatPcmAudioFilter.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-/**
- * Audio filter which accepts floating point PCM samples.
- */
-public interface FloatPcmAudioFilter extends AudioFilter {
- /**
- * @param input An array of samples for each channel
- * @param offset Offset in the arrays to start at
- * @param length Length of the target sequence in arrays
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void process(float[][] input, int offset, int length) throws InterruptedException;
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/PcmFilterFactory.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/PcmFilterFactory.java
deleted file mode 100644
index 17e4e3a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/PcmFilterFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-import java.util.List;
-
-/**
- * Factory for custom PCM filters.
- */
-public interface PcmFilterFactory {
- /**
- * Builds a filter chain for processing a track. Note that this may be called several times during the playback of a
- * single track. All filters should send the output from the filter either to the next filter in the list, or to the
- * output filter if it is the last one in the list. Only the process and flush methods should call the next filter,
- * all other methods are called individually for each filter anyway.
- *
- * @param track The track that this chain is built for.
- * @param format The output format of the track. At the point where these filters are called, the number of channels
- * and the sample rate already matches that of the output format.
- * @param output The filter that the last filter in this chain should send its data to.
- * @return The list of filters in the built chain. May be empty, but not null.
- */
- List buildChain(AudioTrack track, AudioDataFormat format, UniversalPcmAudioFilter output);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/PcmFormat.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/PcmFormat.java
deleted file mode 100644
index 6b74565..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/PcmFormat.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-/**
- * Describes the properties of PCM data.
- */
-public class PcmFormat {
- /**
- * Number of channels.
- */
- public final int channelCount;
- /**
- * Sample rate (frequency).
- */
- public final int sampleRate;
-
- /**
- * @param channelCount See {@link #channelCount}.
- * @param sampleRate See {@link #sampleRate}.
- */
- public PcmFormat(int channelCount, int sampleRate) {
- this.channelCount = channelCount;
- this.sampleRate = sampleRate;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/ResamplingPcmAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/ResamplingPcmAudioFilter.java
deleted file mode 100644
index 00bac03..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/ResamplingPcmAudioFilter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import com.sedmelluq.discord.lavaplayer.natives.samplerate.SampleRateConverter;
-import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
-
-/**
- * Filter which resamples audio to the specified sample rate
- */
-public class ResamplingPcmAudioFilter implements FloatPcmAudioFilter {
- private static final int BUFFER_SIZE = 4096;
-
- private final FloatPcmAudioFilter downstream;
- private final SampleRateConverter[] converters;
- private final SampleRateConverter.Progress progress = new SampleRateConverter.Progress();
- private final float[][] outputSegments;
-
- /**
- * @param configuration Configuration to use
- * @param channels Number of channels in input data
- * @param downstream Next filter in chain
- * @param sourceRate Source sample rate
- * @param targetRate Target sample rate
- */
- public ResamplingPcmAudioFilter(AudioConfiguration configuration, int channels, FloatPcmAudioFilter downstream,
- int sourceRate, int targetRate) {
-
- this.downstream = downstream;
- converters = new SampleRateConverter[channels];
- outputSegments = new float[channels][];
-
- SampleRateConverter.ResamplingType type = getResamplingType(configuration.getResamplingQuality());
-
- for (int i = 0; i < channels; i++) {
- outputSegments[i] = new float[BUFFER_SIZE];
- converters[i] = new SampleRateConverter(type, 1, sourceRate, targetRate);
- }
- }
-
- @Override
- public void seekPerformed(long requestedTime, long providedTime) {
- for (SampleRateConverter converter : converters) {
- converter.reset();
- }
- }
-
- @Override
- public void flush() throws InterruptedException {
- // Nothing to do.
- }
-
- @Override
- public void close() {
- for (SampleRateConverter converter : converters) {
- converter.close();
- }
- }
-
- @Override
- public void process(float[][] input, int offset, int length) throws InterruptedException {
- do {
- for (int i = 0; i < input.length; i++) {
- converters[i].process(input[i], offset, length, outputSegments[i], 0, BUFFER_SIZE, false, progress);
- }
-
- offset += progress.getInputUsed();
- length -= progress.getInputUsed();
-
- if (progress.getOutputGenerated() > 0) {
- downstream.process(outputSegments, 0, progress.getOutputGenerated());
- }
- } while (length > 0 || progress.getOutputGenerated() == BUFFER_SIZE);
- }
-
- private static SampleRateConverter.ResamplingType getResamplingType(AudioConfiguration.ResamplingQuality quality) {
- switch (quality) {
- case HIGH:
- return SampleRateConverter.ResamplingType.SINC_MEDIUM_QUALITY;
- case MEDIUM:
- return SampleRateConverter.ResamplingType.SINC_FASTEST;
- case LOW:
- default:
- return SampleRateConverter.ResamplingType.LINEAR;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/ShortPcmAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/ShortPcmAudioFilter.java
deleted file mode 100644
index 231f8c6..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/ShortPcmAudioFilter.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import java.nio.ShortBuffer;
-
-/**
- * Audio filter which accepts 16-bit signed PCM samples.
- */
-public interface ShortPcmAudioFilter extends AudioFilter {
- /**
- * @param input Array of samples
- * @param offset Offset in the array
- * @param length Length of the sequence in the array
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void process(short[] input, int offset, int length) throws InterruptedException;
-
- /**
- * @param buffer The buffer of samples
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void process(ShortBuffer buffer) throws InterruptedException;
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/SplitShortPcmAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/SplitShortPcmAudioFilter.java
deleted file mode 100644
index f2bbd3b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/SplitShortPcmAudioFilter.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-/**
- * Audio filter which accepts 16-bit signed PCM samples, with an array per .
- */
-public interface SplitShortPcmAudioFilter extends AudioFilter {
- /**
- * @param input An array of samples for each channel
- * @param offset Offset in the array
- * @param length Length of the sequence in the array
- * @throws InterruptedException When interrupted externally (or for seek/stop).
- */
- void process(short[][] input, int offset, int length) throws InterruptedException;
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/UniversalPcmAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/UniversalPcmAudioFilter.java
deleted file mode 100644
index 297aae7..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/UniversalPcmAudioFilter.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-/**
- * A PCM filter which must be able to correctly process all representations of PCM input data, as specified by the
- * methods of the interfaces it extends.
- */
-public interface UniversalPcmAudioFilter extends ShortPcmAudioFilter, SplitShortPcmAudioFilter, FloatPcmAudioFilter {
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/UserProvidedAudioFilters.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/UserProvidedAudioFilters.java
deleted file mode 100644
index 94012a3..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/UserProvidedAudioFilters.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter;
-
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.nio.ShortBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * An composite audio filter for filters provided by a {@link PcmFilterFactory}. Automatically rebuilds the chain
- * whenever the filter factory is changed.
- */
-public class UserProvidedAudioFilters extends CompositeAudioFilter {
- private final AudioProcessingContext context;
- private final UniversalPcmAudioFilter nextFilter;
- private final boolean hotSwapEnabled;
- private AudioFilterChain chain;
-
- /**
- * @param context Configuration and output information for processing
- * @param nextFilter The next filter that should be processed after this one.
- */
- public UserProvidedAudioFilters(AudioProcessingContext context, UniversalPcmAudioFilter nextFilter) {
- this.context = context;
- this.nextFilter = nextFilter;
- this.hotSwapEnabled = context.filterHotSwapEnabled;
- this.chain = buildFragment(context, nextFilter);
- }
-
- private static AudioFilterChain buildFragment(AudioProcessingContext context,
- UniversalPcmAudioFilter nextFilter) {
-
- PcmFilterFactory factory = context.playerOptions.filterFactory.get();
-
- if (factory == null) {
- return new AudioFilterChain(nextFilter, Collections.emptyList(), null);
- } else {
- FilterChainBuilder builder = new FilterChainBuilder();
-
- List filters = new ArrayList<>(factory.buildChain(null, context.outputFormat, nextFilter));
-
- if (filters.isEmpty()) {
- return new AudioFilterChain(nextFilter, Collections.emptyList(), null);
- }
-
- Collections.reverse(filters);
-
- for (AudioFilter filter : filters) {
- builder.addFirst(filter);
- }
-
- return builder.build(factory, context.outputFormat.channelCount);
- }
- }
-
- @Override
- protected List getFilters() {
- return chain.filters;
- }
-
- @Override
- public void process(float[][] input, int offset, int length) throws InterruptedException {
- checkRebuild();
- chain.input.process(input, offset, length);
- }
-
- @Override
- public void process(short[] input, int offset, int length) throws InterruptedException {
- checkRebuild();
- chain.input.process(input, offset, length);
- }
-
- @Override
- public void process(ShortBuffer buffer) throws InterruptedException {
- checkRebuild();
- chain.input.process(buffer);
- }
-
- @Override
- public void process(short[][] input, int offset, int length) throws InterruptedException {
- checkRebuild();
- chain.input.process(input, offset, length);
- }
-
- private void checkRebuild() throws InterruptedException {
- if (hotSwapEnabled && context.playerOptions.filterFactory.get() != chain.context) {
- flush();
- close();
- chain = buildFragment(context, nextFilter);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ConverterAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ConverterAudioFilter.java
deleted file mode 100644
index d4469c0..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ConverterAudioFilter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter.converter;
-
-import com.sedmelluq.discord.lavaplayer.filter.UniversalPcmAudioFilter;
-
-/**
- * Base class for converter filters which have no internal state.
- */
-public abstract class ConverterAudioFilter implements UniversalPcmAudioFilter {
- protected static final int BUFFER_SIZE = 4096;
-
- @Override
- public void seekPerformed(long requestedTime, long providedTime) {
- // Nothing to do.
- }
-
- @Override
- public void flush() throws InterruptedException {
- // Nothing to do.
- }
-
- @Override
- public void close() {
- // Nothing to do.
- }
-
- protected static short floatToShort(float value) {
- return (short) (value * 32768.0f);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ToFloatAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ToFloatAudioFilter.java
deleted file mode 100644
index ae82fe9..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ToFloatAudioFilter.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter.converter;
-
-import com.sedmelluq.discord.lavaplayer.filter.FloatPcmAudioFilter;
-
-import java.nio.ShortBuffer;
-
-/**
- * Filter which takes in PCM data in any representation and outputs it as float PCM.
- */
-public class ToFloatAudioFilter extends ConverterAudioFilter {
- private final FloatPcmAudioFilter downstream;
- private final int channelCount;
- private final float[][] buffers;
-
- /**
- * @param downstream The float PCM filter to pass the output to.
- * @param channelCount Number of channels in the PCM data.
- */
- public ToFloatAudioFilter(FloatPcmAudioFilter downstream, int channelCount) {
- this.downstream = downstream;
- this.channelCount = channelCount;
- this.buffers = new float[channelCount][];
-
- for (int i = 0; i < channelCount; i++) {
- this.buffers[i] = new float[BUFFER_SIZE];
- }
- }
-
- @Override
- public void process(float[][] input, int offset, int length) throws InterruptedException {
- downstream.process(input, offset, length);
- }
-
- @Override
- public void process(short[] input, int offset, int length) throws InterruptedException {
- int end = offset + length;
-
- while (end - offset >= channelCount) {
- int chunkLength = Math.min((end - offset) / channelCount, BUFFER_SIZE);
-
- for (int chunkPosition = 0; chunkPosition < chunkLength; chunkPosition++) {
- for (int channel = 0; channel < channelCount; channel++) {
- buffers[channel][chunkPosition] = shortToFloat(input[offset++]);
- }
- }
-
- downstream.process(buffers, 0, chunkLength);
- }
- }
-
- @Override
- public void process(ShortBuffer buffer) throws InterruptedException {
- while (buffer.hasRemaining()) {
- int chunkLength = Math.min(buffer.remaining() / channelCount, BUFFER_SIZE);
-
- if (chunkLength == 0) {
- break;
- }
-
- for (int chunkPosition = 0; chunkPosition < chunkLength; chunkPosition++) {
- for (int channel = 0; channel < buffers.length; channel++) {
- buffers[channel][chunkPosition] = shortToFloat(buffer.get());
- }
- }
-
- downstream.process(buffers, 0, chunkLength);
- }
- }
-
- @Override
- public void process(short[][] input, int offset, int length) throws InterruptedException {
- int end = offset + length;
-
- while (offset < end) {
- int chunkLength = Math.min(end - offset, BUFFER_SIZE);
-
- for (int channel = 0; channel < buffers.length; channel++) {
- for (int chunkPosition = 0; chunkPosition < chunkLength; chunkPosition++) {
- buffers[channel][chunkPosition] = shortToFloat(input[channel][offset + chunkPosition]);
- }
- }
-
- offset += chunkLength;
- downstream.process(buffers, 0, chunkLength);
- }
- }
-
- private static float shortToFloat(short value) {
- return value / 32768.0f;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ToShortAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ToShortAudioFilter.java
deleted file mode 100644
index 71b4a2a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ToShortAudioFilter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter.converter;
-
-import com.sedmelluq.discord.lavaplayer.filter.ShortPcmAudioFilter;
-
-import java.nio.ShortBuffer;
-
-/**
- * Filter which takes in PCM data in any representation and outputs it as short PCM.
- */
-public class ToShortAudioFilter extends ConverterAudioFilter {
- private final ShortPcmAudioFilter downstream;
- private final int channelCount;
- private final short[] outputBuffer;
-
- /**
- * @param downstream The short PCM filter to pass the output to.
- * @param channelCount Number of channels in the PCM data.
- */
- public ToShortAudioFilter(ShortPcmAudioFilter downstream, int channelCount) {
- this.downstream = downstream;
- this.channelCount = channelCount;
- this.outputBuffer = new short[BUFFER_SIZE * channelCount];
- }
-
- @Override
- public void process(float[][] input, int offset, int length) throws InterruptedException {
- int end = offset + length;
-
- while (offset < end) {
- int chunkSize = Math.min(BUFFER_SIZE, end - offset);
- int writePosition = 0;
-
- for (int chunkPosition = 0; chunkPosition < chunkSize; chunkPosition++) {
- for (int channel = 0; channel < channelCount; channel++) {
- outputBuffer[writePosition++] = floatToShort(input[channel][chunkPosition]);
- }
- }
-
- offset += chunkSize;
- downstream.process(outputBuffer, 0, chunkSize);
- }
- }
-
- @Override
- public void process(short[] input, int offset, int length) throws InterruptedException {
- downstream.process(input, offset, length);
- }
-
- @Override
- public void process(ShortBuffer buffer) throws InterruptedException {
- downstream.process(buffer);
- }
-
- @Override
- public void process(short[][] input, int offset, int length) throws InterruptedException {
- int end = offset + length;
-
- while (offset < end) {
- int chunkSize = Math.min(BUFFER_SIZE, end - offset);
- int writePosition = 0;
-
- for (int chunkPosition = 0; chunkPosition < chunkSize; chunkPosition++) {
- for (int channel = 0; channel < channelCount; channel++) {
- outputBuffer[writePosition++] = input[channel][chunkPosition];
- }
- }
-
- offset += chunkSize;
- downstream.process(outputBuffer, 0, chunkSize);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ToSplitShortAudioFilter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ToSplitShortAudioFilter.java
deleted file mode 100644
index c3f23cd..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/converter/ToSplitShortAudioFilter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter.converter;
-
-import com.sedmelluq.discord.lavaplayer.filter.SplitShortPcmAudioFilter;
-
-import java.nio.ShortBuffer;
-
-/**
- * Filter which takes in PCM data in any representation and outputs it as split short PCM.
- */
-public class ToSplitShortAudioFilter extends ConverterAudioFilter {
- private final SplitShortPcmAudioFilter downstream;
- private final int channelCount;
- private final short[][] buffers;
-
- /**
- * @param downstream The split short PCM filter to pass the output to.
- * @param channelCount Number of channels in the PCM data.
- */
- public ToSplitShortAudioFilter(SplitShortPcmAudioFilter downstream, int channelCount) {
- this.downstream = downstream;
- this.channelCount = channelCount;
- this.buffers = new short[channelCount][];
-
- for (int i = 0; i < channelCount; i++) {
- this.buffers[i] = new short[BUFFER_SIZE];
- }
- }
-
- @Override
- public void process(float[][] input, int offset, int length) throws InterruptedException {
- int end = offset + length;
-
- while (offset < end) {
- int chunkLength = Math.min(end - offset, BUFFER_SIZE);
-
- for (int channel = 0; channel < channelCount; channel++) {
- for (int chunkPosition = 0; chunkPosition < chunkLength; chunkPosition++) {
- buffers[channel][chunkPosition] = floatToShort(input[channel][offset + chunkPosition]);
- }
- }
-
- downstream.process(buffers, 0, chunkLength);
- }
- }
-
- @Override
- public void process(short[] input, int offset, int length) throws InterruptedException {
- int end = offset + length;
-
- while (end - offset >= channelCount) {
- int chunkLength = Math.min(end - offset, BUFFER_SIZE * channelCount);
-
- for (int chunkPosition = 0; chunkPosition < chunkLength; chunkPosition++) {
- for (int channel = 0; channel < buffers.length; channel++) {
- buffers[channel][chunkPosition] = floatToShort(input[offset++]);
- }
- }
-
- downstream.process(buffers, 0, chunkLength);
- }
- }
-
- @Override
- public void process(ShortBuffer buffer) throws InterruptedException {
- while (buffer.hasRemaining()) {
- int chunkLength = Math.min(buffer.remaining(), BUFFER_SIZE * channelCount);
-
- for (int chunkPosition = 0; chunkPosition < chunkLength; chunkPosition++) {
- for (int channel = 0; channel < buffers.length; channel++) {
- buffers[channel][chunkPosition] = floatToShort(buffer.get());
- }
- }
-
- downstream.process(buffers, 0, chunkLength);
- }
- }
-
- @Override
- public void process(short[][] input, int offset, int length) throws InterruptedException {
- downstream.process(input, offset, length);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/equalizer/Equalizer.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/equalizer/Equalizer.java
deleted file mode 100644
index 200189c..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/equalizer/Equalizer.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter.equalizer;
-
-import com.sedmelluq.discord.lavaplayer.filter.FloatPcmAudioFilter;
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-
-import java.util.Arrays;
-
-/**
- * An equalizer PCM filter. Applies the equalizer with configuration specified by band multipliers (either set
- * externally or using {@link #setGain(int, float)}).
- */
-public class Equalizer extends EqualizerConfiguration implements FloatPcmAudioFilter {
- /**
- * Number of bands in the equalizer.
- */
- public static final int BAND_COUNT = 15;
-
- private static final int SAMPLE_RATE = 48000;
-
- private final ChannelProcessor[] channels;
- private final FloatPcmAudioFilter next;
-
- private static final Coefficients[] coefficients48000 = {
- new Coefficients(9.9847546664e-01f, 7.6226668143e-04f, 1.9984647656e+00f),
- new Coefficients(9.9756184654e-01f, 1.2190767289e-03f, 1.9975344645e+00f),
- new Coefficients(9.9616261379e-01f, 1.9186931041e-03f, 1.9960947369e+00f),
- new Coefficients(9.9391578543e-01f, 3.0421072865e-03f, 1.9937449618e+00f),
- new Coefficients(9.9028307215e-01f, 4.8584639242e-03f, 1.9898465702e+00f),
- new Coefficients(9.8485897264e-01f, 7.5705136795e-03f, 1.9837962543e+00f),
- new Coefficients(9.7588512657e-01f, 1.2057436715e-02f, 1.9731772447e+00f),
- new Coefficients(9.6228521814e-01f, 1.8857390928e-02f, 1.9556164694e+00f),
- new Coefficients(9.4080933132e-01f, 2.9595334338e-02f, 1.9242054384e+00f),
- new Coefficients(9.0702059196e-01f, 4.6489704022e-02f, 1.8653476166e+00f),
- new Coefficients(8.5868004289e-01f, 7.0659978553e-02f, 1.7600401337e+00f),
- new Coefficients(7.8409610788e-01f, 1.0795194606e-01f, 1.5450725522e+00f),
- new Coefficients(6.8332861002e-01f, 1.5833569499e-01f, 1.1426447155e+00f),
- new Coefficients(5.5267518228e-01f, 2.2366240886e-01f, 4.0186190803e-01f),
- new Coefficients(4.1811888447e-01f, 2.9094055777e-01f, -7.0905944223e-01f)
- };
-
- /**
- * @param channelCount Number of channels in the input.
- * @param next The next filter in the chain.
- * @param bandMultipliers The band multiplier values. Keeps using this array internally, so the values can be changed
- * externally.
- */
- public Equalizer(int channelCount, FloatPcmAudioFilter next, float[] bandMultipliers) {
- super(bandMultipliers);
- this.channels = createProcessors(channelCount, bandMultipliers);
- this.next = next;
- }
-
- /**
- * @param channelCount Number of channels in the input.
- * @param next The next filter in the chain.
- */
- public Equalizer(int channelCount, FloatPcmAudioFilter next) {
- this(channelCount, next, new float[BAND_COUNT]);
- }
-
- /**
- * @param format Audio output format.
- * @return true if the output format is compatible for the equalizer (based on sample rate).
- */
- public static boolean isCompatible(AudioDataFormat format) {
- return format.sampleRate == SAMPLE_RATE;
- }
-
- @Override
- public void process(float[][] input, int offset, int length) throws InterruptedException {
- for (int channelIndex = 0; channelIndex < channels.length; channelIndex++) {
- channels[channelIndex].process(input[channelIndex], offset, offset + length);
- }
-
- next.process(input, offset, length);
- }
-
- @Override
- public void seekPerformed(long requestedTime, long providedTime) {
- for (int channelIndex = 0; channelIndex < channels.length; channelIndex++) {
- channels[channelIndex].reset();
- }
- }
-
- @Override
- public void flush() throws InterruptedException {
- // Nothing to do here.
- }
-
- @Override
- public void close() {
- // Nothing to do here.
- }
-
- private static ChannelProcessor[] createProcessors(int channelCount, float[] bandMultipliers) {
- ChannelProcessor[] processors = new ChannelProcessor[channelCount];
-
- for (int i = 0; i < channelCount; i++) {
- processors[i] = new ChannelProcessor(bandMultipliers);
- }
-
- return processors;
- }
-
- private static class ChannelProcessor {
- private final float[] history;
- private final float[] bandMultipliers;
-
- private int current;
- private int minusOne;
- private int minusTwo;
-
- private ChannelProcessor(float[] bandMultipliers) {
- this.history = new float[BAND_COUNT * 6];
- this.bandMultipliers = bandMultipliers;
- this.current = 0;
- this.minusOne = 2;
- this.minusTwo = 1;
- }
-
- private void process(float[] samples, int startIndex, int endIndex) {
- for (int sampleIndex = startIndex; sampleIndex < endIndex; sampleIndex++) {
- float sample = samples[sampleIndex];
- float result = sample * 0.25f;
-
- for (int bandIndex = 0; bandIndex < BAND_COUNT; bandIndex++) {
- int x = bandIndex * 6;
- int y = x + 3;
-
- Coefficients coefficients = coefficients48000[bandIndex];
-
- float bandResult = coefficients.alpha * (sample - history[x + minusTwo]) +
- coefficients.gamma * history[y + minusOne] -
- coefficients.beta * history[y + minusTwo];
-
- history[x + current] = sample;
- history[y + current] = bandResult;
-
- result += bandResult * bandMultipliers[bandIndex];
- }
-
- samples[sampleIndex] = Math.min(Math.max(result * 4.0f, -1.0f), 1.0f);
-
- if (++current == 3) {
- current = 0;
- }
-
- if (++minusOne == 3) {
- minusOne = 0;
- }
-
- if (++minusTwo == 3) {
- minusTwo = 0;
- }
- }
- }
-
- private void reset() {
- Arrays.fill(history, 0.0f);
- }
- }
-
- private static class Coefficients {
- private final float beta;
- private final float alpha;
- private final float gamma;
-
- private Coefficients(float beta, float alpha, float gamma) {
- this.beta = beta;
- this.alpha = alpha;
- this.gamma = gamma;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/equalizer/EqualizerConfiguration.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/equalizer/EqualizerConfiguration.java
deleted file mode 100644
index 4844936..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/equalizer/EqualizerConfiguration.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter.equalizer;
-
-/**
- * Holder of equalizer configuration.
- */
-public class EqualizerConfiguration {
- protected final float[] bandMultipliers;
-
- /**
- * @param bandMultipliers The band multiplier values. Keeps using this array internally, so the values can be changed
- * externally.
- */
- public EqualizerConfiguration(float[] bandMultipliers) {
- this.bandMultipliers = bandMultipliers;
- }
-
- /**
- * @param band The index of the band. If this is not a valid band index, the method has no effect.
- * @param value The multiplier for this band. Default value is 0. Valid values are from -0.25 to 1. -0.25 means that
- * the given frequency is completely muted and 0.25 means it is doubled. Note that this may change the
- * volume of the output.
- */
- public void setGain(int band, float value) {
- if (isValidBand(band)) {
- bandMultipliers[band] = Math.max(Math.min(value, 1.0f), -0.25f);
- }
- }
-
- /**
- * @param band The index of the band.
- * @return The multiplier for this band. Default value is 0.
- */
- public float getGain(int band) {
- if (isValidBand(band)) {
- return bandMultipliers[band];
- } else {
- return 0.0f;
- }
- }
-
- private boolean isValidBand(int band) {
- return band >= 0 && band < bandMultipliers.length;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/equalizer/EqualizerFactory.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/equalizer/EqualizerFactory.java
deleted file mode 100644
index 898c836..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/equalizer/EqualizerFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter.equalizer;
-
-import com.sedmelluq.discord.lavaplayer.filter.AudioFilter;
-import com.sedmelluq.discord.lavaplayer.filter.PcmFilterFactory;
-import com.sedmelluq.discord.lavaplayer.filter.UniversalPcmAudioFilter;
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * PCM filter factory which creates a single {@link Equalizer} filter for every track. Useful in case the equalizer is
- * the only custom filter used.
- */
-public class EqualizerFactory extends EqualizerConfiguration implements PcmFilterFactory {
- /**
- * Creates a new instance no gains applied initially.
- */
- public EqualizerFactory() {
- super(new float[Equalizer.BAND_COUNT]);
- }
-
- @Override
- public List buildChain(AudioTrack track, AudioDataFormat format, UniversalPcmAudioFilter output) {
- if (Equalizer.isCompatible(format)) {
- return Collections.singletonList(new Equalizer(format.channelCount, output, bandMultipliers));
- } else {
- return Collections.emptyList();
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/volume/AudioFrameVolumeChanger.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/volume/AudioFrameVolumeChanger.java
deleted file mode 100644
index 201f835..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/volume/AudioFrameVolumeChanger.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter.volume;
-
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.format.transcoder.AudioChunkDecoder;
-import com.sedmelluq.discord.lavaplayer.format.transcoder.AudioChunkEncoder;
-import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrameRebuilder;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-import com.sedmelluq.discord.lavaplayer.track.playback.ImmutableAudioFrame;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.ShortBuffer;
-
-/**
- * A frame rebuilder to apply a specific volume level to the frames.
- */
-public class AudioFrameVolumeChanger implements AudioFrameRebuilder {
- private final AudioConfiguration configuration;
- private final AudioDataFormat format;
- private final int newVolume;
- private final ShortBuffer sampleBuffer;
- private final PcmVolumeProcessor volumeProcessor;
-
- private AudioChunkEncoder encoder;
- private AudioChunkDecoder decoder;
- private int frameIndex;
-
- private AudioFrameVolumeChanger(AudioConfiguration configuration, AudioDataFormat format, int newVolume) {
- this.configuration = configuration;
- this.format = format;
- this.newVolume = newVolume;
-
- this.sampleBuffer = ByteBuffer
- .allocateDirect(format.totalSampleCount() * 2)
- .order(ByteOrder.nativeOrder())
- .asShortBuffer();
- this.volumeProcessor = new PcmVolumeProcessor(100);
- }
-
- @Override
- public AudioFrame rebuild(AudioFrame frame) {
- if (frame.getVolume() == newVolume) {
- return frame;
- }
-
- decoder.decode(frame.getData(), sampleBuffer);
-
- int targetVolume = newVolume;
-
- if (++frameIndex < 50) {
- targetVolume = (int) ((newVolume - frame.getVolume()) * (frameIndex / 50.0) + frame.getVolume());
- }
-
- // Volume 0 is stored in the frame with volume 100 buffer
- if (targetVolume != 0) {
- volumeProcessor.applyVolume(frame.getVolume(), targetVolume, sampleBuffer);
- }
-
- byte[] bytes = encoder.encode(sampleBuffer);
-
- // One frame per 20ms is consumed. To not spike the CPU usage, reencode only once per 5ms. By the time the buffer is
- // fully rebuilt, it is probably near to 3/4 its maximum size.
- try {
- Thread.sleep(5);
- } catch (InterruptedException e) {
- // Keep it interrupted, it will trip on the next interruptible operation
- Thread.currentThread().interrupt();
- }
-
- return new ImmutableAudioFrame(frame.getTimecode(), bytes, targetVolume, format);
- }
-
- private void setupLibraries() {
- encoder = format.createEncoder(configuration);
- decoder = format.createDecoder();
- }
-
- private void clearLibraries() {
- if (encoder != null) {
- encoder.close();
- }
-
- if (decoder != null) {
- decoder.close();
- }
- }
-
- /**
- * Applies a volume level to the buffered frames of a frame consumer
- *
- * @param context Configuration and output information for processing
- */
- public static void apply(AudioProcessingContext context) {
- AudioFrameVolumeChanger volumeChanger = new AudioFrameVolumeChanger(context.configuration, context.outputFormat,
- context.playerOptions.volumeLevel.get());
-
- try {
- volumeChanger.setupLibraries();
- context.frameBuffer.rebuild(volumeChanger);
- } finally {
- volumeChanger.clearLibraries();
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/volume/PcmVolumeProcessor.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/volume/PcmVolumeProcessor.java
deleted file mode 100644
index 4e4b18b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/volume/PcmVolumeProcessor.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter.volume;
-
-import java.nio.ShortBuffer;
-
-/**
- * Class used to apply a volume level to short PCM buffers
- */
-public class PcmVolumeProcessor {
- private int currentVolume = -1;
- private int integerMultiplier;
-
- /**
- * @param initialVolume Initial volume level (only useful for getLastVolume() as specified with each call)
- */
- public PcmVolumeProcessor(int initialVolume) {
- setupMultipliers(initialVolume);
- }
-
- /**
- * @return Last volume level used with this processor
- */
- public int getLastVolume() {
- return currentVolume;
- }
-
- /**
- * @param lastVolume Value to explicitly set for the return value of getLastVolume()
- */
- public void setLastVolume(int lastVolume) {
- currentVolume = lastVolume;
- }
-
- /**
- * @param initialVolume The input volume of the samples
- * @param targetVolume The target volume of the samples
- * @param buffer The buffer containing the samples
- */
- public void applyVolume(int initialVolume, int targetVolume, ShortBuffer buffer) {
- if (initialVolume != 100 && initialVolume != 0) {
- setupMultipliers(initialVolume);
- unapplyCurrentVolume(buffer);
- }
-
- setupMultipliers(targetVolume);
- applyCurrentVolume(buffer);
- }
-
- private void setupMultipliers(int activeVolume) {
- if (currentVolume != activeVolume) {
- currentVolume = activeVolume;
-
- if (activeVolume <= 150) {
- float floatMultiplier = (float) Math.tan(activeVolume * 0.0079f);
- integerMultiplier = (int) (floatMultiplier * 10000);
- } else {
- integerMultiplier = 24621 * activeVolume / 150;
- }
- }
- }
-
- private void applyCurrentVolume(ShortBuffer buffer) {
- if (currentVolume == 100) {
- return;
- }
-
- int endOffset = buffer.limit();
-
- for (int i = buffer.position(); i < endOffset; i++) {
- int value = buffer.get(i) * integerMultiplier / 10000;
- buffer.put(i, (short) Math.max(-32767, Math.min(32767, value)));
- }
- }
-
- private void unapplyCurrentVolume(ShortBuffer buffer) {
- if (integerMultiplier == 0) {
- return;
- }
-
- int endOffset = buffer.limit();
-
- for (int i = buffer.position(); i < endOffset; i++) {
- int value = buffer.get(i) * 10000 / integerMultiplier;
- buffer.put(i, (short) Math.max(-32767, Math.min(32767, value)));
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/volume/VolumePostProcessor.java b/src/main/java/com/sedmelluq/discord/lavaplayer/filter/volume/VolumePostProcessor.java
deleted file mode 100644
index 719d3d5..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/filter/volume/VolumePostProcessor.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.filter.volume;
-
-import com.sedmelluq.discord.lavaplayer.filter.AudioPostProcessor;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-
-import java.nio.ShortBuffer;
-
-/**
- * Audio chunk post processor to apply selected volume.
- */
-public class VolumePostProcessor implements AudioPostProcessor {
- private final PcmVolumeProcessor volumeProcessor;
- private final AudioProcessingContext context;
-
- /**
- * @param context Configuration and output information for processing
- */
- public VolumePostProcessor(AudioProcessingContext context) {
- this.context = context;
- this.volumeProcessor = new PcmVolumeProcessor(context.playerOptions.volumeLevel.get());
- }
-
- @Override
- public void process(long timecode, ShortBuffer buffer) throws InterruptedException {
- int currentVolume = context.playerOptions.volumeLevel.get();
-
- if (currentVolume != volumeProcessor.getLastVolume()) {
- AudioFrameVolumeChanger.apply(context);
- }
-
- // Volume 0 is stored in the frame with volume 100 buffer
- if (currentVolume != 0) {
- volumeProcessor.applyVolume(100, currentVolume, buffer);
- } else {
- volumeProcessor.setLastVolume(0);
- }
- }
-
- @Override
- public void close() {
- // Nothing to close here
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/AudioDataFormat.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/AudioDataFormat.java
deleted file mode 100644
index 48e9036..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/AudioDataFormat.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format;
-
-import com.sedmelluq.discord.lavaplayer.format.transcoder.AudioChunkDecoder;
-import com.sedmelluq.discord.lavaplayer.format.transcoder.AudioChunkEncoder;
-import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
-
-import java.util.Objects;
-
-/**
- * Describes the format for audio with fixed chunk size.
- */
-public abstract class AudioDataFormat {
- /**
- * Number of channels.
- */
- public final int channelCount;
- /**
- * Sample rate (frequency).
- */
- public final int sampleRate;
- /**
- * Number of samples in one chunk.
- */
- public final int chunkSampleCount;
-
- /**
- * @param channelCount Number of channels.
- * @param sampleRate Sample rate (frequency).
- * @param chunkSampleCount Number of samples in one chunk.
- */
- public AudioDataFormat(int channelCount, int sampleRate, int chunkSampleCount) {
- this.channelCount = channelCount;
- this.sampleRate = sampleRate;
- this.chunkSampleCount = chunkSampleCount;
- }
-
- /**
- * @return Total number of samples in one frame.
- */
- public int totalSampleCount() {
- return chunkSampleCount * channelCount;
- }
-
- /**
- * @return The duration in milliseconds of one frame in this format.
- */
- public long frameDuration() {
- return chunkSampleCount * 1000L / sampleRate;
- }
-
- /**
- * @return Name of the codec.
- */
- public abstract String codecName();
-
- /**
- * @return Byte array representing a frame of silence in this format.
- */
- public abstract byte[] silenceBytes();
-
- /**
- * @return Generally expected average size of a frame in this format.
- */
- public abstract int expectedChunkSize();
-
- /**
- * @return Maximum size of a frame in this format.
- */
- public abstract int maximumChunkSize();
-
- /**
- * @return Decoder to convert data in this format to short PCM.
- */
- public abstract AudioChunkDecoder createDecoder();
-
- /**
- * @param configuration Configuration to use for encoding.
- * @return Encoder to convert data in short PCM format to this format.
- */
- public abstract AudioChunkEncoder createEncoder(AudioConfiguration configuration);
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- AudioDataFormat that = (AudioDataFormat) o;
-
- if (channelCount != that.channelCount) return false;
- if (sampleRate != that.sampleRate) return false;
- if (chunkSampleCount != that.chunkSampleCount) return false;
- return Objects.equals(codecName(), that.codecName());
- }
-
- @Override
- public int hashCode() {
- int result = channelCount;
- result = 31 * result + sampleRate;
- result = 31 * result + chunkSampleCount;
- result = 31 * result + codecName().hashCode();
- return result;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/AudioDataFormatTools.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/AudioDataFormatTools.java
deleted file mode 100644
index a8f4ce2..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/AudioDataFormatTools.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format;
-
-import javax.sound.sampled.AudioFormat;
-
-import static javax.sound.sampled.AudioFormat.Encoding.PCM_SIGNED;
-
-/**
- * Tools to deal with audio data formats.
- */
-public class AudioDataFormatTools {
-
- /**
- * @param format Audio data format to convert to JDK audio format
- * @return JDK audio format for the specified format.
- */
- public static AudioFormat toAudioFormat(AudioDataFormat format) {
- if (format instanceof Pcm16AudioDataFormat) {
- return new AudioFormat(
- PCM_SIGNED,
- format.sampleRate,
- 16,
- format.channelCount,
- format.channelCount * 2,
- format.sampleRate,
- format.codecName().equals(Pcm16AudioDataFormat.CODEC_NAME_BE)
- );
- } else {
- throw new IllegalStateException("Only PCM is currently supported.");
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/AudioPlayerInputStream.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/AudioPlayerInputStream.java
deleted file mode 100644
index 8d09716..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/AudioPlayerInputStream.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.track.TrackStateListener;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.nio.ByteBuffer;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * Provides an audio player as an input stream. When nothing is playing, it returns silence instead of blocking.
- */
-public class AudioPlayerInputStream extends InputStream {
- private final AudioPlayer player;
- private final AudioDataFormat format;
- private final long timeout;
- private final boolean provideSilence;
- private ByteBuffer current;
-
- /**
- * @param format Format of the frames expected from the player
- * @param player The player to read frames from
- * @param timeout Timeout till track stuck event is sent. Each time a new frame is required from the player, it asks
- * for a frame with the specified timeout. In case that timeout is reached, the track stuck event is
- * sent and if providing silence is enabled, silence is provided as the next frame.
- * @param provideSilence True if the stream should return silence instead of blocking in case nothing is playing or
- * read times out.
- */
- public AudioPlayerInputStream(AudioDataFormat format, AudioPlayer player, long timeout, boolean provideSilence) {
- this.format = format;
- this.player = player;
- this.timeout = timeout;
- this.provideSilence = provideSilence;
- }
-
- @Override
- public int read() throws IOException {
- ensureAvailable();
- return current.get();
- }
-
- @Override
- public int read(byte[] buffer, int offset, int length) throws IOException {
- int currentOffset = offset;
-
- while (currentOffset < length) {
- ensureAvailable();
-
- int piece = Math.min(current.remaining(), length - currentOffset);
- current.get(buffer, currentOffset, piece);
- currentOffset += piece;
- }
-
- return currentOffset - offset;
- }
-
- @Override
- public int available() throws IOException {
- return current != null ? current.remaining() : 0;
- }
-
- @Override
- public void close() throws IOException {
- player.stopTrack();
- }
-
- /**
- * Create an instance of AudioInputStream using an AudioPlayer as a source.
- *
- * @param player Format of the frames expected from the player
- * @param format The player to read frames from
- * @param stuckTimeout Timeout till track stuck event is sent and silence is returned on reading
- * @param provideSilence Returns true if the stream should provide silence if no track is being played or when getting
- * track frames times out.
- * @return An audio input stream usable with JDK sound system
- */
- public static AudioInputStream createStream(AudioPlayer player, AudioDataFormat format, long stuckTimeout, boolean provideSilence) {
- AudioFormat jdkFormat = AudioDataFormatTools.toAudioFormat(format);
- return new AudioInputStream(new AudioPlayerInputStream(format, player, stuckTimeout, provideSilence), jdkFormat, -1);
- }
-
- private void ensureAvailable() throws IOException {
- while (available() == 0) {
- try {
- attemptRetrieveFrame();
- } catch (TimeoutException e) {
- notifyTrackStuck();
- } catch (InterruptedException e) {
- ExceptionTools.keepInterrupted(e);
- throw new InterruptedIOException();
- }
-
- if (available() == 0 && provideSilence) {
- addFrame(format.silenceBytes());
- break;
- }
- }
- }
-
- private void attemptRetrieveFrame() throws TimeoutException, InterruptedException {
- AudioFrame frame = player.provide(timeout, TimeUnit.MILLISECONDS);
-
- if (frame != null) {
- if (!format.equals(frame.getFormat())) {
- throw new IllegalStateException("Frame read from the player uses a different format than expected.");
- }
-
- addFrame(frame.getData());
- } else if (!provideSilence) {
- Thread.sleep(10);
- }
- }
-
- private void addFrame(byte[] data) {
- current = ByteBuffer.wrap(data);
- }
-
- private void notifyTrackStuck() {
- if (player instanceof TrackStateListener) {
- ((TrackStateListener) player).onTrackStuck(player.getPlayingTrack(), timeout);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/OpusAudioDataFormat.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/OpusAudioDataFormat.java
deleted file mode 100644
index 96cef2e..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/OpusAudioDataFormat.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format;
-
-import com.sedmelluq.discord.lavaplayer.format.transcoder.AudioChunkDecoder;
-import com.sedmelluq.discord.lavaplayer.format.transcoder.AudioChunkEncoder;
-import com.sedmelluq.discord.lavaplayer.format.transcoder.OpusChunkDecoder;
-import com.sedmelluq.discord.lavaplayer.format.transcoder.OpusChunkEncoder;
-import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
-
-/**
- * An {@link AudioDataFormat} for OPUS.
- */
-public class OpusAudioDataFormat extends AudioDataFormat {
- public static final String CODEC_NAME = "OPUS";
-
- private static final byte[] SILENT_OPUS_FRAME = new byte[]{(byte) 0xFC, (byte) 0xFF, (byte) 0xFE};
-
- private final int maximumChunkSize;
- private final int expectedChunkSize;
-
- /**
- * @param channelCount Number of channels.
- * @param sampleRate Sample rate (frequency).
- * @param chunkSampleCount Number of samples in one chunk.
- */
- public OpusAudioDataFormat(int channelCount, int sampleRate, int chunkSampleCount) {
- super(channelCount, sampleRate, chunkSampleCount);
-
- this.maximumChunkSize = 32 + 1536 * chunkSampleCount / 960;
- this.expectedChunkSize = 32 + 512 * chunkSampleCount / 960;
- }
-
- @Override
- public String codecName() {
- return CODEC_NAME;
- }
-
- @Override
- public byte[] silenceBytes() {
- return SILENT_OPUS_FRAME;
- }
-
- @Override
- public int expectedChunkSize() {
- return expectedChunkSize;
- }
-
- @Override
- public int maximumChunkSize() {
- return maximumChunkSize;
- }
-
- @Override
- public AudioChunkDecoder createDecoder() {
- return new OpusChunkDecoder(this);
- }
-
- @Override
- public AudioChunkEncoder createEncoder(AudioConfiguration configuration) {
- return new OpusChunkEncoder(configuration, this);
- }
-
- @Override
- public boolean equals(Object o) {
- return this == o || o != null && getClass() == o.getClass() && super.equals(o);
- }
-
- @Override
- public int hashCode() {
- return super.hashCode();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/Pcm16AudioDataFormat.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/Pcm16AudioDataFormat.java
deleted file mode 100644
index 4171456..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/Pcm16AudioDataFormat.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format;
-
-import com.sedmelluq.discord.lavaplayer.format.transcoder.AudioChunkDecoder;
-import com.sedmelluq.discord.lavaplayer.format.transcoder.AudioChunkEncoder;
-import com.sedmelluq.discord.lavaplayer.format.transcoder.PcmChunkDecoder;
-import com.sedmelluq.discord.lavaplayer.format.transcoder.PcmChunkEncoder;
-import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
-
-/**
- * An {@link AudioDataFormat} for 16-bit signed PCM.
- */
-public class Pcm16AudioDataFormat extends AudioDataFormat {
- public static final String CODEC_NAME_BE = "PCM_S16_BE";
- public static final String CODEC_NAME_LE = "PCM_S16_LE";
-
- private final boolean bigEndian;
- private final byte[] silenceBytes;
-
- /**
- * @param channelCount Number of channels.
- * @param sampleRate Sample rate (frequency).
- * @param chunkSampleCount Number of samples in one chunk.
- * @param bigEndian Whether the samples are in big-endian format (as opposed to little-endian).
- */
- public Pcm16AudioDataFormat(int channelCount, int sampleRate, int chunkSampleCount, boolean bigEndian) {
- super(channelCount, sampleRate, chunkSampleCount);
- this.bigEndian = bigEndian;
- this.silenceBytes = new byte[channelCount * chunkSampleCount * 2];
- }
-
- @Override
- public String codecName() {
- return CODEC_NAME_BE;
- }
-
- @Override
- public byte[] silenceBytes() {
- return silenceBytes;
- }
-
- @Override
- public int expectedChunkSize() {
- return silenceBytes.length;
- }
-
- @Override
- public int maximumChunkSize() {
- return silenceBytes.length;
- }
-
- @Override
- public AudioChunkDecoder createDecoder() {
- return new PcmChunkDecoder(this, bigEndian);
- }
-
- @Override
- public AudioChunkEncoder createEncoder(AudioConfiguration configuration) {
- return new PcmChunkEncoder(this, bigEndian);
- }
-
- @Override
- public boolean equals(Object o) {
- return this == o || o != null && getClass() == o.getClass() && super.equals(o);
- }
-
- @Override
- public int hashCode() {
- return super.hashCode();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/StandardAudioDataFormats.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/StandardAudioDataFormats.java
deleted file mode 100644
index 4ea4c36..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/StandardAudioDataFormats.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format;
-
-/**
- * Standard output formats compatible with Discord.
- */
-public class StandardAudioDataFormats {
- /**
- * The Opus configuration used by both Discord and YouTube. Default.
- */
- public static final AudioDataFormat DISCORD_OPUS = new OpusAudioDataFormat(2, 48000, 960);
- /**
- * Signed 16-bit big-endian PCM format matching the parameters used by Discord.
- */
- public static final AudioDataFormat DISCORD_PCM_S16_BE = new Pcm16AudioDataFormat(2, 48000, 960, true);
- /**
- * Signed 16-bit little-endian PCM format matching the parameters used by Discord.
- */
- public static final AudioDataFormat DISCORD_PCM_S16_LE = new Pcm16AudioDataFormat(2, 48000, 960, false);
- /**
- * Signed 16-bit big-endian PCM format matching with the most common sample rate.
- */
- public static final AudioDataFormat COMMON_PCM_S16_BE = new Pcm16AudioDataFormat(2, 44100, 960, true);
- /**
- * Signed 16-bit big-endian PCM format matching with the most common sample rate.
- */
- public static final AudioDataFormat COMMON_PCM_S16_LE = new Pcm16AudioDataFormat(2, 44100, 960, false);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/AudioChunkDecoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/AudioChunkDecoder.java
deleted file mode 100644
index c74aac4..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/AudioChunkDecoder.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format.transcoder;
-
-import java.nio.ShortBuffer;
-
-/**
- * Decodes one chunk of audio into internal PCM format.
- */
-public interface AudioChunkDecoder {
- /**
- * @param encoded Encoded bytes
- * @param buffer Output buffer for the PCM data
- */
- void decode(byte[] encoded, ShortBuffer buffer);
-
- /**
- * Frees up all held resources.
- */
- void close();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/AudioChunkEncoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/AudioChunkEncoder.java
deleted file mode 100644
index ba6f0b6..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/AudioChunkEncoder.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format.transcoder;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-/**
- * Encodes one chunk of audio from internal PCM format.
- */
-public interface AudioChunkEncoder {
- /**
- * @param buffer Input buffer containing the PCM samples.
- * @return Encoded bytes
- */
- byte[] encode(ShortBuffer buffer);
-
- /**
- * @param buffer Input buffer containing the PCM samples.
- * @param out Output buffer to store the encoded bytes in
- */
- void encode(ShortBuffer buffer, ByteBuffer out);
-
- /**
- * Frees up all held resources.
- */
- void close();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/OpusChunkDecoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/OpusChunkDecoder.java
deleted file mode 100644
index 88cf72a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/OpusChunkDecoder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format.transcoder;
-
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.natives.opus.OpusDecoder;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-/**
- * Audio chunk decoder for Opus codec.
- */
-public class OpusChunkDecoder implements AudioChunkDecoder {
- private final OpusDecoder decoder;
- private final ByteBuffer encodedBuffer;
-
- /**
- * @param format Source audio format.
- */
- public OpusChunkDecoder(AudioDataFormat format) {
- encodedBuffer = ByteBuffer.allocateDirect(4096);
- decoder = new OpusDecoder(format.sampleRate, format.channelCount);
- }
-
- @Override
- public void decode(byte[] encoded, ShortBuffer buffer) {
- encodedBuffer.clear();
- encodedBuffer.put(encoded);
- encodedBuffer.flip();
-
- buffer.clear();
- decoder.decode(encodedBuffer, buffer);
- }
-
- @Override
- public void close() {
- decoder.close();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/OpusChunkEncoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/OpusChunkEncoder.java
deleted file mode 100644
index c85f31f..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/OpusChunkEncoder.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format.transcoder;
-
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.natives.opus.OpusEncoder;
-import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-/**
- * Audio chunk encoder for Opus codec.
- */
-public class OpusChunkEncoder implements AudioChunkEncoder {
- private final AudioDataFormat format;
- private final OpusEncoder encoder;
- private final ByteBuffer encodedBuffer;
-
- /**
- * @param configuration Audio configuration used for configuring the encoder
- * @param format Target audio format.
- */
- public OpusChunkEncoder(AudioConfiguration configuration, AudioDataFormat format) {
- encodedBuffer = ByteBuffer.allocateDirect(format.maximumChunkSize());
- encoder = new OpusEncoder(format.sampleRate, format.channelCount, configuration.getOpusEncodingQuality());
- this.format = format;
- }
-
- @Override
- public byte[] encode(ShortBuffer buffer) {
- encoder.encode(buffer, format.chunkSampleCount, encodedBuffer);
-
- byte[] bytes = new byte[encodedBuffer.remaining()];
- encodedBuffer.get(bytes);
- return bytes;
- }
-
- @Override
- public void encode(ShortBuffer buffer, ByteBuffer outBuffer) {
- if (outBuffer.isDirect()) {
- encoder.encode(buffer, format.chunkSampleCount, outBuffer);
- } else {
- encoder.encode(buffer, format.chunkSampleCount, encodedBuffer);
-
- int length = encodedBuffer.remaining();
- encodedBuffer.get(outBuffer.array(), 0, length);
-
- outBuffer.position(0);
- outBuffer.limit(length);
- }
- }
-
- @Override
- public void close() {
- encoder.close();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/PcmChunkDecoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/PcmChunkDecoder.java
deleted file mode 100644
index f712c31..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/PcmChunkDecoder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format.transcoder;
-
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.ShortBuffer;
-
-/**
- * Audio chunk decoder for PCM data.
- */
-public class PcmChunkDecoder implements AudioChunkDecoder {
- private final ByteBuffer encodedAsByte;
- private final ShortBuffer encodedAsShort;
-
- /**
- * @param format Source audio format.
- * @param bigEndian Whether the samples are in big-endian format (as opposed to little-endian).
- */
- public PcmChunkDecoder(AudioDataFormat format, boolean bigEndian) {
- this.encodedAsByte = ByteBuffer.allocate(format.maximumChunkSize());
-
- if (!bigEndian) {
- encodedAsByte.order(ByteOrder.LITTLE_ENDIAN);
- }
-
- this.encodedAsShort = encodedAsByte.asShortBuffer();
- }
-
- @Override
- public void decode(byte[] encoded, ShortBuffer buffer) {
- buffer.clear();
-
- encodedAsByte.clear();
- encodedAsByte.put(encoded);
-
- encodedAsShort.clear();
- encodedAsShort.limit(encodedAsByte.position() / 2);
-
- buffer.put(encodedAsShort);
- buffer.rewind();
- }
-
- @Override
- public void close() {
- // Nothing to close here
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/PcmChunkEncoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/PcmChunkEncoder.java
deleted file mode 100644
index d636339..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/format/transcoder/PcmChunkEncoder.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.format.transcoder;
-
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.ShortBuffer;
-
-/**
- * Audio chunk encoder for PCM data.
- */
-public class PcmChunkEncoder implements AudioChunkEncoder {
- private final ByteBuffer encoded;
- private final ShortBuffer encodedAsShort;
-
- /**
- * @param format Target audio format.
- * @param bigEndian Whether the samples are in big-endian format (as opposed to little-endian).
- */
- public PcmChunkEncoder(AudioDataFormat format, boolean bigEndian) {
- this.encoded = ByteBuffer.allocate(format.maximumChunkSize());
-
- if (!bigEndian) {
- encoded.order(ByteOrder.LITTLE_ENDIAN);
- }
-
- this.encodedAsShort = encoded.asShortBuffer();
- }
-
- @Override
- public byte[] encode(ShortBuffer buffer) {
- buffer.mark();
-
- encodedAsShort.clear();
- encodedAsShort.put(buffer);
-
- encoded.clear();
- encoded.limit(encodedAsShort.position() * 2);
-
- byte[] encodedBytes = new byte[encoded.remaining()];
- encoded.get(encodedBytes);
-
- buffer.reset();
- return encodedBytes;
- }
-
- @Override
- public void encode(ShortBuffer buffer, ByteBuffer out) {
- buffer.mark();
-
- encodedAsShort.clear();
- encodedAsShort.put(buffer);
-
- out.put(encoded.array(), 0, encodedAsShort.position() * 2);
- out.flip();
-
- buffer.reset();
- }
-
- @Override
- public void close() {
- // Nothing to close here
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/ConnectorNativeLibLoader.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/ConnectorNativeLibLoader.java
deleted file mode 100644
index 28936e5..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/ConnectorNativeLibLoader.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives;
-
-import com.sedmelluq.lava.common.natives.NativeLibraryLoader;
-import com.sedmelluq.lava.common.natives.architecture.DefaultOperatingSystemTypes;
-
-/**
- * Methods for loading the connector library.
- */
-public class ConnectorNativeLibLoader {
- private static final NativeLibraryLoader[] loaders = new NativeLibraryLoader[]{
- NativeLibraryLoader.createFiltered(ConnectorNativeLibLoader.class, "libmpg123-0",
- it -> it.osType == DefaultOperatingSystemTypes.WINDOWS),
- NativeLibraryLoader.create(ConnectorNativeLibLoader.class, "connector")
- };
-
- /**
- * Loads the connector library with its dependencies for the current system
- */
- public static void loadConnectorLibrary() {
- for (NativeLibraryLoader loader : loaders) {
- loader.load();
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/aac/AacDecoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/aac/AacDecoder.java
deleted file mode 100644
index b90220e..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/aac/AacDecoder.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.aac;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.BitStreamWriter;
-import com.sedmelluq.discord.lavaplayer.tools.io.ByteBufferOutputStream;
-import com.sedmelluq.lava.common.natives.NativeResourceHolder;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.ShortBuffer;
-
-/**
- * A wrapper around the native methods of AacDecoder, which uses fdk-aac native library. Supports data with no transport
- * layer. The only AAC type verified to work with this is AAC_LC.
- */
-public class AacDecoder extends NativeResourceHolder {
- private static final int TRANSPORT_NONE = 0;
-
- private static final ShortBuffer NO_BUFFER = ByteBuffer.allocateDirect(0).asShortBuffer();
-
- private static final int ERROR_NOT_ENOUGH_BITS = 4098;
- private static final int ERROR_OUTPUT_BUFFER_TOO_SMALL = 8204;
-
- public static final int AAC_LC = 2;
-
- private final AacDecoderLibrary library;
- private final long instance;
-
- /**
- * Create a new decoder.
- */
- public AacDecoder() {
- library = AacDecoderLibrary.getInstance();
- instance = library.create(TRANSPORT_NONE);
- }
-
- /**
- * Configure the decoder. Must be called before the first decoding.
- *
- * @param objectType Audio object type as defined for Audio Specific Config: https://wiki.multimedia.cx/index.php?title=MPEG-4_Audio
- * @param frequency Frequency of samples in Hz
- * @param channels Number of channels.
- * @throws IllegalStateException If the decoder has already been closed.
- */
- public void configure(int objectType, int frequency, int channels) {
- long buffer = encodeConfiguration(objectType, frequency, channels);
-
- configureRaw(buffer);
- }
-
- /**
- * Configure the decoder. Must be called before the first decoding.
- *
- * @param config Raw ASC format configuration
- * @throws IllegalStateException If the decoder has already been closed.
- */
- public void configure(byte[] config) {
- if (config.length > 8) {
- throw new IllegalArgumentException("Cannot process a header larger than size 8");
- }
-
- long buffer = 0;
- for (int i = 0; i < config.length; i++) {
- buffer |= config[i] << (i << 3);
- }
-
- configureRaw(buffer);
- }
-
- private synchronized void configureRaw(long buffer) {
- checkNotReleased();
-
- if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) {
- buffer = Long.reverseBytes(buffer);
- }
-
- int error;
- if ((error = library.configure(instance, buffer)) != 0) {
- throw new IllegalStateException("Configuring failed with error " + error);
- }
- }
-
- private static long encodeConfiguration(int objectType, int frequency, int channels) {
- try {
- ByteBuffer buffer = ByteBuffer.allocate(8);
- buffer.order(ByteOrder.nativeOrder());
- BitStreamWriter bitWriter = new BitStreamWriter(new ByteBufferOutputStream(buffer));
-
- bitWriter.write(objectType, 5);
-
- int frequencyIndex = getFrequencyIndex(frequency);
- bitWriter.write(frequencyIndex, 4);
-
- if (frequencyIndex == 15) {
- bitWriter.write(frequency, 24);
- }
-
- bitWriter.write(channels, 4);
- bitWriter.flush();
-
- buffer.clear();
-
- return buffer.getLong();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private static int getFrequencyIndex(int frequency) {
- switch (frequency) {
- case 96000:
- return 0;
- case 88200:
- return 1;
- case 64000:
- return 2;
- case 48000:
- return 3;
- case 44100:
- return 4;
- case 32000:
- return 5;
- case 24000:
- return 6;
- case 22050:
- return 7;
- case 16000:
- return 8;
- case 12000:
- return 9;
- case 11025:
- return 10;
- case 8000:
- return 11;
- case 7350:
- return 12;
- default:
- return 15;
- }
- }
-
- /**
- * Fill the internal decoding buffer with the bytes from the buffer. May consume less bytes than the buffer provides.
- *
- * @param buffer DirectBuffer which contains the bytes to be added. Position and limit are respected and position is
- * updated as a result of this operation.
- * @return The number of bytes consumed from the provided buffer.
- * @throws IllegalArgumentException If the buffer is not a DirectBuffer.
- * @throws IllegalStateException If the decoder has already been closed.
- */
- public synchronized int fill(ByteBuffer buffer) {
- checkNotReleased();
-
- if (!buffer.isDirect()) {
- throw new IllegalArgumentException("Buffer argument must be a direct buffer.");
- }
-
- int readBytes = library.fill(instance, buffer, buffer.position(), buffer.limit());
- if (readBytes < 0) {
- throw new IllegalStateException("Filling decoder failed with error " + (-readBytes));
- }
-
- buffer.position(buffer.position() + readBytes);
- return readBytes;
- }
-
- /**
- * Decode a frame of audio into the given buffer.
- *
- * @param buffer DirectBuffer of signed PCM samples where the decoded frame will be stored. The buffer size must be at
- * least of size frameSize * channels * 2. Buffer position and limit are ignored and not
- * updated.
- * @param flush Whether all the buffered data should be flushed, set to true if no more input is expected.
- * @return True if the frame buffer was filled, false if there was not enough input for decoding a full frame.
- * @throws IllegalArgumentException If the buffer is not a DirectBuffer.
- * @throws IllegalStateException If the decoding library returns an error other than running out of input data.
- * @throws IllegalStateException If the decoder has already been closed.
- */
- public synchronized boolean decode(ShortBuffer buffer, boolean flush) {
- checkNotReleased();
-
- if (!buffer.isDirect()) {
- throw new IllegalArgumentException("Buffer argument must be a direct buffer.");
- }
-
- int result = library.decode(instance, buffer, buffer.capacity(), flush);
- if (result != 0 && result != ERROR_NOT_ENOUGH_BITS) {
- throw new IllegalStateException("Error from decoder " + result);
- }
-
- return result == 0;
- }
-
- /**
- * @return Correct stream info. The values passed to configure method do not account for SBR and PS and detecting
- * these is a part of the decoding process. If there was not enough input for decoding a full frame, null is
- * returned.
- * @throws IllegalStateException If the decoder result produced an unexpected error.
- */
- public synchronized StreamInfo resolveStreamInfo() {
- checkNotReleased();
-
- int result = library.decode(instance, NO_BUFFER, 0, false);
-
- if (result == ERROR_NOT_ENOUGH_BITS) {
- return null;
- } else if (result != ERROR_OUTPUT_BUFFER_TOO_SMALL) {
- throw new IllegalStateException("Expected decoding to halt, got: " + result);
- }
-
- long combinedValue = library.getStreamInfo(instance);
- if (combinedValue == 0) {
- throw new IllegalStateException("Native library failed to detect stream info.");
- }
-
- return new StreamInfo(
- (int) (combinedValue >>> 32L),
- (int) (combinedValue & 0xFFFF),
- (int) ((combinedValue >>> 16L) & 0xFFFF)
- );
- }
-
- @Override
- protected void freeResources() {
- library.destroy(instance);
- }
-
- /**
- * AAC stream information.
- */
- public static class StreamInfo {
- /**
- * Sample rate (adjusted to SBR) of the current stream.
- */
- public final int sampleRate;
- /**
- * Channel count (adjusted to PS) of the current stream.
- */
- public final int channels;
- /**
- * Number of samples per channel per frame.
- */
- public final int frameSize;
-
- /**
- * @param sampleRate Sample rate (adjusted to SBR) of the current stream.
- * @param channels Channel count (adjusted to PS) of the current stream.
- * @param frameSize Number of samples per channel per frame.
- */
- public StreamInfo(int sampleRate, int channels, int frameSize) {
- this.sampleRate = sampleRate;
- this.channels = channels;
- this.frameSize = frameSize;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/aac/AacDecoderLibrary.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/aac/AacDecoderLibrary.java
deleted file mode 100644
index 2b9e76d..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/aac/AacDecoderLibrary.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.aac;
-
-import com.sedmelluq.discord.lavaplayer.natives.ConnectorNativeLibLoader;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-class AacDecoderLibrary {
- private AacDecoderLibrary() {
-
- }
-
- static AacDecoderLibrary getInstance() {
- ConnectorNativeLibLoader.loadConnectorLibrary();
- return new AacDecoderLibrary();
- }
-
- native long create(int transportType);
-
- native void destroy(long instance);
-
- native int configure(long instance, long bufferData);
-
- native int fill(long instance, ByteBuffer directBuffer, int offset, int length);
-
- native int decode(long instance, ShortBuffer directBuffer, int length, boolean flush);
-
- native long getStreamInfo(long instance);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/mp3/Mp3Decoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/mp3/Mp3Decoder.java
deleted file mode 100644
index 7195c80..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/mp3/Mp3Decoder.java
+++ /dev/null
@@ -1,257 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.mp3;
-
-import com.sedmelluq.lava.common.natives.NativeResourceHolder;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-/**
- * A wrapper around the native methods of OpusDecoderLibrary.
- */
-public class Mp3Decoder extends NativeResourceHolder {
- public static final long MPEG1_SAMPLES_PER_FRAME = 1152;
- public static final long MPEG2_SAMPLES_PER_FRAME = 576;
- public static final int HEADER_SIZE = 4;
-
- private static final int ERROR_NEED_MORE = -10;
- private static final int ERROR_NEW_FORMAT = -11;
-
- private final Mp3DecoderLibrary library;
- private final long instance;
-
- /**
- * Create a new instance of mp3 decoder
- */
- public Mp3Decoder() {
- library = Mp3DecoderLibrary.getInstance();
- instance = library.create();
-
- if (instance == 0) {
- throw new IllegalStateException("Failed to create a decoder instance");
- }
- }
-
- /**
- * Encode the input buffer to output.
- *
- * @param directInput Input byte buffer
- * @param directOutput Output sample buffer
- * @return Number of samples written to the output
- */
- public int decode(ByteBuffer directInput, ShortBuffer directOutput) {
- checkNotReleased();
-
- if (!directInput.isDirect() || !directOutput.isDirect()) {
- throw new IllegalArgumentException("Arguments must be direct buffers.");
- }
-
- int result = library.decode(instance, directInput, directInput.remaining(), directOutput, directOutput.remaining() * 2);
-
- while (result == ERROR_NEW_FORMAT) {
- result = library.decode(instance, directInput, 0, directOutput, directOutput.remaining() * 2);
- }
-
- if (result == ERROR_NEED_MORE) {
- result = 0;
- } else if (result < 0) {
- throw new IllegalStateException("Decoding failed with error " + result);
- }
-
- directOutput.position(result / 2);
- directOutput.flip();
-
- return result / 2;
- }
-
- @Override
- protected void freeResources() {
- library.destroy(instance);
- }
-
- private static int getFrameBitRate(byte[] buffer, int offset) {
- return isMpegVersionOne(buffer, offset) ? getFrameBitRateV1(buffer, offset) : getFrameBitRateV2(buffer, offset);
- }
-
- private static int getFrameBitRateV1(byte[] buffer, int offset) {
- switch ((buffer[offset + 2] & 0xF0) >>> 4) {
- case 1:
- return 32000;
- case 2:
- return 40000;
- case 3:
- return 48000;
- case 4:
- return 56000;
- case 5:
- return 64000;
- case 6:
- return 80000;
- case 7:
- return 96000;
- case 8:
- return 112000;
- case 9:
- return 128000;
- case 10:
- return 160000;
- case 11:
- return 192000;
- case 12:
- return 224000;
- case 13:
- return 256000;
- case 14:
- return 320000;
- default:
- throw new IllegalArgumentException("Not valid bitrate");
- }
- }
-
- private static int getFrameBitRateV2(byte[] buffer, int offset) {
- switch ((buffer[offset + 2] & 0xF0) >>> 4) {
- case 1:
- return 8000;
- case 2:
- return 16000;
- case 3:
- return 24000;
- case 4:
- return 32000;
- case 5:
- return 40000;
- case 6:
- return 48000;
- case 7:
- return 56000;
- case 8:
- return 64000;
- case 9:
- return 80000;
- case 10:
- return 96000;
- case 11:
- return 112000;
- case 12:
- return 128000;
- case 13:
- return 140000;
- case 14:
- return 160000;
- default:
- throw new IllegalArgumentException("Not valid bitrate");
- }
- }
-
- private static int calculateFrameSize(boolean isVersionOne, int bitRate, int sampleRate, boolean hasPadding) {
- return (isVersionOne ? 144 : 72) * bitRate / sampleRate + (hasPadding ? 1 : 0);
- }
-
- /**
- * Get the sample rate for the current frame
- *
- * @param buffer Buffer which contains the frame header
- * @param offset Offset to the frame header
- * @return Sample rate
- */
- public static int getFrameSampleRate(byte[] buffer, int offset) {
- return isMpegVersionOne(buffer, offset) ? getFrameSampleRateV1(buffer, offset) : getFrameSampleRateV2(buffer, offset);
- }
-
- /**
- * Get the number of channels in the current frame
- *
- * @param buffer Buffer which contains the frame header
- * @param offset Offset to the frame header
- * @return Number of channels
- */
- public static int getFrameChannelCount(byte[] buffer, int offset) {
- return (buffer[offset + 3] & 0xC0) == 0xC0 ? 1 : 2;
- }
-
- private static int getFrameSampleRateV1(byte[] buffer, int offset) {
- switch ((buffer[offset + 2] & 0x0C) >>> 2) {
- case 0:
- return 44100;
- case 1:
- return 48000;
- case 2:
- return 32000;
- default:
- throw new IllegalArgumentException("Not valid sample rate");
- }
- }
-
- private static int getFrameSampleRateV2(byte[] buffer, int offset) {
- switch ((buffer[offset + 2] & 0x0C) >>> 2) {
- case 0:
- return 22050;
- case 1:
- return 24000;
- case 2:
- return 16000;
- default:
- throw new IllegalArgumentException("Not valid sample rate");
- }
- }
-
- /**
- * Get the frame size of the specified 4 bytes
- *
- * @param buffer Buffer which contains the frame header
- * @param offset Offset to the frame header
- * @return Frame size, or zero if not a valid frame header
- */
- public static int getFrameSize(byte[] buffer, int offset) {
- int first = buffer[offset] & 0xFF;
- int second = buffer[offset + 1] & 0xFF;
- int third = buffer[offset + 2] & 0xFF;
-
- boolean invalid = (first != 0xFF || (second & 0xE0) != 0xE0) // Frame sync does not match
- || (second & 0x10) != 0x10 // Not MPEG-1 nor MPEG-2, not dealing with this stuff
- || (second & 0x06) != 0x02 // Not Layer III, not dealing with this stuff
- || (third & 0xF0) == 0x00 // No defined bitrate
- || (third & 0xF0) == 0xF0 // Invalid bitrate
- || (third & 0x0C) == 0x0C; // Invalid sampling rate
-
- if (invalid) {
- return 0;
- }
-
- int bitRate = getFrameBitRate(buffer, offset);
- int sampleRate = getFrameSampleRate(buffer, offset);
- boolean hasPadding = (third & 0x02) != 0;
-
- return calculateFrameSize(isMpegVersionOne(buffer, offset), bitRate, sampleRate, hasPadding);
- }
-
- /**
- * Get the average frame size based on this frame
- *
- * @param buffer Buffer which contains the frame header
- * @param offset Offset to the frame header
- * @return Average frame size, assuming CBR
- */
- public static double getAverageFrameSize(byte[] buffer, int offset) {
- int bitRate = getFrameBitRate(buffer, offset);
- int sampleRate = getFrameSampleRate(buffer, offset);
-
- return (isMpegVersionOne(buffer, offset) ? 144.0 : 72.0) * bitRate / sampleRate;
- }
-
- /**
- * @param buffer Buffer which contains the frame header
- * @param offset Offset to the frame header
- * @return Number of samples per frame.
- */
- public static long getSamplesPerFrame(byte[] buffer, int offset) {
- return isMpegVersionOne(buffer, offset) ? MPEG1_SAMPLES_PER_FRAME : MPEG2_SAMPLES_PER_FRAME;
- }
-
- private static boolean isMpegVersionOne(byte[] buffer, int offset) {
- return (buffer[offset + 1] & 0x08) == 0x08;
- }
-
- public static int getMaximumFrameSize() {
- return calculateFrameSize(true, 320000, 32000, true);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/mp3/Mp3DecoderLibrary.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/mp3/Mp3DecoderLibrary.java
deleted file mode 100644
index 91e1dbe..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/mp3/Mp3DecoderLibrary.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.mp3;
-
-import com.sedmelluq.discord.lavaplayer.natives.ConnectorNativeLibLoader;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-class Mp3DecoderLibrary {
- private Mp3DecoderLibrary() {
-
- }
-
- static Mp3DecoderLibrary getInstance() {
- ConnectorNativeLibLoader.loadConnectorLibrary();
- return new Mp3DecoderLibrary();
- }
-
- native long create();
-
- native void destroy(long instance);
-
- native int decode(long instance, ByteBuffer directInput, int inputLength, ShortBuffer directOutput, int outputLengthInBytes);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusDecoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusDecoder.java
deleted file mode 100644
index 8614cab..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusDecoder.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.opus;
-
-import com.sedmelluq.lava.common.natives.NativeResourceHolder;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-/**
- * A wrapper around the native methods of OpusDecoderLibrary.
- */
-public class OpusDecoder extends NativeResourceHolder {
- private final OpusDecoderLibrary library;
- private final long instance;
- private final int channels;
-
- /**
- * @param sampleRate Input sample rate
- * @param channels Channel count
- */
- public OpusDecoder(int sampleRate, int channels) {
- library = OpusDecoderLibrary.getInstance();
- instance = library.create(sampleRate, channels);
- this.channels = channels;
-
- if (instance == 0) {
- throw new IllegalStateException("Failed to create a decoder instance with sample rate " +
- sampleRate + " and channel count " + channels);
- }
- }
-
- /**
- * Encode the input buffer to output.
- *
- * @param directInput Input byte buffer
- * @param directOutput Output sample buffer
- * @return Number of bytes written to the output
- */
- public int decode(ByteBuffer directInput, ShortBuffer directOutput) {
- checkNotReleased();
-
- if (!directInput.isDirect() || !directOutput.isDirect()) {
- throw new IllegalArgumentException("Arguments must be direct buffers.");
- }
-
- directOutput.clear();
- int result = library.decode(instance, directInput, directInput.remaining(), directOutput, directOutput.remaining() / channels);
-
- if (result < 0) {
- throw new IllegalStateException("Decoding failed with error " + result);
- }
-
- directOutput.position(result * channels);
- directOutput.flip();
-
- return result;
- }
-
- @Override
- protected void freeResources() {
- library.destroy(instance);
- }
-
- /**
- * Get the frame size from an opus packet
- *
- * @param sampleRate The sample rate of the packet
- * @param buffer The buffer containing the packet
- * @param offset Packet offset in the buffer
- * @param length Packet length in the buffer
- * @return Frame size
- */
- public static int getPacketFrameSize(int sampleRate, byte[] buffer, int offset, int length) {
- if (length < 1) {
- return 0;
- }
-
- int frameCount = getPacketFrameCount(buffer, offset, length);
- if (frameCount < 0) {
- return 0;
- }
-
- int samples = frameCount * getPacketSamplesPerFrame(sampleRate, buffer[offset]);
- if (samples * 25 > sampleRate * 3) {
- return 0;
- }
-
- return samples;
- }
-
- private static int getPacketFrameCount(byte[] buffer, int offset, int length) {
- switch (buffer[offset] & 0x03) {
- case 0:
- return 1;
- case 3:
- return length < 2 ? -1 : buffer[offset + 1] & 0x3F;
- default:
- return 2;
- }
- }
-
- private static int getPacketSamplesPerFrame(int frequency, int firstByte) {
- int shiftBits = (firstByte >> 3) & 0x03;
-
- if ((firstByte & 0x80) != 0) {
- return (frequency << shiftBits) / 400;
- } else if ((firstByte & 0x60) == 0x60) {
- return (firstByte & 0x08) != 0 ? frequency / 50 : frequency / 100;
- } else if (shiftBits == 3) {
- return frequency * 60 / 1000;
- } else {
- return (frequency << shiftBits) / 100;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusDecoderLibrary.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusDecoderLibrary.java
deleted file mode 100644
index 93a3a9e..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusDecoderLibrary.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.opus;
-
-import com.sedmelluq.discord.lavaplayer.natives.ConnectorNativeLibLoader;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-class OpusDecoderLibrary {
- private OpusDecoderLibrary() {
-
- }
-
- static OpusDecoderLibrary getInstance() {
- ConnectorNativeLibLoader.loadConnectorLibrary();
- return new OpusDecoderLibrary();
- }
-
- native long create(int sampleRate, int channels);
-
- native void destroy(long instance);
-
- native int decode(long instance, ByteBuffer directInput, int inputSize, ShortBuffer directOutput, int frameSize);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusEncoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusEncoder.java
deleted file mode 100644
index e4ae12e..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusEncoder.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.opus;
-
-import com.sedmelluq.lava.common.natives.NativeResourceHolder;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-/**
- * A wrapper around the native methods of OpusEncoderLibrary.
- */
-public class OpusEncoder extends NativeResourceHolder {
- private final OpusEncoderLibrary library;
- private final long instance;
-
- /**
- * @param sampleRate Input sample rate
- * @param channels Channel count
- * @param quality Encoding quality (0-10)
- */
- public OpusEncoder(int sampleRate, int channels, int quality) {
- library = OpusEncoderLibrary.getInstance();
- instance = library.create(sampleRate, channels, OpusEncoderLibrary.APPLICATION_AUDIO, quality);
-
- if (instance == 0) {
- throw new IllegalStateException("Failed to create an encoder instance");
- }
- }
-
- /**
- * Encode the input buffer to output.
- *
- * @param directInput Input sample buffer
- * @param frameSize Number of samples per channel
- * @param directOutput Output byte buffer
- * @return Number of bytes written to the output
- */
- public int encode(ShortBuffer directInput, int frameSize, ByteBuffer directOutput) {
- checkNotReleased();
-
- if (!directInput.isDirect() || !directOutput.isDirect()) {
- throw new IllegalArgumentException("Arguments must be direct buffers.");
- }
-
- directOutput.clear();
- int result = library.encode(instance, directInput, frameSize, directOutput, directOutput.capacity());
-
- if (result < 0) {
- throw new IllegalStateException("Encoding failed with error " + result);
- }
-
- directOutput.position(result);
- directOutput.flip();
-
- return result;
- }
-
- @Override
- protected void freeResources() {
- library.destroy(instance);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusEncoderLibrary.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusEncoderLibrary.java
deleted file mode 100644
index b19a47f..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/opus/OpusEncoderLibrary.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.opus;
-
-import com.sedmelluq.discord.lavaplayer.natives.ConnectorNativeLibLoader;
-
-import java.nio.ByteBuffer;
-import java.nio.ShortBuffer;
-
-class OpusEncoderLibrary {
- static final int APPLICATION_AUDIO = 2049;
-
- private OpusEncoderLibrary() {
-
- }
-
- static OpusEncoderLibrary getInstance() {
- ConnectorNativeLibLoader.loadConnectorLibrary();
- return new OpusEncoderLibrary();
- }
-
- native long create(int sampleRate, int channels, int application, int quality);
-
- native void destroy(long instance);
-
- native int encode(long instance, ShortBuffer directInput, int frameSize, ByteBuffer directOutput, int outputCapacity);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/samplerate/SampleRateConverter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/samplerate/SampleRateConverter.java
deleted file mode 100644
index 13b1133..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/samplerate/SampleRateConverter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.samplerate;
-
-import com.sedmelluq.lava.common.natives.NativeResourceHolder;
-
-/**
- * Sample rate converter backed by libsamplerate
- */
-public class SampleRateConverter extends NativeResourceHolder {
- private final SampleRateLibrary library;
- private final double ratio;
- private final long instance;
-
- /**
- * @param type Resampling type
- * @param channels Number of channels
- * @param sourceRate Source sample rate
- * @param targetRate Target sample rate
- */
- public SampleRateConverter(ResamplingType type, int channels, int sourceRate, int targetRate) {
- ratio = (double) targetRate / (double) sourceRate;
- library = SampleRateLibrary.getInstance();
- instance = library.create(type.ordinal(), channels);
-
- if (instance == 0) {
- throw new IllegalStateException("Could not create an instance of sample rate converter.");
- }
- }
-
- /**
- * Reset the converter, makes sure previous data does not affect next incoming data
- */
- public void reset() {
- checkNotReleased();
-
- library.reset(instance);
- }
-
- /**
- * @param input Input buffer
- * @param inputOffset Offset for input buffer
- * @param inputLength Length for input buffer
- * @param output Output buffer
- * @param outputOffset Offset for output buffer
- * @param outputLength Length for output buffer
- * @param endOfInput If this is the last piece of input
- * @param progress Instance that is filled with the progress
- */
- public void process(float[] input, int inputOffset, int inputLength, float[] output, int outputOffset, int outputLength, boolean endOfInput, Progress progress) {
- checkNotReleased();
-
- int error = library.process(instance, input, inputOffset, inputLength, output, outputOffset, outputLength, endOfInput, ratio, progress.fields);
-
- if (error != 0) {
- throw new RuntimeException("Failed to convert sample rate, error " + error + ".");
- }
- }
-
- @Override
- protected void freeResources() {
- library.destroy(instance);
- }
-
- /**
- * Progress of converting one piece of data
- */
- public static class Progress {
- private final int[] fields = new int[2];
-
- /**
- * @return Number of samples used from the input buffer
- */
- public int getInputUsed() {
- return fields[0];
- }
-
- /**
- * @return Number of samples written to the output buffer
- */
- public int getOutputGenerated() {
- return fields[1];
- }
- }
-
- /**
- * Available resampling types
- */
- public enum ResamplingType {
- SINC_BEST_QUALITY,
- SINC_MEDIUM_QUALITY,
- SINC_FASTEST,
- ZERO_ORDER_HOLD,
- LINEAR
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/samplerate/SampleRateLibrary.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/samplerate/SampleRateLibrary.java
deleted file mode 100644
index ece33ed..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/samplerate/SampleRateLibrary.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.samplerate;
-
-import com.sedmelluq.discord.lavaplayer.natives.ConnectorNativeLibLoader;
-
-class SampleRateLibrary {
- private SampleRateLibrary() {
-
- }
-
- static SampleRateLibrary getInstance() {
- ConnectorNativeLibLoader.loadConnectorLibrary();
- return new SampleRateLibrary();
- }
-
- native long create(int type, int channels);
-
- native void destroy(long instance);
-
- native void reset(long instance);
-
- native int process(long instance, float[] in, int inOffset, int inLength, float[] out, int outOffset, int outLength, boolean endOfInput, double sourceRatio, int[] progress);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/statistics/CpuStatistics.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/statistics/CpuStatistics.java
deleted file mode 100644
index 93043eb..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/statistics/CpuStatistics.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.statistics;
-
-import static com.sedmelluq.discord.lavaplayer.natives.statistics.CpuStatisticsLibrary.Timings.*;
-
-/**
- * Provides information about system CPU usage.
- */
-public class CpuStatistics {
- private static final int TIMINGS_LENGTH = CpuStatisticsLibrary.Timings.class.getEnumConstants().length;
-
- private final CpuStatisticsLibrary library = CpuStatisticsLibrary.getInstance();
-
- /**
- * @return Absolute CPU timings at the current moment
- */
- public Times getSystemTimes() {
- long[] values = new long[TIMINGS_LENGTH];
- library.getSystemTimes(values);
-
- return new Times(
- values[SYSTEM_TOTAL.id()],
- values[SYSTEM_USER.id()],
- values[SYSTEM_KERNEL.id()],
- values[PROCESS_USER.id()],
- values[PROCESS_KERNEL.id()]
- );
- }
-
- /**
- * CPU timings
- */
- public static class Times {
- /**
- * Total amount of CPU time since system start
- */
- public final long systemTotal;
- /**
- * Total amount of CPU time spent in user mode
- */
- public final long systemUser;
- /**
- * Total amount of CPU time spent in kernel mode
- */
- public final long systemKernel;
- /**
- * Total amount of CPU time this process has spent in user mode
- */
- public final long processUser;
- /**
- * Total amount of CPU time this process has spent in kernel mode
- */
- public final long processKernel;
-
- /**
- * @param systemTotal Total amount of CPU time since system start
- * @param systemUser Total amount of CPU time spent in user mode
- * @param systemKernel Total amount of CPU time spent in kernel mode
- * @param processUser Total amount of CPU time this process has spent in user mode
- * @param processKernel Total amount of CPU time this process has spent in kernel mode
- */
- public Times(long systemTotal, long systemUser, long systemKernel, long processUser, long processKernel) {
- this.systemTotal = systemTotal;
- this.systemUser = systemUser;
- this.systemKernel = systemKernel;
- this.processUser = processUser;
- this.processKernel = processKernel;
- }
-
- /**
- * @return The ratio of used CPU time to total CPU time
- */
- public float getSystemUsage() {
- if (systemTotal == 0) {
- return 0.0f;
- } else {
- return (float) (systemUser + systemKernel) / systemTotal;
- }
- }
-
- /**
- * @return The ratio of used CPU time by current process to total CPU time
- */
- public float getProcessUsage() {
- if (systemTotal == 0) {
- return 0.0f;
- } else {
- return (float) (processUser + processKernel) / systemTotal;
- }
- }
- }
-
- /**
- * @param old Older timing values
- * @param current Newer timing values
- * @return Difference between two timings
- */
- public static Times diff(Times old, Times current) {
- return new Times(
- current.systemTotal - old.systemTotal,
- current.systemUser - old.systemUser,
- current.systemKernel - old.systemKernel,
- current.processUser - old.processUser,
- current.processKernel - old.processKernel
- );
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/statistics/CpuStatisticsLibrary.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/statistics/CpuStatisticsLibrary.java
deleted file mode 100644
index d7fe6f1..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/statistics/CpuStatisticsLibrary.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.statistics;
-
-import com.sedmelluq.discord.lavaplayer.natives.ConnectorNativeLibLoader;
-
-class CpuStatisticsLibrary {
- private CpuStatisticsLibrary() {
-
- }
-
- static CpuStatisticsLibrary getInstance() {
- ConnectorNativeLibLoader.loadConnectorLibrary();
- return new CpuStatisticsLibrary();
- }
-
- native void getSystemTimes(long[] timingArray);
-
- enum Timings {
- SYSTEM_TOTAL,
- SYSTEM_USER,
- SYSTEM_KERNEL,
- PROCESS_USER,
- PROCESS_KERNEL;
-
- int id() {
- return ordinal();
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/vorbis/VorbisDecoder.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/vorbis/VorbisDecoder.java
deleted file mode 100644
index 5892da7..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/vorbis/VorbisDecoder.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.vorbis;
-
-import com.sedmelluq.lava.common.natives.NativeResourceHolder;
-
-import java.nio.ByteBuffer;
-
-/**
- * A wrapper around the native methods of AacDecoder, which uses libvorbis native library.
- */
-public class VorbisDecoder extends NativeResourceHolder {
- private final VorbisDecoderLibrary library;
- private final long instance;
- private int channelCount = 0;
-
- /**
- * Create an instance.
- */
- public VorbisDecoder() {
- library = VorbisDecoderLibrary.getInstance();
- instance = library.create();
- }
-
- /**
- * Initialize the decoder by passing in identification and setup header data. See
- * https://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-170001.2.6 for definitions. The comment header is not required as
- * it is not actually used for decoding setup.
- *
- * @param infoBuffer Identification header, including the 'vorbis' string.
- * @param setupBuffer Setup header (also known as codebook header), including the 'vorbis' string.
- */
- public void initialise(ByteBuffer infoBuffer, ByteBuffer setupBuffer) {
- checkNotReleased();
-
- if (!infoBuffer.isDirect() || !setupBuffer.isDirect()) {
- throw new IllegalArgumentException("Buffer argument must be a direct buffer.");
- }
-
- if (!library.initialise(instance, infoBuffer, infoBuffer.position(), infoBuffer.remaining(), setupBuffer,
- setupBuffer.position(), setupBuffer.remaining())) {
-
- throw new IllegalStateException("Could not initialise library.");
- }
-
- channelCount = library.getChannelCount(instance);
- }
-
- /**
- * Get the number of channels, valid only after initialisation.
- *
- * @return Number of channels
- */
- public int getChannelCount() {
- return channelCount;
- }
-
- /**
- * Provide input for the decoder
- *
- * @param buffer Buffer with the input
- */
- public void input(ByteBuffer buffer) {
- checkNotReleased();
-
- if (!buffer.isDirect()) {
- throw new IllegalArgumentException("Buffer argument must be a direct buffer.");
- }
-
- int result = library.input(instance, buffer, buffer.position(), buffer.remaining());
- buffer.position(buffer.position() + buffer.remaining());
-
- if (result != 0) {
- throw new IllegalStateException("Passing input failed with error " + result + ".");
- }
- }
-
- /**
- * Fetch output from the decoder
- *
- * @param channels Channel buffers to fetch the output to
- * @return The number of samples fetched for each channel
- */
- public int output(float[][] channels) {
- checkNotReleased();
-
- if (channels.length != channelCount) {
- throw new IllegalStateException("Invalid channel float buffer length");
- }
-
- int result = library.output(instance, channels, channels[0].length);
- if (result < 0) {
- throw new IllegalStateException("Retrieving output failed");
- }
-
- return result;
- }
-
- @Override
- protected void freeResources() {
- library.destroy(instance);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/vorbis/VorbisDecoderLibrary.java b/src/main/java/com/sedmelluq/discord/lavaplayer/natives/vorbis/VorbisDecoderLibrary.java
deleted file mode 100644
index f3e4ab9..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/natives/vorbis/VorbisDecoderLibrary.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.natives.vorbis;
-
-import com.sedmelluq.discord.lavaplayer.natives.ConnectorNativeLibLoader;
-
-import java.nio.ByteBuffer;
-
-class VorbisDecoderLibrary {
- private VorbisDecoderLibrary() {
-
- }
-
- static VorbisDecoderLibrary getInstance() {
- ConnectorNativeLibLoader.loadConnectorLibrary();
- return new VorbisDecoderLibrary();
- }
-
- native long create();
-
- native void destroy(long instance);
-
- native boolean initialise(long instance, ByteBuffer infoBuffer, int infoOffset, int infoLength,
- ByteBuffer setupBuffer, int setupOffset, int setupLength);
-
- native int getChannelCount(long instance);
-
- native int input(long instance, ByteBuffer directBuffer, int offset, int length);
-
- native int output(long instance, float[][] channels, int length);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioConfiguration.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioConfiguration.java
deleted file mode 100644
index d8ed1c4..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioConfiguration.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player;
-
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.format.StandardAudioDataFormats;
-import com.sedmelluq.discord.lavaplayer.track.playback.AllocatingAudioFrameBuffer;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrameBufferFactory;
-
-/**
- * Configuration for audio processing.
- */
-public class AudioConfiguration {
- public static final int OPUS_QUALITY_MAX = 10;
-
- private volatile ResamplingQuality resamplingQuality;
- private volatile int opusEncodingQuality;
- private volatile AudioDataFormat outputFormat;
- private volatile boolean filterHotSwapEnabled;
- private volatile AudioFrameBufferFactory frameBufferFactory;
-
- /**
- * Create a new configuration with default values.
- */
- public AudioConfiguration() {
- resamplingQuality = ResamplingQuality.LOW;
- opusEncodingQuality = OPUS_QUALITY_MAX;
- outputFormat = StandardAudioDataFormats.DISCORD_OPUS;
- filterHotSwapEnabled = false;
- frameBufferFactory = AllocatingAudioFrameBuffer::new;
- }
-
- public ResamplingQuality getResamplingQuality() {
- return resamplingQuality;
- }
-
- public void setResamplingQuality(ResamplingQuality resamplingQuality) {
- this.resamplingQuality = resamplingQuality;
- }
-
- public int getOpusEncodingQuality() {
- return opusEncodingQuality;
- }
-
- public void setOpusEncodingQuality(int opusEncodingQuality) {
- this.opusEncodingQuality = Math.max(0, Math.min(opusEncodingQuality, OPUS_QUALITY_MAX));
- }
-
- public AudioDataFormat getOutputFormat() {
- return outputFormat;
- }
-
- public void setOutputFormat(AudioDataFormat outputFormat) {
- this.outputFormat = outputFormat;
- }
-
- public boolean isFilterHotSwapEnabled() {
- return filterHotSwapEnabled;
- }
-
- public void setFilterHotSwapEnabled(boolean filterHotSwapEnabled) {
- this.filterHotSwapEnabled = filterHotSwapEnabled;
- }
-
- public AudioFrameBufferFactory getFrameBufferFactory() {
- return frameBufferFactory;
- }
-
- public void setFrameBufferFactory(AudioFrameBufferFactory frameBufferFactory) {
- this.frameBufferFactory = frameBufferFactory;
- }
-
- /**
- * @return A copy of this configuration.
- */
- public AudioConfiguration copy() {
- AudioConfiguration copy = new AudioConfiguration();
- copy.setResamplingQuality(resamplingQuality);
- copy.setOpusEncodingQuality(opusEncodingQuality);
- copy.setOutputFormat(outputFormat);
- copy.setFilterHotSwapEnabled(filterHotSwapEnabled);
- copy.setFrameBufferFactory(frameBufferFactory);
- return copy;
- }
-
- /**
- * Resampling quality levels
- */
- public enum ResamplingQuality {
- HIGH,
- MEDIUM,
- LOW
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioLoadResultHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioLoadResultHandler.java
deleted file mode 100644
index 8ef4c95..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioLoadResultHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player;
-
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-/**
- * Handles the result of loading an item from an audio player manager.
- */
-public interface AudioLoadResultHandler {
- /**
- * Called when the requested item is a track and it was successfully loaded.
- *
- * @param track The loaded track
- */
- void trackLoaded(AudioTrack track);
-
- /**
- * Called when the requested item is a playlist and it was successfully loaded.
- *
- * @param playlist The loaded playlist
- */
- void playlistLoaded(AudioPlaylist playlist);
-
- /**
- * Called when there were no items found by the specified identifier.
- */
- void noMatches();
-
- /**
- * Called when loading an item failed with an exception.
- *
- * @param exception The exception that was thrown
- */
- void loadFailed(FriendlyException exception);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayer.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayer.java
deleted file mode 100644
index 3637a83..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayer.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player;
-
-import com.sedmelluq.discord.lavaplayer.filter.PcmFilterFactory;
-import com.sedmelluq.discord.lavaplayer.player.event.AudioEventListener;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrameProvider;
-
-/**
- * An audio player that is capable of playing audio tracks and provides audio frames from the currently playing track.
- */
-public interface AudioPlayer extends AudioFrameProvider {
- /**
- * @return Currently playing track
- */
- AudioTrack getPlayingTrack();
-
- /**
- * @param track The track to start playing
- */
- void playTrack(AudioTrack track);
-
- /**
- * @param track The track to start playing, passing null will stop the current track and return false
- * @param noInterrupt Whether to only start if nothing else is playing
- * @return True if the track was started
- */
- boolean startTrack(AudioTrack track, boolean noInterrupt);
-
- /**
- * Stop currently playing track.
- */
- void stopTrack();
-
- int getVolume();
-
- void setVolume(int volume);
-
- void setFilterFactory(PcmFilterFactory factory);
-
- void setFrameBufferDuration(Integer duration);
-
- /**
- * @return Whether the player is paused
- */
- boolean isPaused();
-
- /**
- * @param value True to pause, false to resume
- */
- void setPaused(boolean value);
-
- /**
- * Destroy the player and stop playing track.
- */
- void destroy();
-
- /**
- * Add a listener to events from this player.
- *
- * @param listener New listener
- */
- void addListener(AudioEventListener listener);
-
- /**
- * Remove an attached listener using identity comparison.
- *
- * @param listener The listener to remove
- */
- void removeListener(AudioEventListener listener);
-
- /**
- * Check if the player should be "cleaned up" - stopped due to nothing using it, with the given threshold.
- *
- * @param threshold Threshold in milliseconds to use
- */
- void checkCleanup(long threshold);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayerLifecycleManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayerLifecycleManager.java
deleted file mode 100644
index c1bfd1b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayerLifecycleManager.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player;
-
-import com.sedmelluq.discord.lavaplayer.player.event.AudioEvent;
-import com.sedmelluq.discord.lavaplayer.player.event.AudioEventListener;
-import com.sedmelluq.discord.lavaplayer.player.event.TrackEndEvent;
-import com.sedmelluq.discord.lavaplayer.player.event.TrackStartEvent;
-
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * Triggers cleanup checks on all active audio players at a fixed interval.
- */
-public class AudioPlayerLifecycleManager implements Runnable, AudioEventListener {
- private static final long CHECK_INTERVAL = 10000;
-
- private final ConcurrentMap activePlayers;
- private final ScheduledExecutorService scheduler;
- private final AtomicLong cleanupThreshold;
- private final AtomicReference> scheduledTask;
-
- /**
- * @param scheduler Scheduler to use for the cleanup check task
- * @param cleanupThreshold Threshold for player cleanup
- */
- public AudioPlayerLifecycleManager(ScheduledExecutorService scheduler, AtomicLong cleanupThreshold) {
- this.activePlayers = new ConcurrentHashMap<>();
- this.scheduler = scheduler;
- this.cleanupThreshold = cleanupThreshold;
- this.scheduledTask = new AtomicReference<>();
- }
-
- /**
- * Initialise the scheduled task.
- */
- public void initialise() {
- ScheduledFuture task = scheduler.scheduleAtFixedRate(this, CHECK_INTERVAL, CHECK_INTERVAL, TimeUnit.MILLISECONDS);
- if (!scheduledTask.compareAndSet(null, task)) {
- task.cancel(false);
- }
- }
-
- /**
- * Stop the scheduled task.
- */
- public void shutdown() {
- ScheduledFuture task = scheduledTask.getAndSet(null);
- if (task != null) {
- task.cancel(false);
- }
- }
-
- @Override
- public void onEvent(AudioEvent event) {
- if (event instanceof TrackStartEvent) {
- activePlayers.put(event.player, event.player);
- } else if (event instanceof TrackEndEvent) {
- activePlayers.remove(event.player);
- }
- }
-
- @Override
- public void run() {
- for (AudioPlayer player : activePlayers.keySet()) {
- player.checkCleanup(cleanupThreshold.get());
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayerManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayerManager.java
deleted file mode 100644
index 4b75e80..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayerManager.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player;
-
-import com.sedmelluq.discord.lavaplayer.remote.RemoteNodeRegistry;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.io.MessageInput;
-import com.sedmelluq.discord.lavaplayer.tools.io.MessageOutput;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.DecodedTrackHolder;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import java.io.IOException;
-import java.util.concurrent.Future;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-/**
- * Audio player manager which is used for creating audio players and loading tracks and playlists.
- */
-public interface AudioPlayerManager {
-
- /**
- * Shut down the manager. All threads will be stopped, the manager cannot be used any further. All players created
- * with this manager will stop and all source managers registered to this manager will also be shut down.
- *
- * Every thread created by the audio manager is a daemon thread, so calling this is not required for an application
- * to be able to gracefully shut down, however it should be called if the application continues without requiring this
- * manager any longer.
- */
- void shutdown();
-
- /**
- * Configure to use remote nodes for playback. On consecutive calls, the connections with previously used nodes will
- * be severed and all remotely playing tracks will be stopped first.
- *
- * @param nodeAddresses The addresses of the remote nodes
- */
- void useRemoteNodes(String... nodeAddresses);
-
- /**
- * Enable reporting GC pause length statistics to log (warn level with lengths bad for latency, debug level otherwise)
- */
- void enableGcMonitoring();
-
- /**
- * @param sourceManager The source manager to register, which will be used for subsequent loadItem calls
- */
- void registerSourceManager(AudioSourceManager sourceManager);
-
- /**
- * Shortcut for accessing a source manager of a certain class.
- *
- * @param klass The class of the source manager to return.
- * @param The class of the source manager.
- * @return The source manager of the specified class, or null if not registered.
- */
- T source(Class klass);
-
- /**
- * Schedules loading a track or playlist with the specified identifier.
- *
- * @param identifier The identifier that a specific source manager should be able to find the track with.
- * @param resultHandler A handler to process the result of this operation. It can either end by finding a track,
- * finding a playlist, finding nothing or terminating with an exception.
- * @return A future for this operation
- */
- Future loadItem(final String identifier, final AudioLoadResultHandler resultHandler);
-
- /**
- * Schedules loading a track or playlist with the specified identifier with an ordering key so that items with the
- * same ordering key are handled sequentially in the order of calls to this method.
- *
- * @param orderingKey Object to use as the key for the ordering channel
- * @param identifier The identifier that a specific source manager should be able to find the track with.
- * @param resultHandler A handler to process the result of this operation. It can either end by finding a track,
- * finding a playlist, finding nothing or terminating with an exception.
- * @return A future for this operation
- */
- Future loadItemOrdered(Object orderingKey, final String identifier, final AudioLoadResultHandler resultHandler);
-
- /**
- * Encode a track into an output stream. If the decoder is not supposed to know the number of tracks in advance, then
- * the encoder should call MessageOutput#finish() after all the tracks it wanted to write have been written. This will
- * make decodeTrack() return null at that position
- *
- * @param stream The message stream to write it to.
- * @param track The track to encode.
- * @throws IOException On IO error.
- */
- void encodeTrack(MessageOutput stream, AudioTrack track) throws IOException;
-
- /**
- * Decode a track from an input stream. Null returns value indicates reaching the position where the decoder had
- * called MessageOutput#finish().
- *
- * @param stream The message stream to read it from.
- * @return Holder containing the track if it was successfully decoded.
- * @throws IOException On IO error.
- */
- DecodedTrackHolder decodeTrack(MessageInput stream) throws IOException;
-
- /**
- * @return Audio processing configuration used for tracks executed by this manager.
- */
- AudioConfiguration getConfiguration();
-
- /**
- * Seek ghosting is the effect where while a seek is in progress, buffered audio from the previous location will be
- * served until seek is ready or the buffer is empty.
- *
- * @return True if seek ghosting is enabled.
- */
- boolean isUsingSeekGhosting();
-
- /**
- * @param useSeekGhosting The new state of seek ghosting
- */
- void setUseSeekGhosting(boolean useSeekGhosting);
-
- /**
- * @return The length of the internal buffer for audio in milliseconds.
- */
- int getFrameBufferDuration();
-
- /**
- * @param frameBufferDuration New length of the internal buffer for audio in milliseconds.
- */
- void setFrameBufferDuration(int frameBufferDuration);
-
- /**
- * Sets the threshold for how long a track can be stuck until the TrackStuckEvent is sent out. A track is considered
- * to be stuck if the player receives requests for audio samples from the track, but the audio frame provider of that
- * track has been returning no data for the specified time.
- *
- * @param trackStuckThreshold The threshold in milliseconds.
- */
- void setTrackStuckThreshold(long trackStuckThreshold);
-
- /**
- * Sets the threshold for clearing an audio player when it has not been queried for the specified amount of time.
- *
- * @param cleanupThreshold The threshold in milliseconds.
- */
- void setPlayerCleanupThreshold(long cleanupThreshold);
-
- /**
- * Sets the number of threads used for loading processing item load requests.
- *
- * @param poolSize Maximum number of concurrent threads used for loading items.
- */
- void setItemLoaderThreadPoolSize(int poolSize);
-
- /**
- * @return New audio player.
- */
- AudioPlayer createPlayer();
-
- /**
- * @return Registry of remote nodes currently used.
- */
- RemoteNodeRegistry getRemoteNodeRegistry();
-
- /**
- * @param configurator Function used to reconfigure the request config of all sources which perform HTTP requests.
- * Applied to all current and future registered sources. Setting this while sources are already in
- * use will close all active connections, so this should be called before the sources have been
- * used.
- */
- void setHttpRequestConfigurator(Function configurator);
-
- /**
- * @param configurator Function used to reconfigure the HTTP builder of all sources which perform HTTP requests.
- * Applied to all current and future registered sources. Setting this while sources are already in
- * use will close all active connections, so this should be called before the sources have been
- * used.
- */
- void setHttpBuilderConfigurator(Consumer configurator);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayerOptions.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayerOptions.java
deleted file mode 100644
index d0ade0b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/AudioPlayerOptions.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player;
-
-import com.sedmelluq.discord.lavaplayer.filter.PcmFilterFactory;
-
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * Mutable options of an audio player which may be applied in real-time.
- */
-public class AudioPlayerOptions {
- /**
- * Volume level of the audio, see {@link AudioPlayer#setVolume(int)}. Applied in real-time.
- */
- public final AtomicInteger volumeLevel;
- /**
- * Current PCM filter factory. Applied in real-time.
- */
- public final AtomicReference filterFactory;
- /**
- * Current frame buffer size. If not set, the global default is used. Changing this only affects the next track that
- * is started.
- */
- public final AtomicReference frameBufferDuration;
-
- /**
- * New instance of player options. By default, frame buffer duration is not set, hence taken from global settings.
- */
- public AudioPlayerOptions() {
- this.volumeLevel = new AtomicInteger(100);
- this.filterFactory = new AtomicReference<>();
- this.frameBufferDuration = new AtomicReference<>();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/DefaultAudioPlayer.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/DefaultAudioPlayer.java
deleted file mode 100644
index c7f70d9..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/DefaultAudioPlayer.java
+++ /dev/null
@@ -1,371 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player;
-
-import com.sedmelluq.discord.lavaplayer.filter.PcmFilterFactory;
-import com.sedmelluq.discord.lavaplayer.player.event.*;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
-import com.sedmelluq.discord.lavaplayer.track.InternalAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.TrackStateListener;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrameProviderTools;
-import com.sedmelluq.discord.lavaplayer.track.playback.MutableAudioFrame;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason.*;
-
-/**
- * An audio player that is capable of playing audio tracks and provides audio frames from the currently playing track.
- */
-public class DefaultAudioPlayer implements AudioPlayer, TrackStateListener {
- private static final Logger log = LoggerFactory.getLogger(AudioPlayer.class);
-
- private volatile InternalAudioTrack activeTrack;
- private volatile long lastRequestTime;
- private volatile long lastReceiveTime;
- private volatile boolean stuckEventSent;
- private volatile InternalAudioTrack shadowTrack;
- private final AtomicBoolean paused;
- private final DefaultAudioPlayerManager manager;
- private final List listeners;
- private final Object trackSwitchLock;
- private final AudioPlayerOptions options;
-
- /**
- * @param manager Audio player manager which this player is attached to
- */
- public DefaultAudioPlayer(DefaultAudioPlayerManager manager) {
- this.manager = manager;
- activeTrack = null;
- paused = new AtomicBoolean();
- listeners = new ArrayList<>();
- trackSwitchLock = new Object();
- options = new AudioPlayerOptions();
- }
-
- /**
- * @return Currently playing track
- */
- public AudioTrack getPlayingTrack() {
- return activeTrack;
- }
-
- /**
- * @param track The track to start playing
- */
- public void playTrack(AudioTrack track) {
- startTrack(track, false);
- }
-
- /**
- * @param track The track to start playing, passing null will stop the current track and return false
- * @param noInterrupt Whether to only start if nothing else is playing
- * @return True if the track was started
- */
- public boolean startTrack(AudioTrack track, boolean noInterrupt) {
- InternalAudioTrack newTrack = (InternalAudioTrack) track;
- InternalAudioTrack previousTrack;
-
- synchronized (trackSwitchLock) {
- previousTrack = activeTrack;
-
- if (noInterrupt && previousTrack != null) {
- return false;
- }
-
- activeTrack = newTrack;
- lastRequestTime = System.currentTimeMillis();
- lastReceiveTime = System.nanoTime();
- stuckEventSent = false;
-
- if (previousTrack != null) {
- previousTrack.stop();
- dispatchEvent(new TrackEndEvent(this, previousTrack, newTrack == null ? STOPPED : REPLACED));
-
- shadowTrack = previousTrack;
- }
- }
-
- if (newTrack == null) {
- shadowTrack = null;
- return false;
- }
-
- dispatchEvent(new TrackStartEvent(this, newTrack));
-
- manager.executeTrack(this, newTrack, manager.getConfiguration(), options);
- return true;
- }
-
- /**
- * Stop currently playing track.
- */
- public void stopTrack() {
- stopWithReason(STOPPED);
- }
-
- private void stopWithReason(AudioTrackEndReason reason) {
- shadowTrack = null;
-
- synchronized (trackSwitchLock) {
- InternalAudioTrack previousTrack = activeTrack;
- activeTrack = null;
-
- if (previousTrack != null) {
- previousTrack.stop();
- dispatchEvent(new TrackEndEvent(this, previousTrack, reason));
- }
- }
- }
-
- private AudioFrame provideShadowFrame() {
- InternalAudioTrack shadow = shadowTrack;
- AudioFrame frame = null;
-
- if (shadow != null) {
- frame = shadow.provide();
-
- if (frame != null && frame.isTerminator()) {
- shadowTrack = null;
- frame = null;
- }
- }
-
- return frame;
- }
-
- private boolean provideShadowFrame(MutableAudioFrame targetFrame) {
- InternalAudioTrack shadow = shadowTrack;
-
- if (shadow != null && shadow.provide(targetFrame)) {
- if (targetFrame.isTerminator()) {
- shadowTrack = null;
- return false;
- }
-
- return true;
- }
-
- return false;
- }
-
- @Override
- public AudioFrame provide() {
- return AudioFrameProviderTools.delegateToTimedProvide(this);
- }
-
- @Override
- public AudioFrame provide(long timeout, TimeUnit unit) throws TimeoutException, InterruptedException {
- InternalAudioTrack track;
-
- lastRequestTime = System.currentTimeMillis();
-
- if (timeout == 0 && paused.get()) {
- return null;
- }
-
- while ((track = activeTrack) != null) {
- AudioFrame frame = timeout > 0 ? track.provide(timeout, unit) : track.provide();
-
- if (frame != null) {
- lastReceiveTime = System.nanoTime();
- shadowTrack = null;
-
- if (frame.isTerminator()) {
- handleTerminator(track);
- continue;
- }
- } else if (timeout == 0) {
- checkStuck(track);
-
- frame = provideShadowFrame();
- }
-
- return frame;
- }
-
- return null;
- }
-
- @Override
- public boolean provide(MutableAudioFrame targetFrame) {
- try {
- return provide(targetFrame, 0, TimeUnit.MILLISECONDS);
- } catch (TimeoutException | InterruptedException e) {
- ExceptionTools.keepInterrupted(e);
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public boolean provide(MutableAudioFrame targetFrame, long timeout, TimeUnit unit)
- throws TimeoutException, InterruptedException {
-
- InternalAudioTrack track;
-
- lastRequestTime = System.currentTimeMillis();
-
- if (timeout == 0 && paused.get()) {
- return false;
- }
-
- while ((track = activeTrack) != null) {
- if (timeout > 0 ? track.provide(targetFrame, timeout, unit) : track.provide(targetFrame)) {
- lastReceiveTime = System.nanoTime();
- shadowTrack = null;
-
- if (targetFrame.isTerminator()) {
- handleTerminator(track);
- continue;
- }
-
- return true;
- } else if (timeout == 0) {
- checkStuck(track);
- return provideShadowFrame(targetFrame);
- } else {
- return false;
- }
- }
-
- return false;
- }
-
- private void handleTerminator(InternalAudioTrack track) {
- synchronized (trackSwitchLock) {
- if (activeTrack == track) {
- activeTrack = null;
-
- dispatchEvent(new TrackEndEvent(this, track, track.getActiveExecutor().failedBeforeLoad() ? LOAD_FAILED : FINISHED));
- }
- }
- }
-
- private void checkStuck(AudioTrack track) {
- if (!stuckEventSent && System.nanoTime() - lastReceiveTime > manager.getTrackStuckThresholdNanos()) {
- stuckEventSent = true;
- dispatchEvent(new TrackStuckEvent(this, track, TimeUnit.NANOSECONDS.toMillis(manager.getTrackStuckThresholdNanos())));
- }
- }
-
- public int getVolume() {
- return options.volumeLevel.get();
- }
-
- public void setVolume(int volume) {
- options.volumeLevel.set(Math.min(1000, Math.max(0, volume)));
- }
-
- public void setFilterFactory(PcmFilterFactory factory) {
- options.filterFactory.set(factory);
- }
-
- public void setFrameBufferDuration(Integer duration) {
- if (duration != null) {
- duration = Math.max(200, duration);
- }
-
- options.frameBufferDuration.set(duration);
- }
-
- /**
- * @return Whether the player is paused
- */
- public boolean isPaused() {
- return paused.get();
- }
-
- /**
- * @param value True to pause, false to resume
- */
- public void setPaused(boolean value) {
- if (paused.compareAndSet(!value, value)) {
- if (value) {
- dispatchEvent(new PlayerPauseEvent(this));
- } else {
- dispatchEvent(new PlayerResumeEvent(this));
- lastReceiveTime = System.nanoTime();
- }
- }
- }
-
- /**
- * Destroy the player and stop playing track.
- */
- public void destroy() {
- stopTrack();
- }
-
- /**
- * Add a listener to events from this player.
- *
- * @param listener New listener
- */
- public void addListener(AudioEventListener listener) {
- synchronized (trackSwitchLock) {
- listeners.add(listener);
- }
- }
-
- /**
- * Remove an attached listener using identity comparison.
- *
- * @param listener The listener to remove
- */
- public void removeListener(AudioEventListener listener) {
- synchronized (trackSwitchLock) {
- for (Iterator iterator = listeners.iterator(); iterator.hasNext(); ) {
- if (iterator.next() == listener) {
- iterator.remove();
- }
- }
- }
- }
-
- private void dispatchEvent(AudioEvent event) {
- log.debug("Firing an event with class {}", event.getClass().getSimpleName());
-
- synchronized (trackSwitchLock) {
- for (AudioEventListener listener : listeners) {
- try {
- listener.onEvent(event);
- } catch (Exception e) {
- log.error("Handler of event {} threw an exception.", event, e);
- }
- }
- }
- }
-
- @Override
- public void onTrackException(AudioTrack track, FriendlyException exception) {
- dispatchEvent(new TrackExceptionEvent(this, track, exception));
- }
-
- @Override
- public void onTrackStuck(AudioTrack track, long thresholdMs) {
- dispatchEvent(new TrackStuckEvent(this, track, thresholdMs));
- }
-
- /**
- * Check if the player should be "cleaned up" - stopped due to nothing using it, with the given threshold.
- *
- * @param threshold Threshold in milliseconds to use
- */
- public void checkCleanup(long threshold) {
- AudioTrack track = getPlayingTrack();
- if (track != null && System.currentTimeMillis() - lastRequestTime >= threshold) {
- log.debug("Triggering cleanup on an audio player playing track {}", track);
-
- stopWithReason(CLEANUP);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/DefaultAudioPlayerManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/DefaultAudioPlayerManager.java
deleted file mode 100644
index e1c362f..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/DefaultAudioPlayerManager.java
+++ /dev/null
@@ -1,484 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player;
-
-import com.sedmelluq.discord.lavaplayer.remote.RemoteAudioTrackExecutor;
-import com.sedmelluq.discord.lavaplayer.remote.RemoteNodeManager;
-import com.sedmelluq.discord.lavaplayer.remote.RemoteNodeRegistry;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.ProbingAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.*;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.tools.io.MessageInput;
-import com.sedmelluq.discord.lavaplayer.tools.io.MessageOutput;
-import com.sedmelluq.discord.lavaplayer.track.*;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioTrackExecutor;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import com.sedmelluq.lava.common.tools.DaemonThreadFactory;
-import com.sedmelluq.lava.common.tools.ExecutorTools;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.FAULT;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * The default implementation of audio player manager.
- */
-public class DefaultAudioPlayerManager implements AudioPlayerManager {
- private static final int TRACK_INFO_VERSIONED = 1;
- private static final int TRACK_INFO_VERSION = 2;
-
- private static final int DEFAULT_FRAME_BUFFER_DURATION = (int) TimeUnit.SECONDS.toMillis(5);
- private static final int DEFAULT_CLEANUP_THRESHOLD = (int) TimeUnit.MINUTES.toMillis(1);
-
- private static final int MAXIMUM_LOAD_REDIRECTS = 5;
- private static final int DEFAULT_LOADER_POOL_SIZE = 10;
- private static final int LOADER_QUEUE_CAPACITY = 5000;
-
- private static final Logger log = LoggerFactory.getLogger(DefaultAudioPlayerManager.class);
-
- private final List sourceManagers;
- private volatile Function httpConfigurator;
- private volatile Consumer httpBuilderConfigurator;
-
- // Executors
- private final ExecutorService trackPlaybackExecutorService;
- private final ThreadPoolExecutor trackInfoExecutorService;
- private final ScheduledExecutorService scheduledExecutorService;
- private final OrderedExecutor orderedInfoExecutor;
-
- // Configuration
- private volatile long trackStuckThreshold;
- private volatile AudioConfiguration configuration;
- private final AtomicLong cleanupThreshold;
- private volatile int frameBufferDuration;
- private volatile boolean useSeekGhosting;
-
- // Additional services
- private final RemoteNodeManager remoteNodeManager;
- private final GarbageCollectionMonitor garbageCollectionMonitor;
- private final AudioPlayerLifecycleManager lifecycleManager;
-
-
- /**
- * Create a new instance
- */
- public DefaultAudioPlayerManager() {
- sourceManagers = new ArrayList<>();
-
- // Executors
- trackPlaybackExecutorService = new ThreadPoolExecutor(1, Integer.MAX_VALUE, 10, TimeUnit.SECONDS,
- new SynchronousQueue<>(), new DaemonThreadFactory("playback"));
- trackInfoExecutorService = ExecutorTools.createEagerlyScalingExecutor(1, DEFAULT_LOADER_POOL_SIZE,
- TimeUnit.SECONDS.toMillis(30), LOADER_QUEUE_CAPACITY, new DaemonThreadFactory("info-loader"));
- scheduledExecutorService = Executors.newScheduledThreadPool(1, new DaemonThreadFactory("manager"));
- orderedInfoExecutor = new OrderedExecutor(trackInfoExecutorService);
-
- // Configuration
- trackStuckThreshold = TimeUnit.MILLISECONDS.toNanos(10000);
- configuration = new AudioConfiguration();
- cleanupThreshold = new AtomicLong(DEFAULT_CLEANUP_THRESHOLD);
- frameBufferDuration = DEFAULT_FRAME_BUFFER_DURATION;
- useSeekGhosting = true;
-
- // Additional services
- remoteNodeManager = new RemoteNodeManager(this);
- garbageCollectionMonitor = new GarbageCollectionMonitor(scheduledExecutorService);
- lifecycleManager = new AudioPlayerLifecycleManager(scheduledExecutorService, cleanupThreshold);
- lifecycleManager.initialise();
- }
-
- @Override
- public void shutdown() {
- remoteNodeManager.shutdown(true);
- garbageCollectionMonitor.disable();
- lifecycleManager.shutdown();
-
- for (AudioSourceManager sourceManager : sourceManagers) {
- sourceManager.shutdown();
- }
-
- ExecutorTools.shutdownExecutor(trackPlaybackExecutorService, "track playback");
- ExecutorTools.shutdownExecutor(trackInfoExecutorService, "track info");
- ExecutorTools.shutdownExecutor(scheduledExecutorService, "scheduled operations");
- }
-
- @Override
- public void useRemoteNodes(String... nodeAddresses) {
- if (nodeAddresses.length > 0) {
- remoteNodeManager.initialise(Arrays.asList(nodeAddresses));
- } else {
- remoteNodeManager.shutdown(false);
- }
- }
-
- @Override
- public void enableGcMonitoring() {
- garbageCollectionMonitor.enable();
- }
-
- @Override
- public void registerSourceManager(AudioSourceManager sourceManager) {
- sourceManagers.add(sourceManager);
-
- if (sourceManager instanceof HttpConfigurable) {
- Function configurator = httpConfigurator;
-
- if (configurator != null) {
- ((HttpConfigurable) sourceManager).configureRequests(configurator);
- }
-
- Consumer builderConfigurator = httpBuilderConfigurator;
-
- if (builderConfigurator != null) {
- ((HttpConfigurable) sourceManager).configureBuilder(builderConfigurator);
- }
- }
- }
-
- @Override
- public T source(Class klass) {
- for (AudioSourceManager sourceManager : sourceManagers) {
- if (klass.isAssignableFrom(sourceManager.getClass())) {
- return (T) sourceManager;
- }
- }
-
- return null;
- }
-
- @Override
- public Future loadItem(final String identifier, final AudioLoadResultHandler resultHandler) {
- try {
- return trackInfoExecutorService.submit(createItemLoader(identifier, resultHandler));
- } catch (RejectedExecutionException e) {
- return handleLoadRejected(identifier, resultHandler, e);
- }
- }
-
- @Override
- public Future loadItemOrdered(Object orderingKey, final String identifier, final AudioLoadResultHandler resultHandler) {
- try {
- return orderedInfoExecutor.submit(orderingKey, createItemLoader(identifier, resultHandler));
- } catch (RejectedExecutionException e) {
- return handleLoadRejected(identifier, resultHandler, e);
- }
- }
-
- private Future handleLoadRejected(String identifier, AudioLoadResultHandler resultHandler, RejectedExecutionException e) {
- FriendlyException exception = new FriendlyException("Cannot queue loading a track, queue is full.", SUSPICIOUS, e);
- ExceptionTools.log(log, exception, "queueing item " + identifier);
-
- resultHandler.loadFailed(exception);
-
- return ExecutorTools.COMPLETED_VOID;
- }
-
- private Callable createItemLoader(final String identifier, final AudioLoadResultHandler resultHandler) {
- return () -> {
- boolean[] reported = new boolean[1];
-
- try {
- if (!checkSourcesForItem(new AudioReference(identifier, null), resultHandler, reported)) {
- log.debug("No matches for track with identifier {}.", identifier);
- resultHandler.noMatches();
- }
- } catch (Throwable throwable) {
- if (reported[0]) {
- log.warn("Load result handler for {} threw an exception", identifier, throwable);
- } else {
- dispatchItemLoadFailure(identifier, resultHandler, throwable);
- }
-
- ExceptionTools.rethrowErrors(throwable);
- }
-
- return null;
- };
- }
-
- private void dispatchItemLoadFailure(String identifier, AudioLoadResultHandler resultHandler, Throwable throwable) {
- FriendlyException exception = ExceptionTools.wrapUnfriendlyExceptions("Something went wrong when looking up the track", FAULT, throwable);
- ExceptionTools.log(log, exception, "loading item " + identifier);
-
- resultHandler.loadFailed(exception);
- }
-
- @Override
- public void encodeTrack(MessageOutput stream, AudioTrack track) throws IOException {
- DataOutput output = stream.startMessage();
- output.write(TRACK_INFO_VERSION);
-
- AudioTrackInfo trackInfo = track.getInfo();
- output.writeUTF(trackInfo.title);
- output.writeUTF(trackInfo.author);
- output.writeLong(trackInfo.length);
- output.writeUTF(trackInfo.identifier);
- output.writeBoolean(trackInfo.isStream);
- DataFormatTools.writeNullableText(output, trackInfo.uri);
-
- encodeTrackDetails(track, output);
- output.writeLong(track.getPosition());
-
- stream.commitMessage(TRACK_INFO_VERSIONED);
- }
-
- @Override
- public DecodedTrackHolder decodeTrack(MessageInput stream) throws IOException {
- DataInput input = stream.nextMessage();
- if (input == null) {
- return null;
- }
-
- int version = (stream.getMessageFlags() & TRACK_INFO_VERSIONED) != 0 ? (input.readByte() & 0xFF) : 1;
-
- AudioTrackInfo trackInfo = new AudioTrackInfo(input.readUTF(), input.readUTF(), input.readLong(), input.readUTF(),
- input.readBoolean(), version >= 2 ? DataFormatTools.readNullableText(input) : null);
- AudioTrack track = decodeTrackDetails(trackInfo, input);
- long position = input.readLong();
-
- if (track != null) {
- track.setPosition(position);
- }
-
- stream.skipRemainingBytes();
-
- return new DecodedTrackHolder(track);
- }
-
- /**
- * Encodes an audio track to a byte array. Does not include AudioTrackInfo in the buffer.
- *
- * @param track The track to encode
- * @return The bytes of the encoded data
- */
- public byte[] encodeTrackDetails(AudioTrack track) {
- try {
- ByteArrayOutputStream byteOutput = new ByteArrayOutputStream();
- DataOutput output = new DataOutputStream(byteOutput);
-
- encodeTrackDetails(track, output);
-
- return byteOutput.toByteArray();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private void encodeTrackDetails(AudioTrack track, DataOutput output) throws IOException {
- AudioSourceManager sourceManager = track.getSourceManager();
- output.writeUTF(sourceManager.getSourceName());
- sourceManager.encodeTrack(track, output);
- }
-
- /**
- * Decodes an audio track from a byte array.
- *
- * @param trackInfo Track info for the track to decode
- * @param buffer Byte array containing the encoded track
- * @return Decoded audio track
- */
- public AudioTrack decodeTrackDetails(AudioTrackInfo trackInfo, byte[] buffer) {
- try {
- DataInput input = new DataInputStream(new ByteArrayInputStream(buffer));
- return decodeTrackDetails(trackInfo, input);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private AudioTrack decodeTrackDetails(AudioTrackInfo trackInfo, DataInput input) throws IOException {
- String sourceName = input.readUTF();
-
- for (AudioSourceManager sourceManager : sourceManagers) {
- if (sourceName.equals(sourceManager.getSourceName())) {
- return sourceManager.decodeTrack(trackInfo, input);
- }
- }
-
- return null;
- }
-
- /**
- * Executes an audio track with the given player and volume.
- *
- * @param listener A listener for track state events
- * @param track The audio track to execute
- * @param configuration The audio configuration to use for executing
- * @param playerOptions Options of the audio player
- */
- public void executeTrack(TrackStateListener listener, InternalAudioTrack track, AudioConfiguration configuration,
- AudioPlayerOptions playerOptions) {
-
- final AudioTrackExecutor executor = createExecutorForTrack(track, configuration, playerOptions);
- track.assignExecutor(executor, true);
-
- trackPlaybackExecutorService.execute(() -> executor.execute(listener));
- }
-
- private AudioTrackExecutor createExecutorForTrack(InternalAudioTrack track, AudioConfiguration configuration,
- AudioPlayerOptions playerOptions) {
-
- AudioSourceManager sourceManager = track.getSourceManager();
-
- if (remoteNodeManager.isEnabled() && sourceManager != null && sourceManager.isTrackEncodable(track)) {
- return new RemoteAudioTrackExecutor(track, configuration, remoteNodeManager, playerOptions.volumeLevel);
- } else {
- AudioTrackExecutor customExecutor = track.createLocalExecutor(this);
-
- if (customExecutor != null) {
- return customExecutor;
- } else {
- int bufferDuration = Optional.ofNullable(playerOptions.frameBufferDuration.get()).orElse(frameBufferDuration);
- return new LocalAudioTrackExecutor(track, configuration, playerOptions, useSeekGhosting, bufferDuration);
- }
- }
- }
-
- @Override
- public AudioConfiguration getConfiguration() {
- return configuration;
- }
-
- @Override
- public boolean isUsingSeekGhosting() {
- return useSeekGhosting;
- }
-
- @Override
- public void setUseSeekGhosting(boolean useSeekGhosting) {
- this.useSeekGhosting = useSeekGhosting;
- }
-
- @Override
- public int getFrameBufferDuration() {
- return frameBufferDuration;
- }
-
- @Override
- public void setFrameBufferDuration(int frameBufferDuration) {
- this.frameBufferDuration = Math.max(200, frameBufferDuration);
- }
-
- @Override
- public void setTrackStuckThreshold(long trackStuckThreshold) {
- this.trackStuckThreshold = TimeUnit.MILLISECONDS.toNanos(trackStuckThreshold);
- }
-
- public long getTrackStuckThresholdNanos() {
- return trackStuckThreshold;
- }
-
- @Override
- public void setPlayerCleanupThreshold(long cleanupThreshold) {
- this.cleanupThreshold.set(cleanupThreshold);
- }
-
- @Override
- public void setItemLoaderThreadPoolSize(int poolSize) {
- trackInfoExecutorService.setMaximumPoolSize(poolSize);
- }
-
- private boolean checkSourcesForItem(AudioReference reference, AudioLoadResultHandler resultHandler, boolean[] reported) {
- AudioReference currentReference = reference;
-
- for (int redirects = 0; redirects < MAXIMUM_LOAD_REDIRECTS && currentReference.identifier != null; redirects++) {
- AudioItem item = checkSourcesForItemOnce(currentReference, resultHandler, reported);
- if (item == null) {
- return false;
- } else if (!(item instanceof AudioReference)) {
- return true;
- }
- currentReference = (AudioReference) item;
- }
-
- return false;
- }
-
- private AudioItem checkSourcesForItemOnce(AudioReference reference, AudioLoadResultHandler resultHandler, boolean[] reported) {
- for (AudioSourceManager sourceManager : sourceManagers) {
- if (reference.containerDescriptor != null && !(sourceManager instanceof ProbingAudioSourceManager)) {
- continue;
- }
-
- AudioItem item = sourceManager.loadItem(this, reference);
-
- if (item != null) {
- if (item instanceof AudioTrack) {
- log.debug("Loaded a track with identifier {} using {}.", reference.identifier, sourceManager.getClass().getSimpleName());
- reported[0] = true;
- resultHandler.trackLoaded((AudioTrack) item);
- } else if (item instanceof AudioPlaylist) {
- log.debug("Loaded a playlist with identifier {} using {}.", reference.identifier, sourceManager.getClass().getSimpleName());
- reported[0] = true;
- resultHandler.playlistLoaded((AudioPlaylist) item);
- }
- return item;
- }
- }
-
- return null;
- }
-
- public ExecutorService getExecutor() {
- return trackPlaybackExecutorService;
- }
-
- @Override
- public AudioPlayer createPlayer() {
- AudioPlayer player = constructPlayer();
- player.addListener(lifecycleManager);
-
- if (remoteNodeManager.isEnabled()) {
- player.addListener(remoteNodeManager);
- }
-
- return player;
- }
-
- protected AudioPlayer constructPlayer() {
- return new DefaultAudioPlayer(this);
- }
-
- @Override
- public RemoteNodeRegistry getRemoteNodeRegistry() {
- return remoteNodeManager;
- }
-
- @Override
- public void setHttpRequestConfigurator(Function configurator) {
- this.httpConfigurator = configurator;
-
- if (configurator != null) {
- for (AudioSourceManager sourceManager : sourceManagers) {
- if (sourceManager instanceof HttpConfigurable) {
- ((HttpConfigurable) sourceManager).configureRequests(configurator);
- }
- }
- }
- }
-
- @Override
- public void setHttpBuilderConfigurator(Consumer configurator) {
- this.httpBuilderConfigurator = configurator;
-
- if (configurator != null) {
- for (AudioSourceManager sourceManager : sourceManagers) {
- if (sourceManager instanceof HttpConfigurable) {
- ((HttpConfigurable) sourceManager).configureBuilder(configurator);
- }
- }
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/FunctionalResultHandler.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/FunctionalResultHandler.java
deleted file mode 100644
index 8f2c161..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/FunctionalResultHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player;
-
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-import java.util.function.Consumer;
-
-/**
- * Helper class for creating an audio result handler using only methods that can be passed as lambdas.
- */
-public class FunctionalResultHandler implements AudioLoadResultHandler {
- private final Consumer trackConsumer;
- private final Consumer playlistConsumer;
- private final Runnable emptyResultHandler;
- private final Consumer exceptionConsumer;
-
- /**
- * Refer to {@link AudioLoadResultHandler} methods for details on when each method is called.
- *
- * @param trackConsumer Consumer for single track result
- * @param playlistConsumer Consumer for playlist result
- * @param emptyResultHandler Empty result handler
- * @param exceptionConsumer Consumer for an exception when loading the item fails
- */
- public FunctionalResultHandler(Consumer trackConsumer, Consumer playlistConsumer,
- Runnable emptyResultHandler, Consumer exceptionConsumer) {
-
- this.trackConsumer = trackConsumer;
- this.playlistConsumer = playlistConsumer;
- this.emptyResultHandler = emptyResultHandler;
- this.exceptionConsumer = exceptionConsumer;
- }
-
- @Override
- public void trackLoaded(AudioTrack track) {
- if (trackConsumer != null) {
- trackConsumer.accept(track);
- }
- }
-
- @Override
- public void playlistLoaded(AudioPlaylist playlist) {
- if (playlistConsumer != null) {
- playlistConsumer.accept(playlist);
- }
- }
-
- @Override
- public void noMatches() {
- if (emptyResultHandler != null) {
- emptyResultHandler.run();
- }
- }
-
- @Override
- public void loadFailed(FriendlyException exception) {
- if (exceptionConsumer != null) {
- exceptionConsumer.accept(exception);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/AudioEvent.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/AudioEvent.java
deleted file mode 100644
index a923632..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/AudioEvent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.event;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-
-/**
- * An event related to an audio player.
- */
-public abstract class AudioEvent {
- /**
- * The related audio player.
- */
- public final AudioPlayer player;
-
- /**
- * @param player The related audio player.
- */
- public AudioEvent(AudioPlayer player) {
- this.player = player;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/AudioEventAdapter.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/AudioEventAdapter.java
deleted file mode 100644
index 1929aa0..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/AudioEventAdapter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.event;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
-
-/**
- * Adapter for different event handlers as method overrides
- */
-public abstract class AudioEventAdapter implements AudioEventListener {
- /**
- * @param player Audio player
- */
- public void onPlayerPause(AudioPlayer player) {
- // Adapter dummy method
- }
-
- /**
- * @param player Audio player
- */
- public void onPlayerResume(AudioPlayer player) {
- // Adapter dummy method
- }
-
- /**
- * @param player Audio player
- * @param track Audio track that started
- */
- public void onTrackStart(AudioPlayer player, AudioTrack track) {
- // Adapter dummy method
- }
-
- /**
- * @param player Audio player
- * @param track Audio track that ended
- * @param endReason The reason why the track stopped playing
- */
- public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
- // Adapter dummy method
- }
-
- /**
- * @param player Audio player
- * @param track Audio track where the exception occurred
- * @param exception The exception that occurred
- */
- public void onTrackException(AudioPlayer player, AudioTrack track, FriendlyException exception) {
- // Adapter dummy method
- }
-
- /**
- * @param player Audio player
- * @param track Audio track where the exception occurred
- * @param thresholdMs The wait threshold that was exceeded for this event to trigger
- */
- public void onTrackStuck(AudioPlayer player, AudioTrack track, long thresholdMs) {
- // Adapter dummy method
- }
-
- @Override
- public void onEvent(AudioEvent event) {
- if (event instanceof PlayerPauseEvent) {
- onPlayerPause(event.player);
- } else if (event instanceof PlayerResumeEvent) {
- onPlayerResume(event.player);
- } else if (event instanceof TrackStartEvent) {
- onTrackStart(event.player, ((TrackStartEvent) event).track);
- } else if (event instanceof TrackEndEvent) {
- onTrackEnd(event.player, ((TrackEndEvent) event).track, ((TrackEndEvent) event).endReason);
- } else if (event instanceof TrackExceptionEvent) {
- onTrackException(event.player, ((TrackExceptionEvent) event).track, ((TrackExceptionEvent) event).exception);
- } else if (event instanceof TrackStuckEvent) {
- onTrackStuck(event.player, ((TrackStuckEvent) event).track, ((TrackStuckEvent) event).thresholdMs);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/AudioEventListener.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/AudioEventListener.java
deleted file mode 100644
index 4b0776b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/AudioEventListener.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.event;
-
-/**
- * Listener of audio events.
- */
-public interface AudioEventListener {
- /**
- * @param event The event
- */
- void onEvent(AudioEvent event);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/PlayerPauseEvent.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/PlayerPauseEvent.java
deleted file mode 100644
index 9304ee4..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/PlayerPauseEvent.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.event;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-
-/**
- * Event that is fired when a player is paused.
- */
-public class PlayerPauseEvent extends AudioEvent {
- /**
- * @param player Audio player
- */
- public PlayerPauseEvent(AudioPlayer player) {
- super(player);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/PlayerResumeEvent.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/PlayerResumeEvent.java
deleted file mode 100644
index 15670bb..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/PlayerResumeEvent.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.event;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-
-/**
- * Event that is fired when a player is resumed.
- */
-public class PlayerResumeEvent extends AudioEvent {
- /**
- * @param player Audio player
- */
- public PlayerResumeEvent(AudioPlayer player) {
- super(player);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackEndEvent.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackEndEvent.java
deleted file mode 100644
index 7e1192d..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackEndEvent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.event;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
-
-/**
- * Event that is fired when an audio track ends in an audio player, either by interruption, exception or reaching the end.
- */
-public class TrackEndEvent extends AudioEvent {
- /**
- * Audio track that ended
- */
- public final AudioTrack track;
- /**
- * The reason why the track stopped playing
- */
- public final AudioTrackEndReason endReason;
-
- /**
- * @param player Audio player
- * @param track Audio track that ended
- * @param endReason The reason why the track stopped playing
- */
- public TrackEndEvent(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
- super(player);
- this.track = track;
- this.endReason = endReason;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackExceptionEvent.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackExceptionEvent.java
deleted file mode 100644
index dd3039f..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackExceptionEvent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.event;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-/**
- * Event that is fired when an exception occurs in an audio track that causes it to halt or not start.
- */
-public class TrackExceptionEvent extends AudioEvent {
- /**
- * Audio track where the exception occurred
- */
- public final AudioTrack track;
- /**
- * The exception that occurred
- */
- public final FriendlyException exception;
-
- /**
- * @param player Audio player
- * @param track Audio track where the exception occurred
- * @param exception The exception that occurred
- */
- public TrackExceptionEvent(AudioPlayer player, AudioTrack track, FriendlyException exception) {
- super(player);
- this.track = track;
- this.exception = exception;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackStartEvent.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackStartEvent.java
deleted file mode 100644
index 8ac79d9..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackStartEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.event;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-/**
- * Event that is fired when a track starts playing.
- */
-public class TrackStartEvent extends AudioEvent {
- /**
- * Audio track that started
- */
- public final AudioTrack track;
-
- /**
- * @param player Audio player
- * @param track Audio track that started
- */
- public TrackStartEvent(AudioPlayer player, AudioTrack track) {
- super(player);
- this.track = track;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackStuckEvent.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackStuckEvent.java
deleted file mode 100644
index e6eda4b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/event/TrackStuckEvent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.event;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-/**
- * Event that is fired when a track was started, but no audio frames from it have arrived in a long time, specified
- * by the threshold set via AudioPlayerManager.setTrackStuckThreshold().
- */
-public class TrackStuckEvent extends AudioEvent {
- /**
- * Audio track where the exception occurred
- */
- public final AudioTrack track;
- /**
- * The wait threshold that was exceeded for this event to trigger
- */
- public final long thresholdMs;
-
- /**
- * @param player Audio player
- * @param track Audio track where the exception occurred
- * @param thresholdMs The wait threshold that was exceeded for this event to trigger
- */
- public TrackStuckEvent(AudioPlayer player, AudioTrack track, long thresholdMs) {
- super(player);
- this.track = track;
- this.thresholdMs = thresholdMs;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/hook/AudioOutputHook.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/hook/AudioOutputHook.java
deleted file mode 100644
index f47fc22..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/hook/AudioOutputHook.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.hook;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-
-/**
- * Hook for intercepting outgoing audio frames from AudioPlayer.
- */
-public interface AudioOutputHook {
- /**
- * @param player Audio player where the frame is coming from
- * @param frame Audio frame
- * @return The frame to pass onto the actual caller
- */
- AudioFrame outgoingFrame(AudioPlayer player, AudioFrame frame);
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/player/hook/AudioOutputHookFactory.java b/src/main/java/com/sedmelluq/discord/lavaplayer/player/hook/AudioOutputHookFactory.java
deleted file mode 100644
index 7ebda8d..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/player/hook/AudioOutputHookFactory.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.player.hook;
-
-/**
- * Factory for audio output hook instances.
- */
-public interface AudioOutputHookFactory {
- /**
- * @return New instance of an audio output hook
- */
- AudioOutputHook createOutputHook();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/AbandonedTrackManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/AbandonedTrackManager.java
deleted file mode 100644
index d565de0..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/AbandonedTrackManager.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote;
-
-import com.sedmelluq.discord.lavaplayer.remote.message.NodeStatisticsMessage;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.COMMON;
-
-/**
- * Takes over tracks of offline remote nodes.
- */
-public class AbandonedTrackManager {
- private static final Logger log = LoggerFactory.getLogger(AbandonedTrackManager.class);
-
- private static final long EXPIRE_THRESHOLD = TimeUnit.SECONDS.toMillis(10);
- private static final long CRITICAL_PENALTY = 750;
-
- private final BlockingQueue abandonedExecutors;
-
- /**
- * Create an instance.
- */
- public AbandonedTrackManager() {
- this.abandonedExecutors = new ArrayBlockingQueue<>(2000);
- }
-
- /**
- * Adds a track executor to abandoned tracks. The abandoned track manager will take over managing its lifecycle and
- * the caller should not use it any further.
- *
- * @param executor The executor to register as an abandoned track.
- */
- public void add(RemoteAudioTrackExecutor executor) {
- if (abandonedExecutors.offer(new AbandonedExecutor(System.currentTimeMillis(), executor))) {
- log.debug("{} has been put up for adoption.", executor);
- } else {
- log.debug("{} has been discarded, adoption queue is full.", executor);
-
- executor.dispatchException(new FriendlyException("Cannot find a node to play the track on.", COMMON, null));
- executor.stop();
- }
- }
-
- /**
- * Distributes any abandoned tracks between the specified nodes. Only online nodes which are not under too heavy load
- * are used. The number of tracks that can be assigned to a node depends on the number of tracks it is already
- * processing (track count can increase only by 1/15th on each call, or by 5).
- *
- * @param nodes Remote nodes to give abandoned tracks to.
- */
- public void distribute(List nodes) {
- if (abandonedExecutors.isEmpty()) {
- return;
- }
-
- List adopters = findAdopters(nodes);
- AbandonedExecutor executor;
- long currentTime = System.currentTimeMillis();
- int maximum = getMaximumAdoptions(adopters);
- int assigned = 0;
-
- while (assigned < maximum && (executor = abandonedExecutors.poll()) != null) {
- if (checkValidity(executor, currentTime)) {
- Adopter adopter = selectNextAdopter(adopters);
-
- if (adopter != null) {
- log.debug("Node {} is adopting {}.", adopter.node.getAddress(), executor.executor);
-
- adopter.node.startPlaying(executor.executor);
- assigned++;
- } else {
- log.debug("No node available for adopting {}", executor.executor);
- }
- }
- }
- }
-
- /**
- * Shut down the abandoned track manager, stopping any tracks.
- */
- public void shutdown() {
- AbandonedExecutor executor;
-
- while ((executor = abandonedExecutors.poll()) != null) {
- executor.executor.dispatchException(new FriendlyException("Node system was shut down.", COMMON, null));
- executor.executor.stop();
- }
- }
-
- /**
- * Remove expired or stopped tracks from the abandoned track queue.
- */
- public void drainExpired() {
- AbandonedExecutor executor;
- long currentTime = System.currentTimeMillis();
-
- while ((executor = abandonedExecutors.peek()) != null) {
- if (!checkValidity(executor, currentTime) && abandonedExecutors.remove(executor)) {
- log.debug("Abandoned executor {} removed from queue.", executor.executor);
- }
- }
- }
-
- private boolean checkValidity(AbandonedExecutor executor, long currentTime) {
- long expirationTime = currentTime - EXPIRE_THRESHOLD;
-
- if (executor.executor.getState() == AudioTrackState.FINISHED) {
- log.debug("{} has been cleared from adoption queue because it was stopped.", executor.executor);
- return false;
- } else if (executor.orphanedTime < expirationTime) {
- log.debug("{} has been cleared from adoption queue because it expired.", executor.executor);
-
- executor.executor.dispatchException(new FriendlyException("Could not find next node to play on.", COMMON, null));
- executor.executor.stop();
- return false;
- } else {
- return true;
- }
- }
-
- private List findAdopters(List nodes) {
- List adopters = new ArrayList<>();
-
- for (RemoteNodeProcessor node : nodes) {
- int penalty = node.getBalancerPenalty();
- NodeStatisticsMessage statistics = node.getLastStatistics();
-
- if (penalty >= CRITICAL_PENALTY || statistics == null) {
- continue;
- }
-
- int maximumAdoptions = Math.max(5, statistics.playingTrackCount / 15);
- adopters.add(new Adopter(node, maximumAdoptions));
- }
-
- return adopters;
- }
-
- private Adopter selectNextAdopter(List adopters) {
- Adopter selected = null;
-
- for (Adopter adopter : adopters) {
- if (adopter.adoptions < adopter.maximumAdoptions && (selected == null || adopter.fillRate() > selected.fillRate())) {
- selected = adopter;
- }
- }
-
- if (selected != null) {
- selected.adoptions++;
- }
-
- return selected;
- }
-
- private int getMaximumAdoptions(List adopters) {
- int total = 0;
-
- for (Adopter adopter : adopters) {
- total += adopter.maximumAdoptions;
- }
-
- return total;
- }
-
- private static class AbandonedExecutor {
- private final long orphanedTime;
- private final RemoteAudioTrackExecutor executor;
-
- private AbandonedExecutor(long orphanedTime, RemoteAudioTrackExecutor executor) {
- this.orphanedTime = orphanedTime;
- this.executor = executor;
- }
- }
-
- private static class Adopter {
- private final RemoteNodeProcessor node;
- private final long maximumAdoptions;
- private int adoptions;
-
- private Adopter(RemoteNodeProcessor node, long maximumAdoptions) {
- this.node = node;
- this.maximumAdoptions = maximumAdoptions;
- this.adoptions = 0;
- }
-
- private float fillRate() {
- return (float) adoptions / maximumAdoptions;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteAudioTrackExecutor.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteAudioTrackExecutor.java
deleted file mode 100644
index 1736864..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteAudioTrackExecutor.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.*;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrameBuffer;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioTrackExecutor;
-import com.sedmelluq.discord.lavaplayer.track.playback.MutableAudioFrame;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import static com.sedmelluq.discord.lavaplayer.track.TrackMarkerHandler.MarkerState.ENDED;
-import static com.sedmelluq.discord.lavaplayer.track.TrackMarkerHandler.MarkerState.STOPPED;
-
-/**
- * This executor delegates the actual audio processing to a remote node.
- */
-public class RemoteAudioTrackExecutor implements AudioTrackExecutor {
- private static final Logger log = LoggerFactory.getLogger(RemoteAudioTrackExecutor.class);
-
- private static final long NO_SEEK = -1;
- private static final int BUFFER_DURATION_MS = 3000;
-
- private final AudioTrack track;
- private final AudioConfiguration configuration;
- private final RemoteNodeManager remoteNodeManager;
- private final AtomicInteger volumeLevel;
- private final long executorId;
- private final AudioFrameBuffer frameBuffer;
- private final AtomicLong lastFrameTimecode = new AtomicLong();
- private final AtomicLong pendingSeek = new AtomicLong(NO_SEEK);
- private final TrackMarkerTracker markerTracker = new TrackMarkerTracker();
- private volatile TrackStateListener activeListener;
- private volatile boolean hasReceivedData;
- private volatile boolean hasStarted;
- private volatile Throwable trackException;
-
- /**
- * @param track Audio track to play
- * @param configuration Configuration for audio processing
- * @param remoteNodeManager Manager of remote nodes
- * @param volumeLevel Mutable volume level
- */
- public RemoteAudioTrackExecutor(AudioTrack track, AudioConfiguration configuration,
- RemoteNodeManager remoteNodeManager, AtomicInteger volumeLevel) {
-
- this.track = track;
- this.configuration = configuration.copy();
- this.remoteNodeManager = remoteNodeManager;
- this.volumeLevel = volumeLevel;
- this.executorId = System.nanoTime();
- this.frameBuffer = configuration.getFrameBufferFactory().create(BUFFER_DURATION_MS, configuration.getOutputFormat(), null);
- }
-
- /**
- * @return The unique ID for this executor
- */
- public long getExecutorId() {
- return executorId;
- }
-
- /**
- * @return The configuration to use for processing audio
- */
- public AudioConfiguration getConfiguration() {
- return configuration;
- }
-
- /**
- * @return The current volume of the track
- */
- public int getVolume() {
- return volumeLevel.get();
- }
-
- /**
- * @return The track that this executor is playing
- */
- public AudioTrack getTrack() {
- return track;
- }
-
- /**
- * @return The position of a seek that has not completed. Value is -1 in case no seeking is in progress.
- */
- public long getPendingSeek() {
- return pendingSeek.get();
- }
-
- /**
- * Clear the current seeking if its position matches the specified position
- *
- * @param position The position to compare with
- */
- public void clearSeek(long position) {
- if (position != NO_SEEK) {
- frameBuffer.setClearOnInsert();
-
- if (pendingSeek.compareAndSet(position, NO_SEEK)) {
- markerTracker.checkSeekTimecode(position);
- }
- }
- }
-
- /**
- * Send the specified exception as an event to the active state listener.
- *
- * @param exception Exception to send
- */
- public void dispatchException(FriendlyException exception) {
- TrackStateListener currentListener = activeListener;
-
- ExceptionTools.log(log, exception, track.getIdentifier());
-
- if (currentListener != null) {
- trackException = exception;
- currentListener.onTrackException(track, exception);
- }
- }
-
- /**
- * Mark that this track has received data from the node.
- */
- public void receivedData() {
- hasReceivedData = true;
- }
-
- /**
- * Detach the currently active listener, so no useless reference would be kept and no events would be sent there.
- */
- public void detach() {
- activeListener = null;
-
- markerTracker.trigger(ENDED);
- }
-
- @Override
- public AudioFrameBuffer getAudioBuffer() {
- return frameBuffer;
- }
-
- @Override
- public void execute(TrackStateListener listener) {
- try {
- hasStarted = true;
- activeListener = listener;
- remoteNodeManager.startPlaying(this);
- } catch (Throwable throwable) {
- listener.onTrackException(track, ExceptionTools.wrapUnfriendlyExceptions(
- "An error occurred when trying to start track remotely.", FriendlyException.Severity.FAULT, throwable));
-
- ExceptionTools.rethrowErrors(throwable);
- }
- }
-
- @Override
- public void stop() {
- frameBuffer.lockBuffer();
- frameBuffer.setTerminateOnEmpty();
- frameBuffer.clear();
-
- markerTracker.trigger(STOPPED);
-
- remoteNodeManager.onTrackEnd(null, track, AudioTrackEndReason.STOPPED);
- }
-
- @Override
- public long getPosition() {
- return lastFrameTimecode.get();
- }
-
- @Override
- public void setPosition(long timecode) {
- pendingSeek.set(timecode);
- }
-
- @Override
- public AudioTrackState getState() {
- if (hasStarted && activeListener == null) {
- return AudioTrackState.FINISHED;
- } else if (!hasReceivedData) {
- return AudioTrackState.LOADING;
- } else {
- return AudioTrackState.PLAYING;
- }
- }
-
- @Override
- public void setMarker(TrackMarker marker) {
- markerTracker.set(marker, getPosition());
- }
-
- @Override
- public AudioFrame provide() {
- AudioFrame frame = frameBuffer.provide();
- processProvidedFrame(frame);
- return frame;
- }
-
- @Override
- public AudioFrame provide(long timeout, TimeUnit unit) throws TimeoutException, InterruptedException {
- AudioFrame frame = frameBuffer.provide(timeout, unit);
- processProvidedFrame(frame);
- return frame;
- }
-
- @Override
- public boolean provide(MutableAudioFrame targetFrame) {
- if (frameBuffer.provide(targetFrame)) {
- processProvidedFrame(targetFrame);
- return true;
- }
-
- return true;
- }
-
- @Override
- public boolean provide(MutableAudioFrame targetFrame, long timeout, TimeUnit unit)
- throws TimeoutException, InterruptedException {
-
- if (frameBuffer.provide(targetFrame, timeout, unit)) {
- processProvidedFrame(targetFrame);
- return true;
- }
-
- return true;
- }
-
- private void processProvidedFrame(AudioFrame frame) {
- if (frame != null && !frame.isTerminator()) {
- lastFrameTimecode.set(frame.getTimecode());
-
- if (pendingSeek.get() == NO_SEEK && !frameBuffer.hasClearOnInsert()) {
- markerTracker.checkPlaybackTimecode(frame.getTimecode());
- }
- }
- }
-
- @Override
- public boolean failedBeforeLoad() {
- return trackException != null && !hasReceivedData;
- }
-
- /**
- * @return The expected timecode of the next frame to receive from the remote node.
- */
- public long getNextInputTimecode() {
- boolean dataReceived = hasReceivedData;
- long frameDuration = configuration.getOutputFormat().frameDuration();
-
- if (dataReceived) {
- Long lastBufferTimecode = frameBuffer.getLastInputTimecode();
- if (lastBufferTimecode != null) {
- return lastBufferTimecode + frameDuration;
- }
- }
-
- long seekPosition = pendingSeek.get();
- if (seekPosition != NO_SEEK) {
- return seekPosition;
- }
-
- return dataReceived ? lastFrameTimecode.get() + frameDuration : lastFrameTimecode.get();
- }
-
- @Override
- public String toString() {
- return "RemoteExec " + executorId + ", " + track.getIdentifier();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNode.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNode.java
deleted file mode 100644
index 52b79aa..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNode.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote;
-
-import com.sedmelluq.discord.lavaplayer.remote.message.NodeStatisticsMessage;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * A remote node interface which provides information about a specific node.
- */
-public interface RemoteNode {
- /**
- * @return The address of this remote node.
- */
- String getAddress();
-
- /**
- * @return Gets the current state of connection between the node processor and the node.
- */
- ConnectionState getConnectionState();
-
- /**
- * @return The last statistics received from this node. May be null.
- */
- NodeStatisticsMessage getLastStatistics();
-
- /**
- * @return The minimum amount of time in milliseconds between the start time of two ticks.
- */
- int getTickMinimumInterval();
-
- /**
- * To record all ticks, it is possible to calculate the minimum amount of time which guarantees that none are
- * discarded in the internal history (minimumInterval * tickHistoryCapacity).
- *
- * @return The number of ticks that are kept in history.
- */
- int getTickHistoryCapacity();
-
- /**
- * @param reset Whether to reset the history so next calls will only contain new ones.
- * @return All the ticks in the history, up to the history capacity. In case of an overflow, newer ones will replace
- * older ones.
- */
- List getLastTicks(boolean reset);
-
- /**
- * @return The number of tracks being played by this player manager through this node.
- */
- int getPlayingTrackCount();
-
- /**
- * @return List of tracks being played by this node for the current player manager.
- */
- List getPlayingTracks();
-
- /**
- * @return Map containing the balancer penalty factors, with "Total" being the sum of all others.
- */
- Map getBalancerPenaltyDetails();
-
- /**
- * Checks if a audio track is being played by this node.
- *
- * @param track The audio track.
- * @return True if this node is playing that track.
- */
- boolean isPlayingTrack(AudioTrack track);
-
- /**
- * Information about one request made to the node.
- */
- class Tick {
- /**
- * The time when the node processor started building the request to send to the node.
- */
- public final long startTime;
- /**
- * The time when the processing the response data from the node was finished.
- */
- public final long endTime;
- /**
- * Response code from the node. -1 in case of connection failure.
- */
- public final int responseCode;
- /**
- * The size of the request in bytes.
- */
- public final int requestSize;
- /**
- * The size of the uncompressed response in bytes.
- */
- public final int responseSize;
-
- /**
- * @param startTime The time when the node processor started building the request to send to the node.
- * @param endTime The time when the processing the response data from the node was finished.
- * @param responseCode Response code from the node. -1 in case of connection failure.
- * @param requestSize The size of the request in bytes.
- * @param responseSize The size of the uncompressed response in bytes.
- */
- public Tick(long startTime, long endTime, int responseCode, int requestSize, int responseSize) {
- this.startTime = startTime;
- this.endTime = endTime;
- this.responseCode = responseCode;
- this.requestSize = requestSize;
- this.responseSize = responseSize;
- }
- }
-
- /**
- * State of the connection to this node.
- */
- enum ConnectionState {
- /**
- * The node processor is current in the middle of attempting a connection to this node. Happens on every
- * reconnection attempt, even if the node has already been offline for a period of time.
- */
- PENDING,
- /**
- * The node is currently online, new tracks can be sent to this node.
- */
- ONLINE,
- /**
- * The node is offline, this is the state the node has before attempting the first request and after any failed
- * request to a node until a new request is successful.
- */
- OFFLINE,
- /**
- * This node has been removed from the list of nodes to use. In case a node with the same address is added, this
- * instance will not be reactivated, but a new one should be retrieved.
- */
- REMOVED;
-
- /**
- * @return Shortcut for ordinal.
- */
- public int id() {
- return ordinal();
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNodeManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNodeManager.java
deleted file mode 100644
index 40829f4..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNodeManager.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
-import com.sedmelluq.discord.lavaplayer.track.InternalAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioTrackExecutor;
-import com.sedmelluq.lava.common.tools.DaemonThreadFactory;
-import com.sedmelluq.lava.common.tools.ExecutorTools;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Manager of remote nodes for audio processing.
- */
-public class RemoteNodeManager extends AudioEventAdapter implements RemoteNodeRegistry, Runnable {
- private final DefaultAudioPlayerManager playerManager;
- private final HttpInterfaceManager httpInterfaceManager;
- private final List processors;
- private final AbandonedTrackManager abandonedTrackManager;
- private final AtomicBoolean enabled;
- private final Object lock;
- private volatile ScheduledThreadPoolExecutor scheduler;
- private volatile List activeProcessors;
-
- /**
- * @param playerManager Audio player manager
- */
- public RemoteNodeManager(DefaultAudioPlayerManager playerManager) {
- this.playerManager = playerManager;
- this.httpInterfaceManager = RemoteNodeProcessor.createHttpInterfaceManager();
- this.processors = new ArrayList<>();
- this.abandonedTrackManager = new AbandonedTrackManager();
- this.enabled = new AtomicBoolean();
- this.lock = new Object();
- this.activeProcessors = new ArrayList<>();
- }
-
- /**
- * Enable and initialise the remote nodes.
- *
- * @param nodeAddresses Addresses of remote nodes
- */
- public void initialise(List nodeAddresses) {
- synchronized (lock) {
- if (enabled.compareAndSet(false, true)) {
- startScheduler(nodeAddresses.size() + 1);
- } else {
- scheduler.setCorePoolSize(nodeAddresses.size() + 1);
- }
-
- List newNodeAddresses = new ArrayList<>(nodeAddresses);
-
- for (Iterator iterator = processors.iterator(); iterator.hasNext(); ) {
- RemoteNodeProcessor processor = iterator.next();
-
- if (!newNodeAddresses.remove(processor.getAddress())) {
- processor.shutdown();
- iterator.remove();
- }
- }
-
- for (String nodeAddress : newNodeAddresses) {
- RemoteNodeProcessor processor = new RemoteNodeProcessor(playerManager, nodeAddress, scheduler,
- httpInterfaceManager, abandonedTrackManager);
-
- scheduler.submit(processor);
- processors.add(processor);
- }
-
- activeProcessors = new ArrayList<>(processors);
- }
- }
-
- /**
- * Shut down, freeing all threads and stopping all tracks executed on remote nodes.
- *
- * @param terminal True if initialise will never be called again.
- */
- public void shutdown(boolean terminal) {
- synchronized (lock) {
- if (!enabled.compareAndSet(true, false)) {
- return;
- }
-
- ExecutorTools.shutdownExecutor(scheduler, "node manager");
-
- for (RemoteNodeProcessor processor : processors) {
- processor.processHealthCheck(true);
- }
-
- abandonedTrackManager.shutdown();
-
- processors.clear();
- activeProcessors = new ArrayList<>(processors);
- }
-
- if (terminal) {
- ExceptionTools.closeWithWarnings(httpInterfaceManager);
- }
- }
-
- @Override
- public boolean isEnabled() {
- return enabled.get();
- }
-
- /**
- * Start playing an audio track remotely.
- *
- * @param remoteExecutor The executor of the track
- */
- public void startPlaying(RemoteAudioTrackExecutor remoteExecutor) {
- RemoteNodeProcessor processor = getNodeForNextTrack();
-
- processor.startPlaying(remoteExecutor);
- }
-
- private void startScheduler(int initialSize) {
- ScheduledThreadPoolExecutor scheduledExecutor = new ScheduledThreadPoolExecutor(initialSize, new DaemonThreadFactory("remote"));
- scheduledExecutor.scheduleAtFixedRate(this, 2000, 2000, TimeUnit.MILLISECONDS);
- scheduler = scheduledExecutor;
- }
-
- private RemoteNodeProcessor getNodeForNextTrack() {
- int lowestPenalty = Integer.MAX_VALUE;
- RemoteNodeProcessor node = null;
-
- for (RemoteNodeProcessor processor : processors) {
- int penalty = processor.getBalancerPenalty();
-
- if (penalty < lowestPenalty) {
- lowestPenalty = penalty;
- node = processor;
- }
- }
-
- if (node == null) {
- throw new FriendlyException("No available machines for playing track.", SUSPICIOUS, null);
- }
-
- return node;
- }
-
- @Override
- public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
- AudioTrackExecutor executor = ((InternalAudioTrack) track).getActiveExecutor();
-
- if (endReason != AudioTrackEndReason.FINISHED && executor instanceof RemoteAudioTrackExecutor) {
- for (RemoteNodeProcessor processor : activeProcessors) {
- processor.trackEnded((RemoteAudioTrackExecutor) executor, true);
- }
- }
- }
-
- @Override
- public void run() {
- for (RemoteNodeProcessor processor : activeProcessors) {
- processor.processHealthCheck(false);
- }
-
- abandonedTrackManager.drainExpired();
- }
-
- @Override
- public RemoteNode getNodeUsedForTrack(AudioTrack track) {
- for (RemoteNodeProcessor processor : activeProcessors) {
- if (processor.isPlayingTrack(track)) {
- return processor;
- }
- }
-
- return null;
- }
-
- @Override
- public List getNodes() {
- return new ArrayList<>(activeProcessors);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNodeProcessor.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNodeProcessor.java
deleted file mode 100644
index 8508138..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNodeProcessor.java
+++ /dev/null
@@ -1,575 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote;
-
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.remote.message.*;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.RingBufferMath;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.tools.io.SimpleHttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.InternalAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrameBuffer;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioTrackExecutor;
-import com.sedmelluq.discord.lavaplayer.track.playback.ImmutableAudioFrame;
-import org.apache.commons.io.input.CountingInputStream;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Processes one remote node.
- */
-public class RemoteNodeProcessor implements RemoteNode, Runnable {
- private static final Logger log = LoggerFactory.getLogger(RemoteNodeProcessor.class);
-
- private static final int CONNECT_TIMEOUT = 1000;
- private static final int SOCKET_TIMEOUT = 2000;
- private static final int TRACK_KILL_THRESHOLD = 10000;
- private static final int TICK_MINIMUM_INTERVAL = 500;
- private static final int NODE_REQUEST_HISTORY = 200;
-
- private final DefaultAudioPlayerManager playerManager;
- private final String nodeAddress;
- private final ScheduledThreadPoolExecutor scheduledExecutor;
- private final HttpInterfaceManager httpInterfaceManager;
- private final AbandonedTrackManager abandonedTrackManager;
- private final BlockingQueue queuedMessages;
- private final ConcurrentMap playingTracks;
- private final RemoteMessageMapper mapper;
- private final AtomicBoolean threadRunning;
- private final AtomicInteger connectionState;
- private final ArrayDeque tickHistory;
- private volatile int aliveTickCounter;
- private volatile int requestTimingPenalty;
- private volatile long lastAliveTime;
- private volatile NodeStatisticsMessage lastStatistics;
- private volatile boolean closed;
-
- /**
- * @param playerManager Audio player manager
- * @param nodeAddress Address of this node
- * @param scheduledExecutor Scheduler to use to schedule reconnects
- * @param httpInterfaceManager HTTP interface manager to use for communicating with node
- * @param abandonedTrackManager Abandoned track manager, where the playing tracks are sent if node goes offline
- */
- public RemoteNodeProcessor(DefaultAudioPlayerManager playerManager, String nodeAddress,
- ScheduledThreadPoolExecutor scheduledExecutor, HttpInterfaceManager httpInterfaceManager,
- AbandonedTrackManager abandonedTrackManager) {
-
- this.playerManager = playerManager;
- this.nodeAddress = nodeAddress;
- this.scheduledExecutor = scheduledExecutor;
- this.httpInterfaceManager = httpInterfaceManager;
- this.abandonedTrackManager = abandonedTrackManager;
- queuedMessages = new LinkedBlockingQueue<>();
- playingTracks = new ConcurrentHashMap<>();
- mapper = new RemoteMessageMapper();
- threadRunning = new AtomicBoolean();
- connectionState = new AtomicInteger(ConnectionState.OFFLINE.id());
- tickHistory = new ArrayDeque<>(NODE_REQUEST_HISTORY);
- closed = false;
- }
-
- /**
- * Start playing a track through this remote node.
- *
- * @param executor The executor of the track
- */
- public void startPlaying(RemoteAudioTrackExecutor executor) {
- AudioTrack track = executor.getTrack();
-
- if (playingTracks.putIfAbsent(executor.getExecutorId(), executor) == null) {
- long position = executor.getNextInputTimecode();
- log.info("Sending request to play {} {} from position {}", track.getIdentifier(), executor.getExecutorId(), position);
-
- queuedMessages.add(new TrackStartRequestMessage(executor.getExecutorId(), track.getInfo(), playerManager.encodeTrackDetails(track),
- executor.getVolume(), executor.getConfiguration(), position));
- }
- }
-
- /**
- * Clear the track from this node.
- *
- * @param executor Executor of the track
- * @param notifyNode Whether it is necessary to notify the node
- */
- public void trackEnded(RemoteAudioTrackExecutor executor, boolean notifyNode) {
- if (playingTracks.remove(executor.getExecutorId()) != null) {
- log.info("Track {} removed from node {} (context {})", executor.getTrack().getIdentifier(), nodeAddress, executor.getExecutorId());
-
- if (notifyNode) {
- log.info("Notifying node {} of track stop for {} (context {})", nodeAddress, executor.getTrack().getIdentifier(), executor.getExecutorId());
-
- queuedMessages.add(new TrackStoppedMessage(executor.getExecutorId()));
- }
-
- executor.detach();
- }
- }
-
- /**
- * Mark this processor as shut down. No further tasks for it will be scheduled.
- */
- public void shutdown() {
- processHealthCheck(true);
- closed = true;
- scheduledExecutor.remove(this);
- }
-
- @Override
- public void run() {
- if (closed || !threadRunning.compareAndSet(false, true)) {
- log.debug("Not running node processor for {}, thread already active.", nodeAddress);
- return;
- }
-
- log.debug("Trying to connect to node {}.", nodeAddress);
-
- connectionState.set(ConnectionState.PENDING.id());
-
- try (HttpInterface httpInterface = httpInterfaceManager.getInterface()) {
- RingBufferMath timingAverage = new RingBufferMath(10, in -> Math.pow(in, 5.0), out -> Math.pow(out, 0.2));
-
- while (processOneTick(httpInterface, timingAverage)) {
- aliveTickCounter = Math.max(1, aliveTickCounter + 1);
- lastAliveTime = System.currentTimeMillis();
- }
- } catch (InterruptedException e) {
- log.info("Node {} processing was stopped.", nodeAddress);
- Thread.currentThread().interrupt();
- } catch (IOException e) {
- if (aliveTickCounter > 0) {
- log.error("Node {} went offline with exception.", nodeAddress, e);
- } else {
- log.debug("Retry, node {} is still offline.", nodeAddress);
- }
- } catch (Throwable e) {
- log.error("Node {} appears offline due to unexpected exception.", nodeAddress, e);
-
- ExceptionTools.rethrowErrors(e);
- } finally {
- processHealthCheck(true);
- connectionState.set(ConnectionState.OFFLINE.id());
-
- aliveTickCounter = Math.min(-1, aliveTickCounter - 1);
- threadRunning.set(false);
-
- if (!closed) {
- long delay = getScheduleDelay();
-
- if (aliveTickCounter == -1) {
- log.info("Node {} loop ended, retry scheduled in {}.", nodeAddress, delay);
- }
-
- scheduledExecutor.schedule(this, delay, TimeUnit.MILLISECONDS);
- } else {
- log.info("Node {} loop ended, node was removed.", nodeAddress);
- }
- }
- }
-
- private long getScheduleDelay() {
- if (aliveTickCounter >= -5) {
- return 1000;
- } else if (aliveTickCounter >= -20) {
- return 3000;
- } else {
- return 10000;
- }
- }
-
- private boolean processOneTick(HttpInterface httpInterface, RingBufferMath timingAverage) throws Exception {
- TickBuilder tickBuilder = new TickBuilder(System.currentTimeMillis());
-
- try {
- if (!dispatchOneTick(httpInterface, tickBuilder)) {
- return false;
- }
- } finally {
- tickBuilder.endTime = System.currentTimeMillis();
- recordTick(tickBuilder.build(), timingAverage);
- }
-
- long sleepDuration = Math.max((tickBuilder.startTime + 500) - tickBuilder.endTime, 10);
-
- Thread.sleep(sleepDuration);
- return true;
- }
-
- private boolean dispatchOneTick(HttpInterface httpInterface, TickBuilder tickBuilder) throws Exception {
- boolean success = false;
- HttpPost post = new HttpPost("http://" + nodeAddress + "/tick");
-
- abandonedTrackManager.distribute(Collections.singletonList(this));
-
- ByteArrayEntity entity = new ByteArrayEntity(buildRequestBody());
- post.setEntity(entity);
-
- tickBuilder.requestSize = (int) entity.getContentLength();
-
- CloseableHttpResponse response = httpInterface.execute(post);
-
- try {
- tickBuilder.responseCode = response.getStatusLine().getStatusCode();
- if (tickBuilder.responseCode != 200) {
- throw new IOException("Returned an unexpected response code " + tickBuilder.responseCode);
- }
-
- if (connectionState.compareAndSet(ConnectionState.PENDING.id(), ConnectionState.ONLINE.id())) {
- log.info("Node {} came online.", nodeAddress);
- } else if (connectionState.get() != ConnectionState.ONLINE.id()) {
- log.warn("Node {} received successful response, but had already lost control of its tracks.", nodeAddress);
- return false;
- }
-
- lastAliveTime = System.currentTimeMillis();
-
- if (!handleResponseBody(response.getEntity().getContent(), tickBuilder)) {
- return false;
- }
-
- success = true;
- } finally {
- if (!success) {
- ExceptionTools.closeWithWarnings(response);
- } else {
- ExceptionTools.closeWithWarnings(response.getEntity().getContent());
- }
- }
-
- return true;
- }
-
- private byte[] buildRequestBody() throws IOException {
- ByteArrayOutputStream outputBytes = new ByteArrayOutputStream();
- DataOutputStream output = new DataOutputStream(outputBytes);
-
- List messages = new ArrayList<>();
- int queuedCount = queuedMessages.drainTo(messages);
-
- if (queuedCount > 0) {
- log.debug("Including {} queued messages in the request to {}.", queuedCount, nodeAddress);
- }
-
- for (RemoteAudioTrackExecutor executor : playingTracks.values()) {
- long pendingSeek = executor.getPendingSeek();
-
- AudioFrameBuffer buffer = executor.getAudioBuffer();
- int neededFrames = pendingSeek == -1 ? buffer.getRemainingCapacity() : buffer.getFullCapacity();
-
- messages.add(new TrackFrameRequestMessage(executor.getExecutorId(), neededFrames, executor.getVolume(), pendingSeek));
- }
-
- for (RemoteMessage message : messages) {
- mapper.encode(output, message);
- }
-
- mapper.endOutput(output);
- return outputBytes.toByteArray();
- }
-
- private boolean handleResponseBody(InputStream inputStream, TickBuilder tickBuilder) {
- CountingInputStream countingStream = new CountingInputStream(inputStream);
- DataInputStream input = new DataInputStream(countingStream);
- RemoteMessage message;
-
- try {
- while ((message = mapper.decode(input)) != null) {
- if (message instanceof TrackStartResponseMessage) {
- handleTrackStartResponse((TrackStartResponseMessage) message);
- } else if (message instanceof TrackFrameDataMessage) {
- handleTrackFrameData((TrackFrameDataMessage) message);
- } else if (message instanceof TrackExceptionMessage) {
- handleTrackException((TrackExceptionMessage) message);
- } else if (message instanceof NodeStatisticsMessage) {
- handleNodeStatistics((NodeStatisticsMessage) message);
- }
- }
- } catch (InterruptedException interruption) {
- log.error("Node {} processing thread was interrupted.", nodeAddress);
- Thread.currentThread().interrupt();
- return false;
- } catch (Throwable e) {
- log.error("Error when processing response from node {}.", nodeAddress, e);
- ExceptionTools.rethrowErrors(e);
- } finally {
- tickBuilder.responseSize = countingStream.getCount();
- }
-
- return true;
- }
-
- private void handleTrackStartResponse(TrackStartResponseMessage message) {
- if (message.success) {
- log.debug("Successful start confirmation from node {} for executor {}.", nodeAddress, message.executorId);
- } else {
- RemoteAudioTrackExecutor executor = playingTracks.get(message.executorId);
-
- if (executor != null) {
- executor.dispatchException(new FriendlyException("Remote machine failed to start track: " + message.failureReason, SUSPICIOUS, null));
- executor.stop();
- } else {
- log.debug("Received failed track start for an already stopped executor {} from node {}.", message.executorId, nodeAddress);
- }
- }
- }
-
- private void handleTrackFrameData(TrackFrameDataMessage message) throws Exception {
- RemoteAudioTrackExecutor executor = playingTracks.get(message.executorId);
-
- if (executor != null) {
- if (message.seekedPosition >= 0) {
- executor.clearSeek(message.seekedPosition);
- }
-
- AudioFrameBuffer buffer = executor.getAudioBuffer();
- executor.receivedData();
-
- AudioDataFormat format = executor.getConfiguration().getOutputFormat();
-
- for (AudioFrame frame : message.frames) {
- buffer.consume(new ImmutableAudioFrame(frame.getTimecode(), frame.getData(), frame.getVolume(), format));
- }
-
- if (message.finished) {
- buffer.setTerminateOnEmpty();
- trackEnded(executor, false);
- }
- }
- }
-
- private void handleTrackException(TrackExceptionMessage message) {
- RemoteAudioTrackExecutor executor = playingTracks.get(message.executorId);
-
- if (executor != null) {
- executor.dispatchException(message.exception);
- }
- }
-
- private void handleNodeStatistics(NodeStatisticsMessage message) {
- log.trace("Received stats from node: {} {} {} {}", message.playingTrackCount, message.totalTrackCount,
- message.processCpuUsage, message.systemCpuUsage);
-
- lastStatistics = message;
- }
-
- /**
- * @return An HTTP interface manager with appropriate timeouts for node requests.
- */
- public static HttpInterfaceManager createHttpInterfaceManager() {
- RequestConfig requestConfig = RequestConfig.custom()
- .setConnectTimeout(CONNECT_TIMEOUT)
- .setConnectionRequestTimeout(CONNECT_TIMEOUT)
- .setSocketTimeout(SOCKET_TIMEOUT)
- .build();
-
- HttpClientBuilder builder = HttpClientTools.createSharedCookiesHttpBuilder();
- builder.setDefaultRequestConfig(requestConfig);
- return new SimpleHttpInterfaceManager(builder, requestConfig);
- }
-
- /**
- * Check if there are any playing tracks on a node that has not shown signs of life in too long. In that case its
- * playing tracks will also be marked dead.
- *
- * @param terminate Whether to terminate without checking the threshold
- */
- public synchronized void processHealthCheck(boolean terminate) {
- if (playingTracks.isEmpty() || (!terminate && lastAliveTime >= System.currentTimeMillis() - TRACK_KILL_THRESHOLD)) {
- return;
- }
-
- connectionState.set(ConnectionState.OFFLINE.id());
-
- if (!terminate) {
- log.warn("Bringing node {} offline since last response from it was {}ms ago.", nodeAddress, System.currentTimeMillis() - lastAliveTime);
- }
-
- // There may be some racing that manages to add a track after this, it will be dealt with on the next iteration
- for (Long executorId : new ArrayList<>(playingTracks.keySet())) {
- RemoteAudioTrackExecutor executor = playingTracks.remove(executorId);
-
- if (executor != null) {
- abandonedTrackManager.add(executor);
- }
- }
- }
-
- private void recordTick(RemoteNode.Tick tick, RingBufferMath timingAverage) {
- timingAverage.add(tick.endTime - tick.startTime);
- requestTimingPenalty = (int) ((1450.0f / ((1450.0f - Math.min(timingAverage.mean(), 1440)) / 30.0f)) - 30.0f);
-
- synchronized (tickHistory) {
- if (tickHistory.size() == NODE_REQUEST_HISTORY) {
- tickHistory.removeFirst();
- }
-
- tickHistory.addLast(tick);
- }
- }
-
- @Override
- public String getAddress() {
- return nodeAddress;
- }
-
- @Override
- public ConnectionState getConnectionState() {
- if (closed) {
- return ConnectionState.REMOVED;
- } else {
- return ConnectionState.class.getEnumConstants()[connectionState.get()];
- }
- }
-
- @Override
- public NodeStatisticsMessage getLastStatistics() {
- return lastStatistics;
- }
-
- @Override
- public int getTickMinimumInterval() {
- return TICK_MINIMUM_INTERVAL;
- }
-
- @Override
- public int getTickHistoryCapacity() {
- return NODE_REQUEST_HISTORY;
- }
-
- @Override
- public List getLastTicks(boolean reset) {
- synchronized (tickHistory) {
- List result = new ArrayList<>(tickHistory);
-
- if (reset) {
- tickHistory.clear();
- }
-
- return result;
- }
- }
-
- @Override
- public int getPlayingTrackCount() {
- return playingTracks.size();
- }
-
- @Override
- public List getPlayingTracks() {
- List tracks = new ArrayList<>();
-
- for (RemoteAudioTrackExecutor executor : playingTracks.values()) {
- tracks.add(executor.getTrack());
- }
-
- return tracks;
- }
-
- private boolean isUnavailableForTracks(NodeStatisticsMessage statistics) {
- return statistics == null || connectionState.get() != ConnectionState.ONLINE.id();
- }
-
- private int getPenaltyForPlayingTracks(NodeStatisticsMessage statistics) {
- int count = statistics.playingTrackCount;
- int penalty = Math.min(count, 100);
-
- if (count > 100) {
- penalty += Math.pow(count - 100.0, 0.7);
- }
-
- return penalty * 3 / 2;
- }
-
- private int getPenaltyForPausedTracks(NodeStatisticsMessage statistics) {
- return statistics.totalTrackCount - statistics.playingTrackCount;
- }
-
- private int getPenaltyForCpuUsage(NodeStatisticsMessage statistics) {
- return (int) ((1.0f / ((1.0f - Math.min(statistics.systemCpuUsage, 0.99f)) / 30.0f)) - 30.0f);
- }
-
- @Override
- public Map getBalancerPenaltyDetails() {
- Map details = new HashMap<>();
- NodeStatisticsMessage statistics = lastStatistics;
-
- if (isUnavailableForTracks(statistics)) {
- details.put("unavailable", Integer.MAX_VALUE);
- } else {
- details.put("playing", getPenaltyForPlayingTracks(statistics));
- details.put("paused", getPenaltyForPausedTracks(statistics));
- details.put("cpu", getPenaltyForCpuUsage(statistics));
- details.put("timings", requestTimingPenalty);
- }
-
- int total = 0;
- for (int value : details.values()) {
- total += value;
- }
- details.put("total", total);
-
- return details;
- }
-
- /**
- * @return The penalty for load balancing. Node with the lowest value will receive the next track.
- */
- public int getBalancerPenalty() {
- NodeStatisticsMessage statistics = lastStatistics;
-
- if (isUnavailableForTracks(statistics)) {
- return Integer.MAX_VALUE;
- }
-
- return getPenaltyForPlayingTracks(statistics) +
- getPenaltyForPausedTracks(statistics) +
- getPenaltyForCpuUsage(statistics) +
- requestTimingPenalty;
- }
-
- @Override
- public boolean isPlayingTrack(AudioTrack track) {
- AudioTrackExecutor executor = ((InternalAudioTrack) track).getActiveExecutor();
-
- if (executor instanceof RemoteAudioTrackExecutor) {
- return playingTracks.containsKey(((RemoteAudioTrackExecutor) executor).getExecutorId());
- }
-
- return false;
- }
-
- private static class TickBuilder {
- private final long startTime;
- private long endTime;
- private int responseCode;
- private int requestSize;
- private int responseSize;
-
- private TickBuilder(long startTime) {
- this.startTime = startTime;
- this.responseCode = -1;
- }
-
- private RemoteNode.Tick build() {
- return new RemoteNode.Tick(startTime, endTime, responseCode, requestSize, responseSize);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNodeRegistry.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNodeRegistry.java
deleted file mode 100644
index f3d628a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/RemoteNodeRegistry.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote;
-
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-import java.util.List;
-
-/**
- * Registry of currently used remote nodes by a player manager.
- */
-public interface RemoteNodeRegistry {
- /**
- * @return True if using remote nodes for audio processing is enabled.
- */
- boolean isEnabled();
-
- /**
- * Finds the node which is playing the specified track.
- *
- * @param track The track to check.
- * @return The node which is playing this track, or null if no node is playing it.
- */
- RemoteNode getNodeUsedForTrack(AudioTrack track);
-
- /**
- * @return List of all nodes currently in use (including ones which are offline).
- */
- List getNodes();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/NodeStatisticsCodec.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/NodeStatisticsCodec.java
deleted file mode 100644
index a0fabfb..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/NodeStatisticsCodec.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * Codec for node statistics message.
- */
-public class NodeStatisticsCodec implements RemoteMessageCodec {
- @Override
- public Class getMessageClass() {
- return NodeStatisticsMessage.class;
- }
-
- @Override
- public int version(RemoteMessage message) {
- return 1;
- }
-
- @Override
- public void encode(DataOutput out, NodeStatisticsMessage message) throws IOException {
- out.writeInt(message.playingTrackCount);
- out.writeInt(message.totalTrackCount);
- out.writeFloat(message.systemCpuUsage);
- out.writeFloat(message.processCpuUsage);
- }
-
- @Override
- public NodeStatisticsMessage decode(DataInput in, int version) throws IOException {
- return new NodeStatisticsMessage(in.readInt(), in.readInt(), in.readFloat(), in.readFloat());
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/NodeStatisticsMessage.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/NodeStatisticsMessage.java
deleted file mode 100644
index c0aa9f2..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/NodeStatisticsMessage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-/**
- * A message detailing track and performance statistics that a node includes in every response.
- */
-public class NodeStatisticsMessage implements RemoteMessage {
- /**
- * The number of tracks that are not paused
- */
- public final int playingTrackCount;
- /**
- * Total number of tracks being processed by the node
- */
- public final int totalTrackCount;
- /**
- * Total CPU usage of the system
- */
- public final float systemCpuUsage;
- /**
- * CPU usage of the node process
- */
- public final float processCpuUsage;
-
- /**
- * @param playingTrackCount The number of tracks that are not paused
- * @param totalTrackCount Total number of tracks being processed by the node
- * @param systemCpuUsage Total CPU usage of the machine
- * @param processCpuUsage CPU usage of the node process
- */
- public NodeStatisticsMessage(int playingTrackCount, int totalTrackCount, float systemCpuUsage, float processCpuUsage) {
- this.playingTrackCount = playingTrackCount;
- this.totalTrackCount = totalTrackCount;
- this.systemCpuUsage = systemCpuUsage;
- this.processCpuUsage = processCpuUsage;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessage.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessage.java
deleted file mode 100644
index 6612a9c..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-/**
- * A marker interface for all remote message classes.
- */
-public interface RemoteMessage {
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessageCodec.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessageCodec.java
deleted file mode 100644
index 4214da5..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessageCodec.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * Codec for encoding and decoding remote messages.
- *
- * @param The message class
- */
-public interface RemoteMessageCodec {
- /**
- * @return The class of the message this codec works with
- */
- Class getMessageClass();
-
- /**
- * @param message If set, returns version to use for this specific message.
- * @return Latest version of this codec, or version to use if the message is specified.
- */
- int version(RemoteMessage message);
-
- /**
- * Encode the message to the specified output.
- *
- * @param out The output stream
- * @param message The message to encode
- * @throws IOException When an IO error occurs
- */
- void encode(DataOutput out, T message) throws IOException;
-
- /**
- * Decode a message from the specified input.
- *
- * @param in The input stream
- * @param version Version of the message
- * @return The decoded message
- * @throws IOException When an IO error occurs
- */
- T decode(DataInput in, int version) throws IOException;
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessageMapper.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessageMapper.java
deleted file mode 100644
index c2f2e58..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessageMapper.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-/**
- * Handles encoding and decoding of messages.
- */
-public class RemoteMessageMapper {
- private static final Logger log = LoggerFactory.getLogger(RemoteMessageMapper.class);
-
- private final Map, RemoteMessageType> encodingMap;
-
- /**
- * Create a new instance.
- */
- public RemoteMessageMapper() {
- encodingMap = new IdentityHashMap<>();
-
- initialiseEncodingMap();
- }
-
- private void initialiseEncodingMap() {
- for (RemoteMessageType type : RemoteMessageType.class.getEnumConstants()) {
- encodingMap.put(type.codec.getMessageClass(), type);
- }
- }
-
- /**
- * Decodes one message. If the input stream indicates the end of messages, null is returned.
- *
- * @param input The input stream containing the message
- * @return The decoded message or null in case no more messages are present
- * @throws IOException When an IO error occurs
- */
- public RemoteMessage decode(DataInput input) throws IOException {
- int messageSize = input.readInt();
- if (messageSize == 0) {
- return null;
- }
-
- RemoteMessageType[] types = RemoteMessageType.class.getEnumConstants();
- int typeIndex = input.readByte() & 0xFF;
- int version = input.readByte() & 0xFF;
-
- if (typeIndex >= types.length) {
- log.warn("Invalid message type {}.", typeIndex);
- input.readFully(new byte[messageSize - 1]);
- return UnknownMessage.INSTANCE;
- }
-
- RemoteMessageType type = types[typeIndex];
-
- if (version < 1 || version > type.codec.version(null)) {
- log.warn("Invalid version {} for message {}.", version, type);
- input.readFully(new byte[messageSize - 2]);
- return UnknownMessage.INSTANCE;
- }
-
- return type.codec.decode(input, version);
- }
-
- /**
- * Encodes one message.
- *
- * @param output The output stream to encode to
- * @param message The message to encode
- * @throws IOException When an IO error occurs
- */
- @SuppressWarnings("unchecked")
- public void encode(DataOutputStream output, RemoteMessage message) throws IOException {
- RemoteMessageType type = encodingMap.get(message.getClass());
-
- ByteArrayOutputStream messageOutputBytes = new ByteArrayOutputStream();
- DataOutput messageOutput = new DataOutputStream(messageOutputBytes);
-
- RemoteMessageCodec codec = type.codec;
- codec.encode(messageOutput, message);
-
- output.writeInt(messageOutputBytes.size() + 2);
- output.writeByte((byte) type.ordinal());
- output.writeByte((byte) type.codec.version(message));
- messageOutputBytes.writeTo(output);
- }
-
- /**
- * Write the marker to indicate no more messages are in the stream.
- *
- * @param output The output stream
- * @throws IOException When an IO error occurs
- */
- public void endOutput(DataOutputStream output) throws IOException {
- output.writeInt(0);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessageType.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessageType.java
deleted file mode 100644
index 8e81937..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/RemoteMessageType.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-/**
- * All remote message types.
- */
-public enum RemoteMessageType {
- TRACK_START_REQUEST(new TrackStartRequestCodec()),
- TRACK_START_RESPONSE(new TrackStartResponseCodec()),
- TRACK_FRAME_REQUEST(new TrackFrameRequestCodec()),
- TRACK_FRAME_DATA(new TrackFrameDataCodec()),
- TRACK_STOPPED(new TrackStoppedCodec()),
- TRACK_EXCEPTION(new TrackExceptionCodec()),
- NODE_STATISTICS(new NodeStatisticsCodec());
-
- /**
- * The codec used for encoding and decoding this type of message.
- */
- public final RemoteMessageCodec codec;
-
- RemoteMessageType(RemoteMessageCodec codec) {
- this.codec = codec;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackExceptionCodec.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackExceptionCodec.java
deleted file mode 100644
index 2e172f4..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackExceptionCodec.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * Codec for track exception message.
- */
-public class TrackExceptionCodec implements RemoteMessageCodec {
- @Override
- public Class getMessageClass() {
- return TrackExceptionMessage.class;
- }
-
- @Override
- public int version(RemoteMessage message) {
- return 1;
- }
-
- @Override
- public void encode(DataOutput out, TrackExceptionMessage message) throws IOException {
- out.writeLong(message.executorId);
- ExceptionTools.encodeException(out, message.exception);
- }
-
- @Override
- public TrackExceptionMessage decode(DataInput in, int version) throws IOException {
- return new TrackExceptionMessage(in.readLong(), ExceptionTools.decodeException(in));
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackExceptionMessage.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackExceptionMessage.java
deleted file mode 100644
index 324dbf1..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackExceptionMessage.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-
-/**
- * Track exception message which is sent by the node when processing the track in the node fails.
- */
-public class TrackExceptionMessage implements RemoteMessage {
- /**
- * The ID for the track executor
- */
- public final long executorId;
- /**
- * Exception that was thrown by the local executor
- */
- public final FriendlyException exception;
-
- /**
- * @param executorId The ID for the track executor
- * @param exception Exception that was thrown by the local executor
- */
- public TrackExceptionMessage(long executorId, FriendlyException exception) {
- this.executorId = executorId;
- this.exception = exception;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameDataCodec.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameDataCodec.java
deleted file mode 100644
index 7f9db39..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameDataCodec.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-import com.sedmelluq.discord.lavaplayer.track.playback.ImmutableAudioFrame;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Codec for track frame data message.
- */
-public class TrackFrameDataCodec implements RemoteMessageCodec {
- @Override
- public Class getMessageClass() {
- return TrackFrameDataMessage.class;
- }
-
- @Override
- public int version(RemoteMessage message) {
- return 1;
- }
-
- @Override
- public void encode(DataOutput out, TrackFrameDataMessage message) throws IOException {
- out.writeLong(message.executorId);
- out.writeInt(message.frames.size());
-
- for (AudioFrame frame : message.frames) {
- out.writeLong(frame.getTimecode());
- out.writeInt(frame.getDataLength());
- out.write(frame.getData());
- out.writeInt(frame.getVolume());
- }
-
- out.writeBoolean(message.finished);
- out.writeLong(message.seekedPosition);
- }
-
- @Override
- public TrackFrameDataMessage decode(DataInput in, int version) throws IOException {
- long executorId = in.readLong();
- int frameCount = in.readInt();
-
- List frames = new ArrayList<>(frameCount);
-
- for (int i = 0; i < frameCount; i++) {
- long timecode = in.readLong();
- byte[] data = new byte[in.readInt()];
- in.readFully(data);
-
- frames.add(new ImmutableAudioFrame(timecode, data, in.readInt(), null));
- }
-
- return new TrackFrameDataMessage(executorId, frames, in.readBoolean(), in.readLong());
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameDataMessage.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameDataMessage.java
deleted file mode 100644
index 7018b55..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameDataMessage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-
-import java.util.List;
-
-/**
- * Message from an audio node to the master as a response to TrackFrameRequestMessage. Bouncing back the seeked position
- * is necessary because then the master can clear up the pending seek only if it matches this number. Otherwise the seek
- * position has been changed while the data for the previous seek was requested. The master also cannot clear the seek
- * state when sending the request, because in case the request fails, the seek will be discarded.
- */
-public class TrackFrameDataMessage implements RemoteMessage {
- /**
- * The ID for the track executor
- */
- public final long executorId;
- /**
- * Frames provided by the node. These are missing the audio format, which must be attached locally. It can be assumed
- * that the node provides data in the format that it was initially requested in.
- */
- public final List frames;
- /**
- * If these are the last frames for the track. After receiving a message with this set to true, no more requests about
- * this track should be made to the node as it has already deleted the track from its registry.
- */
- public final boolean finished;
- /**
- * In case the data request included a seek, then this will report that the seek was completed by having the requested
- * seek position as a value. When no seek was performed, this is -1. The frames returned in this message start from
- * this position.
- */
- public final long seekedPosition;
-
- /**
- * @param executorId The ID for the track executor
- * @param frames Frames provided by the node
- * @param finished If these are the last frames for the track
- * @param seekedPosition The position of the seek that was performed
- */
- public TrackFrameDataMessage(long executorId, List frames, boolean finished, long seekedPosition) {
- this.executorId = executorId;
- this.frames = frames;
- this.finished = finished;
- this.seekedPosition = seekedPosition;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameRequestCodec.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameRequestCodec.java
deleted file mode 100644
index a857db3..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameRequestCodec.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * Codec for track frame request message.
- */
-public class TrackFrameRequestCodec implements RemoteMessageCodec {
- @Override
- public Class getMessageClass() {
- return TrackFrameRequestMessage.class;
- }
-
- @Override
- public int version(RemoteMessage message) {
- return 1;
- }
-
- @Override
- public void encode(DataOutput out, TrackFrameRequestMessage message) throws IOException {
- out.writeLong(message.executorId);
- out.writeInt(message.maximumFrames);
- out.writeInt(message.volume);
- out.writeLong(message.seekPosition);
- }
-
- @Override
- public TrackFrameRequestMessage decode(DataInput in, int version) throws IOException {
- return new TrackFrameRequestMessage(in.readLong(), in.readInt(), in.readInt(), in.readLong());
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameRequestMessage.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameRequestMessage.java
deleted file mode 100644
index 79aa300..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackFrameRequestMessage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-/**
- * A message sent to the node to request frames from a track. This is sent even when no frames are required as it is
- * used to indicate that the track is still alive in the master.
- */
-public class TrackFrameRequestMessage implements RemoteMessage {
- /**
- * The ID for the track executor
- */
- public final long executorId;
- /**
- * Maximum number of frames that can be included in the response
- */
- public final int maximumFrames;
- /**
- * Current volume of the track
- */
- public final int volume;
- /**
- * The position to seek to. Value is -1 if no seeking is required at the moment.
- */
- public final long seekPosition;
-
- /**
- * @param executorId The ID for the track executor
- * @param maximumFrames Maximum number of frames that can be included in the response
- * @param volume Current volume of the track
- * @param seekPosition The position to seek to
- */
- public TrackFrameRequestMessage(long executorId, int maximumFrames, int volume, long seekPosition) {
- this.executorId = executorId;
- this.maximumFrames = maximumFrames;
- this.volume = volume;
- this.seekPosition = seekPosition;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartRequestCodec.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartRequestCodec.java
deleted file mode 100644
index 54f1cca..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartRequestCodec.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import com.sedmelluq.discord.lavaplayer.format.AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.format.OpusAudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.format.Pcm16AudioDataFormat;
-import com.sedmelluq.discord.lavaplayer.format.StandardAudioDataFormats;
-import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * Codec for track start message.
- */
-public class TrackStartRequestCodec implements RemoteMessageCodec {
- private static final int VERSION_INITIAL = 1;
- private static final int VERSION_WITH_FORMAT = 2;
- private static final int VERSION_WITH_POSITION = 3;
-
- @Override
- public Class getMessageClass() {
- return TrackStartRequestMessage.class;
- }
-
- @Override
- public int version(RemoteMessage message) {
- // Backwards compatibility with older nodes.
- if (message instanceof TrackStartRequestMessage) {
- if (((TrackStartRequestMessage) message).position != 0) {
- return VERSION_WITH_POSITION;
- }
-
- AudioDataFormat format = ((TrackStartRequestMessage) message).configuration.getOutputFormat();
-
- if (!format.equals(StandardAudioDataFormats.DISCORD_OPUS)) {
- return VERSION_WITH_FORMAT;
- }
-
- return VERSION_INITIAL;
- }
-
- return VERSION_WITH_POSITION;
- }
-
- @Override
- public void encode(DataOutput out, TrackStartRequestMessage message) throws IOException {
- int version = version(message);
-
- out.writeLong(message.executorId);
- out.writeUTF(message.trackInfo.title);
- out.writeUTF(message.trackInfo.author);
- out.writeLong(message.trackInfo.length);
- out.writeUTF(message.trackInfo.identifier);
- out.writeBoolean(message.trackInfo.isStream);
- out.writeInt(message.encodedTrack.length);
- out.write(message.encodedTrack);
- out.writeInt(message.volume);
- out.writeUTF(message.configuration.getResamplingQuality().name());
- out.writeInt(message.configuration.getOpusEncodingQuality());
-
- if (version >= VERSION_WITH_FORMAT) {
- AudioDataFormat format = message.configuration.getOutputFormat();
- out.writeInt(format.channelCount);
- out.writeInt(format.sampleRate);
- out.writeInt(format.chunkSampleCount);
- out.writeUTF(format.codecName());
- }
-
- if (version >= VERSION_WITH_POSITION) {
- out.writeLong(message.position);
- }
- }
-
- @Override
- public TrackStartRequestMessage decode(DataInput in, int version) throws IOException {
- long executorId = in.readLong();
- AudioTrackInfo trackInfo = new AudioTrackInfo(in.readUTF(), in.readUTF(), in.readLong(), in.readUTF(), in.readBoolean(), null);
-
- byte[] encodedTrack = new byte[in.readInt()];
- in.readFully(encodedTrack);
-
- int volume = in.readInt();
- AudioConfiguration configuration = new AudioConfiguration();
- configuration.setResamplingQuality(AudioConfiguration.ResamplingQuality.valueOf(in.readUTF()));
- configuration.setOpusEncodingQuality(in.readInt());
-
- if (version >= VERSION_WITH_FORMAT) {
- AudioDataFormat format = createFormat(in.readInt(), in.readInt(), in.readInt(), in.readUTF());
- configuration.setOutputFormat(format);
- }
-
- long position = 0;
-
- if (version >= VERSION_WITH_POSITION) {
- position = in.readLong();
- }
-
- return new TrackStartRequestMessage(executorId, trackInfo, encodedTrack, volume, configuration, position);
- }
-
- private AudioDataFormat createFormat(int channelCount, int sampleRate, int chunkSampleCount, String codecName)
- throws IOException {
-
- switch (codecName) {
- case OpusAudioDataFormat.CODEC_NAME:
- return new OpusAudioDataFormat(channelCount, sampleRate, chunkSampleCount);
- case Pcm16AudioDataFormat.CODEC_NAME_LE:
- return new Pcm16AudioDataFormat(channelCount, sampleRate, chunkSampleCount, false);
- case Pcm16AudioDataFormat.CODEC_NAME_BE:
- return new Pcm16AudioDataFormat(channelCount, sampleRate, chunkSampleCount, true);
- default:
- throw new IOException("Unsupported codec requested.");
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartRequestMessage.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartRequestMessage.java
deleted file mode 100644
index 785e96f..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartRequestMessage.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioConfiguration;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-
-/**
- * The message that is sent to the node when the master requests the node to start playing a track.
- */
-public class TrackStartRequestMessage implements RemoteMessage {
- /**
- * The ID for the track executor
- */
- public final long executorId;
- /**
- * Generic track information
- */
- public final AudioTrackInfo trackInfo;
- /**
- * Track specific extra information that is required to initialise the track object
- */
- public final byte[] encodedTrack;
- /**
- * Initial volume of the track
- */
- public final int volume;
- /**
- * Configuration to use for audio processing
- */
- public final AudioConfiguration configuration;
- /**
- * Position to start playing at in milliseconds
- */
- public final long position;
-
- /**
- * @param executorId The ID for the track executor
- * @param trackInfo Generic track information
- * @param encodedTrack Track specific extra information that is required to initialise the track object
- * @param volume Initial volume of the track
- * @param configuration Configuration to use for audio processing
- * @param position Position to start playing at in milliseconds
- */
- public TrackStartRequestMessage(long executorId, AudioTrackInfo trackInfo, byte[] encodedTrack, int volume,
- AudioConfiguration configuration, long position) {
-
- this.executorId = executorId;
- this.encodedTrack = encodedTrack;
- this.trackInfo = trackInfo;
- this.volume = volume;
- this.configuration = configuration;
- this.position = position;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartResponseCodec.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartResponseCodec.java
deleted file mode 100644
index a8ec66b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartResponseCodec.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * Codec for track start request response message.
- */
-public class TrackStartResponseCodec implements RemoteMessageCodec {
- @Override
- public Class getMessageClass() {
- return TrackStartResponseMessage.class;
- }
-
- @Override
- public int version(RemoteMessage message) {
- return 1;
- }
-
- @Override
- public void encode(DataOutput out, TrackStartResponseMessage message) throws IOException {
- out.writeLong(message.executorId);
- out.writeBoolean(message.success);
-
- if (!message.success) {
- out.writeUTF(message.failureReason);
- }
- }
-
- @Override
- public TrackStartResponseMessage decode(DataInput in, int version) throws IOException {
- long executorId = in.readLong();
- boolean success = in.readBoolean();
-
- return new TrackStartResponseMessage(executorId, success, success ? null : in.readUTF());
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartResponseMessage.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartResponseMessage.java
deleted file mode 100644
index 673b931..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStartResponseMessage.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-/**
- * This is the response to a TrackStartRequestMessage. It indicates whether the track was successfully started on the
- * node. This does not guarantee that any frames from the track will arrive, only that its execution was submitted.
- */
-public class TrackStartResponseMessage implements RemoteMessage {
- /**
- * The ID for the track executor
- */
- public final long executorId;
- /**
- * Whether the track was successfully started in the node
- */
- public final boolean success;
- /**
- * The reason in case the track was not started
- */
- public final String failureReason;
-
- /**
- * @param executorId The ID for the track executor
- * @param success Whether the track was successfully started in the node
- * @param failureReason The reason in case the track was not started
- */
- public TrackStartResponseMessage(long executorId, boolean success, String failureReason) {
- this.executorId = executorId;
- this.success = success;
- this.failureReason = failureReason;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStoppedCodec.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStoppedCodec.java
deleted file mode 100644
index 4c01030..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStoppedCodec.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * Codec for stopped track notification message.
- */
-public class TrackStoppedCodec implements RemoteMessageCodec {
- @Override
- public Class getMessageClass() {
- return TrackStoppedMessage.class;
- }
-
- @Override
- public int version(RemoteMessage message) {
- return 1;
- }
-
- @Override
- public void encode(DataOutput out, TrackStoppedMessage message) throws IOException {
- out.writeLong(message.executorId);
- }
-
- @Override
- public TrackStoppedMessage decode(DataInput in, int version) throws IOException {
- return new TrackStoppedMessage(in.readLong());
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStoppedMessage.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStoppedMessage.java
deleted file mode 100644
index ae5bf9c..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/TrackStoppedMessage.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-/**
- * Message to notify the node that the track has been stopped in the master. No more requests for that track will occur
- * so the track may be deleted from the node.
- */
-public class TrackStoppedMessage implements RemoteMessage {
- /**
- * The ID for the track executor
- */
- public final long executorId;
-
- /**
- * @param executorId The ID for the track executor
- */
- public TrackStoppedMessage(long executorId) {
- this.executorId = executorId;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/UnknownMessage.java b/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/UnknownMessage.java
deleted file mode 100644
index 1bf8ce5..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/remote/message/UnknownMessage.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.remote.message;
-
-/**
- * Used for cases where the message could not be decoded.
- */
-public class UnknownMessage implements RemoteMessage {
- /**
- * Keep a singleton instance as there can be no difference between instances.
- */
- public static final UnknownMessage INSTANCE = new UnknownMessage();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/AudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/AudioSourceManager.java
deleted file mode 100644
index 883a9ae..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/AudioSourceManager.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source;
-
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-/**
- * Manager for a source of audio items.
- */
-public interface AudioSourceManager {
- /**
- * Every source manager implementation should have its unique name as it is used to determine which source manager
- * should be able to decode a serialized audio track.
- *
- * @return The name of this source manager
- */
- String getSourceName();
-
- /**
- * Returns an audio track for the input string. It should return null if it can immediately detect that there is no
- * track for this identifier for this source. If checking that requires more expensive operations, then it should
- * return a track instance and check that in InternalAudioTrack#loadTrackInfo.
- *
- * @param manager The audio manager to attach to the loaded tracks
- * @param reference The reference with the identifier which the source manager should find the track with
- * @return The loaded item or null on unrecognized identifier
- */
- AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference);
-
- /**
- * Returns whether the specified track can be encoded. The argument is always a track created by this manager. Being
- * encodable also means that it must be possible to play this track on a different node, so it should not depend on
- * any resources that are only available on the current system.
- *
- * @param track The track to check
- * @return True if it is encodable
- */
- boolean isTrackEncodable(AudioTrack track);
-
- /**
- * Encodes an audio track into the specified output. The contents of AudioTrackInfo do not have to be included since
- * they are written to the output already before this call. This will only be called for tracks which were loaded by
- * this source manager and for which isEncodable() returns true.
- *
- * @param track The track to encode
- * @param output Output where to write the decoded format to
- * @throws IOException On write error.
- */
- void encodeTrack(AudioTrack track, DataOutput output) throws IOException;
-
- /**
- * Decodes an audio track from the encoded format encoded with encodeTrack().
- *
- * @param trackInfo The track info
- * @param input The input where to read the bytes of the encoded format
- * @return The decoded track
- * @throws IOException On read error.
- */
- AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException;
-
- /**
- * Shut down the source manager, freeing all associated resources and threads. A source manager is not responsible for
- * terminating the tracks that it has created.
- */
- void shutdown();
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/AudioSourceManagers.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/AudioSourceManagers.java
deleted file mode 100644
index 1e805b3..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/AudioSourceManagers.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerRegistry;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.bandcamp.BandcampAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.beam.BeamAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.local.LocalAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.twitch.TwitchStreamAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.vimeo.VimeoAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
-
-/**
- * A helper class for registering built-in source managers to a player manager.
- */
-public class AudioSourceManagers {
- /**
- * See {@link #registerRemoteSources(AudioPlayerManager, MediaContainerRegistry)}, but with default containers.
- */
- public static void registerRemoteSources(AudioPlayerManager playerManager) {
- registerRemoteSources(playerManager, MediaContainerRegistry.DEFAULT_REGISTRY);
- }
-
- /**
- * Registers all built-in remote audio sources to the specified player manager. Local file audio source must be
- * registered separately.
- *
- * @param playerManager Player manager to register the source managers to
- * @param containerRegistry Media container registry to be used by any probing sources.
- */
- public static void registerRemoteSources(AudioPlayerManager playerManager, MediaContainerRegistry containerRegistry) {
- playerManager.registerSourceManager(new YoutubeAudioSourceManager(true));
- playerManager.registerSourceManager(new SoundCloudAudioSourceManager());
- playerManager.registerSourceManager(new BandcampAudioSourceManager());
- playerManager.registerSourceManager(new VimeoAudioSourceManager());
- playerManager.registerSourceManager(new TwitchStreamAudioSourceManager());
- playerManager.registerSourceManager(new BeamAudioSourceManager());
- playerManager.registerSourceManager(new HttpAudioSourceManager());
- }
-
- /**
- * Registers the local file source manager to the specified player manager.
- *
- * @param playerManager Player manager to register the source manager to
- */
- public static void registerLocalSource(AudioPlayerManager playerManager) {
- registerLocalSource(playerManager, MediaContainerRegistry.DEFAULT_REGISTRY);
- }
-
- /**
- * Registers the local file source manager to the specified player manager.
- *
- * @param playerManager Player manager to register the source manager to
- * @param containerRegistry Media container registry to be used by the local source.
- */
- public static void registerLocalSource(AudioPlayerManager playerManager, MediaContainerRegistry containerRegistry) {
- playerManager.registerSourceManager(new LocalAudioSourceManager());
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/ProbingAudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/ProbingAudioSourceManager.java
deleted file mode 100644
index 4fb8acb..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/ProbingAudioSourceManager.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDescriptor;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerProbe;
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerRegistry;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.COMMON;
-
-/**
- * The base class for audio sources which use probing to detect container type.
- */
-public abstract class ProbingAudioSourceManager implements AudioSourceManager {
- private static final char PARAMETERS_SEPARATOR = '|';
-
- protected final MediaContainerRegistry containerRegistry;
-
- protected ProbingAudioSourceManager(MediaContainerRegistry containerRegistry) {
- this.containerRegistry = containerRegistry;
- }
-
- protected AudioItem handleLoadResult(MediaContainerDetectionResult result) {
- if (result != null) {
- if (result.isReference()) {
- return result.getReference();
- } else if (!result.isContainerDetected()) {
- throw new FriendlyException("Unknown file format.", COMMON, null);
- } else if (!result.isSupportedFile()) {
- throw new FriendlyException(result.getUnsupportedReason(), COMMON, null);
- } else {
- return createTrack(result.getTrackInfo(), result.getContainerDescriptor());
- }
- }
-
- return null;
- }
-
- protected abstract AudioTrack createTrack(AudioTrackInfo trackInfo, MediaContainerDescriptor containerTrackFactory);
-
- protected void encodeTrackFactory(MediaContainerDescriptor factory, DataOutput output) throws IOException {
- String probeInfo = factory.probe.getName() + (factory.parameters != null ? PARAMETERS_SEPARATOR +
- factory.parameters : "");
-
- output.writeUTF(probeInfo);
- }
-
- protected MediaContainerDescriptor decodeTrackFactory(DataInput input) throws IOException {
- String probeInfo = input.readUTF();
- int separatorPosition = probeInfo.indexOf(PARAMETERS_SEPARATOR);
-
- String probeName = separatorPosition < 0 ? probeInfo : probeInfo.substring(0, separatorPosition);
- String parameters = separatorPosition < 0 ? null : probeInfo.substring(separatorPosition + 1);
-
- MediaContainerProbe probe = containerRegistry.find(probeName);
- if (probe != null) {
- return new MediaContainerDescriptor(probe, parameters);
- }
-
- return null;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/bandcamp/BandcampAudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/bandcamp/BandcampAudioSourceManager.java
deleted file mode 100644
index b45a80b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/bandcamp/BandcampAudioSourceManager.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.bandcamp;
-
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.*;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.FAULT;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio source manager that implements finding Bandcamp tracks based on URL.
- */
-public class BandcampAudioSourceManager implements AudioSourceManager, HttpConfigurable {
- private static final String TRACK_URL_REGEX = "^https?://(?:[^.]+\\.|)bandcamp\\.com/track/([a-zA-Z0-9-_]+)/?(?:\\?.*|)$";
- private static final String ALBUM_URL_REGEX = "^https?://(?:[^.]+\\.|)bandcamp\\.com/album/([a-zA-Z0-9-_]+)/?(?:\\?.*|)$";
-
- private static final Pattern trackUrlPattern = Pattern.compile(TRACK_URL_REGEX);
- private static final Pattern albumUrlPattern = Pattern.compile(ALBUM_URL_REGEX);
-
- private final HttpInterfaceManager httpInterfaceManager;
-
- /**
- * Create an instance.
- */
- public BandcampAudioSourceManager() {
- httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
- }
-
- @Override
- public String getSourceName() {
- return "bandcamp";
- }
-
- @Override
- public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference) {
- if (trackUrlPattern.matcher(reference.identifier).matches()) {
- return loadTrack(reference.identifier);
- } else if (albumUrlPattern.matcher(reference.identifier).matches()) {
- return loadAlbum(reference.identifier);
- }
- return null;
- }
-
- private AudioItem loadTrack(String trackUrl) {
- return extractFromPage(trackUrl, (httpClient, text) -> {
- String bandUrl = readBandUrl(text);
- JsonBrowser trackListInfo = readTrackListInformation(text);
- String artist = trackListInfo.get("artist").text();
-
- return extractTrack(trackListInfo.get("trackinfo").index(0), bandUrl, artist);
- });
- }
-
- private AudioItem loadAlbum(String albumUrl) {
- return extractFromPage(albumUrl, (httpClient, text) -> {
- String bandUrl = readBandUrl(text);
- JsonBrowser trackListInfo = readTrackListInformation(text);
- String artist = trackListInfo.get("artist").text();
-
- List tracks = new ArrayList<>();
- for (JsonBrowser trackInfo : trackListInfo.get("trackinfo").values()) {
- tracks.add(extractTrack(trackInfo, bandUrl, artist));
- }
-
- JsonBrowser albumInfo = readAlbumInformation(text);
- return new BasicAudioPlaylist(albumInfo.get("album_title").text(), tracks, null, false);
- });
- }
-
- private AudioTrack extractTrack(JsonBrowser trackInfo, String bandUrl, String artist) {
- String trackPageUrl = bandUrl + trackInfo.get("title_link").text();
-
- return new BandcampAudioTrack(new AudioTrackInfo(
- trackInfo.get("title").text(),
- artist,
- (long) (trackInfo.get("duration").as(Double.class) * 1000.0),
- bandUrl + trackInfo.get("title_link").text(),
- false,
- trackPageUrl
- ), this);
- }
-
- private String readBandUrl(String text) {
- String bandUrl = DataFormatTools.extractBetween(text, "var band_url = \"", "\";");
-
- if (bandUrl == null) {
- throw new FriendlyException("Band information not found on the Bandcamp page.", SUSPICIOUS, null);
- }
-
- return bandUrl;
- }
-
- private JsonBrowser readAlbumInformation(String text) throws IOException {
- String albumInfoJson = DataFormatTools.extractBetween(text, "var EmbedData = ", "};");
-
- if (albumInfoJson == null) {
- throw new FriendlyException("Album information not found on the Bandcamp page.", SUSPICIOUS, null);
- }
-
- albumInfoJson = albumInfoJson.replace("\" + \"", "") + "};";
- return JsonBrowser.parse(albumInfoJson);
- }
-
- JsonBrowser readTrackListInformation(String text) throws IOException {
- String trackInfoJson = DataFormatTools.extractBetween(text, "var TralbumData = ", "};");
-
- if (trackInfoJson == null) {
- throw new FriendlyException("Track information not found on the Bandcamp page.", SUSPICIOUS, null);
- }
-
- trackInfoJson = trackInfoJson.replace("\" + \"", "") + "};";
- return JsonBrowser.parse(trackInfoJson + "};");
- }
-
- private AudioItem extractFromPage(String url, AudioItemExtractor extractor) {
- try (HttpInterface httpInterface = httpInterfaceManager.getInterface()) {
- return extractFromPageWithInterface(httpInterface, url, extractor);
- } catch (Exception e) {
- throw ExceptionTools.wrapUnfriendlyExceptions("Loading information for a Bandcamp track failed.", FAULT, e);
- }
- }
-
- private AudioItem extractFromPageWithInterface(HttpInterface httpInterface, String url, AudioItemExtractor extractor) throws Exception {
- String responseText;
-
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(url))) {
- int statusCode = response.getStatusLine().getStatusCode();
-
- if (statusCode == 404) {
- return new AudioReference(null, null);
- } else if (statusCode != 200) {
- throw new IOException("Invalid status code for track page: " + statusCode);
- }
-
- responseText = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
- }
-
- return extractor.extract(httpInterface, responseText);
- }
-
- @Override
- public boolean isTrackEncodable(AudioTrack track) {
- return true;
- }
-
- @Override
- public void encodeTrack(AudioTrack track, DataOutput output) throws IOException {
- // No special values to encode
- }
-
- @Override
- public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
- return new BandcampAudioTrack(trackInfo, this);
- }
-
- @Override
- public void shutdown() {
- ExceptionTools.closeWithWarnings(httpInterfaceManager);
- }
-
- /**
- * @return Get an HTTP interface for a playing track.
- */
- public HttpInterface getHttpInterface() {
- return httpInterfaceManager.getInterface();
- }
-
- @Override
- public void configureRequests(Function configurator) {
- httpInterfaceManager.configureRequests(configurator);
- }
-
- @Override
- public void configureBuilder(Consumer configurator) {
- httpInterfaceManager.configureBuilder(configurator);
- }
-
- private interface AudioItemExtractor {
- AudioItem extract(HttpInterface httpInterface, String text) throws Exception;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/bandcamp/BandcampAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/bandcamp/BandcampAudioTrack.java
deleted file mode 100644
index 1380d3b..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/bandcamp/BandcampAudioTrack.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.bandcamp;
-
-import com.sedmelluq.discord.lavaplayer.container.mp3.Mp3AudioTrack;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-
-/**
- * Audio track that handles processing Bandcamp tracks.
- */
-public class BandcampAudioTrack extends DelegatedAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(BandcampAudioTrack.class);
-
- private final BandcampAudioSourceManager sourceManager;
-
- /**
- * @param trackInfo Track info
- * @param sourceManager Source manager which was used to find this track
- */
- public BandcampAudioTrack(AudioTrackInfo trackInfo, BandcampAudioSourceManager sourceManager) {
- super(trackInfo);
-
- this.sourceManager = sourceManager;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- try (HttpInterface httpInterface = sourceManager.getHttpInterface()) {
- log.debug("Loading Bandcamp track page from URL: {}", trackInfo.identifier);
-
- String trackMediaUrl = getTrackMediaUrl(httpInterface);
- log.debug("Starting Bandcamp track from URL: {}", trackMediaUrl);
-
- try (PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(trackMediaUrl), null)) {
- processDelegate(new Mp3AudioTrack(trackInfo, stream), localExecutor);
- }
- }
- }
-
- private String getTrackMediaUrl(HttpInterface httpInterface) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(trackInfo.identifier))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for track page: " + statusCode);
- }
-
- String responseText = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
- JsonBrowser trackInfo = sourceManager.readTrackListInformation(responseText);
-
- return trackInfo.get("trackinfo").index(0).get("file").get("mp3-128").text();
- }
- }
-
- @Override
- public AudioTrack makeClone() {
- return new BandcampAudioTrack(trackInfo, sourceManager);
- }
-
- @Override
- public AudioSourceManager getSourceManager() {
- return sourceManager;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/beam/BeamAudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/beam/BeamAudioSourceManager.java
deleted file mode 100644
index 07af3c9..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/beam/BeamAudioSourceManager.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.beam;
-
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio source manager which detects Beam.pro tracks by URL.
- */
-public class BeamAudioSourceManager implements AudioSourceManager, HttpConfigurable {
- private static final String STREAM_NAME_REGEX = "^https://(?:www\\.)?(?:beam\\.pro|mixer\\.com)/([^/]+)$";
- private static final Pattern streamNameRegex = Pattern.compile(STREAM_NAME_REGEX);
-
- private final HttpInterfaceManager httpInterfaceManager;
-
- /**
- * Create an instance.
- */
- public BeamAudioSourceManager() {
- this.httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
- }
-
- @Override
- public String getSourceName() {
- return "beam.pro";
- }
-
- @Override
- public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference) {
- String streamName = getChannelNameFromUrl(reference.identifier);
- if (streamName == null) {
- return null;
- }
-
- JsonBrowser channelInfo = fetchStreamChannelInfo(streamName);
-
- if (channelInfo == null) {
- return AudioReference.NO_TRACK;
- } else {
- String displayName = channelInfo.get("name").text();
- String id = getPlayedStreamId(channelInfo);
-
- if (displayName == null || id == null) {
- throw new IllegalStateException("Expected id and name fields from Beam channel info.");
- }
-
- return new BeamAudioTrack(new AudioTrackInfo(
- displayName,
- streamName,
- Long.MAX_VALUE,
- id + "|" + streamName + "|" + reference.identifier,
- true,
- "https://beam.pro/" + streamName
- ), this);
- }
- }
-
- @Override
- public boolean isTrackEncodable(AudioTrack track) {
- return true;
- }
-
- @Override
- public void encodeTrack(AudioTrack track, DataOutput output) throws IOException {
- // Nothing special to do, URL (identifier) is enough
- }
-
- @Override
- public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
- return new BeamAudioTrack(trackInfo, this);
- }
-
- @Override
- public void shutdown() {
- // Nothing to shut down.
- }
-
- private static String getPlayedStreamId(JsonBrowser channelInfo) {
- // If there is a hostee, this means that the current channel itself is not actually broadcasting anything and all
- // further requests should be performed with the ID of the hostee. Hostee is not rechecked later so it will keep
- // playing the current hostee even if it changes.
- String hosteeId = channelInfo.get("hosteeId").text();
- return hosteeId != null ? hosteeId : channelInfo.get("id").text();
- }
-
- private static String getChannelNameFromUrl(String url) {
- Matcher matcher = streamNameRegex.matcher(url);
- if (!matcher.matches()) {
- return null;
- }
-
- return matcher.group(1);
- }
-
- private JsonBrowser fetchStreamChannelInfo(String name) {
- try (HttpInterface httpInterface = getHttpInterface()) {
- return HttpClientTools.fetchResponseAsJson(httpInterface,
- new HttpGet("https://mixer.com/api/v1/channels/" + name + "?noCount=1"));
- } catch (IOException e) {
- throw new FriendlyException("Loading Beam channel information failed.", SUSPICIOUS, e);
- }
- }
-
- /**
- * @return Get an HTTP interface for a playing track.
- */
- public HttpInterface getHttpInterface() {
- return httpInterfaceManager.getInterface();
- }
-
- @Override
- public void configureRequests(Function configurator) {
- httpInterfaceManager.configureRequests(configurator);
- }
-
- @Override
- public void configureBuilder(Consumer configurator) {
- httpInterfaceManager.configureBuilder(configurator);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/beam/BeamAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/beam/BeamAudioTrack.java
deleted file mode 100644
index cf64986..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/beam/BeamAudioTrack.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.beam;
-
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.stream.M3uStreamAudioTrack;
-import com.sedmelluq.discord.lavaplayer.source.stream.M3uStreamSegmentUrlProvider;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Audio track that handles processing Beam.pro tracks.
- */
-public class BeamAudioTrack extends M3uStreamAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(BeamAudioTrack.class);
-
- private final BeamAudioSourceManager sourceManager;
- private final M3uStreamSegmentUrlProvider segmentUrlProvider;
-
-
- /**
- * @param trackInfo Track info
- * @param sourceManager Source manager which was used to find this track
- */
- public BeamAudioTrack(AudioTrackInfo trackInfo, BeamAudioSourceManager sourceManager) {
- super(trackInfo);
-
- this.sourceManager = sourceManager;
- this.segmentUrlProvider = new BeamSegmentUrlProvider(getChannelId());
- }
-
- @Override
- protected M3uStreamSegmentUrlProvider getSegmentUrlProvider() {
- return segmentUrlProvider;
- }
-
- @Override
- protected HttpInterface getHttpInterface() {
- return sourceManager.getHttpInterface();
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- log.debug("Starting to play Beam channel {}.", getChannelUrl());
-
- super.process(localExecutor);
- }
-
- @Override
- public AudioTrack makeClone() {
- return new BeamAudioTrack(trackInfo, sourceManager);
- }
-
- @Override
- public AudioSourceManager getSourceManager() {
- return sourceManager;
- }
-
- private String getChannelId() {
- return trackInfo.identifier.substring(0, trackInfo.identifier.indexOf('|'));
- }
-
- private String getChannelUrl() {
- return trackInfo.identifier.substring(trackInfo.identifier.lastIndexOf('|') + 1);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/beam/BeamSegmentUrlProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/beam/BeamSegmentUrlProvider.java
deleted file mode 100644
index 87bbd00..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/beam/BeamSegmentUrlProvider.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.beam;
-
-import com.sedmelluq.discord.lavaplayer.source.stream.ExtendedM3uParser;
-import com.sedmelluq.discord.lavaplayer.source.stream.M3uStreamSegmentUrlProvider;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.List;
-
-import static com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools.fetchResponseLines;
-
-/**
- * Provider for Beam segment URLs from a channel.
- */
-public class BeamSegmentUrlProvider extends M3uStreamSegmentUrlProvider {
- private static final Logger log = LoggerFactory.getLogger(BeamSegmentUrlProvider.class);
-
- private final String channelId;
- private String streamSegmentPlaylistUrl;
-
- /**
- * @param channelId Channel ID number.
- */
- public BeamSegmentUrlProvider(String channelId) {
- this.channelId = channelId;
- }
-
- @Override
- protected String getQualityFromM3uDirective(ExtendedM3uParser.Line directiveLine) {
- return directiveLine.directiveArguments.get("NAME");
- }
-
- @Override
- protected String fetchSegmentPlaylistUrl(HttpInterface httpInterface) throws IOException {
- if (streamSegmentPlaylistUrl != null) {
- return streamSegmentPlaylistUrl;
- }
-
- HttpUriRequest jsonRequest = new HttpGet("https://mixer.com/api/v1/channels/" + channelId + "/manifest.light2");
- JsonBrowser lightManifest = HttpClientTools.fetchResponseAsJson(httpInterface, jsonRequest);
-
- if (lightManifest == null) {
- throw new IllegalStateException("Did not find light manifest at " + jsonRequest.getURI());
- }
-
- HttpUriRequest manifestRequest = new HttpGet("https://mixer.com" + lightManifest.get("hlsSrc").text());
- List streams = loadChannelStreamsList(fetchResponseLines(httpInterface, manifestRequest,
- "mixer channel streams list"));
-
- if (streams.isEmpty()) {
- throw new IllegalStateException("No streams available on channel.");
- }
-
- ChannelStreamInfo stream = streams.get(0);
-
- log.debug("Chose stream with quality {} from url {}", stream.quality, stream.url);
- streamSegmentPlaylistUrl = stream.url;
- return streamSegmentPlaylistUrl;
- }
-
- @Override
- protected HttpUriRequest createSegmentGetRequest(String url) {
- return new HttpGet(url);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/http/HttpAudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/http/HttpAudioSourceManager.java
deleted file mode 100644
index 146827a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/http/HttpAudioSourceManager.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.http;
-
-import com.sedmelluq.discord.lavaplayer.container.*;
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.ProbingAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.io.*;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoBuilder;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import static com.sedmelluq.discord.lavaplayer.container.MediaContainerDetectionResult.refer;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.COMMON;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-import static com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools.getHeaderValue;
-
-/**
- * Audio source manager which implements finding audio files from HTTP addresses.
- */
-public class HttpAudioSourceManager extends ProbingAudioSourceManager implements HttpConfigurable {
- private final HttpInterfaceManager httpInterfaceManager;
-
- /**
- * Create a new instance with default media container registry.
- */
- public HttpAudioSourceManager() {
- this(MediaContainerRegistry.DEFAULT_REGISTRY);
- }
-
- /**
- * Create a new instance.
- */
- public HttpAudioSourceManager(MediaContainerRegistry containerRegistry) {
- super(containerRegistry);
-
- httpInterfaceManager = new ThreadLocalHttpInterfaceManager(
- HttpClientTools
- .createSharedCookiesHttpBuilder()
- .setRedirectStrategy(new HttpClientTools.NoRedirectsStrategy()),
- HttpClientTools.DEFAULT_REQUEST_CONFIG
- );
- }
-
- @Override
- public String getSourceName() {
- return "http";
- }
-
- @Override
- public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference) {
- AudioReference httpReference = getAsHttpReference(reference);
- if (httpReference == null) {
- return null;
- }
-
- if (httpReference.containerDescriptor != null) {
- return createTrack(AudioTrackInfoBuilder.create(reference, null).build(), httpReference.containerDescriptor);
- } else {
- return handleLoadResult(detectContainer(httpReference));
- }
- }
-
- @Override
- protected AudioTrack createTrack(AudioTrackInfo trackInfo, MediaContainerDescriptor containerDescriptor) {
- return new HttpAudioTrack(trackInfo, containerDescriptor, this);
- }
-
- /**
- * @return Get an HTTP interface for a playing track.
- */
- public HttpInterface getHttpInterface() {
- return httpInterfaceManager.getInterface();
- }
-
- @Override
- public void configureRequests(Function configurator) {
- httpInterfaceManager.configureRequests(configurator);
- }
-
- @Override
- public void configureBuilder(Consumer configurator) {
- httpInterfaceManager.configureBuilder(configurator);
- }
-
- public static AudioReference getAsHttpReference(AudioReference reference) {
- if (reference.identifier.startsWith("https://") || reference.identifier.startsWith("http://")) {
- return reference;
- } else if (reference.identifier.startsWith("icy://")) {
- return new AudioReference("http://" + reference.identifier.substring(6), reference.title);
- }
- return null;
- }
-
- private MediaContainerDetectionResult detectContainer(AudioReference reference) {
- MediaContainerDetectionResult result;
-
- try (HttpInterface httpInterface = getHttpInterface()) {
- result = detectContainerWithClient(httpInterface, reference);
- } catch (IOException e) {
- throw new FriendlyException("Connecting to the URL failed.", SUSPICIOUS, e);
- }
-
- return result;
- }
-
- private MediaContainerDetectionResult detectContainerWithClient(HttpInterface httpInterface, AudioReference reference) throws IOException {
- try (PersistentHttpStream inputStream = new PersistentHttpStream(httpInterface, new URI(reference.identifier), Long.MAX_VALUE)) {
- int statusCode = inputStream.checkStatusCode();
- String redirectUrl = HttpClientTools.getRedirectLocation(reference.identifier, inputStream.getCurrentResponse());
-
- if (redirectUrl != null) {
- return refer(null, new AudioReference(redirectUrl, null));
- } else if (statusCode == HttpStatus.SC_NOT_FOUND) {
- return null;
- } else if (!HttpClientTools.isSuccessWithContent(statusCode)) {
- throw new FriendlyException("That URL is not playable.", COMMON, new IllegalStateException("Status code " + statusCode));
- }
-
- MediaContainerHints hints = MediaContainerHints.from(getHeaderValue(inputStream.getCurrentResponse(), "Content-Type"), null);
- return new MediaContainerDetection(containerRegistry, reference, inputStream, hints).detectContainer();
- } catch (URISyntaxException e) {
- throw new FriendlyException("Not a valid URL.", COMMON, e);
- }
- }
-
- @Override
- public boolean isTrackEncodable(AudioTrack track) {
- return true;
- }
-
- @Override
- public void encodeTrack(AudioTrack track, DataOutput output) throws IOException {
- encodeTrackFactory(((HttpAudioTrack) track).getContainerTrackFactory(), output);
- }
-
- @Override
- public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
- MediaContainerDescriptor containerTrackFactory = decodeTrackFactory(input);
-
- if (containerTrackFactory != null) {
- return new HttpAudioTrack(trackInfo, containerTrackFactory, this);
- }
-
- return null;
- }
-
- @Override
- public void shutdown() {
- // Nothing to shut down
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/http/HttpAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/http/HttpAudioTrack.java
deleted file mode 100644
index 6f1de55..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/http/HttpAudioTrack.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.http;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDescriptor;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.InternalAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.URI;
-
-/**
- * Audio track that handles processing HTTP addresses as audio tracks.
- */
-public class HttpAudioTrack extends DelegatedAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(HttpAudioTrack.class);
-
- private final MediaContainerDescriptor containerTrackFactory;
- private final HttpAudioSourceManager sourceManager;
-
- /**
- * @param trackInfo Track info
- * @param containerTrackFactory Container track factory - contains the probe with its parameters.
- * @param sourceManager Source manager used to load this track
- */
- public HttpAudioTrack(AudioTrackInfo trackInfo, MediaContainerDescriptor containerTrackFactory,
- HttpAudioSourceManager sourceManager) {
-
- super(trackInfo);
-
- this.containerTrackFactory = containerTrackFactory;
- this.sourceManager = sourceManager;
- }
-
- /**
- * @return The media probe which handles creating a container-specific delegated track for this track.
- */
- public MediaContainerDescriptor getContainerTrackFactory() {
- return containerTrackFactory;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- try (HttpInterface httpInterface = sourceManager.getHttpInterface()) {
- log.debug("Starting http track from URL: {}", trackInfo.identifier);
-
- try (PersistentHttpStream inputStream = new PersistentHttpStream(httpInterface, new URI(trackInfo.identifier), Long.MAX_VALUE)) {
- processDelegate((InternalAudioTrack) containerTrackFactory.createTrack(trackInfo, inputStream), localExecutor);
- }
- }
- }
-
- @Override
- public AudioTrack makeClone() {
- return new HttpAudioTrack(trackInfo, containerTrackFactory, sourceManager);
- }
-
- @Override
- public AudioSourceManager getSourceManager() {
- return sourceManager;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/local/LocalAudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/local/LocalAudioSourceManager.java
deleted file mode 100644
index 16ebc6d..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/local/LocalAudioSourceManager.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.local;
-
-import com.sedmelluq.discord.lavaplayer.container.*;
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.ProbingAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.File;
-import java.io.IOException;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio source manager that implements finding audio files from the local file system.
- */
-public class LocalAudioSourceManager extends ProbingAudioSourceManager {
- public LocalAudioSourceManager() {
- this(MediaContainerRegistry.DEFAULT_REGISTRY);
- }
-
- public LocalAudioSourceManager(MediaContainerRegistry containerRegistry) {
- super(containerRegistry);
- }
-
- @Override
- public String getSourceName() {
- return "local";
- }
-
- @Override
- public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference) {
- File file = new File(reference.identifier);
-
- if (file.exists() && file.isFile() && file.canRead()) {
- return handleLoadResult(detectContainerForFile(reference, file));
- } else {
- return null;
- }
- }
-
- @Override
- protected AudioTrack createTrack(AudioTrackInfo trackInfo, MediaContainerDescriptor containerTrackFactory) {
- return new LocalAudioTrack(trackInfo, containerTrackFactory, this);
- }
-
- private MediaContainerDetectionResult detectContainerForFile(AudioReference reference, File file) {
- try (LocalSeekableInputStream inputStream = new LocalSeekableInputStream(file)) {
- int lastDotIndex = file.getName().lastIndexOf('.');
- String fileExtension = lastDotIndex >= 0 ? file.getName().substring(lastDotIndex + 1) : null;
-
- return new MediaContainerDetection(containerRegistry, reference, inputStream,
- MediaContainerHints.from(null, fileExtension)).detectContainer();
- } catch (IOException e) {
- throw new FriendlyException("Failed to open file for reading.", SUSPICIOUS, e);
- }
- }
-
- @Override
- public boolean isTrackEncodable(AudioTrack track) {
- return true;
- }
-
- @Override
- public void encodeTrack(AudioTrack track, DataOutput output) throws IOException {
- encodeTrackFactory(((LocalAudioTrack) track).getContainerTrackFactory(), output);
- }
-
- @Override
- public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
- MediaContainerDescriptor containerTrackFactory = decodeTrackFactory(input);
-
- if (containerTrackFactory != null) {
- return new LocalAudioTrack(trackInfo, containerTrackFactory, this);
- }
-
- return null;
- }
-
- @Override
- public void shutdown() {
- // Nothing to shut down
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/local/LocalAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/local/LocalAudioTrack.java
deleted file mode 100644
index 07d36a2..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/local/LocalAudioTrack.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.local;
-
-import com.sedmelluq.discord.lavaplayer.container.MediaContainerDescriptor;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.InternalAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-
-import java.io.File;
-
-/**
- * Audio track that handles processing local files as audio tracks.
- */
-public class LocalAudioTrack extends DelegatedAudioTrack {
- private final File file;
- private final MediaContainerDescriptor containerTrackFactory;
- private final LocalAudioSourceManager sourceManager;
-
- /**
- * @param trackInfo Track info
- * @param containerTrackFactory Probe track factory - contains the probe with its parameters.
- * @param sourceManager Source manager used to load this track
- */
- public LocalAudioTrack(AudioTrackInfo trackInfo, MediaContainerDescriptor containerTrackFactory,
- LocalAudioSourceManager sourceManager) {
-
- super(trackInfo);
-
- this.file = new File(trackInfo.identifier);
- this.containerTrackFactory = containerTrackFactory;
- this.sourceManager = sourceManager;
- }
-
- /**
- * @return The media probe which handles creating a container-specific delegated track for this track.
- */
- public MediaContainerDescriptor getContainerTrackFactory() {
- return containerTrackFactory;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- try (LocalSeekableInputStream inputStream = new LocalSeekableInputStream(file)) {
- processDelegate((InternalAudioTrack) containerTrackFactory.createTrack(trackInfo, inputStream), localExecutor);
- }
- }
-
- @Override
- public AudioTrack makeClone() {
- return new LocalAudioTrack(trackInfo, containerTrackFactory, sourceManager);
- }
-
- @Override
- public AudioSourceManager getSourceManager() {
- return sourceManager;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/local/LocalSeekableInputStream.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/local/LocalSeekableInputStream.java
deleted file mode 100644
index b27fad8..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/local/LocalSeekableInputStream.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.local;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.ExtendedBufferedInputStream;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.info.AudioTrackInfoProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Seekable input stream implementation for local files.
- */
-public class LocalSeekableInputStream extends SeekableInputStream {
- private static final Logger log = LoggerFactory.getLogger(LocalSeekableInputStream.class);
-
- private final FileInputStream inputStream;
- private final FileChannel channel;
- private final ExtendedBufferedInputStream bufferedStream;
- private long position;
-
- /**
- * @param file File to create a stream for.
- */
- public LocalSeekableInputStream(File file) {
- super(file.length(), 0);
-
- try {
- inputStream = new FileInputStream(file);
- bufferedStream = new ExtendedBufferedInputStream(inputStream);
- channel = inputStream.getChannel();
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public int read() throws IOException {
- int result = bufferedStream.read();
- if (result >= 0) {
- position++;
- }
-
- return result;
- }
-
- @Override
- public int read(byte[] b, int off, int len) throws IOException {
- int read = bufferedStream.read(b, off, len);
- position += read;
- return read;
- }
-
- @Override
- public long skip(long n) throws IOException {
- long skipped = bufferedStream.skip(n);
- position += skipped;
- return skipped;
- }
-
- @Override
- public int available() throws IOException {
- return bufferedStream.available();
- }
-
- @Override
- public synchronized void reset() throws IOException {
- throw new IOException("mark/reset not supported");
- }
-
- @Override
- public boolean markSupported() {
- return false;
- }
-
- @Override
- public void close() throws IOException {
- try {
- channel.close();
- } catch (IOException e) {
- log.debug("Failed to close channel", e);
- }
- }
-
- @Override
- public long getPosition() {
- return position;
- }
-
- @Override
- public boolean canSeekHard() {
- return true;
- }
-
- @Override
- public List getTrackInfoProviders() {
- return Collections.emptyList();
- }
-
- @Override
- protected void seekHard(long position) throws IOException {
- channel.position(position);
- this.position = position;
- bufferedStream.discardBuffer();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/nico/NicoAudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/nico/NicoAudioSourceManager.java
deleted file mode 100644
index 6815600..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/nico/NicoAudioSourceManager.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.nico;
-
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import org.apache.http.Header;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.message.BasicNameValuePair;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.parser.Parser;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.COMMON;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio source manager that implements finding NicoNico tracks based on URL.
- */
-public class NicoAudioSourceManager implements AudioSourceManager, HttpConfigurable {
- private static final String TRACK_URL_REGEX = "^(?:http://|https://|)(?:www\\.|)nicovideo\\.jp/watch/(sm[0-9]+)(?:\\?.*|)$";
-
- private static final Pattern trackUrlPattern = Pattern.compile(TRACK_URL_REGEX);
-
- private final String email;
- private final String password;
- private final HttpInterfaceManager httpInterfaceManager;
- private final AtomicBoolean loggedIn;
-
- /**
- * @param email Site account email
- * @param password Site account password
- */
- public NicoAudioSourceManager(String email, String password) {
- this.email = email;
- this.password = password;
- httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
- loggedIn = new AtomicBoolean();
- }
-
- @Override
- public String getSourceName() {
- return "niconico";
- }
-
- @Override
- public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference) {
- Matcher trackMatcher = trackUrlPattern.matcher(reference.identifier);
-
- if (trackMatcher.matches()) {
- return loadTrack(trackMatcher.group(1));
- }
-
- return null;
- }
-
- private AudioTrack loadTrack(String videoId) {
- checkLoggedIn();
-
- try (HttpInterface httpInterface = getHttpInterface()) {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet("http://ext.nicovideo.jp/api/getthumbinfo/" + videoId))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Unexpected response code from video info: " + statusCode);
- }
-
- Document document = Jsoup.parse(response.getEntity().getContent(), StandardCharsets.UTF_8.name(), "", Parser.xmlParser());
- return extractTrackFromXml(videoId, document);
- }
- } catch (IOException e) {
- throw new FriendlyException("Error occurred when extracting video info.", SUSPICIOUS, e);
- }
- }
-
- private AudioTrack extractTrackFromXml(String videoId, Document document) {
- for (Element element : document.select(":root > thumb")) {
- String uploader = element.select("user_nickname").first().text();
- String title = element.select("title").first().text();
- long duration = DataFormatTools.durationTextToMillis(element.select("length").first().text());
-
- return new NicoAudioTrack(new AudioTrackInfo(title, uploader, duration, videoId, false, getWatchUrl(videoId)), this);
- }
-
- return null;
- }
-
- @Override
- public boolean isTrackEncodable(AudioTrack track) {
- return true;
- }
-
- @Override
- public void encodeTrack(AudioTrack track, DataOutput output) throws IOException {
- // No extra information to save
- }
-
- @Override
- public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
- return new NicoAudioTrack(trackInfo, this);
- }
-
- @Override
- public void shutdown() {
- // Nothing to shut down
- }
-
- /**
- * @return Get an HTTP interface for a playing track.
- */
- public HttpInterface getHttpInterface() {
- return httpInterfaceManager.getInterface();
- }
-
- @Override
- public void configureRequests(Function configurator) {
- httpInterfaceManager.configureRequests(configurator);
- }
-
- @Override
- public void configureBuilder(Consumer configurator) {
- httpInterfaceManager.configureBuilder(configurator);
- }
-
- void checkLoggedIn() {
- synchronized (loggedIn) {
- if (loggedIn.get()) {
- return;
- }
-
- HttpPost loginRequest = new HttpPost("https://secure.nicovideo.jp/secure/login");
-
- loginRequest.setEntity(new UrlEncodedFormEntity(Arrays.asList(
- new BasicNameValuePair("mail", email),
- new BasicNameValuePair("password", password)
- ), StandardCharsets.UTF_8));
-
- try (HttpInterface httpInterface = getHttpInterface()) {
- try (CloseableHttpResponse response = httpInterface.execute(loginRequest)) {
- int statusCode = response.getStatusLine().getStatusCode();
-
- if (statusCode != 302) {
- throw new IOException("Unexpected response code " + statusCode);
- }
-
- Header location = response.getFirstHeader("Location");
-
- if (location == null || location.getValue().contains("message=")) {
- throw new FriendlyException("Login details for NicoNico are invalid.", COMMON, null);
- }
-
- loggedIn.set(true);
- }
- } catch (IOException e) {
- throw new FriendlyException("Exception when trying to log into NicoNico", SUSPICIOUS, e);
- }
- }
- }
-
- private static String getWatchUrl(String videoId) {
- return "http://www.nicovideo.jp/watch/" + videoId;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/nico/NicoAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/nico/NicoAudioTrack.java
deleted file mode 100644
index 0ab57fa..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/nico/NicoAudioTrack.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.nico;
-
-import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegAudioTrack;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-
-import static com.sedmelluq.discord.lavaplayer.tools.DataFormatTools.convertToMapLayout;
-
-/**
- * Audio track that handles processing NicoNico tracks.
- */
-public class NicoAudioTrack extends DelegatedAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(NicoAudioTrack.class);
-
- private final NicoAudioSourceManager sourceManager;
-
- /**
- * @param trackInfo Track info
- * @param sourceManager Source manager which was used to find this track
- */
- public NicoAudioTrack(AudioTrackInfo trackInfo, NicoAudioSourceManager sourceManager) {
- super(trackInfo);
-
- this.sourceManager = sourceManager;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- sourceManager.checkLoggedIn();
-
- try (HttpInterface httpInterface = sourceManager.getHttpInterface()) {
- loadVideoMainPage(httpInterface);
- String playbackUrl = loadPlaybackUrl(httpInterface);
-
- log.debug("Starting NicoNico track from URL: {}", playbackUrl);
-
- try (PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(playbackUrl), null)) {
- processDelegate(new MpegAudioTrack(trackInfo, stream), localExecutor);
- }
- }
- }
-
- private void loadVideoMainPage(HttpInterface httpInterface) throws IOException {
- HttpGet request = new HttpGet("http://www.nicovideo.jp/watch/" + trackInfo.identifier);
-
- try (CloseableHttpResponse response = httpInterface.execute(request)) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Unexpected status code from video main page: " + statusCode);
- }
-
- EntityUtils.consume(response.getEntity());
- }
- }
-
- private String loadPlaybackUrl(HttpInterface httpInterface) throws IOException {
- HttpGet request = new HttpGet("http://flapi.nicovideo.jp/api/getflv/" + trackInfo.identifier);
-
- try (CloseableHttpResponse response = httpInterface.execute(request)) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Unexpected status code from playback parameters page: " + statusCode);
- }
-
- String text = EntityUtils.toString(response.getEntity());
- Map format = convertToMapLayout(URLEncodedUtils.parse(text, StandardCharsets.UTF_8));
-
- return format.get("url");
- }
- }
-
- @Override
- public AudioTrack makeClone() {
- return new NicoAudioTrack(trackInfo, sourceManager);
- }
-
- @Override
- public AudioSourceManager getSourceManager() {
- return sourceManager;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/soundcloud/SoundCloudAudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/soundcloud/SoundCloudAudioSourceManager.java
deleted file mode 100644
index 1aaecdd..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/soundcloud/SoundCloudAudioSourceManager.java
+++ /dev/null
@@ -1,606 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.soundcloud;
-
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.*;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.COMMON;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio source manager that implements finding SoundCloud tracks based on URL.
- */
-public class SoundCloudAudioSourceManager implements AudioSourceManager, HttpConfigurable {
- private static final Logger log = LoggerFactory.getLogger(SoundCloudAudioSourceManager.class);
-
- private static final int DEFAULT_SEARCH_RESULTS = 10;
- private static final int MAXIMUM_SEARCH_RESULTS = 200;
-
- private static final long CLIENT_ID_REFRESH_INTERVAL = TimeUnit.HOURS.toMillis(1);
-
- private static final String CHARSET = "UTF-8";
- private static final String LATEST_CLIENT_ID = "2t9loNQH90kzJcsFCODdigxfp325aq4z";
- private static final String TRACK_URL_REGEX = "^(?:http://|https://|)(?:www\\.|)(?:m\\.|)soundcloud\\.com/([a-zA-Z0-9-_]+)/([a-zA-Z0-9-_]+)(?:\\?.*|)$";
- private static final String UNLISTED_URL_REGEX = "^(?:http://|https://|)(?:www\\.|)(?:m\\.|)soundcloud\\.com/([a-zA-Z0-9-_]+)/([a-zA-Z0-9-_]+)/s-([a-zA-Z0-9-_]+)(?:\\?.*|)$";
- private static final String PLAYLIST_URL_REGEX = "^(?:http://|https://|)(?:www\\.|)(?:m\\.|)soundcloud\\.com/([a-zA-Z0-9-_]+)/sets/([a-zA-Z0-9-_]+)(?:\\?.*|)$";
- private static final String LIKED_URL_REGEX = "^(?:http://|https://|)(?:www\\.|)(?:m\\.|)soundcloud\\.com/([a-zA-Z0-9-_]+)/likes/?(?:\\?.*|)$";
- private static final String LIKED_USER_URN_REGEX = "\"urn\":\"soundcloud:users:([0-9]+)\",\"username\":\"([^\"]+)\"";
- private static final String SEARCH_PREFIX = "scsearch";
- private static final String SEARCH_PREFIX_DEFAULT = "scsearch:";
- private static final String SEARCH_REGEX = SEARCH_PREFIX + "\\[([0-9]{1,9}),([0-9]{1,9})\\]:\\s*(.*)\\s*";
- private static final String PAGE_APP_SCRIPT_REGEX = "https://[A-Za-z0-9-.]+/assets/app-[a-f0-9-]+\\.js";
- private static final String APP_SCRIPT_CLIENT_ID_REGEX = ",client_id:\"([a-zA-Z0-9-_]+)\"";
-
- private static final Pattern trackUrlPattern = Pattern.compile(TRACK_URL_REGEX);
- private static final Pattern unlistedUrlPattern = Pattern.compile(UNLISTED_URL_REGEX);
- private static final Pattern playlistUrlPattern = Pattern.compile(PLAYLIST_URL_REGEX);
- private static final Pattern likedUrlPattern = Pattern.compile(LIKED_URL_REGEX);
- private static final Pattern likedUserUrnPattern = Pattern.compile(LIKED_USER_URN_REGEX);
- private static final Pattern searchPattern = Pattern.compile(SEARCH_REGEX);
- private static final Pattern pageAppScriptPattern = Pattern.compile(PAGE_APP_SCRIPT_REGEX);
- private static final Pattern appScriptClientIdPattern = Pattern.compile(APP_SCRIPT_CLIENT_ID_REGEX);
-
- private final HttpInterfaceManager httpInterfaceManager;
- private final Object clientIdLock;
- private final boolean allowSearch;
- private long lastClientIdUpdate;
- private volatile String clientId;
-
- /**
- * Create an instance with default settings.
- */
- public SoundCloudAudioSourceManager() {
- this(true);
- }
-
- /**
- * Create an instance.
- *
- * @param allowSearch Whether to allow search queries as identifiers
- */
- public SoundCloudAudioSourceManager(boolean allowSearch) {
- httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
- this.allowSearch = allowSearch;
- this.clientIdLock = new Object();
- this.lastClientIdUpdate = 0;
-
- setClientId(LATEST_CLIENT_ID);
- }
-
- @Override
- public String getSourceName() {
- return "soundcloud";
- }
-
- @Override
- public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference) {
- AudioItem track = processAsSingleTrack(reference);
-
- if (track == null) {
- track = processAsPlaylist(reference);
- }
-
- if (track == null && allowSearch) {
- track = processAsSearchQuery(reference);
- }
-
- return track;
- }
-
- @Override
- public boolean isTrackEncodable(AudioTrack track) {
- return true;
- }
-
- @Override
- public void encodeTrack(AudioTrack track, DataOutput output) throws IOException {
- // No extra information to save
- }
-
- @Override
- public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
- return new SoundCloudAudioTrack(trackInfo, this);
- }
-
- @Override
- public void shutdown() {
- // Nothing to shut down
- }
-
- /**
- * @param trackId ID of the track
- * @return URL to use for streaming the track.
- */
- public String getTrackUrlFromId(String trackId) {
- String[] parts = trackId.split("\\|");
-
- if (parts.length < 2) {
- return "https://api.soundcloud.com/tracks/" + trackId + "/stream?client_id=" + getClientId();
- } else {
- return "https://api.soundcloud.com/tracks/" + parts[0] + "/stream?client_id=" + getClientId() + "&secret_token=" + parts[1];
- }
- }
-
- /**
- * @return Get an HTTP interface for a playing track.
- */
- public HttpInterface getHttpInterface() {
- return httpInterfaceManager.getInterface();
- }
-
- @Override
- public void configureRequests(Function configurator) {
- httpInterfaceManager.configureRequests(configurator);
- }
-
- @Override
- public void configureBuilder(Consumer configurator) {
- httpInterfaceManager.configureBuilder(configurator);
- }
-
- /**
- * Updates the clientID if more than {@link #CLIENT_ID_REFRESH_INTERVAL} time has passed since last updated.
- */
- public void updateClientId() {
- synchronized (clientIdLock) {
- long now = System.currentTimeMillis();
- if (now - lastClientIdUpdate < CLIENT_ID_REFRESH_INTERVAL) {
- log.debug("Client ID was recently updated, not updating again right away.");
- return;
- }
-
- lastClientIdUpdate = now;
- log.info("Updating SoundCloud client ID (current is {}).", clientId);
-
- try {
- clientId = findClientIdFromSite();
- log.info("Updating SoundCloud client ID succeeded, new ID is {}.", clientId);
- } catch (Exception e) {
- log.error("SoundCloud client ID update failed.", e);
- }
- }
- }
-
- public void setClientId(String clientId) {
- synchronized (clientIdLock) {
- this.clientId = clientId;
- }
- }
-
- public String getClientId() {
- synchronized (clientIdLock) {
- return clientId;
- }
- }
-
- private String findClientIdFromSite() throws IOException {
- try (HttpInterface httpInterface = getHttpInterface()) {
- String scriptUrl = findApplicationScriptUrl(httpInterface);
- return findClientIdFromApplicationScript(httpInterface, scriptUrl);
- }
- }
-
- private String findApplicationScriptUrl(HttpInterface httpInterface) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet("https://soundcloud.com"))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for main page response: " + statusCode);
- }
-
- String page = EntityUtils.toString(response.getEntity());
- Matcher scriptMatcher = pageAppScriptPattern.matcher(page);
-
- if (scriptMatcher.find()) {
- return scriptMatcher.group(0);
- } else {
- throw new IllegalStateException("Could not find application script from main page.");
- }
- }
- }
-
- private String findClientIdFromApplicationScript(HttpInterface httpInterface, String scriptUrl) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(scriptUrl))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for application script response: " + statusCode);
- }
-
- String page = EntityUtils.toString(response.getEntity());
- Matcher clientIdMatcher = appScriptClientIdPattern.matcher(page);
-
- if (clientIdMatcher.find()) {
- return clientIdMatcher.group(1);
- } else {
- throw new IllegalStateException("Could not find client ID from application script.");
- }
- }
- }
-
- private AudioTrack processAsSingleTrack(AudioReference reference) {
- String url = nonMobileUrl(reference.identifier);
-
- Matcher trackUrlMatcher = trackUrlPattern.matcher(url);
- if (trackUrlMatcher.matches() && !"likes".equals(trackUrlMatcher.group(2))) {
- return loadFromTrackPage(url, null);
- }
-
- Matcher unlistedUrlMatcher = unlistedUrlPattern.matcher(url);
- if (unlistedUrlMatcher.matches()) {
- return loadFromTrackPage(url, "s-" + unlistedUrlMatcher.group(3));
- }
-
- return null;
- }
-
- private AudioItem processAsPlaylist(AudioReference reference) {
- String url = nonMobileUrl(reference.identifier);
-
- if (playlistUrlPattern.matcher(url).matches()) {
- return loadFromSet(url);
- } else if (likedUrlPattern.matcher(url).matches()) {
- return loadFromLikedTracks(url);
- } else {
- return null;
- }
- }
-
- private AudioTrack loadFromTrackPage(String trackWebUrl, String secretToken) {
- try (HttpInterface httpInterface = getHttpInterface()) {
- JsonBrowser trackInfoJson = loadTrackInfoFromJson(loadPageConfigJson(httpInterface, trackWebUrl));
- return buildAudioTrack(trackInfoJson, secretToken);
- } catch (IOException e) {
- throw new FriendlyException("Loading track from SoundCloud failed.", SUSPICIOUS, e);
- }
- }
-
- private AudioTrack buildAudioTrack(JsonBrowser trackInfoJson, String secretToken) {
- String trackId = trackInfoJson.get("id").text();
-
- AudioTrackInfo trackInfo = new AudioTrackInfo(
- trackInfoJson.get("title").text(),
- trackInfoJson.get("user").get("username").text(),
- trackInfoJson.get("duration").as(Integer.class),
- secretToken != null ? trackId + "|" + secretToken : trackId,
- false,
- trackInfoJson.get("permalink_url").text()
- );
-
- return new SoundCloudAudioTrack(trackInfo, this);
- }
-
- private JsonBrowser loadPageConfigJson(HttpInterface httpInterface, String url) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(url))) {
- int statusCode = response.getStatusLine().getStatusCode();
-
- if (statusCode == HttpStatus.SC_NOT_FOUND) {
- throw new FriendlyException("That track does not exist.", COMMON, null);
- } else if (statusCode != HttpStatus.SC_OK) {
- throw new IOException("Invalid status code for video page response: " + statusCode);
- }
-
- String html = IOUtils.toString(response.getEntity().getContent(), Charset.forName(CHARSET));
- String configJson = DataFormatTools.extractBetween(html, "e}var c=", ",o=Date.now()");
-
- if (configJson == null) {
- throw new FriendlyException("This url does not appear to be a playable track.", SUSPICIOUS, null);
- }
-
- return JsonBrowser.parse(configJson);
- }
- }
-
- private JsonBrowser loadTrackInfoFromJson(JsonBrowser json) {
- for (JsonBrowser value : json.values()) {
- for (JsonBrowser entry : value.safeGet("data").values()) {
- if (entry.isMap() && "track".equals(entry.get("kind").text())) {
- return entry;
- }
- }
- }
-
- throw new IllegalStateException("Could not find track information block.");
- }
-
- private static String nonMobileUrl(String url) {
- if (url.startsWith("https://m.")) {
- return "https://" + url.substring("https://m.".length());
- } else {
- return url;
- }
- }
-
- private AudioPlaylist loadFromSet(String playlistWebUrl) {
- try (HttpInterface httpInterface = getHttpInterface()) {
- JsonBrowser playlistInfo = loadPlaylistInfoFromJson(loadPageConfigJson(httpInterface, playlistWebUrl));
-
- return new BasicAudioPlaylist(
- playlistInfo.get("title").text(),
- loadTracksFromPlaylist(httpInterface, playlistInfo, playlistWebUrl),
- null,
- false
- );
- } catch (IOException e) {
- throw new FriendlyException("Loading playlist from SoundCloud failed.", SUSPICIOUS, e);
- }
- }
-
- private JsonBrowser loadPlaylistInfoFromJson(JsonBrowser json) {
- for (JsonBrowser value : json.values()) {
- for (JsonBrowser entry : value.safeGet("data").values()) {
- if (entry.isMap() && "playlist".equals(entry.get("kind").text())) {
- return entry;
- }
- }
- }
-
- throw new IllegalStateException("Could not find playlist information block.");
- }
-
- private List loadTracksFromPlaylist(HttpInterface httpInterface, JsonBrowser playlistInfo, String playlistWebUrl) throws IOException {
- List trackIds = loadPlaylistTrackList(playlistInfo);
-
- return withClientIdRetry(httpInterface,
- response -> handlePlaylistTracksResponse(response, playlistWebUrl, trackIds),
- () -> buildTrackListUrl(trackIds)
- );
- }
-
- private List handlePlaylistTracksResponse(HttpResponse response, String playlistWebUrl, List trackIds) throws IOException {
- List tracks = new ArrayList<>();
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for track list response: " + statusCode);
- }
-
- JsonBrowser trackList = JsonBrowser.parse(response.getEntity().getContent());
- int blockedCount = 0;
-
- for (JsonBrowser trackInfoJson : trackList.values()) {
- if ("BLOCK".equals(trackInfoJson.get("policy").text())) {
- blockedCount++;
- } else {
- tracks.add(buildAudioTrack(trackInfoJson, null));
- }
- }
-
- if (blockedCount > 0) {
- log.debug("In soundcloud playlist {}, {} tracks were omitted because they are blocked.", playlistWebUrl, blockedCount);
- }
-
- sortPlaylistTracks(tracks, trackIds);
-
- return tracks;
- }
-
- private List loadPlaylistTrackList(JsonBrowser playlistInfo) {
- List trackIds = new ArrayList<>();
- for (JsonBrowser trackInfo : playlistInfo.get("tracks").values()) {
- trackIds.add(trackInfo.get("id").text());
- }
- return trackIds;
- }
-
- private URI buildTrackListUrl(List trackIds) {
- try {
- StringJoiner joiner = new StringJoiner(",");
- for (String trackId : trackIds) {
- joiner.add(trackId);
- }
-
- return new URIBuilder("https://api-v2.soundcloud.com/tracks")
- .addParameter("ids", joiner.toString())
- .addParameter("client_id", getClientId())
- .build();
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-
- private static void sortPlaylistTracks(List tracks, List trackIds) {
- final Map positions = new HashMap<>();
- for (int i = 0; i < trackIds.size(); i++) {
- positions.put(trackIds.get(i), i);
- }
-
- Collections.sort(tracks, Comparator.comparingInt(o -> getSortPosition(positions, o)));
- }
-
- private static int getSortPosition(Map positions, AudioTrack track) {
- return DataFormatTools.defaultOnNull(positions.get(track.getIdentifier()), Integer.MAX_VALUE);
- }
-
- private AudioItem loadFromLikedTracks(String likedListUrl) {
- try (HttpInterface httpInterface = getHttpInterface()) {
- UserInfo userInfo = findUserIdFromLikedList(httpInterface, likedListUrl);
- if (userInfo == null) {
- return AudioReference.NO_TRACK;
- }
-
- return extractTracksFromLikedList(loadLikedListForUserId(httpInterface, userInfo), userInfo);
- } catch (IOException e) {
- throw new FriendlyException("Loading liked tracks from SoundCloud failed.", SUSPICIOUS, e);
- }
- }
-
- private UserInfo findUserIdFromLikedList(HttpInterface httpInterface, String likedListUrl) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(likedListUrl))) {
- int statusCode = response.getStatusLine().getStatusCode();
-
- if (statusCode == 404) {
- return null;
- } else if (statusCode != 200) {
- throw new IOException("Invalid status code for track list response: " + statusCode);
- }
-
- Matcher matcher = likedUserUrnPattern.matcher(IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8));
- return matcher.find() ? new UserInfo(matcher.group(1), matcher.group(2)) : null;
- }
- }
-
- private JsonBrowser loadLikedListForUserId(HttpInterface httpInterface, UserInfo userInfo) throws IOException {
- return withClientIdRetry(httpInterface, response -> {
- int statusCode = response.getStatusLine().getStatusCode();
-
- if (statusCode != 200) {
- throw new IOException("Invalid status code for liked tracks response: " + statusCode);
- }
-
- return JsonBrowser.parse(response.getEntity().getContent());
- }, () ->
- new URI("https://api-v2.soundcloud.com/users/" + userInfo.id + "/likes?client_id=" + getClientId() + "&limit=200&offset=0")
- );
- }
-
- private AudioItem extractTracksFromLikedList(JsonBrowser likedTracks, UserInfo userInfo) {
- List tracks = new ArrayList<>();
-
- for (JsonBrowser item : likedTracks.get("collection").values()) {
- JsonBrowser trackItem = item.get("track");
-
- if (!trackItem.isNull()) {
- tracks.add(buildAudioTrack(trackItem, null));
- }
- }
-
- return new BasicAudioPlaylist("Liked by " + userInfo.name, tracks, null, false);
- }
-
- private static class UserInfo {
- private final String id;
- private final String name;
-
- private UserInfo(String id, String name) {
- this.id = id;
- this.name = name;
- }
- }
-
- private AudioItem processAsSearchQuery(AudioReference reference) {
- if (reference.identifier.startsWith(SEARCH_PREFIX)) {
- if (reference.identifier.startsWith(SEARCH_PREFIX_DEFAULT)) {
- return loadSearchResult(reference.identifier.substring(SEARCH_PREFIX_DEFAULT.length()).trim(), 0, DEFAULT_SEARCH_RESULTS);
- }
-
- Matcher searchMatcher = searchPattern.matcher(reference.identifier);
-
- if (searchMatcher.matches()) {
- return loadSearchResult(searchMatcher.group(3), Integer.parseInt(searchMatcher.group(1)), Integer.parseInt(searchMatcher.group(2)));
- }
- }
-
- return null;
- }
-
- private AudioItem loadSearchResult(String query, int offset, int rawLimit) {
- int limit = Math.min(rawLimit, MAXIMUM_SEARCH_RESULTS);
-
- try (HttpInterface httpInterface = getHttpInterface()) {
- return withClientIdRetry(httpInterface,
- response -> loadSearchResultsFromResponse(response, query),
- () -> buildSearchUri(query, offset, limit)
- );
- } catch (IOException e) {
- throw new FriendlyException("Loading search results from SoundCloud failed.", SUSPICIOUS, e);
- }
- }
-
- private AudioItem loadSearchResultsFromResponse(HttpResponse response, String query) throws IOException {
- try {
- JsonBrowser searchResults = JsonBrowser.parse(response.getEntity().getContent());
- return extractTracksFromSearchResults(query, searchResults);
- } finally {
- EntityUtils.consumeQuietly(response.getEntity());
- }
- }
-
- private URI buildSearchUri(String query, int offset, int limit) {
- try {
- return new URIBuilder("https://api-v2.soundcloud.com/search/tracks")
- .addParameter("q", query)
- .addParameter("client_id", getClientId())
- .addParameter("offset", String.valueOf(offset))
- .addParameter("limit", String.valueOf(limit))
- .build();
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-
- private T withClientIdRetry(HttpInterface httpInterface, ResponseHandler handler, URIProvider uriProvider) throws IOException {
- try {
- HttpResponse response = httpInterface.execute(new HttpGet(uriProvider.provide()));
- int statusCode = response.getStatusLine().getStatusCode();
-
- try {
- if (statusCode != 401) {
- return handler.handle(response);
- }
- } finally {
- EntityUtils.consumeQuietly(response.getEntity());
- }
-
- updateClientId();
- response = httpInterface.execute(new HttpGet(uriProvider.provide()));
-
- try {
- return handler.handle(response);
- } finally {
- EntityUtils.consumeQuietly(response.getEntity());
- }
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-
- private AudioItem extractTracksFromSearchResults(String query, JsonBrowser searchResults) {
- List tracks = new ArrayList<>();
-
- for (JsonBrowser item : searchResults.get("collection").values()) {
- if (!item.isNull()) {
- tracks.add(buildAudioTrack(item, null));
- }
- }
-
- return new BasicAudioPlaylist("Search results for: " + query, tracks, null, true);
- }
-
- private interface ResponseHandler {
- T handle(HttpResponse response) throws IOException;
- }
-
- private interface URIProvider {
- URI provide() throws URISyntaxException;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/soundcloud/SoundCloudAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/soundcloud/SoundCloudAudioTrack.java
deleted file mode 100644
index 6331d82..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/soundcloud/SoundCloudAudioTrack.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.soundcloud;
-
-import com.sedmelluq.discord.lavaplayer.container.mp3.Mp3AudioTrack;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-
-/**
- * Audio track that handles processing SoundCloud tracks.
- */
-public class SoundCloudAudioTrack extends DelegatedAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(SoundCloudAudioTrack.class);
-
- private final SoundCloudAudioSourceManager sourceManager;
-
- /**
- * @param trackInfo Track info
- * @param sourceManager Source manager which was used to find this track
- */
- public SoundCloudAudioTrack(AudioTrackInfo trackInfo, SoundCloudAudioSourceManager sourceManager) {
- super(trackInfo);
-
- this.sourceManager = sourceManager;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- try (HttpInterface httpInterface = sourceManager.getHttpInterface()) {
- if (!attemptLoadStream(localExecutor, httpInterface, true)) {
- sourceManager.updateClientId();
-
- attemptLoadStream(localExecutor, httpInterface, false);
- }
- }
- }
-
- private boolean attemptLoadStream(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface, boolean checkUnauthorized) throws Exception {
- String trackUrl = sourceManager.getTrackUrlFromId(trackInfo.identifier);
- log.debug("Starting SoundCloud track from URL: {}", trackUrl);
-
- try (PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(trackUrl), null)) {
- if (checkUnauthorized) {
- int statusCode = stream.checkStatusCode();
-
- if (statusCode == 401) {
- return false;
- } else if (statusCode < 200 && statusCode >= 300) {
- throw new IOException("Invalid status code for soundcloud stream: " + statusCode);
- }
- }
-
- processDelegate(new Mp3AudioTrack(trackInfo, stream), localExecutor);
- }
-
- return true;
- }
-
- @Override
- public AudioTrack makeClone() {
- return new SoundCloudAudioTrack(trackInfo, sourceManager);
- }
-
- @Override
- public AudioSourceManager getSourceManager() {
- return sourceManager;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/stream/ExtendedM3uParser.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/stream/ExtendedM3uParser.java
deleted file mode 100644
index 328be1d..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/stream/ExtendedM3uParser.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.stream;
-
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Parser for extended M3U lines, handles the format where directives have named argumentsm, for example:
- * #SOMETHING:FOO="thing",BAR=4
- */
-public class ExtendedM3uParser {
- private static final Pattern directiveArgumentPattern = Pattern.compile("([A-Z-]+)=(?:\"([^\"]*)\"|([^,]*))(?:,|\\z)");
-
- /**
- * Parses one line.
- *
- * @param line Line.
- * @return Line object describing the directive or data on the line.
- */
- public static Line parseLine(String line) {
- String trimmed = line.trim();
-
- if (trimmed.isEmpty()) {
- return Line.EMPTY_LINE;
- } else if (!trimmed.startsWith("#")) {
- return new Line(trimmed, null, Collections.emptyMap(), null);
- } else {
- return parseDirectiveLine(trimmed);
- }
- }
-
- private static Line parseDirectiveLine(String line) {
- String[] parts = line.split(":", 2);
-
- if (parts.length == 1) {
- return new Line(null, line.substring(1), Collections.emptyMap(), "");
- }
-
- Matcher matcher = directiveArgumentPattern.matcher(parts[1]);
- Map arguments = new HashMap<>();
-
- while (matcher.find()) {
- arguments.put(matcher.group(1), DataFormatTools.defaultOnNull(matcher.group(2), matcher.group(3)));
- }
-
- return new Line(null, parts[0].substring(1), arguments, parts[1]);
- }
-
- /**
- * Parsed extended M3U line info. May be either an empty line (isDirective() and isData() both false), a directive
- * or a data line.
- */
- public static class Line {
- private static final Line EMPTY_LINE = new Line(null, null, null, null);
-
- /**
- * The data of a data line.
- */
- public final String lineData;
- /**
- * Directive name of a directive line.
- */
- public final String directiveName;
- /**
- * Directive arguments of a directive line.
- */
- public final Map directiveArguments;
- /**
- * Raw unprocessed directive extra data (where arguments are parsed from).
- */
- public final String extraData;
-
- private Line(String lineData, String directiveName, Map directiveArguments, String extraData) {
- this.lineData = lineData;
- this.directiveName = directiveName;
- this.directiveArguments = directiveArguments;
- this.extraData = extraData;
- }
-
- /**
- * @return True if it is a directive line.
- */
- public boolean isDirective() {
- return directiveName != null;
- }
-
- /**
- * @return True if it is a data line.
- */
- public boolean isData() {
- return lineData != null;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/stream/M3uStreamAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/stream/M3uStreamAudioTrack.java
deleted file mode 100644
index 388ae1f..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/stream/M3uStreamAudioTrack.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.stream;
-
-import com.sedmelluq.discord.lavaplayer.container.adts.AdtsAudioTrack;
-import com.sedmelluq.discord.lavaplayer.container.mpegts.MpegTsElementaryInputStream;
-import com.sedmelluq.discord.lavaplayer.container.mpegts.PesPacketInputStream;
-import com.sedmelluq.discord.lavaplayer.tools.io.ChainedInputStream;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-
-import static com.sedmelluq.discord.lavaplayer.container.mpegts.MpegTsElementaryInputStream.ADTS_ELEMENTARY_STREAM;
-
-/**
- * Audio track that handles processing M3U segment streams which using MPEG-TS wrapped ADTS codec.
- */
-public abstract class M3uStreamAudioTrack extends DelegatedAudioTrack {
- /**
- * @param trackInfo Track info
- */
- public M3uStreamAudioTrack(AudioTrackInfo trackInfo) {
- super(trackInfo);
- }
-
- protected abstract M3uStreamSegmentUrlProvider getSegmentUrlProvider();
-
- protected abstract HttpInterface getHttpInterface();
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- try (final HttpInterface httpInterface = getHttpInterface()) {
- try (ChainedInputStream chainedInputStream = new ChainedInputStream(() -> getSegmentUrlProvider().getNextSegmentStream(httpInterface))) {
- MpegTsElementaryInputStream elementaryInputStream = new MpegTsElementaryInputStream(chainedInputStream, ADTS_ELEMENTARY_STREAM);
- PesPacketInputStream pesPacketInputStream = new PesPacketInputStream(elementaryInputStream);
-
- processDelegate(new AdtsAudioTrack(trackInfo, pesPacketInputStream), localExecutor);
- }
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/stream/M3uStreamSegmentUrlProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/stream/M3uStreamSegmentUrlProvider.java
deleted file mode 100644
index f5ec1d1..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/stream/M3uStreamSegmentUrlProvider.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.stream;
-
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-import static com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools.fetchResponseLines;
-
-/**
- * Provides track segment URLs for streams which use the M3U segment format. There is a base M3U containing the list of
- * different available streams. Those point to segment M3U urls, which always give the direct stream URLs of last X
- * segments. The segment provider fetches the stream for the next segment on each call to
- * {@link M3uStreamSegmentUrlProvider#getNextSegmentStream}.
- */
-public abstract class M3uStreamSegmentUrlProvider {
- private static final long SEGMENT_WAIT_STEP_MS = 200;
-
- protected SegmentInfo lastSegment;
-
- protected static String createSegmentUrl(String playlistUrl, String segmentName) {
- return URI.create(playlistUrl).resolve(segmentName).toString();
- }
-
- /**
- * If applicable, extracts the quality information from the M3U directive which describes one stream in the root M3U.
- *
- * @param directiveLine Directive line with arguments.
- * @return The quality name extracted from the directive line.
- */
- protected abstract String getQualityFromM3uDirective(ExtendedM3uParser.Line directiveLine);
-
- protected abstract String fetchSegmentPlaylistUrl(HttpInterface httpInterface) throws IOException;
-
- /**
- * Logic for getting the URL for the next segment.
- *
- * @param httpInterface HTTP interface to use for any requests required to perform to find the segment URL.
- * @return The direct stream URL of the next segment.
- */
- protected String getNextSegmentUrl(HttpInterface httpInterface) {
- try {
- String streamSegmentPlaylistUrl = fetchSegmentPlaylistUrl(httpInterface);
- if (streamSegmentPlaylistUrl == null) {
- return null;
- }
-
- long startTime = System.currentTimeMillis();
- SegmentInfo nextSegment;
-
- while (true) {
- List segments = loadStreamSegmentsList(httpInterface, streamSegmentPlaylistUrl);
- nextSegment = chooseNextSegment(segments, lastSegment);
-
- if (nextSegment != null || !shouldWaitForSegment(startTime, segments)) {
- break;
- }
-
- Thread.sleep(SEGMENT_WAIT_STEP_MS);
- }
-
- if (nextSegment == null) {
- return null;
- }
-
- lastSegment = nextSegment;
- return createSegmentUrl(streamSegmentPlaylistUrl, lastSegment.url);
- } catch (IOException e) {
- throw new FriendlyException("Failed to get next part of the stream.", SUSPICIOUS, e);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Fetches the input stream for the next segment in the M3U stream.
- *
- * @param httpInterface HTTP interface to use for any requests required to perform to find the segment URL.
- * @return Input stream of the next segment.
- */
- public InputStream getNextSegmentStream(HttpInterface httpInterface) {
- String url = getNextSegmentUrl(httpInterface);
- if (url == null) {
- return null;
- }
-
- CloseableHttpResponse response = null;
- boolean success = false;
-
- try {
- response = httpInterface.execute(createSegmentGetRequest(url));
- int statusCode = response.getStatusLine().getStatusCode();
-
- if (statusCode != 200) {
- throw new IOException("Invalid status code from segment data URL: " + statusCode);
- }
-
- success = true;
- return response.getEntity().getContent();
- } catch (IOException e) {
- throw new RuntimeException(e);
- } finally {
- if (response != null && !success) {
- ExceptionTools.closeWithWarnings(response);
- }
- }
- }
-
- protected abstract HttpUriRequest createSegmentGetRequest(String url);
-
- protected List loadChannelStreamsList(String[] lines) {
- ExtendedM3uParser.Line streamInfoLine = null;
-
- List streams = new ArrayList<>();
-
- for (String lineText : lines) {
- ExtendedM3uParser.Line line = ExtendedM3uParser.parseLine(lineText);
-
- if (line.isData() && streamInfoLine != null) {
- String quality = getQualityFromM3uDirective(streamInfoLine);
- if (quality != null) {
- streams.add(new ChannelStreamInfo(quality, line.lineData));
- }
-
- streamInfoLine = null;
- } else if (line.isDirective() && "EXT-X-STREAM-INF".equals(line.directiveName)) {
- streamInfoLine = line;
- }
- }
-
- return streams;
- }
-
- protected List loadStreamSegmentsList(HttpInterface httpInterface, String streamSegmentPlaylistUrl) throws IOException {
- List segments = new ArrayList<>();
- ExtendedM3uParser.Line segmentInfo = null;
-
- for (String lineText : fetchResponseLines(httpInterface, new HttpGet(streamSegmentPlaylistUrl), "stream segments list")) {
- ExtendedM3uParser.Line line = ExtendedM3uParser.parseLine(lineText);
-
- if (line.isDirective() && "EXTINF".equals(line.directiveName)) {
- segmentInfo = line;
- }
-
- if (line.isData()) {
- if (segmentInfo != null && segmentInfo.extraData.contains(",")) {
- String[] fields = segmentInfo.extraData.split(",", 2);
- segments.add(new SegmentInfo(line.lineData, parseSecondDuration(fields[0]), fields[1]));
- } else {
- segments.add(new SegmentInfo(line.lineData, null, null));
- }
- }
- }
-
- return segments;
- }
-
- private static Long parseSecondDuration(String value) {
- try {
- double asDouble = Double.parseDouble(value);
- return (long) (asDouble * 1000.0);
- } catch (NumberFormatException ignored) {
- return null;
- }
- }
-
- protected SegmentInfo chooseNextSegment(List segments, SegmentInfo lastSegment) {
- SegmentInfo selected = null;
-
- for (int i = segments.size() - 1; i >= 0; i--) {
- SegmentInfo current = segments.get(i);
- if (lastSegment != null && current.url.equals(lastSegment.url)) {
- break;
- }
-
- selected = current;
- }
-
- return selected;
- }
-
- private boolean shouldWaitForSegment(long startTime, List segments) {
- if (!segments.isEmpty()) {
- SegmentInfo sampleSegment = segments.get(0);
-
- if (sampleSegment.duration != null) {
- return System.currentTimeMillis() - startTime < sampleSegment.duration;
- }
- }
-
- return false;
- }
-
- protected static class ChannelStreamInfo {
- /**
- * Stream quality extracted from stream M3U directive.
- */
- public final String quality;
- /**
- * URL for stream segment list.
- */
- public final String url;
-
- private ChannelStreamInfo(String quality, String url) {
- this.quality = quality;
- this.url = url;
- }
- }
-
- protected static class SegmentInfo {
- /**
- * URL of the segment.
- */
- public final String url;
- /**
- * Duration of the segment in milliseconds. null if unknown.
- */
- public final Long duration;
- /**
- * Name of the segment. null if unknown.
- */
- public final String name;
-
- public SegmentInfo(String url, Long duration, String name) {
- this.url = url;
- this.duration = duration;
- this.name = name;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/twitch/TwitchStreamAudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/twitch/TwitchStreamAudioSourceManager.java
deleted file mode 100644
index 3f15942..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/twitch/TwitchStreamAudioSourceManager.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.twitch;
-
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.net.URI;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio source manager which detects Twitch tracks by URL.
- */
-public class TwitchStreamAudioSourceManager implements AudioSourceManager, HttpConfigurable {
- private static final String STREAM_NAME_REGEX = "^https://(?:www\\.|go\\.)?twitch.tv/([^/]+)$";
- private static final Pattern streamNameRegex = Pattern.compile(STREAM_NAME_REGEX);
-
- public static final String DEFAULT_CLIENT_ID = "jzkbprff40iqj646a697cyrvl0zt2m6";
-
- private final HttpInterfaceManager httpInterfaceManager;
- private final String twitchClientId;
-
- /**
- * Create an instance.
- */
- public TwitchStreamAudioSourceManager() {
- this(DEFAULT_CLIENT_ID);
- }
-
- /**
- * Create an instance.
- *
- * @param clientId The Twitch client id for your application.
- */
- public TwitchStreamAudioSourceManager(String clientId) {
- httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
- twitchClientId = clientId;
- }
-
- public String getClientId() {
- return twitchClientId;
- }
-
- @Override
- public String getSourceName() {
- return "twitch";
- }
-
- @Override
- public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference) {
- String streamName = getChannelIdentifierFromUrl(reference.identifier);
- if (streamName == null) {
- return null;
- }
-
- JsonBrowser channelInfo = fetchStreamChannelInfo(streamName);
-
- if (channelInfo == null) {
- return AudioReference.NO_TRACK;
- } else {
- //Use the stream name as the display name (we would require an additional call to the user to get the true display name)
- String displayName = streamName;
-
- //Retrieve the data value list; this will have only one element since we're getting only one stream's information
- List dataList = channelInfo.get("data").values();
-
- //The value list is empty if the stream is offline, even when hosting another channel
- if (dataList.size() == 0) {
- return null;
- }
-
- //The first one has the title of the broadcast
- JsonBrowser channelData = dataList.get(0);
- String status = channelData.get("title").text();
-
- return new TwitchStreamAudioTrack(new AudioTrackInfo(
- status,
- displayName,
- Long.MAX_VALUE,
- reference.identifier,
- true,
- reference.identifier
- ), this);
- }
- }
-
- @Override
- public boolean isTrackEncodable(AudioTrack track) {
- return true;
- }
-
- @Override
- public void encodeTrack(AudioTrack track, DataOutput output) throws IOException {
- // Nothing special to do, URL (identifier) is enough
- }
-
- @Override
- public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
- return new TwitchStreamAudioTrack(trackInfo, this);
- }
-
- /**
- * Extract channel identifier from a channel URL.
- *
- * @param url Channel URL
- * @return Channel identifier (for API requests)
- */
- public static String getChannelIdentifierFromUrl(String url) {
- Matcher matcher = streamNameRegex.matcher(url);
- if (!matcher.matches()) {
- return null;
- }
-
- return matcher.group(1);
- }
-
- /**
- * @param url Request URL
- * @return Request with necessary headers attached.
- */
- public HttpUriRequest createGetRequest(String url) {
- return addClientHeaders(new HttpGet(url), twitchClientId);
- }
-
- /**
- * @param url Request URL
- * @return Request with necessary headers attached.
- */
- public HttpUriRequest createGetRequest(URI url) {
- return addClientHeaders(new HttpGet(url), twitchClientId);
- }
-
- /**
- * @return Get an HTTP interface for a playing track.
- */
- public HttpInterface getHttpInterface() {
- return httpInterfaceManager.getInterface();
- }
-
- @Override
- public void configureRequests(Function configurator) {
- httpInterfaceManager.configureRequests(configurator);
- }
-
- @Override
- public void configureBuilder(Consumer configurator) {
- httpInterfaceManager.configureBuilder(configurator);
- }
-
- private static HttpUriRequest addClientHeaders(HttpUriRequest request, String clientId) {
- request.setHeader("Client-ID", clientId);
- return request;
- }
-
- private JsonBrowser fetchStreamChannelInfo(String name) {
- try (HttpInterface httpInterface = getHttpInterface()) {
- HttpUriRequest request = createGetRequest("https://api.twitch.tv/helix/streams?user_login=" + name);
-
- return HttpClientTools.fetchResponseAsJson(httpInterface, request);
- } catch (IOException e) {
- throw new FriendlyException("Loading Twitch channel information failed.", SUSPICIOUS, e);
- }
- }
-
- @Override
- public void shutdown() {
- ExceptionTools.closeWithWarnings(httpInterfaceManager);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/twitch/TwitchStreamAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/twitch/TwitchStreamAudioTrack.java
deleted file mode 100644
index a88e78a..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/twitch/TwitchStreamAudioTrack.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.twitch;
-
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.stream.M3uStreamAudioTrack;
-import com.sedmelluq.discord.lavaplayer.source.stream.M3uStreamSegmentUrlProvider;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static com.sedmelluq.discord.lavaplayer.source.twitch.TwitchStreamAudioSourceManager.getChannelIdentifierFromUrl;
-
-/**
- * Audio track that handles processing Twitch tracks.
- */
-public class TwitchStreamAudioTrack extends M3uStreamAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(TwitchStreamAudioTrack.class);
-
- private final TwitchStreamAudioSourceManager sourceManager;
- private final M3uStreamSegmentUrlProvider segmentUrlProvider;
-
- /**
- * @param trackInfo Track info
- * @param sourceManager Source manager which was used to find this track
- */
- public TwitchStreamAudioTrack(AudioTrackInfo trackInfo, TwitchStreamAudioSourceManager sourceManager) {
- super(trackInfo);
-
- this.sourceManager = sourceManager;
- this.segmentUrlProvider = new TwitchStreamSegmentUrlProvider(getChannelName(), sourceManager);
- }
-
- /**
- * @return Name of the channel of the stream.
- */
- public String getChannelName() {
- return getChannelIdentifierFromUrl(trackInfo.identifier);
- }
-
- @Override
- protected M3uStreamSegmentUrlProvider getSegmentUrlProvider() {
- return segmentUrlProvider;
- }
-
- @Override
- protected HttpInterface getHttpInterface() {
- return sourceManager.getHttpInterface();
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- log.debug("Starting to play Twitch channel {}.", getChannelName());
-
- super.process(localExecutor);
- }
-
- @Override
- public AudioTrack makeClone() {
- return new TwitchStreamAudioTrack(trackInfo, sourceManager);
- }
-
- @Override
- public AudioSourceManager getSourceManager() {
- return sourceManager;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/twitch/TwitchStreamSegmentUrlProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/twitch/TwitchStreamSegmentUrlProvider.java
deleted file mode 100644
index f4223cf..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/twitch/TwitchStreamSegmentUrlProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.twitch;
-
-import com.sedmelluq.discord.lavaplayer.source.stream.ExtendedM3uParser;
-import com.sedmelluq.discord.lavaplayer.source.stream.M3uStreamSegmentUrlProvider;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.utils.URIBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-
-/**
- * Provider for Twitch segment URLs from a channel.
- */
-public class TwitchStreamSegmentUrlProvider extends M3uStreamSegmentUrlProvider {
- private static final String TOKEN_PARAMETER = "token";
-
- private static final Logger log = LoggerFactory.getLogger(TwitchStreamSegmentUrlProvider.class);
-
- private final String channelName;
- private final TwitchStreamAudioSourceManager manager;
-
- private String streamSegmentPlaylistUrl;
- private long tokenExpirationTime;
-
- /**
- * @param channelName Channel identifier.
- * @param manager Twitch source manager.
- */
- public TwitchStreamSegmentUrlProvider(String channelName, TwitchStreamAudioSourceManager manager) {
- this.channelName = channelName;
- this.manager = manager;
- this.tokenExpirationTime = -1;
- }
-
- @Override
- protected String getQualityFromM3uDirective(ExtendedM3uParser.Line directiveLine) {
- return directiveLine.directiveArguments.get("VIDEO");
- }
-
- @Override
- protected String fetchSegmentPlaylistUrl(HttpInterface httpInterface) throws IOException {
- if (System.currentTimeMillis() < tokenExpirationTime) {
- return streamSegmentPlaylistUrl;
- }
-
- JsonBrowser token = loadAccessToken(httpInterface);
- HttpUriRequest request = new HttpGet(getChannelStreamsUrl(token).toString());
- ChannelStreams streams = loadChannelStreamsInfo(HttpClientTools.fetchResponseLines(httpInterface, request, "channel streams list"));
-
- if (streams.entries.isEmpty()) {
- throw new IllegalStateException("No streams available on channel.");
- }
-
- ChannelStreamInfo stream = streams.entries.get(0);
-
- log.debug("Chose stream with quality {} from url {}", stream.quality, stream.url);
- streamSegmentPlaylistUrl = stream.url;
-
- long tokenServerExpirationTime = JsonBrowser.parse(token.get(TOKEN_PARAMETER).text()).get("expires").as(Long.class) * 1000L;
- tokenExpirationTime = System.currentTimeMillis() + (tokenServerExpirationTime - streams.serverTime) - 5000;
-
- return streamSegmentPlaylistUrl;
- }
-
- @Override
- protected HttpUriRequest createSegmentGetRequest(String url) {
- return manager.createGetRequest(url);
- }
-
- private JsonBrowser loadAccessToken(HttpInterface httpInterface) throws IOException {
- HttpUriRequest request = createSegmentGetRequest("https://api.twitch.tv/api/channels/" + channelName +
- "/access_token?adblock=false&need_https=true&platform=web&player_type=site");
-
- try (CloseableHttpResponse response = httpInterface.execute(request)) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Unexpected response code from access token request: " + statusCode);
- }
-
- return JsonBrowser.parse(response.getEntity().getContent());
- }
- }
-
- private ChannelStreams loadChannelStreamsInfo(String[] lines) {
- List streams = loadChannelStreamsList(lines);
- ExtendedM3uParser.Line twitchInfoLine = null;
-
- for (String lineText : lines) {
- ExtendedM3uParser.Line line = ExtendedM3uParser.parseLine(lineText);
-
- if (line.isDirective() && "EXT-X-TWITCH-INFO".equals(line.directiveName)) {
- twitchInfoLine = line;
- }
- }
-
- return buildChannelStreamsInfo(twitchInfoLine, streams);
- }
-
- private ChannelStreams buildChannelStreamsInfo(ExtendedM3uParser.Line twitchInfoLine, List streams) {
- String serverTimeValue = twitchInfoLine != null ? twitchInfoLine.directiveArguments.get("SERVER-TIME") : null;
-
- if (serverTimeValue == null) {
- throw new IllegalStateException("Required server time information not available.");
- }
-
- return new ChannelStreams(
- (long) (Double.valueOf(serverTimeValue) * 1000.0),
- streams
- );
- }
-
- private URI getChannelStreamsUrl(JsonBrowser token) {
- try {
- return new URIBuilder("https://usher.ttvnw.net/api/channel/hls/" + channelName + ".m3u8")
- .addParameter(TOKEN_PARAMETER, token.get(TOKEN_PARAMETER).text())
- .addParameter("sig", token.get("sig").text())
- .addParameter("allow_source", "true")
- .addParameter("allow_spectre", "true")
- .addParameter("player_backend", "html5")
- .addParameter("expgroup", "regular")
- .build();
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-
- private static class ChannelStreams {
- private final long serverTime;
- private final List entries;
-
- private ChannelStreams(long serverTime, List entries) {
- this.serverTime = serverTime;
- this.entries = entries;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/vimeo/VimeoAudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/vimeo/VimeoAudioSourceManager.java
deleted file mode 100644
index d96b976..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/vimeo/VimeoAudioSourceManager.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.vimeo;
-
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio source manager which detects Vimeo tracks by URL.
- */
-public class VimeoAudioSourceManager implements AudioSourceManager, HttpConfigurable {
- private static final String TRACK_URL_REGEX = "^https://vimeo.com/[0-9]+(?:\\?.*|)$";
- private static final Pattern trackUrlPattern = Pattern.compile(TRACK_URL_REGEX);
-
- private final HttpInterfaceManager httpInterfaceManager;
-
- /**
- * Create an instance.
- */
- public VimeoAudioSourceManager() {
- httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
- }
-
- @Override
- public String getSourceName() {
- return "vimeo";
- }
-
- @Override
- public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference) {
- if (!trackUrlPattern.matcher(reference.identifier).matches()) {
- return null;
- }
-
- try (HttpInterface httpInterface = httpInterfaceManager.getInterface()) {
- return loadFromTrackPage(httpInterface, reference.identifier);
- } catch (IOException e) {
- throw new FriendlyException("Loading Vimeo track information failed.", SUSPICIOUS, e);
- }
- }
-
- @Override
- public boolean isTrackEncodable(AudioTrack track) {
- return true;
- }
-
- @Override
- public void encodeTrack(AudioTrack track, DataOutput output) throws IOException {
- // Nothing special to encode
- }
-
- @Override
- public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) throws IOException {
- return new VimeoAudioTrack(trackInfo, this);
- }
-
- @Override
- public void shutdown() {
- ExceptionTools.closeWithWarnings(httpInterfaceManager);
- }
-
- /**
- * @return Get an HTTP interface for a playing track.
- */
- public HttpInterface getHttpInterface() {
- return httpInterfaceManager.getInterface();
- }
-
- @Override
- public void configureRequests(Function configurator) {
- httpInterfaceManager.configureRequests(configurator);
- }
-
- @Override
- public void configureBuilder(Consumer configurator) {
- httpInterfaceManager.configureBuilder(configurator);
- }
-
- JsonBrowser loadConfigJsonFromPageContent(String content) throws IOException {
- String configText = DataFormatTools.extractBetween(content, "window.vimeo.clip_page_config = ", "\n");
-
- if (configText != null) {
- return JsonBrowser.parse(configText);
- }
-
- return null;
- }
-
- private AudioItem loadFromTrackPage(HttpInterface httpInterface, String trackUrl) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(trackUrl))) {
- int statusCode = response.getStatusLine().getStatusCode();
-
- if (statusCode == 404) {
- return AudioReference.NO_TRACK;
- } else if (statusCode != 200) {
- throw new FriendlyException("Server responded with an error.", SUSPICIOUS,
- new IllegalStateException("Response code is " + statusCode));
- }
-
- return loadTrackFromPageContent(trackUrl, IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8));
- }
- }
-
- private AudioTrack loadTrackFromPageContent(String trackUrl, String content) throws IOException {
- JsonBrowser config = loadConfigJsonFromPageContent(content);
-
- if (config == null) {
- throw new FriendlyException("Track information not found on the page.", SUSPICIOUS, null);
- }
-
- return new VimeoAudioTrack(new AudioTrackInfo(
- config.get("clip").get("title").text(),
- config.get("owner").get("display_name").text(),
- (long) (config.get("clip").get("duration").get("raw").as(Double.class) * 1000.0),
- trackUrl,
- false,
- trackUrl
- ), this);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/vimeo/VimeoAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/vimeo/VimeoAudioTrack.java
deleted file mode 100644
index 572c928..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/vimeo/VimeoAudioTrack.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.vimeo;
-
-import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegAudioTrack;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio track that handles processing Vimeo tracks.
- */
-public class VimeoAudioTrack extends DelegatedAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(VimeoAudioTrack.class);
-
- private final VimeoAudioSourceManager sourceManager;
-
- /**
- * @param trackInfo Track info
- * @param sourceManager Source manager which was used to find this track
- */
- public VimeoAudioTrack(AudioTrackInfo trackInfo, VimeoAudioSourceManager sourceManager) {
- super(trackInfo);
-
- this.sourceManager = sourceManager;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- try (HttpInterface httpInterface = sourceManager.getHttpInterface()) {
- String playbackUrl = loadPlaybackUrl(httpInterface);
-
- log.debug("Starting Vimeo track from URL: {}", playbackUrl);
-
- try (PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(playbackUrl), null)) {
- processDelegate(new MpegAudioTrack(trackInfo, stream), localExecutor);
- }
- }
- }
-
- private String loadPlaybackUrl(HttpInterface httpInterface) throws IOException {
- JsonBrowser config = loadPlayerConfig(httpInterface);
- if (config == null) {
- throw new FriendlyException("Track information not present on the page.", SUSPICIOUS, null);
- }
-
- String trackConfigUrl = config.get("player").get("config_url").text();
- JsonBrowser trackConfig = loadTrackConfig(httpInterface, trackConfigUrl);
-
- return trackConfig.get("request").get("files").get("progressive").index(0).get("url").text();
- }
-
- private JsonBrowser loadPlayerConfig(HttpInterface httpInterface) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(trackInfo.identifier))) {
- int statusCode = response.getStatusLine().getStatusCode();
-
- if (statusCode != 200) {
- throw new FriendlyException("Server responded with an error.", SUSPICIOUS,
- new IllegalStateException("Response code for player config is " + statusCode));
- }
-
- return sourceManager.loadConfigJsonFromPageContent(IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8));
- }
- }
-
- private JsonBrowser loadTrackConfig(HttpInterface httpInterface, String trackAccessInfoUrl) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(trackAccessInfoUrl))) {
- int statusCode = response.getStatusLine().getStatusCode();
-
- if (statusCode != 200) {
- throw new FriendlyException("Server responded with an error.", SUSPICIOUS,
- new IllegalStateException("Response code for track access info is " + statusCode));
- }
-
- return JsonBrowser.parse(response.getEntity().getContent());
- }
- }
-
- @Override
- public AudioTrack makeClone() {
- return new VimeoAudioTrack(trackInfo, sourceManager);
- }
-
- @Override
- public AudioSourceManager getSourceManager() {
- return sourceManager;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeAudioSourceManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeAudioSourceManager.java
deleted file mode 100644
index cc919da..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeAudioSourceManager.java
+++ /dev/null
@@ -1,566 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.*;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import static com.sedmelluq.discord.lavaplayer.tools.DataFormatTools.convertToMapLayout;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.*;
-
-/**
- * Audio source manager that implements finding Youtube videos or playlists based on an URL or ID.
- */
-public class YoutubeAudioSourceManager implements AudioSourceManager, HttpConfigurable {
- private static final Logger log = LoggerFactory.getLogger(YoutubeAudioSourceManager.class);
- static final String CHARSET = "UTF-8";
-
- private static final String PROTOCOL_REGEX = "(?:http://|https://|)";
- private static final String DOMAIN_REGEX = "(?:www\\.|m\\.|music\\.|)youtube\\.com";
- private static final String SHORT_DOMAIN_REGEX = "(?:www\\.|)youtu\\.be";
- private static final String VIDEO_ID_REGEX = "(?[a-zA-Z0-9_-]{11})";
- private static final String PLAYLIST_ID_REGEX = "(?(PL|LL|FL|UU)[a-zA-Z0-9_-]+)";
-
- private static final String SEARCH_PREFIX = "ytsearch:";
-
- private static final Pattern directVideoIdPattern = Pattern.compile("^" + VIDEO_ID_REGEX + "$");
-
- private final Extractor[] extractors = new Extractor[]{
- new Extractor(directVideoIdPattern, id -> loadTrackWithVideoId(id, false)),
- new Extractor(Pattern.compile("^" + PLAYLIST_ID_REGEX + "$"), id -> loadPlaylistWithId(id, null)),
- new Extractor(Pattern.compile("^" + PROTOCOL_REGEX + DOMAIN_REGEX + "/.*"), this::loadFromMainDomain),
- new Extractor(Pattern.compile("^" + PROTOCOL_REGEX + SHORT_DOMAIN_REGEX + "/.*"), this::loadFromShortDomain)
- };
-
- private final YoutubeSignatureCipherManager signatureCipherManager;
- private final HttpInterfaceManager httpInterfaceManager;
- private final YoutubeSearchProvider searchProvider;
- private final YoutubeMixProvider mixProvider;
- private final boolean allowSearch;
- private volatile int playlistPageCount;
-
- /**
- * Create an instance with default settings.
- */
- public YoutubeAudioSourceManager() {
- this(true);
- }
-
- /**
- * Create an instance.
- *
- * @param allowSearch Whether to allow search queries as identifiers
- */
- public YoutubeAudioSourceManager(boolean allowSearch) {
- signatureCipherManager = new YoutubeSignatureCipherManager();
- httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
- this.allowSearch = allowSearch;
- playlistPageCount = 6;
- searchProvider = new YoutubeSearchProvider(this);
- mixProvider = new YoutubeMixProvider(this);
- }
-
- /**
- * @param playlistPageCount Maximum number of pages loaded from one playlist. There are 100 tracks per page.
- */
- public void setPlaylistPageCount(int playlistPageCount) {
- this.playlistPageCount = playlistPageCount;
- }
-
- /**
- * @param maximumPoolSize Maximum number of threads in mix loader thread pool.
- */
- public void setMixLoaderMaximumPoolSize(int maximumPoolSize) {
- mixProvider.setLoaderMaximumPoolSize(maximumPoolSize);
- }
-
- @Override
- public String getSourceName() {
- return "youtube";
- }
-
- @Override
- public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference reference) {
- try {
- return loadItemOnce(reference);
- } catch (FriendlyException exception) {
- // In case of a connection reset exception, try once more.
- if (HttpClientTools.isRetriableNetworkException(exception.getCause())) {
- return loadItemOnce(reference);
- } else {
- throw exception;
- }
- }
- }
-
- @Override
- public boolean isTrackEncodable(AudioTrack track) {
- return true;
- }
-
- @Override
- public void encodeTrack(AudioTrack track, DataOutput output) {
- // No custom values that need saving
- }
-
- @Override
- public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
- return new YoutubeAudioTrack(trackInfo, this);
- }
-
- @Override
- public void shutdown() {
- ExceptionTools.closeWithWarnings(httpInterfaceManager);
-
- mixProvider.shutdown();
- }
-
- public YoutubeSignatureCipherManager getCipherManager() {
- return signatureCipherManager;
- }
-
- /**
- * @return Get an HTTP interface for a playing track.
- */
- public HttpInterface getHttpInterface() {
- return httpInterfaceManager.getInterface();
- }
-
- @Override
- public void configureRequests(Function configurator) {
- httpInterfaceManager.configureRequests(configurator);
- searchProvider.configureRequests(configurator);
- }
-
- @Override
- public void configureBuilder(Consumer configurator) {
- httpInterfaceManager.configureBuilder(configurator);
- searchProvider.configureBuilder(configurator);
- }
-
- private AudioItem loadItemOnce(AudioReference reference) {
- if (allowSearch && reference.identifier.startsWith(SEARCH_PREFIX)) {
- return searchProvider.loadSearchResult(reference.identifier.substring(SEARCH_PREFIX.length()).trim());
- }
-
- return loadNonSearch(reference.identifier);
- }
-
- /**
- * Loads a single track from video ID.
- *
- * @param videoId ID of the YouTube video.
- * @param mustExist True if it should throw an exception on missing track, otherwise returns AudioReference.NO_TRACK.
- * @return Loaded YouTube track.
- */
- public AudioItem loadTrackWithVideoId(String videoId, boolean mustExist) {
- try (HttpInterface httpInterface = getHttpInterface()) {
- JsonBrowser info = getTrackInfoFromMainPage(httpInterface, videoId, mustExist);
- if (info == null) {
- return AudioReference.NO_TRACK;
- }
-
- JsonBrowser args = info.get("args");
-
- if ("fail".equals(args.get("status").text())) {
- throw new FriendlyException(args.get("reason").text(), COMMON, null);
- }
-
- boolean isStream = "1".equals(args.get("live_playback").text());
- long duration = isStream ? Long.MAX_VALUE : args.get("length_seconds").as(Long.class) * 1000;
-
- return buildTrackObject(videoId, args.get("title").text(), args.get("author").text(), isStream, duration);
- } catch (Exception e) {
- throw ExceptionTools.wrapUnfriendlyExceptions("Loading information for a YouTube track failed.", FAULT, e);
- }
- }
-
- /**
- * @param tracks List of tracks to search from.
- * @param selectedVideoId Selected track identifier.
- * @return The selected track from the track list, or null if it is not present.
- */
- public AudioTrack findSelectedTrack(List tracks, String selectedVideoId) {
- if (selectedVideoId != null) {
- for (AudioTrack track : tracks) {
- if (selectedVideoId.equals(track.getIdentifier())) {
- return track;
- }
- }
- }
- return null;
- }
-
- private AudioItem loadFromMainDomain(String identifier) {
- UrlInfo urlInfo = getUrlInfo(identifier, true);
-
- if ("/watch".equals(urlInfo.path)) {
- String videoId = urlInfo.parameters.get("v");
-
- if (videoId != null) {
- return loadFromUrlWithVideoId(videoId, urlInfo);
- }
- } else if ("/playlist".equals(urlInfo.path)) {
- String playlistId = urlInfo.parameters.get("list");
-
- if (playlistId != null) {
- return loadPlaylistWithId(playlistId, null);
- }
- } else if ("/watch_videos".equals(urlInfo.path)) {
- String videoIds = urlInfo.parameters.get("video_ids");
- if (videoIds != null) {
- return loadAnonymous(videoIds);
- }
- }
-
- return null;
- }
-
- private AudioItem loadAnonymous(String videoIds) {
- try (HttpInterface httpInterface = getHttpInterface()) {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet("https://www.youtube.com/watch_videos?video_ids=" + videoIds))) {
- int statusCode = response.getStatusLine().getStatusCode();
- HttpClientContext context = httpInterface.getContext();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for playlist response: " + statusCode);
- }
- // youtube currently transforms watch_video links into a link with a video id and a list id.
- // because thats what happens, we can simply re-process with the redirected link
- List redirects = context.getRedirectLocations();
- if (redirects != null && !redirects.isEmpty()) {
- return loadNonSearch(redirects.get(0).toString());
- } else {
- throw new FriendlyException("Unable to process youtube watch_videos link", SUSPICIOUS,
- new IllegalStateException("Expected youtube to redirect watch_videos link to a watch?v={id}&list={list_id} link, but it did not redirect at all"));
- }
- }
- } catch (Exception e) {
- throw ExceptionTools.wrapUnfriendlyExceptions(e);
- }
- }
-
- private AudioItem loadFromShortDomain(String identifier) {
- UrlInfo urlInfo = getUrlInfo(identifier, true);
- return loadFromUrlWithVideoId(urlInfo.path.substring(1), urlInfo);
- }
-
- private AudioItem loadFromUrlWithVideoId(String videoId, UrlInfo urlInfo) {
- if (videoId.length() > 11) {
- // YouTube allows extra junk in the end, it redirects to the correct video.
- videoId = videoId.substring(0, 11);
- }
-
- if (!directVideoIdPattern.matcher(videoId).matches()) {
- return AudioReference.NO_TRACK;
- } else if (urlInfo.parameters.containsKey("list")) {
- String playlistId = urlInfo.parameters.get("list");
-
- if (playlistId.startsWith("RD")) {
- return mixProvider.loadMixWithId(playlistId, videoId);
- } else {
- return loadLinkedPlaylistWithId(urlInfo.parameters.get("list"), videoId);
- }
- } else {
- return loadTrackWithVideoId(videoId, false);
- }
- }
-
- private AudioItem loadNonSearch(String identifier) {
- for (Extractor extractor : extractors) {
- if (extractor.pattern.matcher(identifier).matches()) {
- AudioItem item = extractor.loader.apply(identifier);
-
- if (item != null) {
- return item;
- }
- }
- }
-
- return null;
- }
-
- private AudioItem loadLinkedPlaylistWithId(String playlistId, String videoId) {
- AudioPlaylist playlist = loadPlaylistWithId(playlistId, videoId);
-
- if (playlist == null) {
- return loadTrackWithVideoId(videoId, false);
- } else {
- return playlist;
- }
- }
-
- /**
- * @param httpInterface HTTP interface to use for performing any necessary request.
- * @param videoId ID of the video.
- * @param mustExist If true, throws an exception instead of returning null if the track does
- * not exist.
- * @return JSON information about the track if it exists. null if it does not and mustExist is
- * false.
- * @throws IOException On network error.
- */
- public JsonBrowser getTrackInfoFromMainPage(HttpInterface httpInterface, String videoId, boolean mustExist) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(getWatchUrl(videoId)))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for video page response: " + statusCode);
- }
-
- String html = IOUtils.toString(response.getEntity().getContent(), Charset.forName(CHARSET));
- String configJson = DataFormatTools.extractBetween(html, "ytplayer.config = ", ";ytplayer.load");
-
- if (configJson != null) {
- return JsonBrowser.parse(configJson);
- }
- }
-
- if (determineFailureReason(httpInterface, videoId, mustExist)) {
- return null;
- }
-
- // In case main page does not give player configuration, but info page indicates an OK result, it is probably an
- // age-restricted video for which the complete track info can be combined from the embed page and the info page.
- return getTrackInfoFromEmbedPage(httpInterface, videoId);
- }
-
- private boolean determineFailureReason(HttpInterface httpInterface, String videoId, boolean mustExist) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet("https://www.youtube.com/get_video_info?hl=en_GB&video_id=" + videoId))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for video info response: " + statusCode);
- }
-
- Map format = convertToMapLayout(URLEncodedUtils.parse(response.getEntity()));
- return determineFailureReasonFromStatus(format.get("status"), format.get("reason"), mustExist);
- }
- }
-
- private boolean determineFailureReasonFromStatus(String status, String reason, boolean mustExist) {
- if ("fail".equals(status)) {
- if (("This video does not exist.".equals(reason) || "This video is unavailable.".equals(reason)) && !mustExist) {
- return true;
- } else if (reason != null) {
- throw new FriendlyException(reason, COMMON, null);
- }
- } else if ("ok".equals(status)) {
- return false;
- }
-
- throw new FriendlyException("Track is unavailable for an unknown reason.", SUSPICIOUS,
- new IllegalStateException("Main page had no video, but video info has no error."));
- }
-
- private JsonBrowser getTrackInfoFromEmbedPage(HttpInterface httpInterface, String videoId) throws IOException {
- JsonBrowser basicInfo = loadTrackBaseInfoFromEmbedPage(httpInterface, videoId);
- basicInfo.put("args", loadTrackArgsFromVideoInfoPage(httpInterface, videoId, basicInfo.get("sts").text()));
- return basicInfo;
- }
-
- private JsonBrowser loadTrackBaseInfoFromEmbedPage(HttpInterface httpInterface, String videoId) throws IOException {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet("https://www.youtube.com/embed/" + videoId))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for embed video page response: " + statusCode);
- }
-
- String html = IOUtils.toString(response.getEntity().getContent(), Charset.forName(CHARSET));
- String configJson = DataFormatTools.extractBetween(html, "'PLAYER_CONFIG': ", "});writeEmbed();");
-
- if (configJson != null) {
- return JsonBrowser.parse(configJson);
- }
- }
-
- throw new FriendlyException("Track information is unavailable.", SUSPICIOUS,
- new IllegalStateException("Expected player config is not present in embed page."));
- }
-
- private Map loadTrackArgsFromVideoInfoPage(HttpInterface httpInterface, String videoId, String sts) throws IOException {
- String url = "https://www.youtube.com/get_video_info?hl=en_GB&video_id=" + videoId + "&sts=" + sts;
-
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(url))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for video info response: " + statusCode);
- }
-
- return convertToMapLayout(URLEncodedUtils.parse(response.getEntity()));
- }
- }
-
- private AudioPlaylist loadPlaylistWithId(String playlistId, String selectedVideoId) {
- log.debug("Starting to load playlist with ID {}", playlistId);
-
- try (HttpInterface httpInterface = getHttpInterface()) {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet("https://www.youtube.com/playlist?list=" + playlistId))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for playlist response: " + statusCode);
- }
-
- Document document = Jsoup.parse(response.getEntity().getContent(), CHARSET, "");
- return buildPlaylist(httpInterface, document, selectedVideoId);
- }
- } catch (Exception e) {
- throw ExceptionTools.wrapUnfriendlyExceptions(e);
- }
- }
-
- private AudioPlaylist buildPlaylist(HttpInterface httpInterface, Document document, String selectedVideoId) throws IOException {
- boolean isAccessible = !document.select("#pl-header").isEmpty();
-
- if (!isAccessible) {
- if (selectedVideoId != null) {
- return null;
- } else {
- throw new FriendlyException("The playlist is private.", COMMON, null);
- }
- }
-
- Element container = document.select("#pl-header").first().parent();
-
- String playlistName = container.select(".pl-header-title").first().text();
-
- List tracks = new ArrayList<>();
- String loadMoreUrl = extractPlaylistTracks(container, container, tracks);
- int loadCount = 0;
- int pageCount = playlistPageCount;
-
- // Also load the next pages, each result gives us a JSON with separate values for list html and next page loader html
- while (loadMoreUrl != null && ++loadCount < pageCount) {
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet("https://www.youtube.com" + loadMoreUrl))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for playlist response: " + statusCode);
- }
-
- JsonBrowser json = JsonBrowser.parse(response.getEntity().getContent());
-
- String html = json.get("content_html").text();
- Element videoContainer = Jsoup.parse("", "");
-
- String moreHtml = json.get("load_more_widget_html").text();
- Element moreContainer = moreHtml != null ? Jsoup.parse(moreHtml) : null;
-
- loadMoreUrl = extractPlaylistTracks(videoContainer, moreContainer, tracks);
- }
- }
-
- return new BasicAudioPlaylist(playlistName, tracks, findSelectedTrack(tracks, selectedVideoId), false);
- }
-
- private String extractPlaylistTracks(Element videoContainer, Element loadMoreContainer, List tracks) {
- for (Element video : videoContainer.select(".pl-video")) {
- Elements lengthElements = video.select(".timestamp span");
-
- // If the timestamp element does not exist, it means the video is private
- if (!lengthElements.isEmpty()) {
- String videoId = video.attr("data-video-id").trim();
- String title = video.attr("data-title").trim();
- String author = video.select(".pl-video-owner a").text().trim();
- long duration = DataFormatTools.durationTextToMillis(lengthElements.first().text());
-
- tracks.add(buildTrackObject(videoId, title, author, false, duration));
- }
- }
-
- if (loadMoreContainer != null) {
- Elements more = loadMoreContainer.select(".load-more-button");
- if (!more.isEmpty()) {
- return more.first().attr("data-uix-load-more-href");
- }
- }
-
- return null;
- }
-
- /**
- * @param videoId Video ID. Used as {@link AudioTrackInfo#identifier}.
- * @param title See {@link AudioTrackInfo#title}.
- * @param uploader Name of the uploader. Used as {@link AudioTrackInfo#author}.
- * @param isStream See {@link AudioTrackInfo#isStream}.
- * @param duration See {@link AudioTrackInfo#length}.
- * @return An audio track instance.
- */
- public YoutubeAudioTrack buildTrackObject(String videoId, String title, String uploader, boolean isStream, long duration) {
- return new YoutubeAudioTrack(new AudioTrackInfo(title, uploader, duration, videoId, isStream, getWatchUrl(videoId)), this);
- }
-
- private static String getWatchUrl(String videoId) {
- return "https://www.youtube.com/watch?v=" + videoId;
- }
-
- private static UrlInfo getUrlInfo(String url, boolean retryValidPart) {
- try {
- if (!url.startsWith("http://") && !url.startsWith("https://")) {
- url = "https://" + url;
- }
-
- URIBuilder builder = new URIBuilder(url);
- return new UrlInfo(builder.getPath(), builder.getQueryParams().stream()
- .filter(it -> it.getValue() != null)
- .collect(Collectors.toMap(NameValuePair::getName, NameValuePair::getValue)));
- } catch (URISyntaxException e) {
- if (retryValidPart) {
- return getUrlInfo(url.substring(0, e.getIndex() - 1), false);
- } else {
- throw new FriendlyException("Not a valid URL: " + url, COMMON, e);
- }
- }
- }
-
- private static class UrlInfo {
- private final String path;
- private final Map parameters;
-
- private UrlInfo(String path, Map parameters) {
- this.path = path;
- this.parameters = parameters;
- }
- }
-
- private static class Extractor {
- private final Pattern pattern;
- private final Function loader;
-
- private Extractor(Pattern pattern, Function loader) {
- this.pattern = pattern;
- this.loader = loader;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeAudioTrack.java
deleted file mode 100644
index 963c507..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeAudioTrack.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-import com.sedmelluq.discord.lavaplayer.container.matroska.MatroskaAudioTrack;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegAudioTrack;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.JsonBrowser;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.apache.http.entity.ContentType;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.parser.Parser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.StringJoiner;
-
-import static com.sedmelluq.discord.lavaplayer.container.Formats.MIME_AUDIO_WEBM;
-import static com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager.CHARSET;
-import static com.sedmelluq.discord.lavaplayer.tools.DataFormatTools.convertToMapLayout;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.COMMON;
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Audio track that handles processing Youtube videos as audio tracks.
- */
-public class YoutubeAudioTrack extends DelegatedAudioTrack {
- private static final Logger log = LoggerFactory.getLogger(YoutubeAudioTrack.class);
-
- private static final String DEFAULT_SIGNATURE_KEY = "signature";
-
- private final YoutubeAudioSourceManager sourceManager;
-
- /**
- * @param trackInfo Track info
- * @param sourceManager Source manager which was used to find this track
- */
- public YoutubeAudioTrack(AudioTrackInfo trackInfo, YoutubeAudioSourceManager sourceManager) {
- super(trackInfo);
-
- this.sourceManager = sourceManager;
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
- try (HttpInterface httpInterface = sourceManager.getHttpInterface()) {
- FormatWithUrl format = loadBestFormatWithUrl(httpInterface);
-
- log.debug("Starting track from URL: {}", format.signedUrl);
-
- if (trackInfo.isStream) {
- processStream(localExecutor, format);
- } else {
- processStatic(localExecutor, httpInterface, format);
- }
- }
- }
-
- private void processStatic(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface, FormatWithUrl format) throws Exception {
- try (YoutubePersistentHttpStream stream = new YoutubePersistentHttpStream(httpInterface, format.signedUrl, format.details.getContentLength())) {
- if (format.details.getType().getMimeType().endsWith("/webm")) {
- processDelegate(new MatroskaAudioTrack(trackInfo, stream), localExecutor);
- } else {
- processDelegate(new MpegAudioTrack(trackInfo, stream), localExecutor);
- }
- }
- }
-
- private void processStream(LocalAudioTrackExecutor localExecutor, FormatWithUrl format) throws Exception {
- if (MIME_AUDIO_WEBM.equals(format.details.getType().getMimeType())) {
- throw new FriendlyException("YouTube WebM streams are currently not supported.", COMMON, null);
- } else {
- try (HttpInterface streamingInterface = sourceManager.getHttpInterface()) {
- processDelegate(new YoutubeMpegStreamAudioTrack(trackInfo, streamingInterface, format.signedUrl), localExecutor);
- }
- }
- }
-
- private FormatWithUrl loadBestFormatWithUrl(HttpInterface httpInterface) throws Exception {
- JsonBrowser info = getTrackInfo(httpInterface);
-
- String playerScript = extractPlayerScriptFromInfo(info);
- List formats = loadTrackFormats(info, httpInterface, playerScript);
- YoutubeTrackFormat format = findBestSupportedFormat(formats);
-
- URI signedUrl = sourceManager.getCipherManager().getValidUrl(httpInterface, playerScript, format);
-
- return new FormatWithUrl(format, signedUrl);
- }
-
- @Override
- public AudioTrack makeClone() {
- return new YoutubeAudioTrack(trackInfo, sourceManager);
- }
-
- @Override
- public AudioSourceManager getSourceManager() {
- return sourceManager;
- }
-
- private JsonBrowser getTrackInfo(HttpInterface httpInterface) throws Exception {
- return sourceManager.getTrackInfoFromMainPage(httpInterface, getIdentifier(), true);
- }
-
- private List loadTrackFormats(JsonBrowser info, HttpInterface httpInterface, String playerScript) throws Exception {
- JsonBrowser args = info.safeGet("args");
-
- String adaptiveFormats = args.safeGet("adaptive_fmts").text();
- if (adaptiveFormats != null) {
- return loadTrackFormatsFromAdaptive(adaptiveFormats);
- }
-
- String dashUrl = args.safeGet("dashmpd").text();
- if (dashUrl != null) {
- return loadTrackFormatsFromDash(dashUrl, httpInterface, playerScript);
- }
-
- String formatStreamMap = args.safeGet("url_encoded_fmt_stream_map").text();
- if (formatStreamMap != null) {
- return loadTrackFormatsFromFormatStreamMap(formatStreamMap);
- }
-
- throw new FriendlyException("Unable to play this YouTube track.", SUSPICIOUS,
- new IllegalStateException("No adaptive formats, no dash, no stream map."));
- }
-
- private List loadTrackFormatsFromAdaptive(String adaptiveFormats) throws Exception {
- List tracks = new ArrayList<>();
-
- for (String formatString : adaptiveFormats.split(",")) {
- Map format = convertToMapLayout(URLEncodedUtils.parse(formatString, Charset.forName(CHARSET)));
-
- tracks.add(new YoutubeTrackFormat(
- ContentType.parse(format.get("type")),
- Long.parseLong(format.get("bitrate")),
- Long.parseLong(format.get("clen")),
- format.get("url"),
- format.get("s"),
- format.getOrDefault("sp", DEFAULT_SIGNATURE_KEY)
- ));
- }
-
- return tracks;
- }
-
- private List loadTrackFormatsFromFormatStreamMap(String adaptiveFormats) throws Exception {
- List tracks = new ArrayList<>();
-
- for (String formatString : adaptiveFormats.split(",")) {
- Map format = convertToMapLayout(URLEncodedUtils.parse(formatString, Charset.forName(CHARSET)));
- String url = format.get("url");
- String contentLength = DataFormatTools.extractBetween(url, "clen=", "&");
-
- if (contentLength == null) {
- log.debug("Could not find content length from URL {}, skipping format", url);
- continue;
- }
-
- tracks.add(new YoutubeTrackFormat(
- ContentType.parse(format.get("type")),
- qualityToBitrateValue(format.get("quality")),
- Long.parseLong(contentLength),
- url,
- format.get("s"),
- format.getOrDefault("sp", DEFAULT_SIGNATURE_KEY)
- ));
- }
-
- return tracks;
- }
-
- private long qualityToBitrateValue(String quality) {
- // Return negative bitrate values to indicate missing bitrate info, but still retain the relative order.
- if ("small".equals(quality)) {
- return -10;
- } else if ("medium".equals(quality)) {
- return -5;
- } else if ("hd720".equals(quality)) {
- return -4;
- } else {
- return -1;
- }
- }
-
- private List loadTrackFormatsFromDash(String dashUrl, HttpInterface httpInterface, String playerScript) throws Exception {
- String resolvedDashUrl = sourceManager.getCipherManager().getValidDashUrl(httpInterface, playerScript, dashUrl);
-
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(resolvedDashUrl))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for track info page response: " + statusCode);
- }
-
- Document document = Jsoup.parse(response.getEntity().getContent(), CHARSET, "", Parser.xmlParser());
- return loadTrackFormatsFromDashDocument(document);
- }
- }
-
- private List loadTrackFormatsFromDashDocument(Document document) {
- List tracks = new ArrayList<>();
-
- for (Element adaptation : document.select("AdaptationSet")) {
- String mimeType = adaptation.attr("mimeType");
-
- for (Element representation : adaptation.select("Representation")) {
- String url = representation.select("BaseURL").first().text();
- String contentLength = DataFormatTools.extractBetween(url, "/clen/", "/");
- String contentType = mimeType + "; codecs=" + representation.attr("codecs");
-
- if (contentLength == null) {
- log.debug("Skipping format {} because the content length is missing", contentType);
- continue;
- }
-
- tracks.add(new YoutubeTrackFormat(
- ContentType.parse(contentType),
- Long.parseLong(representation.attr("bandwidth")),
- Long.parseLong(contentLength),
- url,
- null,
- DEFAULT_SIGNATURE_KEY
- ));
- }
- }
-
- return tracks;
- }
-
- private static String extractPlayerScriptFromInfo(JsonBrowser info) {
- return info.get("assets").get("js").text();
- }
-
- private static boolean isBetterFormat(YoutubeTrackFormat format, YoutubeTrackFormat other) {
- YoutubeFormatInfo info = format.getInfo();
-
- if (info == null) {
- return false;
- } else if (other == null) {
- return true;
- } else if (info.ordinal() != other.getInfo().ordinal()) {
- return info.ordinal() < other.getInfo().ordinal();
- } else {
- return format.getBitrate() > other.getBitrate();
- }
- }
-
- private static YoutubeTrackFormat findBestSupportedFormat(List formats) throws Exception {
- YoutubeTrackFormat bestFormat = null;
-
- for (YoutubeTrackFormat format : formats) {
- if (isBetterFormat(format, bestFormat)) {
- bestFormat = format;
- }
- }
-
- if (bestFormat == null) {
- StringJoiner joiner = new StringJoiner(", ");
- formats.forEach(format -> joiner.add(format.getType().toString()));
- throw new IllegalStateException("No supported audio streams available, available types: " + joiner.toString());
- }
-
- return bestFormat;
- }
-
- private static class FormatWithUrl {
- private final YoutubeTrackFormat details;
- private final URI signedUrl;
-
- private FormatWithUrl(YoutubeTrackFormat details, URI signedUrl) {
- this.details = details;
- this.signedUrl = signedUrl;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeCipherOperation.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeCipherOperation.java
deleted file mode 100644
index 1fd63a9..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeCipherOperation.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-/**
- * One cipher operation definition.
- */
-public class YoutubeCipherOperation {
- /**
- * The type of the operation.
- */
- public final YoutubeCipherOperationType type;
- /**
- * The parameter for the operation.
- */
- public final int parameter;
-
- /**
- * @param type The type of the operation.
- * @param parameter The parameter for the operation.
- */
- public YoutubeCipherOperation(YoutubeCipherOperationType type, int parameter) {
- this.type = type;
- this.parameter = parameter;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeCipherOperationType.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeCipherOperationType.java
deleted file mode 100644
index 8a79385..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeCipherOperationType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-/**
- * Type of a signature cipher operation.
- */
-public enum YoutubeCipherOperationType {
- SWAP,
- REVERSE,
- SLICE,
- SPLICE
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeFormatInfo.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeFormatInfo.java
deleted file mode 100644
index 503c0f4..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeFormatInfo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-import org.apache.http.entity.ContentType;
-
-import static com.sedmelluq.discord.lavaplayer.container.Formats.*;
-
-/**
- * The mime type and codec info of a Youtube track format.
- */
-public enum YoutubeFormatInfo {
- WEBM_OPUS(MIME_AUDIO_WEBM, CODEC_OPUS),
- WEBM_VORBIS(MIME_AUDIO_WEBM, CODEC_VORBIS),
- MP4_AAC_LC(MIME_AUDIO_MP4, CODEC_AAC_LC),
- WEBM_VIDEO_VORBIS(MIME_VIDEO_WEBM, CODEC_VORBIS),
- MP4_VIDEO_AAC_LC(MIME_VIDEO_MP4, CODEC_AAC_LC);
-
- /**
- * Mime type of the format
- */
- public final String mimeType;
- /**
- * Codec name of the format
- */
- public final String codec;
-
- YoutubeFormatInfo(String mimeType, String codec) {
- this.mimeType = mimeType;
- this.codec = codec;
- }
-
- /**
- * Find a matching format info instance from a content type.
- *
- * @param contentType The content type to use for matching against known formats
- * @return The format info entry that matches the content type
- */
- public static YoutubeFormatInfo get(ContentType contentType) {
- String mimeType = contentType.getMimeType();
- String codec = contentType.getParameter("codecs");
-
- // Check accurate matches
- for (YoutubeFormatInfo formatInfo : YoutubeFormatInfo.class.getEnumConstants()) {
- if (formatInfo.mimeType.equals(mimeType) && formatInfo.codec.equals(codec)) {
- return formatInfo;
- }
- }
-
- // Check for substring matches
- for (YoutubeFormatInfo formatInfo : YoutubeFormatInfo.class.getEnumConstants()) {
- if (formatInfo.mimeType.equals(mimeType) && codec.contains(formatInfo.codec)) {
- return formatInfo;
- }
- }
-
- return null;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeMixProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeMixProvider.java
deleted file mode 100644
index b4d7b34..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeMixProvider.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.track.*;
-import com.sedmelluq.lava.common.tools.DaemonThreadFactory;
-import com.sedmelluq.lava.common.tools.ExecutorTools;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.*;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * Handles loading of YouTube mixes.
- */
-public class YoutubeMixProvider {
- private static final Logger log = LoggerFactory.getLogger(YoutubeMixProvider.class);
-
- private static final int MIX_QUEUE_CAPACITY = 5000;
-
- private final YoutubeAudioSourceManager sourceManager;
- private final ThreadPoolExecutor mixLoadingExecutor;
-
- /**
- * @param sourceManager YouTube source manager used for created tracks.
- */
- public YoutubeMixProvider(YoutubeAudioSourceManager sourceManager) {
- this.sourceManager = sourceManager;
- mixLoadingExecutor = new ThreadPoolExecutor(0, 10, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<>(MIX_QUEUE_CAPACITY),
- new DaemonThreadFactory("yt-mix"));
- }
-
- /**
- * @param maximumPoolSize Maximum number of threads in mix loader thread pool.
- */
- public void setLoaderMaximumPoolSize(int maximumPoolSize) {
- mixLoadingExecutor.setMaximumPoolSize(maximumPoolSize);
- }
-
- /**
- * Shuts down mix loading threads.
- */
- public void shutdown() {
- ExecutorTools.shutdownExecutor(mixLoadingExecutor, "youtube mix");
- }
-
- /**
- * Loads tracks from mix in parallel into a playlist entry.
- *
- * @param mixId ID of the mix
- * @param selectedVideoId Selected track, {@link AudioPlaylist#getSelectedTrack()} will return this.
- * @return Playlist of the tracks in the mix.
- */
- public AudioItem loadMixWithId(String mixId, String selectedVideoId) {
- List videoIds = new ArrayList<>();
-
- try (HttpInterface httpInterface = sourceManager.getHttpInterface()) {
- String mixUrl = "https://www.youtube.com/watch?v=" + selectedVideoId + "&list=" + mixId;
-
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(mixUrl))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for mix response: " + statusCode);
- }
-
- Document document = Jsoup.parse(response.getEntity().getContent(), StandardCharsets.UTF_8.name(), "");
- extractVideoIdsFromMix(document, videoIds);
-
- if (videoIds.isEmpty() && !document.select("#player-unavailable").isEmpty()) {
- return AudioReference.NO_TRACK;
- }
- }
- } catch (IOException e) {
- throw new FriendlyException("Could not read mix page.", SUSPICIOUS, e);
- }
-
- if (videoIds.isEmpty()) {
- throw new FriendlyException("Could not find tracks from mix.", SUSPICIOUS, null);
- }
-
- return loadTracksAsynchronously(videoIds, selectedVideoId);
- }
-
- private void extractVideoIdsFromMix(Document document, List videoIds) {
- for (Element videoList : document.select("#playlist-autoscroll-list")) {
- for (Element item : videoList.select("li")) {
- videoIds.add(item.attr("data-video-id"));
- }
- }
- }
-
- private AudioPlaylist loadTracksAsynchronously(List videoIds, String selectedVideoId) {
- ExecutorCompletionService completion = new ExecutorCompletionService<>(mixLoadingExecutor);
- List tracks = new ArrayList<>();
-
- for (final String videoId : videoIds) {
- completion.submit(() -> sourceManager.loadTrackWithVideoId(videoId, true));
- }
-
- try {
- fetchTrackResultsFromExecutor(completion, tracks, videoIds.size());
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
-
- AudioTrack selectedTrack = sourceManager.findSelectedTrack(tracks, selectedVideoId);
-
- if (tracks.isEmpty()) {
- throw new FriendlyException("No tracks from the mix loaded succesfully.", SUSPICIOUS, null);
- } else if (selectedTrack == null) {
- throw new FriendlyException("The selected track of the mix failed to load.", SUSPICIOUS, null);
- }
-
- return new BasicAudioPlaylist("YouTube mix", tracks, selectedTrack, false);
- }
-
- private void fetchTrackResultsFromExecutor(ExecutorCompletionService completion, List tracks, int size) throws InterruptedException {
- for (int i = 0; i < size; i++) {
- try {
- AudioItem item = completion.take().get();
-
- if (item instanceof AudioTrack) {
- tracks.add((AudioTrack) item);
- }
- } catch (ExecutionException e) {
- if (e.getCause() instanceof FriendlyException) {
- ExceptionTools.log(log, (FriendlyException) e.getCause(), "Loading a track from a mix.");
- } else {
- log.warn("Failed to load a track from a mix.", e);
- }
- }
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeMpegStreamAudioTrack.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeMpegStreamAudioTrack.java
deleted file mode 100644
index 2430971..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeMpegStreamAudioTrack.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegAudioTrack;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegFileLoader;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.MpegTrackConsumer;
-import com.sedmelluq.discord.lavaplayer.container.mpeg.reader.MpegFileTrackProvider;
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioProcessingContext;
-import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.utils.URIBuilder;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-
-import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
-
-/**
- * YouTube segmented MPEG stream track. The base URL always gives the latest chunk. Every chunk contains the current
- * sequence number in it, which is used to get the sequence number of the next segment. This is repeated until YouTube
- * responds to a segment request with 204.
- */
-public class YoutubeMpegStreamAudioTrack extends MpegAudioTrack {
- private static final RequestConfig streamingRequestConfig = RequestConfig.custom().setConnectTimeout(10000).build();
-
- private final HttpInterface httpInterface;
- private final URI signedUrl;
-
- /**
- * @param trackInfo Track info
- * @param httpInterface HTTP interface to use for loading segments
- * @param signedUrl URI of the base stream with signature resolved
- */
- public YoutubeMpegStreamAudioTrack(AudioTrackInfo trackInfo, HttpInterface httpInterface, URI signedUrl) {
- super(trackInfo, null);
-
- this.httpInterface = httpInterface;
- this.signedUrl = signedUrl;
-
- // YouTube does not return a segment until it is ready, this might trigger a connect timeout otherwise.
- httpInterface.getContext().setRequestConfig(streamingRequestConfig);
- }
-
- @Override
- public void process(LocalAudioTrackExecutor localExecutor) {
- localExecutor.executeProcessingLoop(() -> {
- execute(localExecutor);
- }, null);
- }
-
- private void execute(LocalAudioTrackExecutor localExecutor) throws InterruptedException {
- TrackState state = new TrackState(signedUrl);
-
- try {
- while (!state.finished) {
- processNextSegment(localExecutor, state);
- state.relativeSequence++;
- }
- } finally {
- if (state.trackConsumer != null) {
- state.trackConsumer.close();
- }
- }
- }
-
- private void processNextSegment(LocalAudioTrackExecutor localExecutor, TrackState state) throws InterruptedException {
- URI segmentUrl = getNextSegmentUrl(state);
-
- try (YoutubePersistentHttpStream stream = new YoutubePersistentHttpStream(httpInterface, segmentUrl, Long.MAX_VALUE)) {
- if (stream.checkStatusCode() == HttpStatus.SC_NO_CONTENT || stream.getContentLength() == 0) {
- state.finished = true;
- return;
- }
-
- // If we were redirected, use that URL as a base for the next segment URL. Otherwise we will likely get redirected
- // again on every other request, which is inefficient (redirects across domains, the original URL is always
- // closing the connection, whereas the final URL is keep-alive).
- state.baseUrl = httpInterface.getFinalLocation();
-
- processSegmentStream(stream, localExecutor.getProcessingContext(), state);
-
- stream.releaseConnection();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private void processSegmentStream(SeekableInputStream stream, AudioProcessingContext context, TrackState state) throws InterruptedException {
- MpegFileLoader file = new MpegFileLoader(stream);
- file.parseHeaders();
-
- state.absoluteSequence = extractAbsoluteSequenceFromEvent(file.getLastEventMessage());
-
- if (state.trackConsumer == null) {
- state.trackConsumer = loadAudioTrack(file, context);
- }
-
- MpegFileTrackProvider fileReader = file.loadReader(state.trackConsumer);
- if (fileReader == null) {
- throw new FriendlyException("Unknown MP4 format.", SUSPICIOUS, null);
- }
-
- fileReader.provideFrames();
- }
-
- private URI getNextSegmentUrl(TrackState state) {
- URIBuilder builder = new URIBuilder(state.baseUrl)
- .setParameter("rn", String.valueOf(state.relativeSequence))
- .setParameter("rbuf", "0");
-
- if (state.absoluteSequence != null) {
- builder.setParameter("sq", String.valueOf(state.absoluteSequence + 1));
- }
-
- try {
- return builder.build();
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-
- private Long extractAbsoluteSequenceFromEvent(byte[] data) {
- if (data == null) {
- return null;
- }
-
- String message = new String(data, StandardCharsets.UTF_8);
- String sequence = DataFormatTools.extractBetween(message, "Sequence-Number: ", "\r\n");
-
- return sequence != null ? Long.valueOf(sequence) : null;
- }
-
- private static class TrackState {
- private long relativeSequence;
- private Long absoluteSequence;
- private MpegTrackConsumer trackConsumer;
- private boolean finished;
- private URI baseUrl;
-
- public TrackState(URI baseUrl) {
- this.baseUrl = baseUrl;
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubePersistentHttpStream.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubePersistentHttpStream.java
deleted file mode 100644
index 71a6526..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubePersistentHttpStream.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
-import org.apache.http.client.utils.URIBuilder;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * A persistent HTTP stream implementation that uses the range parameter instead of HTTP headers for specifying
- * the start position at which to start reading on a new connection.
- */
-public class YoutubePersistentHttpStream extends PersistentHttpStream {
-
- /**
- * @param httpInterface The HTTP interface to use for requests
- * @param contentUrl The URL of the resource
- * @param contentLength The length of the resource in bytes
- */
- public YoutubePersistentHttpStream(HttpInterface httpInterface, URI contentUrl, long contentLength) {
- super(httpInterface, contentUrl, contentLength);
- }
-
- @Override
- protected URI getConnectUrl() {
- if (position > 0) {
- try {
- return new URIBuilder(contentUrl).addParameter("range", position + "-" + contentLength).build();
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- } else {
- return contentUrl;
- }
- }
-
- @Override
- protected boolean useHeadersForRange() {
- return false;
- }
-
- @Override
- public boolean canSeekHard() {
- return true;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeSearchProvider.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeSearchProvider.java
deleted file mode 100644
index 40c76c4..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeSearchProvider.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-import com.sedmelluq.discord.lavaplayer.tools.DataFormatTools;
-import com.sedmelluq.discord.lavaplayer.tools.ExceptionTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpConfigurable;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
-import com.sedmelluq.discord.lavaplayer.track.AudioItem;
-import com.sedmelluq.discord.lavaplayer.track.AudioReference;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import com.sedmelluq.discord.lavaplayer.track.BasicAudioPlaylist;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-/**
- * Handles processing YouTube searches.
- */
-public class YoutubeSearchProvider implements HttpConfigurable {
- private static final Logger log = LoggerFactory.getLogger(YoutubeSearchProvider.class);
-
- private final YoutubeAudioSourceManager sourceManager;
- private final HttpInterfaceManager httpInterfaceManager;
-
- /**
- * @param sourceManager YouTube source manager used for created tracks.
- */
- public YoutubeSearchProvider(YoutubeAudioSourceManager sourceManager) {
- this.sourceManager = sourceManager;
- this.httpInterfaceManager = HttpClientTools.createCookielessThreadLocalManager();
- }
-
- /**
- * @param query Search query.
- * @return Playlist of the first page of results.
- */
- public AudioItem loadSearchResult(String query) {
- log.debug("Performing a search with query {}", query);
-
- try (HttpInterface httpInterface = httpInterfaceManager.getInterface()) {
- URI url = new URIBuilder("https://www.youtube.com/results").addParameter("search_query", query).build();
-
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(url))) {
- int statusCode = response.getStatusLine().getStatusCode();
- if (statusCode != 200) {
- throw new IOException("Invalid status code for search response: " + statusCode);
- }
-
- Document document = Jsoup.parse(response.getEntity().getContent(), StandardCharsets.UTF_8.name(), "");
- return extractSearchResults(document, query);
- }
- } catch (Exception e) {
- throw ExceptionTools.wrapUnfriendlyExceptions(e);
- }
- }
-
- private AudioItem extractSearchResults(Document document, String query) {
- List tracks = new ArrayList<>();
-
- for (Element results : document.select("#page > #content #results")) {
- for (Element result : results.select(".yt-lockup-video")) {
- if (!result.hasAttr("data-ad-impressions") && result.select(".standalone-ypc-badge-renderer-label").isEmpty()) {
- extractTrackFromResultEntry(tracks, result);
- }
- }
- }
-
- if (tracks.isEmpty()) {
- return AudioReference.NO_TRACK;
- } else {
- return new BasicAudioPlaylist("Search results for: " + query, tracks, null, true);
- }
- }
-
- private void extractTrackFromResultEntry(List tracks, Element element) {
- Element durationElement = element.select("[class^=video-time]").first();
- Element contentElement = element.select(".yt-lockup-content").first();
- String videoId = element.attr("data-context-item-id");
-
- if (durationElement == null || contentElement == null || videoId.isEmpty()) {
- return;
- }
-
- long duration = DataFormatTools.durationTextToMillis(durationElement.text());
-
- String title = contentElement.select(".yt-lockup-title > a").text();
- String author = contentElement.select(".yt-lockup-byline > a").text();
-
- tracks.add(sourceManager.buildTrackObject(videoId, title, author, false, duration));
- }
-
- @Override
- public void configureRequests(Function configurator) {
- httpInterfaceManager.configureRequests(configurator);
- }
-
- @Override
- public void configureBuilder(Consumer configurator) {
- httpInterfaceManager.configureBuilder(configurator);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeSignatureCipher.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeSignatureCipher.java
deleted file mode 100644
index d149842..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeSignatureCipher.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Describes one signature cipher
- */
-public class YoutubeSignatureCipher {
- private final List operations = new ArrayList<>();
-
- /**
- * @param text Text to apply the cipher on
- * @return The result of the cipher on the input text
- */
- public String apply(String text) {
- StringBuilder builder = new StringBuilder(text);
-
- for (YoutubeCipherOperation operation : operations) {
- switch (operation.type) {
- case SWAP:
- int position = operation.parameter % text.length();
- char temp = builder.charAt(0);
- builder.setCharAt(0, builder.charAt(position));
- builder.setCharAt(position, temp);
- break;
- case REVERSE:
- builder.reverse();
- break;
- case SLICE:
- case SPLICE:
- builder.delete(0, operation.parameter);
- break;
- default:
- throw new IllegalStateException("All branches should be covered");
- }
- }
-
- return builder.toString();
- }
-
- /**
- * @param operation The operation to add to this cipher
- */
- public void addOperation(YoutubeCipherOperation operation) {
- operations.add(operation);
- }
-
- /**
- * @return True if the cipher contains no operations.
- */
- public boolean isEmpty() {
- return operations.isEmpty();
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeSignatureCipherManager.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeSignatureCipherManager.java
deleted file mode 100644
index 239f6be..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeSignatureCipherManager.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.utils.URIBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Handles parsing and caching of signature ciphers
- */
-public class YoutubeSignatureCipherManager {
- private static final Logger log = LoggerFactory.getLogger(YoutubeSignatureCipherManager.class);
-
- private static final String VARIABLE_PART = "[a-zA-Z_\\$][a-zA-Z_0-9]*";
- private static final String VARIABLE_PART_DEFINE = "\\\"?" + VARIABLE_PART + "\\\"?";
- private static final String BEFORE_ACCESS = "(?:\\[\\\"|\\.)";
- private static final String AFTER_ACCESS = "(?:\\\"\\]|)";
- private static final String VARIABLE_PART_ACCESS = BEFORE_ACCESS + VARIABLE_PART + AFTER_ACCESS;
- private static final String REVERSE_PART = ":function\\(a\\)\\{(?:return )?a\\.reverse\\(\\)\\}";
- private static final String SLICE_PART = ":function\\(a,b\\)\\{return a\\.slice\\(b\\)\\}";
- private static final String SPLICE_PART = ":function\\(a,b\\)\\{a\\.splice\\(0,b\\)\\}";
- private static final String SWAP_PART = ":function\\(a,b\\)\\{" +
- "var c=a\\[0\\];a\\[0\\]=a\\[b%a\\.length\\];a\\[b(?:%a.length|)\\]=c(?:;return a)?\\}";
-
- private static final Pattern functionPattern = Pattern.compile("" +
- "function(?: " + VARIABLE_PART + ")?\\(a\\)\\{" +
- "a=a\\.split\\(\"\"\\);\\s*" +
- "((?:(?:a=)?" + VARIABLE_PART + VARIABLE_PART_ACCESS + "\\(a,\\d+\\);)+)" +
- "return a\\.join\\(\"\"\\)" +
- "\\}"
- );
-
- private static final Pattern actionsPattern = Pattern.compile("" +
- "var (" + VARIABLE_PART + ")=\\{((?:(?:" +
- VARIABLE_PART_DEFINE + REVERSE_PART + "|" +
- VARIABLE_PART_DEFINE + SLICE_PART + "|" +
- VARIABLE_PART_DEFINE + SPLICE_PART + "|" +
- VARIABLE_PART_DEFINE + SWAP_PART +
- "),?\\n?)+)\\};"
- );
-
- private static final String PATTERN_PREFIX = "(?:^|,)\\\"?(" + VARIABLE_PART + ")\\\"?";
-
- private static final Pattern reversePattern = Pattern.compile(PATTERN_PREFIX + REVERSE_PART, Pattern.MULTILINE);
- private static final Pattern slicePattern = Pattern.compile(PATTERN_PREFIX + SLICE_PART, Pattern.MULTILINE);
- private static final Pattern splicePattern = Pattern.compile(PATTERN_PREFIX + SPLICE_PART, Pattern.MULTILINE);
- private static final Pattern swapPattern = Pattern.compile(PATTERN_PREFIX + SWAP_PART, Pattern.MULTILINE);
-
- private static final Pattern signatureExtraction = Pattern.compile("/s/([^/]+)/");
-
- private final ConcurrentMap cipherCache;
- private final Set dumpedScriptUrls;
- private final Object cipherLoadLock;
-
- /**
- * Create a new signature cipher manager
- */
- public YoutubeSignatureCipherManager() {
- this.cipherCache = new ConcurrentHashMap<>();
- this.dumpedScriptUrls = new HashSet<>();
- this.cipherLoadLock = new Object();
- }
-
- /**
- * Produces a valid playback URL for the specified track
- *
- * @param httpInterface HTTP interface to use
- * @param playerScript Address of the script which is used to decipher signatures
- * @param format The track for which to get the URL
- * @return Valid playback URL
- * @throws IOException On network IO error
- */
- public URI getValidUrl(HttpInterface httpInterface, String playerScript, YoutubeTrackFormat format) throws IOException {
- String signature = format.getSignature();
- URI initialUrl = format.getUrl();
-
- if (signature == null) {
- return initialUrl;
- }
-
- YoutubeSignatureCipher cipher = getCipherKeyFromScript(httpInterface, playerScript);
-
- try {
- return new URIBuilder(initialUrl)
- .setParameter("ratebypass", "yes")
- .setParameter(format.getSignatureKey(), cipher.apply(signature))
- .build();
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Produces a valid dash XML URL from the possibly ciphered URL.
- *
- * @param httpInterface HTTP interface instance to use
- * @param playerScript Address of the script which is used to decipher signatures
- * @param dashUrl URL of the dash XML, possibly with a ciphered signature
- * @return Valid dash XML URL
- * @throws IOException On network IO error
- */
- public String getValidDashUrl(HttpInterface httpInterface, String playerScript, String dashUrl) throws IOException {
- Matcher matcher = signatureExtraction.matcher(dashUrl);
-
- if (!matcher.find()) {
- return dashUrl;
- }
-
- YoutubeSignatureCipher cipher = getCipherKeyFromScript(httpInterface, playerScript);
- return matcher.replaceFirst("/signature/" + cipher.apply(matcher.group(1)) + "/");
- }
-
- private YoutubeSignatureCipher getCipherKeyFromScript(HttpInterface httpInterface, String cipherScriptUrl) throws IOException {
- YoutubeSignatureCipher cipherKey = cipherCache.get(cipherScriptUrl);
-
- if (cipherKey == null) {
- synchronized (cipherLoadLock) {
- log.debug("Parsing cipher from player script {}.", cipherScriptUrl);
-
- try (CloseableHttpResponse response = httpInterface.execute(new HttpGet(parseTokenScriptUrl(cipherScriptUrl)))) {
- validateResponseCode(response);
-
- cipherKey = extractTokensFromScript(IOUtils.toString(response.getEntity().getContent(), "UTF-8"), cipherScriptUrl);
- cipherCache.put(cipherScriptUrl, cipherKey);
- }
- }
- }
-
- return cipherKey;
- }
-
- private void validateResponseCode(CloseableHttpResponse response) throws IOException {
- int statusCode = response.getStatusLine().getStatusCode();
-
- if (statusCode != 200) {
- throw new IOException("Received non-success response code " + statusCode);
- }
- }
-
- private List getQuotedFunctions(String... functionNames) {
- return Stream.of(functionNames)
- .filter(Objects::nonNull)
- .map(Pattern::quote)
- .collect(Collectors.toList());
- }
-
- private void dumpProblematicScript(String script, String sourceUrl, String issue) {
- if (!dumpedScriptUrls.add(sourceUrl)) {
- return;
- }
-
- try {
- Path path = Files.createTempFile("lavaplayer-yt-player-script", ".js");
- Files.write(path, script.getBytes(StandardCharsets.UTF_8));
-
- log.error("Problematic YouTube player script {} detected (issue detected with script: {}). Dumped to {}.",
- sourceUrl, issue, path.toAbsolutePath());
- } catch (Exception e) {
- log.error("Failed to dump problematic YouTube player script {} (issue detected with script: {})", sourceUrl, issue);
- }
- }
-
- private YoutubeSignatureCipher extractTokensFromScript(String script, String sourceUrl) {
- Matcher actions = actionsPattern.matcher(script);
- if (!actions.find()) {
- dumpProblematicScript(script, sourceUrl, "no actions match");
- throw new IllegalStateException("Must find action functions from script: " + sourceUrl);
- }
-
- String actionBody = actions.group(2);
-
- String reverseKey = extractDollarEscapedFirstGroup(reversePattern, actionBody);
- String slicePart = extractDollarEscapedFirstGroup(slicePattern, actionBody);
- String splicePart = extractDollarEscapedFirstGroup(splicePattern, actionBody);
- String swapKey = extractDollarEscapedFirstGroup(swapPattern, actionBody);
-
- Pattern extractor = Pattern.compile(
- "(?:a=)?" + Pattern.quote(actions.group(1)) + BEFORE_ACCESS + "(" +
- String.join("|", getQuotedFunctions(reverseKey, slicePart, splicePart, swapKey)) +
- ")" + AFTER_ACCESS + "\\(a,(\\d+)\\)"
- );
-
- Matcher functions = functionPattern.matcher(script);
- if (!functions.find()) {
- dumpProblematicScript(script, sourceUrl, "no decipher function match");
- throw new IllegalStateException("Must find decipher function from script.");
- }
-
- Matcher matcher = extractor.matcher(functions.group(1));
-
- YoutubeSignatureCipher cipherKey = new YoutubeSignatureCipher();
-
- while (matcher.find()) {
- String type = matcher.group(1);
-
- if (type.equals(swapKey)) {
- cipherKey.addOperation(new YoutubeCipherOperation(YoutubeCipherOperationType.SWAP, Integer.parseInt(matcher.group(2))));
- } else if (type.equals(reverseKey)) {
- cipherKey.addOperation(new YoutubeCipherOperation(YoutubeCipherOperationType.REVERSE, 0));
- } else if (type.equals(slicePart)) {
- cipherKey.addOperation(new YoutubeCipherOperation(YoutubeCipherOperationType.SLICE, Integer.parseInt(matcher.group(2))));
- } else if (type.equals(splicePart)) {
- cipherKey.addOperation(new YoutubeCipherOperation(YoutubeCipherOperationType.SPLICE, Integer.parseInt(matcher.group(2))));
- } else {
- dumpProblematicScript(script, sourceUrl, "unknown cipher operation found");
- }
- }
-
- if (cipherKey.isEmpty()) {
- log.error("No operations detected from cipher extracted from {}.", sourceUrl);
- dumpProblematicScript(script, sourceUrl, "no cipher operations");
- }
-
- return cipherKey;
- }
-
- private static String extractDollarEscapedFirstGroup(Pattern pattern, String text) {
- Matcher matcher = pattern.matcher(text);
- return matcher.find() ? matcher.group(1).replace("$", "\\$") : null;
- }
-
- private static URI parseTokenScriptUrl(String urlString) {
- try {
- if (urlString.startsWith("//")) {
- return new URI("https:" + urlString);
- } else if (urlString.startsWith("/")) {
- return new URI("https://s.ytimg.com" + urlString);
- } else {
- return new URI(urlString);
- }
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeTrackFormat.java b/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeTrackFormat.java
deleted file mode 100644
index 9998842..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/source/youtube/YoutubeTrackFormat.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.source.youtube;
-
-import org.apache.http.entity.ContentType;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * Describes an available media format for a track
- */
-public class YoutubeTrackFormat {
- private final YoutubeFormatInfo info;
- private final ContentType type;
- private final long bitrate;
- private final long contentLength;
- private final String url;
- private final String signature;
- private final String signatureKey;
-
- /**
- * @param type Mime type of the format
- * @param bitrate Bitrate of the format
- * @param contentLength Length in bytes of the media
- * @param url Base URL for the playback of this format
- * @param signature Cipher signature for this format
- * @param signatureKey The key to use for deciphered signature in the final playback URL
- */
- public YoutubeTrackFormat(ContentType type, long bitrate, long contentLength, String url, String signature,
- String signatureKey) {
-
- this.info = YoutubeFormatInfo.get(type);
- this.type = type;
- this.bitrate = bitrate;
- this.contentLength = contentLength;
- this.url = url;
- this.signature = signature;
- this.signatureKey = signatureKey;
- }
-
- /**
- * @return Format container and codec info
- */
- public YoutubeFormatInfo getInfo() {
- return info;
- }
-
- /**
- * @return Mime type of the format
- */
- public ContentType getType() {
- return type;
- }
-
- /**
- * @return Bitrate of the format
- */
- public long getBitrate() {
- return bitrate;
- }
-
- /**
- * @return Base URL for the playback of this format
- */
- public URI getUrl() {
- try {
- return new URI(url);
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * @return Length in bytes of the media
- */
- public long getContentLength() {
- return contentLength;
- }
-
- /**
- * @return Cipher signature for this format
- */
- public String getSignature() {
- return signature;
- }
-
- /**
- * @return The key to use for deciphered signature in the final playback URL
- */
- public String getSignatureKey() {
- return signatureKey;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/DataFormatTools.java b/src/main/java/com/sedmelluq/discord/lavaplayer/tools/DataFormatTools.java
deleted file mode 100644
index 81fae07..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/DataFormatTools.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.tools;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.http.NameValuePair;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-/**
- * Helper methods related to strings and maps.
- */
-public class DataFormatTools {
- private static final Pattern lineSplitPattern = Pattern.compile("[\\r\\n\\s]*\\n[\\r\\n\\s]*");
-
- /**
- * Extract text between the first subsequent occurrences of start and end in haystack
- *
- * @param haystack The text to search from
- * @param start The text after which to start extracting
- * @param end The text before which to stop extracting
- * @return The extracted string
- */
- public static String extractBetween(String haystack, String start, String end) {
- int startMatch = haystack.indexOf(start);
-
- if (startMatch >= 0) {
- int startPosition = startMatch + start.length();
- int endPosition = haystack.indexOf(end, startPosition);
-
- if (endPosition >= 0) {
- return haystack.substring(startPosition, endPosition);
- }
- }
-
- return null;
- }
-
- /**
- * Converts name value pairs to a map, with the last entry for each name being present.
- *
- * @param pairs Name value pairs to convert
- * @return The resulting map
- */
- public static Map convertToMapLayout(Collection pairs) {
- Map map = new HashMap<>();
- for (NameValuePair pair : pairs) {
- map.put(pair.getName(), pair.getValue());
- }
- return map;
- }
-
- /**
- * Returns the specified default value if the value itself is null.
- *
- * @param value Value to check
- * @param defaultValue Default value to return if value is null
- * @param The type of the value
- * @return Value or default value
- */
- public static T defaultOnNull(T value, T defaultValue) {
- return value == null ? defaultValue : value;
- }
-
- /**
- * Consumes a stream and returns it as lines.
- *
- * @param inputStream Input stream to consume.
- * @param charset Character set of the stream
- * @return Lines from the stream
- * @throws IOException On read error
- */
- public static String[] streamToLines(InputStream inputStream, Charset charset) throws IOException {
- String text = IOUtils.toString(inputStream, charset);
- return lineSplitPattern.split(text);
- }
-
- /**
- * Converts duration in the format HH:mm:ss (or mm:ss or ss) to milliseconds. Does not support day count.
- *
- * @param durationText Duration in text format.
- * @return Duration in milliseconds.
- */
- public static long durationTextToMillis(String durationText) {
- int length = 0;
-
- for (String part : durationText.split("[:.]")) {
- length = length * 60 + Integer.valueOf(part);
- }
-
- return length * 1000L;
- }
-
- /**
- * Writes a string to output with the additional information whether it is null or not. Compatible with
- * {@link #readNullableText(DataInput)}.
- *
- * @param output Output to write to.
- * @param text Text to write.
- * @throws IOException On write error.
- */
- public static void writeNullableText(DataOutput output, String text) throws IOException {
- output.writeBoolean(text != null);
-
- if (text != null) {
- output.writeUTF(text);
- }
- }
-
- /**
- * Reads a string from input which may be null. Compatible with
- * {@link #writeNullableText(DataOutput, String)}.
- *
- * @param input Input to read from.
- * @return The string that was read, or null.
- * @throws IOException On read error.
- */
- public static String readNullableText(DataInput input) throws IOException {
- boolean exists = input.readBoolean();
- return exists ? input.readUTF() : null;
- }
-
- public static boolean arrayRangeEquals(byte[] array, int offset, byte[] segment) {
- if (array.length < offset + segment.length) {
- return false;
- }
-
- for (int i = 0; i < segment.length; i++) {
- if (segment[i] != array[i + offset]) {
- return false;
- }
- }
-
- return true;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/DecodedException.java b/src/main/java/com/sedmelluq/discord/lavaplayer/tools/DecodedException.java
deleted file mode 100644
index 586742e..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/DecodedException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.tools;
-
-/**
- * Decoded serialized exception. The original exception class is not restored, instead all exceptions will be instances
- * of this class and contain the original class name and message as fields and as the message.
- */
-public class DecodedException extends Exception {
- /**
- * Original exception class name
- */
- public final String className;
- /**
- * Original exception message
- */
- public final String originalMessage;
-
- /**
- * @param className Original exception class name
- * @param originalMessage Original exception message
- * @param cause Cause of this exception
- */
- public DecodedException(String className, String originalMessage, DecodedException cause) {
- super(className + ": " + originalMessage, cause, true, true);
-
- this.className = className;
- this.originalMessage = originalMessage;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/ExceptionTools.java b/src/main/java/com/sedmelluq/discord/lavaplayer/tools/ExceptionTools.java
deleted file mode 100644
index 473febc..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/ExceptionTools.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.tools;
-
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Contains common helper methods for dealing with exceptions.
- */
-public class ExceptionTools {
- private static final Logger log = LoggerFactory.getLogger(ExceptionTools.class);
-
- /**
- * Sometimes it is necessary to catch Throwable instances for logging or reporting purposes. However, unless for
- * specific known cases, Error instances should not be blocked from propagating, so rethrow them.
- *
- * @param throwable The Throwable to check, it is rethrown if it is an Error
- */
- public static void rethrowErrors(Throwable throwable) {
- if (throwable instanceof Error) {
- throw (Error) throwable;
- }
- }
-
- /**
- * If the exception is not a FriendlyException, wrap with a FriendlyException with the given message
- *
- * @param message Message of the new FriendlyException if needed
- * @param severity Severity of the new FriendlyException
- * @param throwable The exception to potentially wrap
- * @return Original or wrapped exception
- */
- public static FriendlyException wrapUnfriendlyExceptions(String message, Severity severity, Throwable throwable) {
- if (throwable instanceof FriendlyException) {
- return (FriendlyException) throwable;
- } else {
- return new FriendlyException(message, severity, throwable);
- }
- }
-
- /**
- * If the exception is not a FriendlyException, wrap with a RuntimeException
- *
- * @param throwable The exception to potentially wrap
- * @return Original or wrapped exception
- */
- public static RuntimeException wrapUnfriendlyExceptions(Throwable throwable) {
- if (throwable instanceof FriendlyException) {
- return (FriendlyException) throwable;
- } else {
- return new RuntimeException(throwable);
- }
- }
-
- /**
- * Finds the first exception which is an instance of the specified class from the throwable cause chain.
- *
- * @param throwable Throwable to scan.
- * @param klass The throwable class to scan for.
- * @param The throwable class to scan for.
- * @return The first exception in the cause chain (including itself) which is an instance of the specified class.
- */
- public static T findDeepException(Throwable throwable, Class klass) {
- while (throwable != null) {
- if (klass.isAssignableFrom(throwable.getClass())) {
- return (T) throwable;
- }
-
- throwable = throwable.getCause();
- }
-
- return null;
- }
-
- /**
- * Makes sure thread is set to interrupted state when the throwable is an InterruptedException
- *
- * @param throwable Throwable to check
- */
- public static void keepInterrupted(Throwable throwable) {
- if (throwable instanceof InterruptedException) {
- Thread.currentThread().interrupt();
- }
- }
-
- /**
- * Log a FriendlyException appropriately according to its severity.
- *
- * @param log Logger instance to log it to
- * @param exception The exception itself
- * @param context An object that is included in the log
- */
- public static void log(Logger log, FriendlyException exception, Object context) {
- switch (exception.severity) {
- case COMMON:
- log.debug("Common failure for {}: {}", context, exception.getMessage());
- break;
- case SUSPICIOUS:
- log.warn("Suspicious exception for {}", context, exception);
- break;
- case FAULT:
- default:
- log.error("Error in {}", context, exception);
- break;
- }
- }
-
- /**
- * Encode an exception to an output stream
- *
- * @param output Data output
- * @param exception Exception to encode
- * @throws IOException On IO error
- */
- public static void encodeException(DataOutput output, FriendlyException exception) throws IOException {
- List causes = new ArrayList<>();
- Throwable next = exception.getCause();
-
- while (next != null) {
- causes.add(next);
- next = next.getCause();
- }
-
- for (int i = causes.size() - 1; i >= 0; i--) {
- Throwable cause = causes.get(i);
- output.writeBoolean(true);
-
- String message;
-
- if (cause instanceof DecodedException) {
- output.writeUTF(((DecodedException) cause).className);
- message = ((DecodedException) cause).originalMessage;
- } else {
- output.writeUTF(cause.getClass().getName());
- message = cause.getMessage();
- }
-
- output.writeBoolean(message != null);
- if (message != null) {
- output.writeUTF(message);
- }
-
- encodeStackTrace(output, cause);
- }
-
- output.writeBoolean(false);
- output.writeUTF(exception.getMessage());
- output.writeInt(exception.severity.ordinal());
-
- encodeStackTrace(output, exception);
- }
-
- /**
- * Closes the specified closeable object. In case that throws an error, logs the error with WARN level, but does not
- * rethrow.
- *
- * @param closeable Object to close.
- */
- public static void closeWithWarnings(AutoCloseable closeable) {
- try {
- closeable.close();
- } catch (Exception e) {
- log.warn("Failed to close.", e);
- }
- }
-
- private static void encodeStackTrace(DataOutput output, Throwable throwable) throws IOException {
- StackTraceElement[] trace = throwable.getStackTrace();
- output.writeInt(trace.length);
-
- for (StackTraceElement element : trace) {
- output.writeUTF(element.getClassName());
- output.writeUTF(element.getMethodName());
-
- String fileName = element.getFileName();
- output.writeBoolean(fileName != null);
- if (fileName != null) {
- output.writeUTF(fileName);
- }
- output.writeInt(element.getLineNumber());
- }
- }
-
- /**
- * Decode an exception from an input stream
- *
- * @param input Data input
- * @return Decoded exception
- * @throws IOException On IO error
- */
- public static FriendlyException decodeException(DataInput input) throws IOException {
- DecodedException cause = null;
-
- while (input.readBoolean()) {
- cause = new DecodedException(input.readUTF(), input.readBoolean() ? input.readUTF() : null, cause);
- cause.setStackTrace(decodeStackTrace(input));
- }
-
- FriendlyException exception = new FriendlyException(input.readUTF(), Severity.class.getEnumConstants()[input.readInt()], cause);
- exception.setStackTrace(decodeStackTrace(input));
- return exception;
- }
-
- private static StackTraceElement[] decodeStackTrace(DataInput input) throws IOException {
- StackTraceElement[] trace = new StackTraceElement[input.readInt()];
-
- for (int i = 0; i < trace.length; i++) {
- trace[i] = new StackTraceElement(input.readUTF(), input.readUTF(), input.readBoolean() ? input.readUTF() : null, input.readInt());
- }
-
- return trace;
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/FriendlyException.java b/src/main/java/com/sedmelluq/discord/lavaplayer/tools/FriendlyException.java
deleted file mode 100644
index 54bf649..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/FriendlyException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.tools;
-
-/**
- * An exception with a friendly message.
- */
-public class FriendlyException extends RuntimeException {
- /**
- * Severity of the exception
- */
- public final Severity severity;
-
- /**
- * @param friendlyMessage A message which is understandable to end-users
- * @param severity Severity of the exception
- * @param cause The cause of the exception with technical details
- */
- public FriendlyException(String friendlyMessage, Severity severity, Throwable cause) {
- super(friendlyMessage, cause);
-
- this.severity = severity;
- }
-
- /**
- * Severity levels for FriendlyException
- */
- public enum Severity {
- /**
- * The cause is known and expected, indicates that there is nothing wrong with the library itself.
- */
- COMMON,
- /**
- * The cause might not be exactly known, but is possibly caused by outside factors. For example when an outside
- * service responds in a format that we do not expect.
- */
- SUSPICIOUS,
- /**
- * If the probable cause is an issue with the library or when there is no way to tell what the cause might be.
- * This is the default level and other levels are used in cases where the thrower has more in-depth knowledge
- * about the error.
- */
- FAULT
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/GarbageCollectionMonitor.java b/src/main/java/com/sedmelluq/discord/lavaplayer/tools/GarbageCollectionMonitor.java
deleted file mode 100644
index a6a6937..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/GarbageCollectionMonitor.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.tools;
-
-import com.sun.management.GarbageCollectionNotificationInfo;
-import com.sun.management.GcInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.management.ListenerNotFoundException;
-import javax.management.Notification;
-import javax.management.NotificationEmitter;
-import javax.management.NotificationListener;
-import javax.management.openmbean.CompositeData;
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.ManagementFactory;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static com.sun.management.GarbageCollectionNotificationInfo.GARBAGE_COLLECTION_NOTIFICATION;
-import static com.sun.management.GarbageCollectionNotificationInfo.from;
-
-/**
- * Garbage collection monitor which records all GC pause lengths and logs them. In case the GC pause statistics are
- * considered bad for latency, the statistics are logged at a warning level.
- */
-public class GarbageCollectionMonitor implements NotificationListener, Runnable {
- private static final Logger log = LoggerFactory.getLogger(GarbageCollectionMonitor.class);
-
- private static final long REPORTING_FREQUENCY = TimeUnit.MINUTES.toMillis(2);
- private static final long[] BUCKETS = new long[]{2000, 500, 200, 50, 20, 0};
-
- private final ScheduledExecutorService reportingExecutor;
- private final int[] bucketCounters;
- private final AtomicBoolean enabled;
- private final AtomicReference> executorFuture;
-
- /**
- * Create an instance of GC monitor. Does nothing until enabled.
- *
- * @param reportingExecutor Executor to use for scheduling reporting task
- */
- public GarbageCollectionMonitor(ScheduledExecutorService reportingExecutor) {
- this.reportingExecutor = reportingExecutor;
- bucketCounters = new int[BUCKETS.length];
- enabled = new AtomicBoolean();
- executorFuture = new AtomicReference<>();
- }
-
- /**
- * Enable GC monitoring and reporting.
- */
- public void enable() {
- if (enabled.compareAndSet(false, true)) {
- registerBeanListener();
-
- executorFuture.set(reportingExecutor.scheduleAtFixedRate(this, REPORTING_FREQUENCY, REPORTING_FREQUENCY, TimeUnit.MILLISECONDS));
-
- log.info("GC monitoring enabled, reporting results every 2 minutes.");
- }
- }
-
- /**
- * Disable GC monitoring and reporting.
- */
- public void disable() {
- if (enabled.compareAndSet(true, false)) {
- unregisterBeanListener();
-
- ScheduledFuture scheduledTask = executorFuture.getAndSet(null);
- if (scheduledTask != null) {
- scheduledTask.cancel(false);
- }
-
- log.info("GC monitoring disabled.");
- }
- }
-
- private void registerBeanListener() {
- for (GarbageCollectorMXBean gcBean : ManagementFactory.getGarbageCollectorMXBeans()) {
- if (gcBean instanceof NotificationEmitter) {
- ((NotificationEmitter) gcBean).addNotificationListener(this, null, gcBean);
- }
- }
- }
-
- private void unregisterBeanListener() {
- for (GarbageCollectorMXBean gcBean : ManagementFactory.getGarbageCollectorMXBeans()) {
- if (gcBean instanceof NotificationEmitter) {
- try {
- ((NotificationEmitter) gcBean).removeNotificationListener(this);
- } catch (ListenerNotFoundException e) {
- log.debug("No listener found on bean {}, should have been there.", gcBean, e);
- }
- }
- }
- }
-
- private void registerPause(long duration) {
- synchronized (bucketCounters) {
- for (int i = 0; i < bucketCounters.length; i++) {
- if (duration >= BUCKETS[i]) {
- bucketCounters[i]++;
- break;
- }
- }
- }
- }
-
- @Override
- public void handleNotification(Notification notification, Object handback) {
- if (GARBAGE_COLLECTION_NOTIFICATION.equals(notification.getType())) {
- GarbageCollectionNotificationInfo notificationInfo = from((CompositeData) notification.getUserData());
- GcInfo info = notificationInfo.getGcInfo();
-
- if (info != null && !"No GC".equals(notificationInfo.getGcCause())) {
- registerPause(info.getDuration());
- }
- }
- }
-
- @Override
- public void run() {
- StringBuilder statistics = new StringBuilder();
- boolean hasBadLatency;
-
- synchronized (bucketCounters) {
- hasBadLatency = bucketCounters[3] > 1 || bucketCounters[2] > 0;
-
- for (int i = bucketCounters.length - 1; i >= 0; i--) {
- statistics.append(String.format("[Bucket %d = %d] ", BUCKETS[i], bucketCounters[i]));
- bucketCounters[i] = 0;
- }
- }
-
- if (hasBadLatency) {
- log.warn("Suspicious GC results for the last 2 minutes: {}", statistics);
- } else {
- log.debug("GC results for the last 2 minutes: {}", statistics);
- }
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/JsonBrowser.java b/src/main/java/com/sedmelluq/discord/lavaplayer/tools/JsonBrowser.java
deleted file mode 100644
index 8547550..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/JsonBrowser.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.tools;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Allows to easily navigate in decoded JSON data
- */
-public class JsonBrowser {
- private static final ObjectMapper mapper = setupMapper();
-
- private final Object value;
-
- private JsonBrowser(Object value) {
- this.value = value;
- }
-
- /**
- * @return True if the value represents a list.
- */
- public boolean isList() {
- return value instanceof List;
- }
-
- /**
- * @return True if the value represents a map.
- */
- public boolean isMap() {
- return value instanceof Map;
- }
-
- /**
- * Get an element at an index for a list value
- *
- * @param index List index
- * @return JsonBrowser instance which wraps the value at the specified index
- */
- public JsonBrowser index(int index) {
- if (value instanceof List) {
- return new JsonBrowser(((List) value).get(index));
- } else {
- throw new IllegalStateException("Index only works on a list");
- }
- }
-
- /**
- * Get an element by key from a map value
- *
- * @param key Map key
- * @return JsonBrowser instance which wraps the value with the specified key
- */
- public JsonBrowser get(Object key) {
- if (value instanceof Map) {
- return new JsonBrowser(((Map) value).get(key));
- } else {
- throw new IllegalStateException("Get only works on a map");
- }
- }
-
- /**
- * Get an element by key from a map value
- *
- * @param key Map key
- * @return JsonBrowser instance which wraps the value with the specified key
- */
- public JsonBrowser safeGet(Object key) {
- if (value instanceof Map) {
- return new JsonBrowser(((Map) value).get(key));
- } else {
- return new JsonBrowser(null);
- }
- }
-
- /**
- * Put a value into the map if this instance contains a map.
- *
- * @param key The map entry key
- * @param item The map entry value
- */
- @SuppressWarnings("unchecked")
- public void put(String key, Object item) {
- if (value instanceof Map) {
- ((Map) value).put(key, item);
- } else {
- throw new IllegalStateException("Put only works on a map");
- }
- }
-
- /**
- * Returns a list of all the values in this element
- *
- * @return The list of values as JsonBrowser elements
- */
- public List values() {
- List values = new ArrayList<>();
- if (value instanceof Map) {
- for (Object object : ((Map) value).values()) {
- values.add(new JsonBrowser(object));
- }
- } else if (value instanceof List) {
- for (Object object : (List) value) {
- values.add(new JsonBrowser(object));
- }
- }
- return values;
- }
-
- /**
- * Attempt to retrieve the value in the specified format
- *
- * @param klass The class to retrieve the value as
- * @return The value as an instance of the specified class
- * @throws IllegalArgumentException If conversion is impossible
- */
- public T as(Class klass) {
- return mapper.convertValue(value, klass);
- }
-
- /**
- * @return The value of the element as text
- */
- public String text() {
- return value != null ? value.toString() : null;
- }
-
- /**
- * @return The value of the element as text
- */
- public boolean isNull() {
- return value == null;
- }
-
- /**
- * Parse from string.
- *
- * @param json The JSON object as a string
- * @return JsonBrowser instance for navigating in the result
- * @throws IOException When parsing the JSON failed
- */
- public static JsonBrowser parse(String json) throws IOException {
- return new JsonBrowser(mapper.readValue(json, Object.class));
- }
-
- /**
- * Parse from string.
- *
- * @param stream The JSON object as a stream
- * @return JsonBrowser instance for navigating in the result
- * @throws IOException When parsing the JSON failed
- */
- public static JsonBrowser parse(InputStream stream) throws IOException {
- return new JsonBrowser(mapper.readValue(stream, Object.class));
- }
-
- private static ObjectMapper setupMapper() {
- JsonFactory jsonFactory = new JsonFactory();
- jsonFactory.enable(JsonParser.Feature.ALLOW_COMMENTS);
- jsonFactory.enable(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES);
- return new ObjectMapper(jsonFactory);
- }
-}
diff --git a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/OrderedExecutor.java b/src/main/java/com/sedmelluq/discord/lavaplayer/tools/OrderedExecutor.java
deleted file mode 100644
index 6b89a0d..0000000
--- a/src/main/java/com/sedmelluq/discord/lavaplayer/tools/OrderedExecutor.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.sedmelluq.discord.lavaplayer.tools;
-
-import java.util.concurrent.*;
-
-/**
- * Wrapper for executor services which ensures that tasks with the same key are processed in order.
- */
-public class OrderedExecutor {
- private final ExecutorService delegateService;
- private final ConcurrentMap> states;
-
- /**
- * @param delegateService Executor service where to delegate the actual execution to
- */
- public OrderedExecutor(ExecutorService delegateService) {
- this.delegateService = delegateService;
- this.states = new ConcurrentHashMap<>();
- }
-
- /**
- * @param orderingKey Key for the ordering channel
- * @param runnable Runnable to submit to the executor service
- * @return Future for the task
- */
- public Future submit(Object orderingKey, Runnable runnable) {
- RunnableFuture runnableFuture = newTaskFor(runnable, null);
- queueOrSubmit(new ChannelRunnable(orderingKey), runnableFuture);
- return runnableFuture;
- }
-
- /**
- * @param orderingKey Key for the ordering channel
- * @param callable Callable to submit to the executor service
- * @return Future for the task
- */
- public Future