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 96f78ac0e..dcd751e81 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
@@ -43,7 +43,8 @@ public class DataReader {
return readBuffer[readOffset++] & 0xFF;
}
- public long skipBytes(long amount) throws IOException {
+ public long skipBytes(final long byteAmount) throws IOException {
+ long amount = byteAmount;
if (readCount < 0) {
return 0;
} else if (readCount == 0) {
@@ -90,7 +91,10 @@ public class DataReader {
return read(buffer, 0, buffer.length);
}
- public int read(final byte[] buffer, int offset, int count) throws IOException {
+ public int read(final byte[] buffer, final int off, final int c) throws IOException {
+ int offset = off;
+ int count = c;
+
if (readCount < 0) {
return -1;
}
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 00a0f750e..2baf8fe55 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -464,16 +464,16 @@ public class Mp4FromDashWriter {
}
private void initChunkTables(final TablesInfo tables, final int firstCount,
- final int succesiveCount) {
+ final int successiveCount) {
// tables.stsz holds amount of samples of the track (total)
int totalSamples = (tables.stsz - firstCount);
- float chunkAmount = totalSamples / (float) succesiveCount;
+ float chunkAmount = totalSamples / (float) successiveCount;
int remainChunkOffset = (int) Math.ceil(chunkAmount);
boolean remain = remainChunkOffset != (int) chunkAmount;
int index = 0;
tables.stsc = 1;
- if (firstCount != succesiveCount) {
+ if (firstCount != successiveCount) {
tables.stsc++;
}
if (remain) {
@@ -488,15 +488,15 @@ public class Mp4FromDashWriter {
tables.stscBEntries[index++] = firstCount;
tables.stscBEntries[index++] = 1;
- if (firstCount != succesiveCount) {
+ if (firstCount != successiveCount) {
tables.stscBEntries[index++] = 2;
- tables.stscBEntries[index++] = succesiveCount;
+ tables.stscBEntries[index++] = successiveCount;
tables.stscBEntries[index++] = 1;
}
if (remain) {
tables.stscBEntries[index++] = remainChunkOffset + 1;
- tables.stscBEntries[index++] = totalSamples % succesiveCount;
+ tables.stscBEntries[index++] = totalSamples % successiveCount;
tables.stscBEntries[index] = 1;
}
}
@@ -640,19 +640,20 @@ public class Mp4FromDashWriter {
return size;
}
- private byte[] makeMdat(long refSize, final boolean is64) {
+ private byte[] makeMdat(final long refSize, final boolean is64) {
+ long size = refSize;
if (is64) {
- refSize += 16;
+ size += 16;
} else {
- refSize += 8;
+ size += 8;
}
ByteBuffer buffer = ByteBuffer.allocate(is64 ? 16 : 8)
- .putInt(is64 ? 0x01 : (int) refSize)
+ .putInt(is64 ? 0x01 : (int) size)
.putInt(0x6D646174); // mdat
if (is64) {
- buffer.putLong(refSize);
+ buffer.putLong(size);
}
return buffer.array();
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 092b9d31f..00a29c7ab 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
@@ -282,7 +282,7 @@ public class OggFromWebMWriter implements Closeable {
0x03, // ¿¿¿???
0x76, 0x6f, 0x72, 0x62, 0x69, 0x73, // "vorbis" binary string
0x00, 0x00, 0x00, 0x00, // writing application string size (not present)
- 0x00, 0x00, 0x00, 0x00, // additional tags count (zero means no tags)
+ 0x00, 0x00, 0x00, 0x00 // additional tags count (zero means no tags)
};
}
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 7cdcac15e..02b22965d 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
@@ -148,21 +148,25 @@ public class WebMWriter implements Closeable {
0x11, 0x4d, (byte) 0x9b, 0x74, (byte) 0xbe,
0x4d, (byte) 0xbb, (byte) 0x8b,
0x53, (byte) 0xab, (byte) 0x84, 0x15, 0x49, (byte) 0xa9, 0x66, 0x53,
- (byte) 0xac, (byte) 0x81, /*info offset*/ 0x43,
+ (byte) 0xac, (byte) 0x81,
+ /*info offset*/ 0x43,
0x4d, (byte) 0xbb, (byte) 0x8b, 0x53, (byte) 0xab,
(byte) 0x84, 0x16, 0x54, (byte) 0xae, 0x6b, 0x53, (byte) 0xac, (byte) 0x81,
/*tracks offset*/ 0x56,
0x4d, (byte) 0xbb, (byte) 0x8e, 0x53, (byte) 0xab, (byte) 0x84, 0x1f,
- 0x43, (byte) 0xb6, 0x75, 0x53, (byte) 0xac, (byte) 0x84, /*cluster offset [2]*/ 0x00, 0x00, 0x00, 0x00,
+ 0x43, (byte) 0xb6, 0x75, 0x53, (byte) 0xac, (byte) 0x84,
+ /*cluster offset [2]*/ 0x00, 0x00, 0x00, 0x00,
0x4d, (byte) 0xbb, (byte) 0x8e, 0x53, (byte) 0xab, (byte) 0x84, 0x1c, 0x53,
- (byte) 0xbb, 0x6b, 0x53, (byte) 0xac, (byte) 0x84, /*cues offset [7]*/ 0x00, 0x00, 0x00, 0x00
+ (byte) 0xbb, 0x6b, 0x53, (byte) 0xac, (byte) 0x84,
+ /*cues offset [7]*/ 0x00, 0x00, 0x00, 0x00
});
/* info */
listBuffer.add(new byte[]{
0x15, 0x49, (byte) 0xa9, 0x66, (byte) 0x8e, 0x2a, (byte) 0xd7, (byte) 0xb1
});
- listBuffer.add(encode(DEFAULT_TIMECODE_SCALE, true)); // this value MUST NOT exceed 4 bytes
+ // the segment duration MUST NOT exceed 4 bytes
+ listBuffer.add(encode(DEFAULT_TIMECODE_SCALE, true));
listBuffer.add(new byte[]{0x44, (byte) 0x89, (byte) 0x84,
0x00, 0x00, 0x00, 0x00, // info.duration
});
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index a4fc516f2..b29789eca 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -16,21 +16,6 @@
lines="278,310"/>
-
-
-
-
-
-
-