X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fio%2Fmp3%2FParser.java;h=55165d809b3ad7e3e0db6bf50a5faa72d54e3400;hb=aeb4004e3483f17e79e9c12f0f238db58d3eb09e;hp=eb2b441e75e2ffcaa8d8a5a6b74d2dbfa67be072;hpb=5e7624c78c82e47a5d6040ac27186e55f5ff4c8f;p=sonitus.git diff --git a/src/main/java/net/pterodactylus/sonitus/io/mp3/Parser.java b/src/main/java/net/pterodactylus/sonitus/io/mp3/Parser.java index eb2b441..55165d8 100644 --- a/src/main/java/net/pterodactylus/sonitus/io/mp3/Parser.java +++ b/src/main/java/net/pterodactylus/sonitus/io/mp3/Parser.java @@ -27,6 +27,8 @@ import com.google.common.io.ByteStreams; /** * A parser for MP3 files. It can recognize (and skip) ID3v2 header tags and * MPEG audio frames. + *

+ * This uses information from mpgedit.org/mpgedit/mpeg_format/mpeghdr.htm. * * @author David ‘Bombe’ Roden */ @@ -51,16 +53,16 @@ public class Parser { */ public Parser(InputStream inputStream) throws IOException { this.inputStream = inputStream; - readFully(inputStream, buffer, 0, 3); - if ((buffer[0] == 'I') && (buffer[1] == 'D') && (buffer[2] == '3')) { - readFully(inputStream, buffer, 0, 3); + readFully(inputStream, buffer, 1, 3); + if ((buffer[1] == 'I') && (buffer[2] == 'D') && (buffer[3] == '3')) { + readFully(inputStream, buffer, 1, 3); byte[] lengthBuffer = new byte[4]; readFully(inputStream, lengthBuffer, 0, 4); int headerLength = (lengthBuffer[0] << 21) | (lengthBuffer[1] << 14) | (lengthBuffer[2] << 7) | lengthBuffer[3]; id3Tag = new byte[headerLength + 10]; - System.arraycopy(new byte[] { 'I', 'D', '3', buffer[0], buffer[1], buffer[2], lengthBuffer[0], lengthBuffer[1], lengthBuffer[2], lengthBuffer[3] }, 0, id3Tag, 0, 10); + System.arraycopy(new byte[] { 'I', 'D', '3', buffer[1], buffer[2], buffer[3], lengthBuffer[0], lengthBuffer[1], lengthBuffer[2], lengthBuffer[3] }, 0, id3Tag, 0, 10); readFully(inputStream, id3Tag, 10, headerLength); - readFully(inputStream, buffer, 0, 3); + readFully(inputStream, buffer, 1, 3); } else { id3Tag = null; }