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

Add Util.getUtf8Bytes to avoid warnings

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=128980489
This commit is contained in:
olly 2016-08-01 06:31:45 -07:00 committed by Oliver Woodman
parent 3604d589c1
commit abd5653dc4
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
View file

@ -17,6 +17,7 @@ package com.google.android.exoplayer2.text.webvtt;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util;
/** /**
* Unit test for {@link CssParser}. * Unit test for {@link CssParser}.
@ -122,7 +123,7 @@ public final class CssParserTest extends InstrumentationTestCase {
public void testGetNextToken() { public void testGetNextToken() {
String stringInput = " lorem:ipsum\n{dolor}#sit,amet;lorem:ipsum\r\t\f\ndolor(())\n"; String stringInput = " lorem:ipsum\n{dolor}#sit,amet;lorem:ipsum\r\t\f\ndolor(())\n";
ParsableByteArray input = new ParsableByteArray(stringInput.getBytes()); ParsableByteArray input = new ParsableByteArray(Util.getUtf8Bytes(stringInput));
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
assertEquals(CssParser.parseNextToken(input, builder), "lorem"); assertEquals(CssParser.parseNextToken(input, builder), "lorem");
assertEquals(CssParser.parseNextToken(input, builder), ":"); assertEquals(CssParser.parseNextToken(input, builder), ":");
@ -178,20 +179,20 @@ public final class CssParserTest extends InstrumentationTestCase {
// Utility methods. // Utility methods.
private void assertSkipsToEndOfSkip(String expectedLine, String s) { private void assertSkipsToEndOfSkip(String expectedLine, String s) {
ParsableByteArray input = new ParsableByteArray(s.getBytes()); ParsableByteArray input = new ParsableByteArray(Util.getUtf8Bytes(s));
CssParser.skipWhitespaceAndComments(input); CssParser.skipWhitespaceAndComments(input);
assertEquals(expectedLine, input.readLine()); assertEquals(expectedLine, input.readLine());
} }
private void assertInputLimit(String expectedLine, String s) { private void assertInputLimit(String expectedLine, String s) {
ParsableByteArray input = new ParsableByteArray(s.getBytes()); ParsableByteArray input = new ParsableByteArray(Util.getUtf8Bytes(s));
CssParser.skipStyleBlock(input); CssParser.skipStyleBlock(input);
assertEquals(expectedLine, input.readLine()); assertEquals(expectedLine, input.readLine());
} }
private void assertParserProduces(WebvttCssStyle expected, private void assertParserProduces(WebvttCssStyle expected,
String styleBlock){ String styleBlock){
ParsableByteArray input = new ParsableByteArray(styleBlock.getBytes()); ParsableByteArray input = new ParsableByteArray(Util.getUtf8Bytes(styleBlock));
WebvttCssStyle actualElem = parser.parseBlock(input); WebvttCssStyle actualElem = parser.parseBlock(input);
assertEquals(expected.hasBackgroundColor(), actualElem.hasBackgroundColor()); assertEquals(expected.hasBackgroundColor(), actualElem.hasBackgroundColor());
if (expected.hasBackgroundColor()) { if (expected.hasBackgroundColor()) {

4
library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
View file

@ -986,8 +986,8 @@ public final class MatroskaExtractor implements Extractor {
int seconds = (int) (timeUs / 1000000); int seconds = (int) (timeUs / 1000000);
timeUs -= (seconds * 1000000); timeUs -= (seconds * 1000000);
int milliseconds = (int) (timeUs / 1000); int milliseconds = (int) (timeUs / 1000);
timeCodeData = String.format(Locale.US, "%02d:%02d:%02d,%03d", timeCodeData = Util.getUtf8Bytes(String.format(Locale.US, "%02d:%02d:%02d,%03d", hours,
hours, minutes, seconds, milliseconds).getBytes(); minutes, seconds, milliseconds));
} }
System.arraycopy(timeCodeData, 0, subripSampleData, SUBRIP_PREFIX_END_TIMECODE_OFFSET, System.arraycopy(timeCodeData, 0, subripSampleData, SUBRIP_PREFIX_END_TIMECODE_OFFSET,
SUBRIP_TIMECODE_LENGTH); SUBRIP_TIMECODE_LENGTH);

11
library/src/main/java/com/google/android/exoplayer2/util/Util.java
View file

@ -34,6 +34,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.nio.charset.Charset;
import java.text.ParseException; import java.text.ParseException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
@ -238,6 +239,16 @@ public final class Util {
} }
} }
/**
* Returns a new byte array containing the code points of a {@link String} encoded using UTF-8.
*
* @param value The {@link String} whose bytes should be obtained.
* @return The code points encoding using UTF-8.
*/
public static byte[] getUtf8Bytes(String value) {
return value.getBytes(Charset.defaultCharset()); // UTF-8 is the default on Android.
}
/** /**
* Converts text to lower case using {@link Locale#US}. * Converts text to lower case using {@link Locale#US}.
* *