sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Lev 2022-11-26 03:04:35 +03:00
parent 5e3b817b81
commit 101b712267
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/common/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
View file

@ -234,7 +234,7 @@ public final class ParsableByteArray {
/** Peeks at the next char. */ /** Peeks at the next char. */
public char peekLittleEndianChar() { public char peekLittleEndianChar() {
return (char) ((data[position] & 0xFF) | (data[position + 1] & 0xFF) << 8 ); return (char) ((data[position] & 0xFF) | (data[position + 1] & 0xFF) << 8);
} }
/** Reads the next byte as an unsigned value. */ /** Reads the next byte as an unsigned value. */
@ -554,12 +554,12 @@ public final class ParsableByteArray {
*/ */
@Nullable @Nullable
public String readUtfLine(Charset charset) { public String readUtfLine(Charset charset) {
if(!charset.equals(Charsets.UTF_8) if (!charset.equals(Charsets.UTF_8)
&& !charset.equals(Charsets.UTF_16BE) && !charset.equals(Charsets.UTF_16BE)
&& !charset.equals(Charsets.UTF_16LE)) { && !charset.equals(Charsets.UTF_16LE)) {
throw new IllegalArgumentException("Only UTF-8, UTF-16LE, UTF-16BE encoding supported."); throw new IllegalArgumentException("Only UTF-8, UTF-16LE, UTF-16BE encoding supported.");
} }
if(charset.equals(Charsets.UTF_8)) { if (charset.equals(Charsets.UTF_8)) {
return readLine(); return readLine();
} }

6
library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
View file

@ -149,13 +149,11 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
* @return determined encoding * @return determined encoding
*/ */
private Charset detectUtfCharset(ParsableByteArray data) { private Charset detectUtfCharset(ParsableByteArray data) {
if(data.limit() < 2) { if (data.limit() < 2) {
return Charsets.UTF_8; return Charsets.UTF_8;
} }
char twoBytes = data.peekChar(); switch (data.peekChar()) {
switch (twoBytes) {
case ParsableByteArray.BOM_UTF16_BE: case ParsableByteArray.BOM_UTF16_BE:
return Charsets.UTF_16BE; return Charsets.UTF_16BE;
case ParsableByteArray.BOM_UTF16_LE: case ParsableByteArray.BOM_UTF16_LE: