From ff9a1ebb1bd0101c692cc99bdfc63626d6bc97f8 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Wed, 8 Apr 2020 12:08:01 -0300
Subject: [PATCH] checkstyle * drop unused methods * split blobs * make no
 final parameters

---
 .../schabi/newpipe/streams/DataReader.java    |  524 ++---
 .../schabi/newpipe/streams/Mp4DashReader.java | 1941 ++++++++---------
 .../newpipe/streams/Mp4FromDashWriter.java    |   43 +-
 .../newpipe/streams/OggFromWebMWriter.java    |   10 +-
 .../schabi/newpipe/streams/WebMWriter.java    |   12 +-
 checkstyle-suppressions.xml                   |   30 -
 6 files changed, 1244 insertions(+), 1316 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
index 0f142ad32..01a124c9e 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
@@ -1,262 +1,262 @@
-package org.schabi.newpipe.streams;
-
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author kapodamy
- */
-public class DataReader {
-    public static final int SHORT_SIZE = 2;
-    public static final int LONG_SIZE = 8;
-    public static final int INTEGER_SIZE = 4;
-    public static final int FLOAT_SIZE = 4;
-
-    private static final int BUFFER_SIZE = 128 * 1024; // 128 KiB
-
-    private long position = 0;
-    private final SharpStream stream;
-
-    private InputStream view;
-    private int viewSize;
-
-    public DataReader(final SharpStream stream) {
-        this.stream = stream;
-        this.readOffset = this.readBuffer.length;
-    }
-
-    public long position() {
-        return position;
-    }
-
-    public int read() throws IOException {
-        if (fillBuffer()) {
-            return -1;
-        }
-
-        position++;
-        readCount--;
-
-        return readBuffer[readOffset++] & 0xFF;
-    }
-
-    public long skipBytes(long amount) throws IOException {
-        if (readCount < 0) {
-            return 0;
-        } else if (readCount == 0) {
-            amount = stream.skip(amount);
-        } else {
-            if (readCount > amount) {
-                readCount -= (int) amount;
-                readOffset += (int) amount;
-            } else {
-                amount = readCount + stream.skip(amount - readCount);
-                readCount = 0;
-                readOffset = readBuffer.length;
-            }
-        }
-
-        position += amount;
-        return amount;
-    }
-
-    public int readInt() throws IOException {
-        primitiveRead(INTEGER_SIZE);
-        return primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
-    }
-
-    public long readUnsignedInt()  throws IOException {
-        long value = readInt();
-        return value & 0xffffffffL;
-    }
-
-
-    public short readShort() throws IOException {
-        primitiveRead(SHORT_SIZE);
-        return (short) (primitive[0] << 8 | primitive[1]);
-    }
-
-    public long readLong() throws IOException {
-        primitiveRead(LONG_SIZE);
-        long high = primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
-        long low = primitive[4] << 24 | primitive[5] << 16 | primitive[6] << 8 | primitive[7];
-        return high << 32 | low;
-    }
-
-    public int read(final byte[] buffer) throws IOException {
-        return read(buffer, 0, buffer.length);
-    }
-
-    public int read(final byte[] buffer, int offset, int count) throws IOException {
-        if (readCount < 0) {
-            return -1;
-        }
-        int total = 0;
-
-        if (count >= readBuffer.length) {
-            if (readCount > 0) {
-                System.arraycopy(readBuffer, readOffset, buffer, offset, readCount);
-                readOffset += readCount;
-
-                offset += readCount;
-                count -= readCount;
-
-                total = readCount;
-                readCount = 0;
-            }
-            total += Math.max(stream.read(buffer, offset, count), 0);
-        } else {
-            while (count > 0 && !fillBuffer()) {
-                int read = Math.min(readCount, count);
-                System.arraycopy(readBuffer, readOffset, buffer, offset, read);
-
-                readOffset += read;
-                readCount -= read;
-
-                offset += read;
-                count -= read;
-
-                total += read;
-            }
-        }
-
-        position += total;
-        return total;
-    }
-
-    public boolean available() {
-        return readCount > 0 || stream.available() > 0;
-    }
-
-    public void rewind() throws IOException {
-        stream.rewind();
-
-        if ((position - viewSize) > 0) {
-            viewSize = 0; // drop view
-        } else {
-            viewSize += position;
-        }
-
-        position = 0;
-        readOffset = readBuffer.length;
-        readCount = 0;
-    }
-
-    public boolean canRewind() {
-        return stream.canRewind();
-    }
-
-    /**
-     * Wraps this instance of {@code DataReader} into {@code InputStream}
-     * object. Note: Any read in the {@code DataReader} will not modify
-     * (decrease) the view size
-     *
-     * @param size the size of the view
-     * @return the view
-     */
-    public InputStream getView(final int size) {
-        if (view == null) {
-            view = new InputStream() {
-                @Override
-                public int read() throws IOException {
-                    if (viewSize < 1) {
-                        return -1;
-                    }
-                    int res = DataReader.this.read();
-                    if (res > 0) {
-                        viewSize--;
-                    }
-                    return res;
-                }
-
-                @Override
-                public int read(final byte[] buffer) throws IOException {
-                    return read(buffer, 0, buffer.length);
-                }
-
-                @Override
-                public int read(final byte[] buffer, final int offset, final int count)
-                        throws IOException {
-                    if (viewSize < 1) {
-                        return -1;
-                    }
-
-                    int res = DataReader.this.read(buffer, offset, Math.min(viewSize, count));
-                    viewSize -= res;
-
-                    return res;
-                }
-
-                @Override
-                public long skip(final long amount) throws IOException {
-                    if (viewSize < 1) {
-                        return 0;
-                    }
-                    int res = (int) DataReader.this.skipBytes(Math.min(amount, viewSize));
-                    viewSize -= res;
-
-                    return res;
-                }
-
-                @Override
-                public int available() {
-                    return viewSize;
-                }
-
-                @Override
-                public void close() {
-                    viewSize = 0;
-                }
-
-                @Override
-                public boolean markSupported() {
-                    return false;
-                }
-
-            };
-        }
-        viewSize = size;
-
-        return view;
-    }
-
-    private final short[] primitive = new short[LONG_SIZE];
-
-    private void primitiveRead(final int amount) throws IOException {
-        byte[] buffer = new byte[amount];
-        int read = read(buffer, 0, amount);
-
-        if (read != amount) {
-            throw new EOFException("Truncated stream, missing "
-                    + String.valueOf(amount - read) + " bytes");
-        }
-
-        for (int i = 0; i < amount; i++) {
-            // the "byte" data type in java is signed and is very annoying
-            primitive[i] = (short) (buffer[i] & 0xFF);
-        }
-    }
-
-    private final byte[] readBuffer = new byte[BUFFER_SIZE];
-    private int readOffset;
-    private int readCount;
-
-    private boolean fillBuffer() throws IOException {
-        if (readCount < 0) {
-            return true;
-        }
-        if (readOffset >= readBuffer.length) {
-            readCount = stream.read(readBuffer);
-            if (readCount < 1) {
-                readCount = -1;
-                return true;
-            }
-            readOffset = 0;
-        }
-
-        return readCount < 1;
-    }
-}
+package org.schabi.newpipe.streams;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author kapodamy
+ */
+public class DataReader {
+    public static final int SHORT_SIZE = 2;
+    public static final int LONG_SIZE = 8;
+    public static final int INTEGER_SIZE = 4;
+    public static final int FLOAT_SIZE = 4;
+
+    private static final int BUFFER_SIZE = 128 * 1024; // 128 KiB
+
+    private long position = 0;
+    private final SharpStream stream;
+
+    private InputStream view;
+    private int viewSize;
+
+    public DataReader(final SharpStream stream) {
+        this.stream = stream;
+        this.readOffset = this.readBuffer.length;
+    }
+
+    public long position() {
+        return position;
+    }
+
+    public int read() throws IOException {
+        if (fillBuffer()) {
+            return -1;
+        }
+
+        position++;
+        readCount--;
+
+        return readBuffer[readOffset++] & 0xFF;
+    }
+
+    public long skipBytes(long amount) throws IOException {
+        if (readCount < 0) {
+            return 0;
+        } else if (readCount == 0) {
+            amount = stream.skip(amount);
+        } else {
+            if (readCount > amount) {
+                readCount -= (int) amount;
+                readOffset += (int) amount;
+            } else {
+                amount = readCount + stream.skip(amount - readCount);
+                readCount = 0;
+                readOffset = readBuffer.length;
+            }
+        }
+
+        position += amount;
+        return amount;
+    }
+
+    public int readInt() throws IOException {
+        primitiveRead(INTEGER_SIZE);
+        return primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
+    }
+
+    public long readUnsignedInt()  throws IOException {
+        long value = readInt();
+        return value & 0xffffffffL;
+    }
+
+
+    public short readShort() throws IOException {
+        primitiveRead(SHORT_SIZE);
+        return (short) (primitive[0] << 8 | primitive[1]);
+    }
+
+    public long readLong() throws IOException {
+        primitiveRead(LONG_SIZE);
+        long high = primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
+        long low = primitive[4] << 24 | primitive[5] << 16 | primitive[6] << 8 | primitive[7];
+        return high << 32 | low;
+    }
+
+    public int read(byte[] buffer) throws IOException {
+        return read(buffer, 0, buffer.length);
+    }
+
+    public int read(byte[] buffer, int offset, int count) throws IOException {
+        if (readCount < 0) {
+            return -1;
+        }
+        int total = 0;
+
+        if (count >= readBuffer.length) {
+            if (readCount > 0) {
+                System.arraycopy(readBuffer, readOffset, buffer, offset, readCount);
+                readOffset += readCount;
+
+                offset += readCount;
+                count -= readCount;
+
+                total = readCount;
+                readCount = 0;
+            }
+            total += Math.max(stream.read(buffer, offset, count), 0);
+        } else {
+            while (count > 0 && !fillBuffer()) {
+                int read = Math.min(readCount, count);
+                System.arraycopy(readBuffer, readOffset, buffer, offset, read);
+
+                readOffset += read;
+                readCount -= read;
+
+                offset += read;
+                count -= read;
+
+                total += read;
+            }
+        }
+
+        position += total;
+        return total;
+    }
+
+    public boolean available() {
+        return readCount > 0 || stream.available() > 0;
+    }
+
+    public void rewind() throws IOException {
+        stream.rewind();
+
+        if ((position - viewSize) > 0) {
+            viewSize = 0; // drop view
+        } else {
+            viewSize += position;
+        }
+
+        position = 0;
+        readOffset = readBuffer.length;
+        readCount = 0;
+    }
+
+    public boolean canRewind() {
+        return stream.canRewind();
+    }
+
+    /**
+     * Wraps this instance of {@code DataReader} into {@code InputStream}
+     * object. Note: Any read in the {@code DataReader} will not modify
+     * (decrease) the view size
+     *
+     * @param size the size of the view
+     * @return the view
+     */
+    public InputStream getView(final int size) {
+        if (view == null) {
+            view = new InputStream() {
+                @Override
+                public int read() throws IOException {
+                    if (viewSize < 1) {
+                        return -1;
+                    }
+                    int res = DataReader.this.read();
+                    if (res > 0) {
+                        viewSize--;
+                    }
+                    return res;
+                }
+
+                @Override
+                public int read(final byte[] buffer) throws IOException {
+                    return read(buffer, 0, buffer.length);
+                }
+
+                @Override
+                public int read(final byte[] buffer, final int offset, final int count)
+                        throws IOException {
+                    if (viewSize < 1) {
+                        return -1;
+                    }
+
+                    int res = DataReader.this.read(buffer, offset, Math.min(viewSize, count));
+                    viewSize -= res;
+
+                    return res;
+                }
+
+                @Override
+                public long skip(final long amount) throws IOException {
+                    if (viewSize < 1) {
+                        return 0;
+                    }
+                    int res = (int) DataReader.this.skipBytes(Math.min(amount, viewSize));
+                    viewSize -= res;
+
+                    return res;
+                }
+
+                @Override
+                public int available() {
+                    return viewSize;
+                }
+
+                @Override
+                public void close() {
+                    viewSize = 0;
+                }
+
+                @Override
+                public boolean markSupported() {
+                    return false;
+                }
+
+            };
+        }
+        viewSize = size;
+
+        return view;
+    }
+
+    private final short[] primitive = new short[LONG_SIZE];
+
+    private void primitiveRead(final int amount) throws IOException {
+        byte[] buffer = new byte[amount];
+        int read = read(buffer, 0, amount);
+
+        if (read != amount) {
+            throw new EOFException("Truncated stream, missing "
+                    + String.valueOf(amount - read) + " bytes");
+        }
+
+        for (int i = 0; i < amount; i++) {
+            // the "byte" data type in java is signed and is very annoying
+            primitive[i] = (short) (buffer[i] & 0xFF);
+        }
+    }
+
+    private final byte[] readBuffer = new byte[BUFFER_SIZE];
+    private int readOffset;
+    private int readCount;
+
+    private boolean fillBuffer() throws IOException {
+        if (readCount < 0) {
+            return true;
+        }
+        if (readOffset >= readBuffer.length) {
+            readCount = stream.read(readBuffer);
+            if (readCount < 1) {
+                readCount = -1;
+                return true;
+            }
+            readOffset = 0;
+        }
+
+        return readCount < 1;
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
index 8fad7fa7c..ff3aabd78 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
@@ -1,994 +1,947 @@
-package org.schabi.newpipe.streams;
-
-import org.schabi.newpipe.streams.io.SharpStream;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.NoSuchElementException;
-
-/**
- * @author kapodamy
- */
-public class Mp4DashReader {
-    private static final int ATOM_MOOF = 0x6D6F6F66;
-    private static final int ATOM_MFHD = 0x6D666864;
-    private static final int ATOM_TRAF = 0x74726166;
-    private static final int ATOM_TFHD = 0x74666864;
-    private static final int ATOM_TFDT = 0x74666474;
-    private static final int ATOM_TRUN = 0x7472756E;
-    private static final int ATOM_MDIA = 0x6D646961;
-    private static final int ATOM_FTYP = 0x66747970;
-    private static final int ATOM_SIDX = 0x73696478;
-    private static final int ATOM_MOOV = 0x6D6F6F76;
-    private static final int ATOM_MDAT = 0x6D646174;
-    private static final int ATOM_MVHD = 0x6D766864;
-    private static final int ATOM_TRAK = 0x7472616B;
-    private static final int ATOM_MVEX = 0x6D766578;
-    private static final int ATOM_TREX = 0x74726578;
-    private static final int ATOM_TKHD = 0x746B6864;
-    private static final int ATOM_MFRA = 0x6D667261;
-    private static final int ATOM_MDHD = 0x6D646864;
-    private static final int ATOM_EDTS = 0x65647473;
-    private static final int ATOM_ELST = 0x656C7374;
-    private static final int ATOM_HDLR = 0x68646C72;
-    private static final int ATOM_MINF = 0x6D696E66;
-    private static final int ATOM_DINF = 0x64696E66;
-    private static final int ATOM_STBL = 0x7374626C;
-    private static final int ATOM_STSD = 0x73747364;
-    private static final int ATOM_VMHD = 0x766D6864;
-    private static final int ATOM_SMHD = 0x736D6864;
-
-    private static final int BRAND_DASH = 0x64617368;
-    private static final int BRAND_ISO5 = 0x69736F35;
-
-    private static final int HANDLER_VIDE = 0x76696465;
-    private static final int HANDLER_SOUN = 0x736F756E;
-    private static final int HANDLER_SUBT = 0x73756274;
-
-    private final DataReader stream;
-
-    private Mp4Track[] tracks = null;
-    private int[] brands = null;
-
-    private Box box;
-    private Moof moof;
-
-    private boolean chunkZero = false;
-
-    private int selectedTrack = -1;
-    private Box backupBox = null;
-
-    public enum TrackKind {
-        Audio, Video, Subtitles, Other
-    }
-
-    public Mp4DashReader(final SharpStream source) {
-        this.stream = new DataReader(source);
-    }
-
-    public void parse() throws IOException, NoSuchElementException {
-        if (selectedTrack > -1) {
-            return;
-        }
-
-        box = readBox(ATOM_FTYP);
-        brands = parseFtyp(box);
-        switch (brands[0]) {
-            case BRAND_DASH:
-            case BRAND_ISO5:// ¿why not?
-                break;
-            default:
-                throw new NoSuchElementException(
-                        "Not a MPEG-4 DASH container, major brand is not 'dash' or 'iso5' is "
-                                + boxName(brands[0])
-                );
-        }
-
-        Moov moov = null;
-        int i;
-
-        while (box.type != ATOM_MOOF) {
-            ensure(box);
-            box = readBox();
-
-            switch (box.type) {
-                case ATOM_MOOV:
-                    moov = parseMoov(box);
-                    break;
-                case ATOM_SIDX:
-                    break;
-                case ATOM_MFRA:
-                    break;
-            }
-        }
-
-        if (moov == null) {
-            throw new IOException("The provided Mp4 doesn't have the 'moov' box");
-        }
-
-        tracks = new Mp4Track[moov.trak.length];
-
-        for (i = 0; i < tracks.length; i++) {
-            tracks[i] = new Mp4Track();
-            tracks[i].trak = moov.trak[i];
-
-            if (moov.mvexTrex != null) {
-                for (Trex mvexTrex : moov.mvexTrex) {
-                    if (tracks[i].trak.tkhd.trackId == mvexTrex.trackId) {
-                        tracks[i].trex = mvexTrex;
-                    }
-                }
-            }
-
-            switch (moov.trak[i].mdia.hdlr.subType) {
-                case HANDLER_VIDE:
-                    tracks[i].kind = TrackKind.Video;
-                    break;
-                case HANDLER_SOUN:
-                    tracks[i].kind = TrackKind.Audio;
-                    break;
-                case HANDLER_SUBT:
-                    tracks[i].kind = TrackKind.Subtitles;
-                    break;
-                default:
-                    tracks[i].kind = TrackKind.Other;
-                    break;
-            }
-        }
-
-        backupBox = box;
-    }
-
-    Mp4Track selectTrack(final int index) {
-        selectedTrack = index;
-        return tracks[index];
-    }
-
-    /**
-     * Count all fragments present. This operation requires a seekable stream
-     *
-     * @return list with a basic info
-     * @throws IOException if the source stream is not seekeable
-     */
-    int getFragmentsCount() throws IOException {
-        if (selectedTrack < 0) {
-            throw new IllegalStateException("track no selected");
-        }
-        if (!stream.canRewind()) {
-            throw new IOException("The provided stream doesn't allow seek");
-        }
-
-        Box tmp;
-        int count = 0;
-
-        if (box.type == ATOM_MOOF) {
-            tmp = box;
-        } else {
-            ensure(box);
-            tmp = readBox();
-        }
-
-        do {
-            if (tmp.type == ATOM_MOOF) {
-                ensure(readBox(ATOM_MFHD));
-                Box traf;
-                while ((traf = untilBox(tmp, ATOM_TRAF)) != null) {
-                    Box tfhd = readBox(ATOM_TFHD);
-                    if (parseTfhd(tracks[selectedTrack].trak.tkhd.trackId) != null) {
-                        count++;
-                        break;
-                    }
-                    ensure(tfhd);
-                    ensure(traf);
-                }
-            }
-            ensure(tmp);
-        } while (stream.available() && (tmp = readBox()) != null);
-
-        rewind();
-
-        return count;
-    }
-
-    public int[] getBrands() {
-        if (brands == null) {
-            throw new IllegalStateException("Not parsed");
-        }
-        return brands;
-    }
-
-    public void rewind() throws IOException {
-        if (!stream.canRewind()) {
-            throw new IOException("The provided stream doesn't allow seek");
-        }
-        if (box == null) {
-            return;
-        }
-
-        box = backupBox;
-        chunkZero = false;
-
-        stream.rewind();
-        stream.skipBytes(backupBox.offset + (DataReader.INTEGER_SIZE * 2));
-    }
-
-    public Mp4Track[] getAvailableTracks() {
-        return tracks;
-    }
-
-    public Mp4DashChunk getNextChunk(final boolean infoOnly) throws IOException {
-        Mp4Track track = tracks[selectedTrack];
-
-        while (stream.available()) {
-
-            if (chunkZero) {
-                ensure(box);
-                if (!stream.available()) {
-                    break;
-                }
-                box = readBox();
-            } else {
-                chunkZero = true;
-            }
-
-            switch (box.type) {
-                case ATOM_MOOF:
-                    if (moof != null) {
-                        throw new IOException("moof found without mdat");
-                    }
-
-                    moof = parseMoof(box, track.trak.tkhd.trackId);
-
-                    if (moof.traf != null) {
-
-                        if (hasFlag(moof.traf.trun.bFlags, 0x0001)) {
-                            moof.traf.trun.dataOffset -= box.size + 8;
-                            if (moof.traf.trun.dataOffset < 0) {
-                                throw new IOException("trun box has wrong data offset, "
-                                        + "points outside of concurrent mdat box");
-                            }
-                        }
-
-                        if (moof.traf.trun.chunkSize < 1) {
-                            if (hasFlag(moof.traf.tfhd.bFlags, 0x10)) {
-                                moof.traf.trun.chunkSize = moof.traf.tfhd.defaultSampleSize
-                                        * moof.traf.trun.entryCount;
-                            } else {
-                                moof.traf.trun.chunkSize = (int) (box.size - 8);
-                            }
-                        }
-                        if (!hasFlag(moof.traf.trun.bFlags, 0x900)
-                                && moof.traf.trun.chunkDuration == 0) {
-                            if (hasFlag(moof.traf.tfhd.bFlags, 0x20)) {
-                                moof.traf.trun.chunkDuration = moof.traf.tfhd.defaultSampleDuration
-                                        * moof.traf.trun.entryCount;
-                            }
-                        }
-                    }
-                    break;
-                case ATOM_MDAT:
-                    if (moof == null) {
-                        throw new IOException("mdat found without moof");
-                    }
-
-                    if (moof.traf == null) {
-                        moof = null;
-                        continue; // find another chunk
-                    }
-
-                    Mp4DashChunk chunk = new Mp4DashChunk();
-                    chunk.moof = moof;
-                    if (!infoOnly) {
-                        chunk.data = stream.getView(moof.traf.trun.chunkSize);
-                    }
-
-                    moof = null;
-
-                    stream.skipBytes(chunk.moof.traf.trun.dataOffset);
-                    return chunk;
-                default:
-            }
-        }
-
-        return null;
-    }
-
-    public static boolean hasFlag(final int flags, final int mask) {
-        return (flags & mask) == mask;
-    }
-
-    private String boxName(final Box ref) {
-        return boxName(ref.type);
-    }
-
-    private String boxName(final int type) {
-        try {
-            return new String(ByteBuffer.allocate(4).putInt(type).array(), "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            return "0x" + Integer.toHexString(type);
-        }
-    }
-
-    private Box readBox() throws IOException {
-        Box b = new Box();
-        b.offset = stream.position();
-        b.size = stream.readUnsignedInt();
-        b.type = stream.readInt();
-
-        if (b.size == 1) {
-            b.size = stream.readLong();
-        }
-
-        return b;
-    }
-
-    private Box readBox(final int expected) throws IOException {
-        Box b = readBox();
-        if (b.type != expected) {
-            throw new NoSuchElementException("expected " + boxName(expected)
-                    + " found " + boxName(b));
-        }
-        return b;
-    }
-
-    private byte[] readFullBox(final Box ref) throws IOException {
-        // full box reading is limited to 2 GiB, and should be enough
-        int size = (int) ref.size;
-
-        ByteBuffer buffer = ByteBuffer.allocate(size);
-        buffer.putInt(size);
-        buffer.putInt(ref.type);
-
-        int read = size - 8;
-
-        if (stream.read(buffer.array(), 8, read) != read) {
-            throw new EOFException(String.format("EOF reached in box: type=%s offset=%s size=%s",
-                    boxName(ref.type), ref.offset, ref.size));
-        }
-
-        return buffer.array();
-    }
-
-    private void ensure(final Box ref) throws IOException {
-        long skip = ref.offset + ref.size - stream.position();
-
-        if (skip == 0) {
-            return;
-        } else if (skip < 0) {
-            throw new EOFException(String.format(
-                    "parser go beyond limits of the box. type=%s offset=%s size=%s position=%s",
-                    boxName(ref), ref.offset, ref.size, stream.position()
-            ));
-        }
-
-        stream.skipBytes((int) skip);
-    }
-
-    private Box untilBox(final Box ref, final int... expected) throws IOException {
-        Box b;
-        while (stream.position() < (ref.offset + ref.size)) {
-            b = readBox();
-            for (int type : expected) {
-                if (b.type == type) {
-                    return b;
-                }
-            }
-            ensure(b);
-        }
-
-        return null;
-    }
-
-    private Box untilAnyBox(final Box ref) throws IOException {
-        if (stream.position() >= (ref.offset + ref.size)) {
-            return null;
-        }
-
-        return readBox();
-    }
-
-    private Moof parseMoof(final Box ref, final int trackId) throws IOException {
-        Moof obj = new Moof();
-
-        Box b = readBox(ATOM_MFHD);
-        obj.mfhdSequenceNumber = parseMfhd();
-        ensure(b);
-
-        while ((b = untilBox(ref, ATOM_TRAF)) != null) {
-            obj.traf = parseTraf(b, trackId);
-            ensure(b);
-
-            if (obj.traf != null) {
-                return obj;
-            }
-        }
-
-        return obj;
-    }
-
-    private int parseMfhd() throws IOException {
-        // version
-        // flags
-        stream.skipBytes(4);
-
-        return stream.readInt();
-    }
-
-    private Traf parseTraf(final Box ref, final int trackId) throws IOException {
-        Traf traf = new Traf();
-
-        Box b = readBox(ATOM_TFHD);
-        traf.tfhd = parseTfhd(trackId);
-        ensure(b);
-
-        if (traf.tfhd == null) {
-            return null;
-        }
-
-        b = untilBox(ref, ATOM_TRUN, ATOM_TFDT);
-
-        if (b.type == ATOM_TFDT) {
-            traf.tfdt = parseTfdt();
-            ensure(b);
-            b = readBox(ATOM_TRUN);
-        }
-
-        traf.trun = parseTrun();
-        ensure(b);
-
-        return traf;
-    }
-
-    private Tfhd parseTfhd(final int trackId) throws IOException {
-        Tfhd obj = new Tfhd();
-
-        obj.bFlags = stream.readInt();
-        obj.trackId = stream.readInt();
-
-        if (trackId != -1 && obj.trackId != trackId) {
-            return null;
-        }
-
-        if (hasFlag(obj.bFlags, 0x01)) {
-            stream.skipBytes(8);
-        }
-        if (hasFlag(obj.bFlags, 0x02)) {
-            stream.skipBytes(4);
-        }
-        if (hasFlag(obj.bFlags, 0x08)) {
-            obj.defaultSampleDuration = stream.readInt();
-        }
-        if (hasFlag(obj.bFlags, 0x10)) {
-            obj.defaultSampleSize = stream.readInt();
-        }
-        if (hasFlag(obj.bFlags, 0x20)) {
-            obj.defaultSampleFlags = stream.readInt();
-        }
-
-        return obj;
-    }
-
-    private long parseTfdt() throws IOException {
-        int version = stream.read();
-        stream.skipBytes(3); // flags
-        return version == 0 ? stream.readUnsignedInt() : stream.readLong();
-    }
-
-    private Trun parseTrun() throws IOException {
-        Trun obj = new Trun();
-        obj.bFlags = stream.readInt();
-        obj.entryCount = stream.readInt(); // unsigned int
-
-        obj.entriesRowSize = 0;
-        if (hasFlag(obj.bFlags, 0x0100)) {
-            obj.entriesRowSize += 4;
-        }
-        if (hasFlag(obj.bFlags, 0x0200)) {
-            obj.entriesRowSize += 4;
-        }
-        if (hasFlag(obj.bFlags, 0x0400)) {
-            obj.entriesRowSize += 4;
-        }
-        if (hasFlag(obj.bFlags, 0x0800)) {
-            obj.entriesRowSize += 4;
-        }
-        obj.bEntries = new byte[obj.entriesRowSize * obj.entryCount];
-
-        if (hasFlag(obj.bFlags, 0x0001)) {
-            obj.dataOffset = stream.readInt();
-        }
-        if (hasFlag(obj.bFlags, 0x0004)) {
-            obj.bFirstSampleFlags = stream.readInt();
-        }
-
-        stream.read(obj.bEntries);
-
-        for (int i = 0; i < obj.entryCount; i++) {
-            TrunEntry entry = obj.getEntry(i);
-            if (hasFlag(obj.bFlags, 0x0100)) {
-                obj.chunkDuration += entry.sampleDuration;
-            }
-            if (hasFlag(obj.bFlags, 0x0200)) {
-                obj.chunkSize += entry.sampleSize;
-            }
-            if (hasFlag(obj.bFlags, 0x0800)) {
-                if (!hasFlag(obj.bFlags, 0x0100)) {
-                    obj.chunkDuration += entry.sampleCompositionTimeOffset;
-                }
-            }
-        }
-
-        return obj;
-    }
-
-    private int[] parseFtyp(final Box ref) throws IOException {
-        int i = 0;
-        int[] list = new int[(int) ((ref.offset + ref.size - stream.position() - 4) / 4)];
-
-        list[i++] = stream.readInt(); // major brand
-
-        stream.skipBytes(4); // minor version
-
-        for (; i < list.length; i++) {
-            list[i] = stream.readInt(); // compatible brands
-        }
-
-        return list;
-    }
-
-    private Mvhd parseMvhd() throws IOException {
-        int version = stream.read();
-        stream.skipBytes(3); // flags
-
-        // creation entries_time
-        // modification entries_time
-        stream.skipBytes(2 * (version == 0 ? 4 : 8));
-
-        Mvhd obj = new Mvhd();
-        obj.timeScale = stream.readUnsignedInt();
-
-        // chunkDuration
-        stream.skipBytes(version == 0 ? 4 : 8);
-
-        // rate
-        // volume
-        // reserved
-        // matrix array
-        // predefined
-        stream.skipBytes(76);
-
-        obj.nextTrackId = stream.readUnsignedInt();
-
-        return obj;
-    }
-
-    private Tkhd parseTkhd() throws IOException {
-        int version = stream.read();
-
-        Tkhd obj = new Tkhd();
-
-        // flags
-        // creation entries_time
-        // modification entries_time
-        stream.skipBytes(3 + (2 * (version == 0 ? 4 : 8)));
-
-        obj.trackId = stream.readInt();
-
-        stream.skipBytes(4); // reserved
-
-        obj.duration = version == 0 ? stream.readUnsignedInt() : stream.readLong();
-
-        stream.skipBytes(2 * 4); // reserved
-
-        obj.bLayer = stream.readShort();
-        obj.bAlternateGroup = stream.readShort();
-        obj.bVolume = stream.readShort();
-
-        stream.skipBytes(2); // reserved
-
-        obj.matrix = new byte[9 * 4];
-        stream.read(obj.matrix);
-
-        obj.bWidth = stream.readInt();
-        obj.bHeight = stream.readInt();
-
-        return obj;
-    }
-
-    private Trak parseTrak(final Box ref) throws IOException {
-        Trak trak = new Trak();
-
-        Box b = readBox(ATOM_TKHD);
-        trak.tkhd = parseTkhd();
-        ensure(b);
-
-        while ((b = untilBox(ref, ATOM_MDIA, ATOM_EDTS)) != null) {
-            switch (b.type) {
-                case ATOM_MDIA:
-                    trak.mdia = parseMdia(b);
-                    break;
-                case ATOM_EDTS:
-                    trak.edstElst = parseEdts(b);
-                    break;
-            }
-
-            ensure(b);
-        }
-
-        return trak;
-    }
-
-    private Mdia parseMdia(final Box ref) throws IOException {
-        Mdia obj = new Mdia();
-
-        Box b;
-        while ((b = untilBox(ref, ATOM_MDHD, ATOM_HDLR, ATOM_MINF)) != null) {
-            switch (b.type) {
-                case ATOM_MDHD:
-                    obj.mdhd = readFullBox(b);
-
-                    // read time scale
-                    ByteBuffer buffer = ByteBuffer.wrap(obj.mdhd);
-                    byte version = buffer.get(8);
-                    buffer.position(12 + ((version == 0 ? 4 : 8) * 2));
-                    obj.mdhdTimeScale = buffer.getInt();
-                    break;
-                case ATOM_HDLR:
-                    obj.hdlr = parseHdlr(b);
-                    break;
-                case ATOM_MINF:
-                    obj.minf = parseMinf(b);
-                    break;
-            }
-            ensure(b);
-        }
-
-        return obj;
-    }
-
-    private Hdlr parseHdlr(final Box ref) throws IOException {
-        // version
-        // flags
-        stream.skipBytes(4);
-
-        Hdlr obj = new Hdlr();
-        obj.bReserved = new byte[12];
-
-        obj.type = stream.readInt();
-        obj.subType = stream.readInt();
-        stream.read(obj.bReserved);
-
-        // component name (is a ansi/ascii string)
-        stream.skipBytes((ref.offset + ref.size) - stream.position());
-
-        return obj;
-    }
-
-    private Moov parseMoov(final Box ref) throws IOException {
-        Box b = readBox(ATOM_MVHD);
-        Moov moov = new Moov();
-        moov.mvhd = parseMvhd();
-        ensure(b);
-
-        ArrayList<Trak> tmp = new ArrayList<>((int) moov.mvhd.nextTrackId);
-        while ((b = untilBox(ref, ATOM_TRAK, ATOM_MVEX)) != null) {
-
-            switch (b.type) {
-                case ATOM_TRAK:
-                    tmp.add(parseTrak(b));
-                    break;
-                case ATOM_MVEX:
-                    moov.mvexTrex = parseMvex(b, (int) moov.mvhd.nextTrackId);
-                    break;
-            }
-
-            ensure(b);
-        }
-
-        moov.trak = tmp.toArray(new Trak[0]);
-
-        return moov;
-    }
-
-    private Trex[] parseMvex(final Box ref, final int possibleTrackCount) throws IOException {
-        ArrayList<Trex> tmp = new ArrayList<>(possibleTrackCount);
-
-        Box b;
-        while ((b = untilBox(ref, ATOM_TREX)) != null) {
-            tmp.add(parseTrex());
-            ensure(b);
-        }
-
-        return tmp.toArray(new Trex[0]);
-    }
-
-    private Trex parseTrex() throws IOException {
-        // version
-        // flags
-        stream.skipBytes(4);
-
-        Trex obj = new Trex();
-        obj.trackId = stream.readInt();
-        obj.defaultSampleDescriptionIndex = stream.readInt();
-        obj.defaultSampleDuration = stream.readInt();
-        obj.defaultSampleSize = stream.readInt();
-        obj.defaultSampleFlags = stream.readInt();
-
-        return obj;
-    }
-
-    private Elst parseEdts(final Box ref) throws IOException {
-        Box b = untilBox(ref, ATOM_ELST);
-        if (b == null) {
-            return null;
-        }
-
-        Elst obj = new Elst();
-
-        boolean v1 = stream.read() == 1;
-        stream.skipBytes(3); // flags
-
-        int entryCount = stream.readInt();
-        if (entryCount < 1) {
-            obj.bMediaRate = 0x00010000; // default media rate (1.0)
-            return obj;
-        }
-
-        if (v1) {
-            stream.skipBytes(DataReader.LONG_SIZE); // segment duration
-            obj.mediaTime = stream.readLong();
-            // ignore all remain entries
-            stream.skipBytes((entryCount - 1) * (DataReader.LONG_SIZE * 2));
-        } else {
-            stream.skipBytes(DataReader.INTEGER_SIZE); // segment duration
-            obj.mediaTime = stream.readInt();
-        }
-
-        obj.bMediaRate = stream.readInt();
-
-        return obj;
-    }
-
-    private Minf parseMinf(final Box ref) throws IOException {
-        Minf obj = new Minf();
-
-        Box b;
-        while ((b = untilAnyBox(ref)) != null) {
-
-            switch (b.type) {
-                case ATOM_DINF:
-                    obj.dinf = readFullBox(b);
-                    break;
-                case ATOM_STBL:
-                    obj.stblStsd = parseStbl(b);
-                    break;
-                case ATOM_VMHD:
-                case ATOM_SMHD:
-                    obj.mhd = readFullBox(b);
-                    break;
-
-            }
-            ensure(b);
-        }
-
-        return obj;
-    }
-
-    /**
-     * This only reads the "stsd" box inside.
-     *
-     * @param ref stbl box
-     * @return stsd box inside
-     */
-    private byte[] parseStbl(final Box ref) throws IOException {
-        Box b = untilBox(ref, ATOM_STSD);
-
-        if (b == null) {
-            return new byte[0]; // this never should happens (missing codec startup data)
-        }
-
-        return readFullBox(b);
-    }
-
-    class Box {
-        int type;
-        long offset;
-        long size;
-    }
-
-    public class Moof {
-        int mfhdSequenceNumber;
-        public Traf traf;
-    }
-
-    public class Traf {
-        public Tfhd tfhd;
-        long tfdt;
-        public Trun trun;
-    }
-
-    public class Tfhd {
-        int bFlags;
-        public int trackId;
-        int defaultSampleDuration;
-        int defaultSampleSize;
-        int defaultSampleFlags;
-    }
-
-    class TrunEntry {
-        int sampleDuration;
-        int sampleSize;
-        int sampleFlags;
-        int sampleCompositionTimeOffset;
-
-        boolean hasCompositionTimeOffset;
-        boolean isKeyframe;
-
-    }
-
-    public class Trun {
-        public int chunkDuration;
-        public int chunkSize;
-
-        public int bFlags;
-        int bFirstSampleFlags;
-        int dataOffset;
-
-        public int entryCount;
-        byte[] bEntries;
-        int entriesRowSize;
-
-        public TrunEntry getEntry(final int i) {
-            ByteBuffer buffer = ByteBuffer.wrap(bEntries, i * entriesRowSize, entriesRowSize);
-            TrunEntry entry = new TrunEntry();
-
-            if (hasFlag(bFlags, 0x0100)) {
-                entry.sampleDuration = buffer.getInt();
-            }
-            if (hasFlag(bFlags, 0x0200)) {
-                entry.sampleSize = buffer.getInt();
-            }
-            if (hasFlag(bFlags, 0x0400)) {
-                entry.sampleFlags = buffer.getInt();
-            }
-            if (hasFlag(bFlags, 0x0800)) {
-                entry.sampleCompositionTimeOffset = buffer.getInt();
-            }
-
-            entry.hasCompositionTimeOffset = hasFlag(bFlags, 0x0800);
-            entry.isKeyframe = !hasFlag(entry.sampleFlags, 0x10000);
-
-            return entry;
-        }
-
-        public TrunEntry getAbsoluteEntry(final int i, final Tfhd header) {
-            TrunEntry entry = getEntry(i);
-
-            if (!hasFlag(bFlags, 0x0100) && hasFlag(header.bFlags, 0x20)) {
-                entry.sampleFlags = header.defaultSampleFlags;
-            }
-
-            if (!hasFlag(bFlags, 0x0200) && hasFlag(header.bFlags, 0x10)) {
-                entry.sampleSize = header.defaultSampleSize;
-            }
-
-            if (!hasFlag(bFlags, 0x0100) && hasFlag(header.bFlags, 0x08)) {
-                entry.sampleDuration = header.defaultSampleDuration;
-            }
-
-            if (i == 0 && hasFlag(bFlags, 0x0004)) {
-                entry.sampleFlags = bFirstSampleFlags;
-            }
-
-            return entry;
-        }
-    }
-
-    public class Tkhd {
-        int trackId;
-        long duration;
-        short bVolume;
-        int bWidth;
-        int bHeight;
-        byte[] matrix;
-        short bLayer;
-        short bAlternateGroup;
-    }
-
-    public class Trak {
-        public Tkhd tkhd;
-        public Elst edstElst;
-        public Mdia mdia;
-
-    }
-
-    class Mvhd {
-        long timeScale;
-        long nextTrackId;
-    }
-
-    class Moov {
-        Mvhd mvhd;
-        Trak[] trak;
-        Trex[] mvexTrex;
-    }
-
-    public class Trex {
-        private int trackId;
-        int defaultSampleDescriptionIndex;
-        int defaultSampleDuration;
-        int defaultSampleSize;
-        int defaultSampleFlags;
-    }
-
-    public class Elst {
-        public long mediaTime;
-        public int bMediaRate;
-    }
-
-    public class Mdia {
-        public int mdhdTimeScale;
-        public byte[] mdhd;
-        public Hdlr hdlr;
-        public Minf minf;
-    }
-
-    public class Hdlr {
-        public int type;
-        public int subType;
-        public byte[] bReserved;
-    }
-
-    public class Minf {
-        public byte[] dinf;
-        public byte[] stblStsd;
-        public byte[] mhd;
-    }
-
-    public class Mp4Track {
-        public TrackKind kind;
-        public Trak trak;
-        public Trex trex;
-    }
-
-    public class Mp4DashChunk {
-        public InputStream data;
-        public Moof moof;
-        private int i = 0;
-
-        public TrunEntry getNextSampleInfo() {
-            if (i >= moof.traf.trun.entryCount) {
-                return null;
-            }
-            return moof.traf.trun.getAbsoluteEntry(i++, moof.traf.tfhd);
-        }
-
-        public Mp4DashSample getNextSample() throws IOException {
-            if (data == null) {
-                throw new IllegalStateException("This chunk has info only");
-            }
-            if (i >= moof.traf.trun.entryCount) {
-                return null;
-            }
-
-            Mp4DashSample sample = new Mp4DashSample();
-            sample.info = moof.traf.trun.getAbsoluteEntry(i++, moof.traf.tfhd);
-            sample.data = new byte[sample.info.sampleSize];
-
-            if (data.read(sample.data) != sample.info.sampleSize) {
-                throw new EOFException("EOF reached while reading a sample");
-            }
-
-            return sample;
-        }
-    }
-
-    public class Mp4DashSample {
-        public TrunEntry info;
-        public byte[] data;
-    }
-}
+package org.schabi.newpipe.streams;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.NoSuchElementException;
+
+/**
+ * @author kapodamy
+ */
+public class Mp4DashReader {
+    private static final int ATOM_MOOF = 0x6D6F6F66;
+    private static final int ATOM_MFHD = 0x6D666864;
+    private static final int ATOM_TRAF = 0x74726166;
+    private static final int ATOM_TFHD = 0x74666864;
+    private static final int ATOM_TFDT = 0x74666474;
+    private static final int ATOM_TRUN = 0x7472756E;
+    private static final int ATOM_MDIA = 0x6D646961;
+    private static final int ATOM_FTYP = 0x66747970;
+    private static final int ATOM_SIDX = 0x73696478;
+    private static final int ATOM_MOOV = 0x6D6F6F76;
+    private static final int ATOM_MDAT = 0x6D646174;
+    private static final int ATOM_MVHD = 0x6D766864;
+    private static final int ATOM_TRAK = 0x7472616B;
+    private static final int ATOM_MVEX = 0x6D766578;
+    private static final int ATOM_TREX = 0x74726578;
+    private static final int ATOM_TKHD = 0x746B6864;
+    private static final int ATOM_MFRA = 0x6D667261;
+    private static final int ATOM_MDHD = 0x6D646864;
+    private static final int ATOM_EDTS = 0x65647473;
+    private static final int ATOM_ELST = 0x656C7374;
+    private static final int ATOM_HDLR = 0x68646C72;
+    private static final int ATOM_MINF = 0x6D696E66;
+    private static final int ATOM_DINF = 0x64696E66;
+    private static final int ATOM_STBL = 0x7374626C;
+    private static final int ATOM_STSD = 0x73747364;
+    private static final int ATOM_VMHD = 0x766D6864;
+    private static final int ATOM_SMHD = 0x736D6864;
+
+    private static final int BRAND_DASH = 0x64617368;
+    private static final int BRAND_ISO5 = 0x69736F35;
+
+    private static final int HANDLER_VIDE = 0x76696465;
+    private static final int HANDLER_SOUN = 0x736F756E;
+    private static final int HANDLER_SUBT = 0x73756274;
+
+    private final DataReader stream;
+
+    private Mp4Track[] tracks = null;
+    private int[] brands = null;
+
+    private Box box;
+    private Moof moof;
+
+    private boolean chunkZero = false;
+
+    private int selectedTrack = -1;
+    private Box backupBox = null;
+
+    public enum TrackKind {
+        Audio, Video, Subtitles, Other
+    }
+
+    public Mp4DashReader(final SharpStream source) {
+        this.stream = new DataReader(source);
+    }
+
+    public void parse() throws IOException, NoSuchElementException {
+        if (selectedTrack > -1) {
+            return;
+        }
+
+        box = readBox(ATOM_FTYP);
+        brands = parseFtyp(box);
+        switch (brands[0]) {
+            case BRAND_DASH:
+            case BRAND_ISO5:// ¿why not?
+                break;
+            default:
+                throw new NoSuchElementException(
+                        "Not a MPEG-4 DASH container, major brand is not 'dash' or 'iso5' is "
+                                + boxName(brands[0])
+                );
+        }
+
+        Moov moov = null;
+        int i;
+
+        while (box.type != ATOM_MOOF) {
+            ensure(box);
+            box = readBox();
+
+            switch (box.type) {
+                case ATOM_MOOV:
+                    moov = parseMoov(box);
+                    break;
+                case ATOM_SIDX:
+                case ATOM_MFRA:
+                    break;
+            }
+        }
+
+        if (moov == null) {
+            throw new IOException("The provided Mp4 doesn't have the 'moov' box");
+        }
+
+        tracks = new Mp4Track[moov.trak.length];
+
+        for (i = 0; i < tracks.length; i++) {
+            tracks[i] = new Mp4Track();
+            tracks[i].trak = moov.trak[i];
+
+            if (moov.mvexTrex != null) {
+                for (Trex mvexTrex : moov.mvexTrex) {
+                    if (tracks[i].trak.tkhd.trackId == mvexTrex.trackId) {
+                        tracks[i].trex = mvexTrex;
+                    }
+                }
+            }
+
+            switch (moov.trak[i].mdia.hdlr.subType) {
+                case HANDLER_VIDE:
+                    tracks[i].kind = TrackKind.Video;
+                    break;
+                case HANDLER_SOUN:
+                    tracks[i].kind = TrackKind.Audio;
+                    break;
+                case HANDLER_SUBT:
+                    tracks[i].kind = TrackKind.Subtitles;
+                    break;
+                default:
+                    tracks[i].kind = TrackKind.Other;
+                    break;
+            }
+        }
+
+        backupBox = box;
+    }
+
+    Mp4Track selectTrack(final int index) {
+        selectedTrack = index;
+        return tracks[index];
+    }
+
+    public int[] getBrands() {
+        if (brands == null) {
+            throw new IllegalStateException("Not parsed");
+        }
+        return brands;
+    }
+
+    public void rewind() throws IOException {
+        if (!stream.canRewind()) {
+            throw new IOException("The provided stream doesn't allow seek");
+        }
+        if (box == null) {
+            return;
+        }
+
+        box = backupBox;
+        chunkZero = false;
+
+        stream.rewind();
+        stream.skipBytes(backupBox.offset + (DataReader.INTEGER_SIZE * 2));
+    }
+
+    public Mp4Track[] getAvailableTracks() {
+        return tracks;
+    }
+
+    public Mp4DashChunk getNextChunk(final boolean infoOnly) throws IOException {
+        Mp4Track track = tracks[selectedTrack];
+
+        while (stream.available()) {
+
+            if (chunkZero) {
+                ensure(box);
+                if (!stream.available()) {
+                    break;
+                }
+                box = readBox();
+            } else {
+                chunkZero = true;
+            }
+
+            switch (box.type) {
+                case ATOM_MOOF:
+                    if (moof != null) {
+                        throw new IOException("moof found without mdat");
+                    }
+
+                    moof = parseMoof(box, track.trak.tkhd.trackId);
+
+                    if (moof.traf != null) {
+
+                        if (hasFlag(moof.traf.trun.bFlags, 0x0001)) {
+                            moof.traf.trun.dataOffset -= box.size + 8;
+                            if (moof.traf.trun.dataOffset < 0) {
+                                throw new IOException("trun box has wrong data offset, "
+                                        + "points outside of concurrent mdat box");
+                            }
+                        }
+
+                        if (moof.traf.trun.chunkSize < 1) {
+                            if (hasFlag(moof.traf.tfhd.bFlags, 0x10)) {
+                                moof.traf.trun.chunkSize = moof.traf.tfhd.defaultSampleSize
+                                        * moof.traf.trun.entryCount;
+                            } else {
+                                moof.traf.trun.chunkSize = (int) (box.size - 8);
+                            }
+                        }
+                        if (!hasFlag(moof.traf.trun.bFlags, 0x900)
+                                && moof.traf.trun.chunkDuration == 0) {
+                            if (hasFlag(moof.traf.tfhd.bFlags, 0x20)) {
+                                moof.traf.trun.chunkDuration = moof.traf.tfhd.defaultSampleDuration
+                                        * moof.traf.trun.entryCount;
+                            }
+                        }
+                    }
+                    break;
+                case ATOM_MDAT:
+                    if (moof == null) {
+                        throw new IOException("mdat found without moof");
+                    }
+
+                    if (moof.traf == null) {
+                        moof = null;
+                        continue; // find another chunk
+                    }
+
+                    Mp4DashChunk chunk = new Mp4DashChunk();
+                    chunk.moof = moof;
+                    if (!infoOnly) {
+                        chunk.data = stream.getView(moof.traf.trun.chunkSize);
+                    }
+
+                    moof = null;
+
+                    stream.skipBytes(chunk.moof.traf.trun.dataOffset);
+                    return chunk;
+                default:
+            }
+        }
+
+        return null;
+    }
+
+    public static boolean hasFlag(final int flags, final int mask) {
+        return (flags & mask) == mask;
+    }
+
+    private String boxName(final Box ref) {
+        return boxName(ref.type);
+    }
+
+    private String boxName(final int type) {
+        try {
+            return new String(ByteBuffer.allocate(4).putInt(type).array(), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return "0x" + Integer.toHexString(type);
+        }
+    }
+
+    private Box readBox() throws IOException {
+        Box b = new Box();
+        b.offset = stream.position();
+        b.size = stream.readUnsignedInt();
+        b.type = stream.readInt();
+
+        if (b.size == 1) {
+            b.size = stream.readLong();
+        }
+
+        return b;
+    }
+
+    private Box readBox(final int expected) throws IOException {
+        Box b = readBox();
+        if (b.type != expected) {
+            throw new NoSuchElementException("expected " + boxName(expected)
+                    + " found " + boxName(b));
+        }
+        return b;
+    }
+
+    private byte[] readFullBox(final Box ref) throws IOException {
+        // full box reading is limited to 2 GiB, and should be enough
+        int size = (int) ref.size;
+
+        ByteBuffer buffer = ByteBuffer.allocate(size);
+        buffer.putInt(size);
+        buffer.putInt(ref.type);
+
+        int read = size - 8;
+
+        if (stream.read(buffer.array(), 8, read) != read) {
+            throw new EOFException(String.format("EOF reached in box: type=%s offset=%s size=%s",
+                    boxName(ref.type), ref.offset, ref.size));
+        }
+
+        return buffer.array();
+    }
+
+    private void ensure(final Box ref) throws IOException {
+        long skip = ref.offset + ref.size - stream.position();
+
+        if (skip == 0) {
+            return;
+        } else if (skip < 0) {
+            throw new EOFException(String.format(
+                    "parser go beyond limits of the box. type=%s offset=%s size=%s position=%s",
+                    boxName(ref), ref.offset, ref.size, stream.position()
+            ));
+        }
+
+        stream.skipBytes((int) skip);
+    }
+
+    private Box untilBox(final Box ref, final int... expected) throws IOException {
+        Box b;
+        while (stream.position() < (ref.offset + ref.size)) {
+            b = readBox();
+            for (int type : expected) {
+                if (b.type == type) {
+                    return b;
+                }
+            }
+            ensure(b);
+        }
+
+        return null;
+    }
+
+    private Box untilAnyBox(final Box ref) throws IOException {
+        if (stream.position() >= (ref.offset + ref.size)) {
+            return null;
+        }
+
+        return readBox();
+    }
+
+    private Moof parseMoof(final Box ref, final int trackId) throws IOException {
+        Moof obj = new Moof();
+
+        Box b = readBox(ATOM_MFHD);
+        obj.mfhdSequenceNumber = parseMfhd();
+        ensure(b);
+
+        while ((b = untilBox(ref, ATOM_TRAF)) != null) {
+            obj.traf = parseTraf(b, trackId);
+            ensure(b);
+
+            if (obj.traf != null) {
+                return obj;
+            }
+        }
+
+        return obj;
+    }
+
+    private int parseMfhd() throws IOException {
+        // version
+        // flags
+        stream.skipBytes(4);
+
+        return stream.readInt();
+    }
+
+    private Traf parseTraf(final Box ref, final int trackId) throws IOException {
+        Traf traf = new Traf();
+
+        Box b = readBox(ATOM_TFHD);
+        traf.tfhd = parseTfhd(trackId);
+        ensure(b);
+
+        if (traf.tfhd == null) {
+            return null;
+        }
+
+        b = untilBox(ref, ATOM_TRUN, ATOM_TFDT);
+
+        if (b.type == ATOM_TFDT) {
+            traf.tfdt = parseTfdt();
+            ensure(b);
+            b = readBox(ATOM_TRUN);
+        }
+
+        traf.trun = parseTrun();
+        ensure(b);
+
+        return traf;
+    }
+
+    private Tfhd parseTfhd(final int trackId) throws IOException {
+        Tfhd obj = new Tfhd();
+
+        obj.bFlags = stream.readInt();
+        obj.trackId = stream.readInt();
+
+        if (trackId != -1 && obj.trackId != trackId) {
+            return null;
+        }
+
+        if (hasFlag(obj.bFlags, 0x01)) {
+            stream.skipBytes(8);
+        }
+        if (hasFlag(obj.bFlags, 0x02)) {
+            stream.skipBytes(4);
+        }
+        if (hasFlag(obj.bFlags, 0x08)) {
+            obj.defaultSampleDuration = stream.readInt();
+        }
+        if (hasFlag(obj.bFlags, 0x10)) {
+            obj.defaultSampleSize = stream.readInt();
+        }
+        if (hasFlag(obj.bFlags, 0x20)) {
+            obj.defaultSampleFlags = stream.readInt();
+        }
+
+        return obj;
+    }
+
+    private long parseTfdt() throws IOException {
+        int version = stream.read();
+        stream.skipBytes(3); // flags
+        return version == 0 ? stream.readUnsignedInt() : stream.readLong();
+    }
+
+    private Trun parseTrun() throws IOException {
+        Trun obj = new Trun();
+        obj.bFlags = stream.readInt();
+        obj.entryCount = stream.readInt(); // unsigned int
+
+        obj.entriesRowSize = 0;
+        if (hasFlag(obj.bFlags, 0x0100)) {
+            obj.entriesRowSize += 4;
+        }
+        if (hasFlag(obj.bFlags, 0x0200)) {
+            obj.entriesRowSize += 4;
+        }
+        if (hasFlag(obj.bFlags, 0x0400)) {
+            obj.entriesRowSize += 4;
+        }
+        if (hasFlag(obj.bFlags, 0x0800)) {
+            obj.entriesRowSize += 4;
+        }
+        obj.bEntries = new byte[obj.entriesRowSize * obj.entryCount];
+
+        if (hasFlag(obj.bFlags, 0x0001)) {
+            obj.dataOffset = stream.readInt();
+        }
+        if (hasFlag(obj.bFlags, 0x0004)) {
+            obj.bFirstSampleFlags = stream.readInt();
+        }
+
+        stream.read(obj.bEntries);
+
+        for (int i = 0; i < obj.entryCount; i++) {
+            TrunEntry entry = obj.getEntry(i);
+            if (hasFlag(obj.bFlags, 0x0100)) {
+                obj.chunkDuration += entry.sampleDuration;
+            }
+            if (hasFlag(obj.bFlags, 0x0200)) {
+                obj.chunkSize += entry.sampleSize;
+            }
+            if (hasFlag(obj.bFlags, 0x0800)) {
+                if (!hasFlag(obj.bFlags, 0x0100)) {
+                    obj.chunkDuration += entry.sampleCompositionTimeOffset;
+                }
+            }
+        }
+
+        return obj;
+    }
+
+    private int[] parseFtyp(final Box ref) throws IOException {
+        int i = 0;
+        int[] list = new int[(int) ((ref.offset + ref.size - stream.position() - 4) / 4)];
+
+        list[i++] = stream.readInt(); // major brand
+
+        stream.skipBytes(4); // minor version
+
+        for (; i < list.length; i++) {
+            list[i] = stream.readInt(); // compatible brands
+        }
+
+        return list;
+    }
+
+    private Mvhd parseMvhd() throws IOException {
+        int version = stream.read();
+        stream.skipBytes(3); // flags
+
+        // creation entries_time
+        // modification entries_time
+        stream.skipBytes(2 * (version == 0 ? 4 : 8));
+
+        Mvhd obj = new Mvhd();
+        obj.timeScale = stream.readUnsignedInt();
+
+        // chunkDuration
+        stream.skipBytes(version == 0 ? 4 : 8);
+
+        // rate
+        // volume
+        // reserved
+        // matrix array
+        // predefined
+        stream.skipBytes(76);
+
+        obj.nextTrackId = stream.readUnsignedInt();
+
+        return obj;
+    }
+
+    private Tkhd parseTkhd() throws IOException {
+        int version = stream.read();
+
+        Tkhd obj = new Tkhd();
+
+        // flags
+        // creation entries_time
+        // modification entries_time
+        stream.skipBytes(3 + (2 * (version == 0 ? 4 : 8)));
+
+        obj.trackId = stream.readInt();
+
+        stream.skipBytes(4); // reserved
+
+        obj.duration = version == 0 ? stream.readUnsignedInt() : stream.readLong();
+
+        stream.skipBytes(2 * 4); // reserved
+
+        obj.bLayer = stream.readShort();
+        obj.bAlternateGroup = stream.readShort();
+        obj.bVolume = stream.readShort();
+
+        stream.skipBytes(2); // reserved
+
+        obj.matrix = new byte[9 * 4];
+        stream.read(obj.matrix);
+
+        obj.bWidth = stream.readInt();
+        obj.bHeight = stream.readInt();
+
+        return obj;
+    }
+
+    private Trak parseTrak(final Box ref) throws IOException {
+        Trak trak = new Trak();
+
+        Box b = readBox(ATOM_TKHD);
+        trak.tkhd = parseTkhd();
+        ensure(b);
+
+        while ((b = untilBox(ref, ATOM_MDIA, ATOM_EDTS)) != null) {
+            switch (b.type) {
+                case ATOM_MDIA:
+                    trak.mdia = parseMdia(b);
+                    break;
+                case ATOM_EDTS:
+                    trak.edstElst = parseEdts(b);
+                    break;
+            }
+
+            ensure(b);
+        }
+
+        return trak;
+    }
+
+    private Mdia parseMdia(final Box ref) throws IOException {
+        Mdia obj = new Mdia();
+
+        Box b;
+        while ((b = untilBox(ref, ATOM_MDHD, ATOM_HDLR, ATOM_MINF)) != null) {
+            switch (b.type) {
+                case ATOM_MDHD:
+                    obj.mdhd = readFullBox(b);
+
+                    // read time scale
+                    ByteBuffer buffer = ByteBuffer.wrap(obj.mdhd);
+                    byte version = buffer.get(8);
+                    buffer.position(12 + ((version == 0 ? 4 : 8) * 2));
+                    obj.mdhdTimeScale = buffer.getInt();
+                    break;
+                case ATOM_HDLR:
+                    obj.hdlr = parseHdlr(b);
+                    break;
+                case ATOM_MINF:
+                    obj.minf = parseMinf(b);
+                    break;
+            }
+            ensure(b);
+        }
+
+        return obj;
+    }
+
+    private Hdlr parseHdlr(final Box ref) throws IOException {
+        // version
+        // flags
+        stream.skipBytes(4);
+
+        Hdlr obj = new Hdlr();
+        obj.bReserved = new byte[12];
+
+        obj.type = stream.readInt();
+        obj.subType = stream.readInt();
+        stream.read(obj.bReserved);
+
+        // component name (is a ansi/ascii string)
+        stream.skipBytes((ref.offset + ref.size) - stream.position());
+
+        return obj;
+    }
+
+    private Moov parseMoov(final Box ref) throws IOException {
+        Box b = readBox(ATOM_MVHD);
+        Moov moov = new Moov();
+        moov.mvhd = parseMvhd();
+        ensure(b);
+
+        ArrayList<Trak> tmp = new ArrayList<>((int) moov.mvhd.nextTrackId);
+        while ((b = untilBox(ref, ATOM_TRAK, ATOM_MVEX)) != null) {
+
+            switch (b.type) {
+                case ATOM_TRAK:
+                    tmp.add(parseTrak(b));
+                    break;
+                case ATOM_MVEX:
+                    moov.mvexTrex = parseMvex(b, (int) moov.mvhd.nextTrackId);
+                    break;
+            }
+
+            ensure(b);
+        }
+
+        moov.trak = tmp.toArray(new Trak[0]);
+
+        return moov;
+    }
+
+    private Trex[] parseMvex(final Box ref, final int possibleTrackCount) throws IOException {
+        ArrayList<Trex> tmp = new ArrayList<>(possibleTrackCount);
+
+        Box b;
+        while ((b = untilBox(ref, ATOM_TREX)) != null) {
+            tmp.add(parseTrex());
+            ensure(b);
+        }
+
+        return tmp.toArray(new Trex[0]);
+    }
+
+    private Trex parseTrex() throws IOException {
+        // version
+        // flags
+        stream.skipBytes(4);
+
+        Trex obj = new Trex();
+        obj.trackId = stream.readInt();
+        obj.defaultSampleDescriptionIndex = stream.readInt();
+        obj.defaultSampleDuration = stream.readInt();
+        obj.defaultSampleSize = stream.readInt();
+        obj.defaultSampleFlags = stream.readInt();
+
+        return obj;
+    }
+
+    private Elst parseEdts(final Box ref) throws IOException {
+        Box b = untilBox(ref, ATOM_ELST);
+        if (b == null) {
+            return null;
+        }
+
+        Elst obj = new Elst();
+
+        boolean v1 = stream.read() == 1;
+        stream.skipBytes(3); // flags
+
+        int entryCount = stream.readInt();
+        if (entryCount < 1) {
+            obj.bMediaRate = 0x00010000; // default media rate (1.0)
+            return obj;
+        }
+
+        if (v1) {
+            stream.skipBytes(DataReader.LONG_SIZE); // segment duration
+            obj.mediaTime = stream.readLong();
+            // ignore all remain entries
+            stream.skipBytes((entryCount - 1) * (DataReader.LONG_SIZE * 2));
+        } else {
+            stream.skipBytes(DataReader.INTEGER_SIZE); // segment duration
+            obj.mediaTime = stream.readInt();
+        }
+
+        obj.bMediaRate = stream.readInt();
+
+        return obj;
+    }
+
+    private Minf parseMinf(final Box ref) throws IOException {
+        Minf obj = new Minf();
+
+        Box b;
+        while ((b = untilAnyBox(ref)) != null) {
+
+            switch (b.type) {
+                case ATOM_DINF:
+                    obj.dinf = readFullBox(b);
+                    break;
+                case ATOM_STBL:
+                    obj.stblStsd = parseStbl(b);
+                    break;
+                case ATOM_VMHD:
+                case ATOM_SMHD:
+                    obj.mhd = readFullBox(b);
+                    break;
+
+            }
+            ensure(b);
+        }
+
+        return obj;
+    }
+
+    /**
+     * This only reads the "stsd" box inside.
+     *
+     * @param ref stbl box
+     * @return stsd box inside
+     */
+    private byte[] parseStbl(final Box ref) throws IOException {
+        Box b = untilBox(ref, ATOM_STSD);
+
+        if (b == null) {
+            return new byte[0]; // this never should happens (missing codec startup data)
+        }
+
+        return readFullBox(b);
+    }
+
+    class Box {
+        int type;
+        long offset;
+        long size;
+    }
+
+    public class Moof {
+        int mfhdSequenceNumber;
+        public Traf traf;
+    }
+
+    public class Traf {
+        public Tfhd tfhd;
+        long tfdt;
+        public Trun trun;
+    }
+
+    public class Tfhd {
+        int bFlags;
+        public int trackId;
+        int defaultSampleDuration;
+        int defaultSampleSize;
+        int defaultSampleFlags;
+    }
+
+    class TrunEntry {
+        int sampleDuration;
+        int sampleSize;
+        int sampleFlags;
+        int sampleCompositionTimeOffset;
+
+        boolean hasCompositionTimeOffset;
+        boolean isKeyframe;
+
+    }
+
+    public class Trun {
+        public int chunkDuration;
+        public int chunkSize;
+
+        public int bFlags;
+        int bFirstSampleFlags;
+        int dataOffset;
+
+        public int entryCount;
+        byte[] bEntries;
+        int entriesRowSize;
+
+        public TrunEntry getEntry(final int i) {
+            ByteBuffer buffer = ByteBuffer.wrap(bEntries, i * entriesRowSize, entriesRowSize);
+            TrunEntry entry = new TrunEntry();
+
+            if (hasFlag(bFlags, 0x0100)) {
+                entry.sampleDuration = buffer.getInt();
+            }
+            if (hasFlag(bFlags, 0x0200)) {
+                entry.sampleSize = buffer.getInt();
+            }
+            if (hasFlag(bFlags, 0x0400)) {
+                entry.sampleFlags = buffer.getInt();
+            }
+            if (hasFlag(bFlags, 0x0800)) {
+                entry.sampleCompositionTimeOffset = buffer.getInt();
+            }
+
+            entry.hasCompositionTimeOffset = hasFlag(bFlags, 0x0800);
+            entry.isKeyframe = !hasFlag(entry.sampleFlags, 0x10000);
+
+            return entry;
+        }
+
+        public TrunEntry getAbsoluteEntry(final int i, final Tfhd header) {
+            TrunEntry entry = getEntry(i);
+
+            if (!hasFlag(bFlags, 0x0100) && hasFlag(header.bFlags, 0x20)) {
+                entry.sampleFlags = header.defaultSampleFlags;
+            }
+
+            if (!hasFlag(bFlags, 0x0200) && hasFlag(header.bFlags, 0x10)) {
+                entry.sampleSize = header.defaultSampleSize;
+            }
+
+            if (!hasFlag(bFlags, 0x0100) && hasFlag(header.bFlags, 0x08)) {
+                entry.sampleDuration = header.defaultSampleDuration;
+            }
+
+            if (i == 0 && hasFlag(bFlags, 0x0004)) {
+                entry.sampleFlags = bFirstSampleFlags;
+            }
+
+            return entry;
+        }
+    }
+
+    public class Tkhd {
+        int trackId;
+        long duration;
+        short bVolume;
+        int bWidth;
+        int bHeight;
+        byte[] matrix;
+        short bLayer;
+        short bAlternateGroup;
+    }
+
+    public class Trak {
+        public Tkhd tkhd;
+        public Elst edstElst;
+        public Mdia mdia;
+
+    }
+
+    class Mvhd {
+        long timeScale;
+        long nextTrackId;
+    }
+
+    class Moov {
+        Mvhd mvhd;
+        Trak[] trak;
+        Trex[] mvexTrex;
+    }
+
+    public class Trex {
+        private int trackId;
+        int defaultSampleDescriptionIndex;
+        int defaultSampleDuration;
+        int defaultSampleSize;
+        int defaultSampleFlags;
+    }
+
+    public class Elst {
+        public long mediaTime;
+        public int bMediaRate;
+    }
+
+    public class Mdia {
+        public int mdhdTimeScale;
+        public byte[] mdhd;
+        public Hdlr hdlr;
+        public Minf minf;
+    }
+
+    public class Hdlr {
+        public int type;
+        public int subType;
+        public byte[] bReserved;
+    }
+
+    public class Minf {
+        public byte[] dinf;
+        public byte[] stblStsd;
+        public byte[] mhd;
+    }
+
+    public class Mp4Track {
+        public TrackKind kind;
+        public Trak trak;
+        public Trex trex;
+    }
+
+    public class Mp4DashChunk {
+        public InputStream data;
+        public Moof moof;
+        private int i = 0;
+
+        public TrunEntry getNextSampleInfo() {
+            if (i >= moof.traf.trun.entryCount) {
+                return null;
+            }
+            return moof.traf.trun.getAbsoluteEntry(i++, moof.traf.tfhd);
+        }
+
+        public Mp4DashSample getNextSample() throws IOException {
+            if (data == null) {
+                throw new IllegalStateException("This chunk has info only");
+            }
+            if (i >= moof.traf.trun.entryCount) {
+                return null;
+            }
+
+            Mp4DashSample sample = new Mp4DashSample();
+            sample.info = moof.traf.trun.getAbsoluteEntry(i++, moof.traf.tfhd);
+            sample.data = new byte[sample.info.sampleSize];
+
+            if (data.read(sample.data) != sample.info.sampleSize) {
+                throw new EOFException("EOF reached while reading a sample");
+            }
+
+            return sample;
+        }
+    }
+
+    public class Mp4DashSample {
+        public TrunEntry info;
+        public byte[] data;
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
index 2fc887896..66e9ce6f3 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -640,7 +640,7 @@ public class Mp4FromDashWriter {
         return size;
     }
 
-    private byte[] makeMdat(long refSize, final boolean is64) {
+    private byte[] makeMdat(long refSize, boolean is64) {
         if (is64) {
             refSize += 16;
         } else {
@@ -674,8 +674,9 @@ public class Mp4FromDashWriter {
                 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, // default volume and rate
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // reserved values
                 // default matrix
-                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00,
                 0x40, 0x00, 0x00, 0x00
         });
         auxWrite(new byte[24]); // predefined
@@ -717,12 +718,13 @@ public class Mp4FromDashWriter {
 
         // udta/meta/ilst/©too
         auxWrite(new byte[]{
-                0x00, 0x00, 0x00, 0x5C, 0x75, 0x64, 0x74, 0x61, 0x00, 0x00, 0x00, 0x54, 0x6D, 0x65, 0x74, 0x61,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x68, 0x64, 0x6C, 0x72, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x69, 0x72, 0x61, 0x70, 0x70, 0x6C, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x69, 0x6C, 0x73, 0x74, 0x00, 0x00, 0x00,
-                0x1F, (byte) 0xA9, 0x74, 0x6F, 0x6F, 0x00, 0x00, 0x00, 0x17, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00,
-                0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x5C, 0x75, 0x64, 0x74, 0x61, 0x00, 0x00, 0x00, 0x54, 0x6D, 0x65,
+                0x74, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x68, 0x64, 0x6C, 0x72,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x69, 0x72, 0x61, 0x70,
+                0x70, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x27, 0x69, 0x6C, 0x73, 0x74, 0x00, 0x00, 0x00,
+                0x1F, (byte) 0xA9, 0x74, 0x6F, 0x6F, 0x00, 0x00, 0x00, 0x17, 0x64, 0x61, 0x74, 0x61,
+                0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
                 0x4E, 0x65, 0x77, 0x50, 0x69, 0x70, 0x65 // "NewPipe" binary string
         });
 
@@ -759,7 +761,8 @@ public class Mp4FromDashWriter {
 
         auxWrite(new byte[]{
                 0x00, 0x00, 0x00, 0x24, 0x65, 0x64, 0x74, 0x73, // edts header
-                0x00, 0x00, 0x00, 0x1C, 0x65, 0x6C, 0x73, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 // elst header
+                0x00, 0x00, 0x00, 0x1C, 0x65, 0x6C, 0x73, 0x74,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 // elst header
         });
 
         int bMediaRate;
@@ -845,14 +848,18 @@ public class Mp4FromDashWriter {
     private byte[] makeHdlr(final Hdlr hdlr) {
         ByteBuffer buffer = ByteBuffer.wrap(new byte[]{
                 0x00, 0x00, 0x00, 0x77, 0x68, 0x64, 0x6C, 0x72, // hdlr
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                // binary string "ISO Media file created in NewPipe (A libre lightweight streaming frontend for Android)."
-                0x49, 0x53, 0x4F, 0x20, 0x4D, 0x65, 0x64, 0x69, 0x61, 0x20, 0x66, 0x69, 0x6C, 0x65, 0x20, 0x63,
-                0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x20, 0x4E, 0x65, 0x77, 0x50, 0x69, 0x70,
-                0x65, 0x20, 0x28, 0x41, 0x20, 0x6C, 0x69, 0x62, 0x72, 0x65, 0x20, 0x6C, 0x69, 0x67, 0x68, 0x74,
-                0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6D, 0x69, 0x6E, 0x67,
-                0x20, 0x66, 0x72, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x41, 0x6E,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                // binary string
+                // "ISO Media file created in NewPipe (
+                // A libre lightweight streaming frontend for Android)."
+                0x49, 0x53, 0x4F, 0x20, 0x4D, 0x65, 0x64, 0x69, 0x61, 0x20, 0x66, 0x69, 0x6C, 0x65,
+                0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x20, 0x4E, 0x65,
+                0x77, 0x50, 0x69, 0x70, 0x65, 0x20, 0x28, 0x41, 0x20, 0x6C, 0x69, 0x62, 0x72, 0x65,
+                0x20, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x73,
+                0x74, 0x72, 0x65, 0x61, 0x6D, 0x69,0x6E, 0x67,
+                0x20, 0x66, 0x72, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20,
+                0x41, 0x6E,
                 0x64, 0x72, 0x6F, 0x69, 0x64, 0x29, 0x2E
         });
 
diff --git a/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
index ee0a61492..d655b4d00 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
@@ -289,11 +289,13 @@ public class OggFromWebMWriter implements Closeable {
                     /*
                         // whole file duration (not implemented)
                         0x44,// tag string size
-                        0x55, 0x52, 0x41, 0x54, 0x49, 0x4F, 0x4E, 0x3D, 0x30, 0x30, 0x3A, 0x30, 0x30, 0x3A, 0x30,
-                        0x30, 0x2E, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30
+                        0x55, 0x52, 0x41, 0x54, 0x49, 0x4F, 0x4E, 0x3D, 0x30,
+                        0x30, 0x3A, 0x30, 0x30, 0x3A, 0x30, 0x30, 0x2E, 0x30,
+                        0x30, 0x30, 0x30, 0x30, 0x30, 0x30
                      */
                     0x0F, // tag string size
-                    0x00, 0x00, 0x00, 0x45, 0x4E, 0x43, 0x4F, 0x44, 0x45, 0x52, 0x3D, // "ENCODER=" binary string
+                    0x00, 0x00, 0x00, 0x45, 0x4E, 0x43, 0x4F,
+                    0x44, 0x45, 0x52, 0x3D, // "ENCODER=" binary string
                     0x4E, 0x65, 0x77, 0x50, 0x69, 0x70, 0x65, // "NewPipe" binary string
                     0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ????????
             };
@@ -417,7 +419,7 @@ public class OggFromWebMWriter implements Closeable {
         }
     }
 
-    private int calcCrc32(int initialCrc, final byte[] buffer, final int size) {
+    private int calcCrc32(int initialCrc, byte[] buffer, int size) {
         for (int i = 0; i < size; i++) {
             int reg = (initialCrc >>> 24) & 0xff;
             initialCrc = (initialCrc << 8) ^ crc32Table[reg ^ (buffer[i] & 0xff)];
diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
index da1e119c3..c3cd2a2e4 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
@@ -102,10 +102,6 @@ public class WebMWriter implements Closeable {
         return done;
     }
 
-    public boolean isParsed() {
-        return parsed;
-    }
-
     @Override
     public void close() {
         done = true;
@@ -360,7 +356,7 @@ public class WebMWriter implements Closeable {
 
         Block bloq = new Block();
         bloq.data = res.data;
-        bloq.dataSize = (int) res.dataSize;
+        bloq.dataSize = res.dataSize;
         bloq.trackNumber = internalTrackId;
         bloq.flags = res.flags;
         bloq.absoluteTimecode = res.absoluteTimeCodeNs / DEFAULT_TIMECODE_SCALE;
@@ -728,7 +724,7 @@ public class WebMWriter implements Closeable {
         return 0;
     }
 
-    class KeyFrame {
+    static class KeyFrame {
         KeyFrame(final long segment, final long cluster, final long block, final long timecode) {
             clusterPosition = cluster - segment;
             relativePosition = (int) (block - cluster - CLUSTER_HEADER_SIZE);
@@ -740,7 +736,7 @@ public class WebMWriter implements Closeable {
         final long duration;
     }
 
-    class Block {
+    static class Block {
         InputStream data;
         int trackNumber;
         byte flags;
@@ -759,7 +755,7 @@ public class WebMWriter implements Closeable {
         }
     }
 
-    class ClusterInfo {
+    static class ClusterInfo {
         long offset;
         int size;
     }
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 141522287..6b53cfc5b 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -10,34 +10,4 @@
   <suppress checks="FinalParameters"
     files="InfoListAdapter.java"
     lines="253,325"/>
-
-  <!-- org.schabi.newpipe.streams -->
-  <suppress checks="FinalParameters"
-    files="WebMWriter.java"
-    lines="423,595"/>
-  <suppress checks="LineLength"
-    files="WebMWriter.java"
-    lines="160,162"/>
-
-  <suppress checks="FinalParameters"
-    files="OggFromWebMWriter.java"
-    lines="378,420"/>
-  <suppress checks="LineLength"
-    files="OggFromWebMWriter.java"
-    lines="292,296"/>
-
-  <suppress checks="FinalParameters"
-    files="Mp4FromDashWriter.java"
-    lines="643"/>
-  <suppress checks="LineLength"
-    files="Mp4FromDashWriter.java"
-    lines="677,678,720-724,738,762,848,850-855"/>
-
-  <suppress checks="InnerAssignment"
-    files="Mp4DashReader.java"
-    lines="190"/>
-
-  <suppress checks="FinalParameters"
-    files="DataReader.java"
-    lines="46,93"/>
 </suppressions>