Auto-infer character encoding.

This commit is contained in:
Oliver Woodman 2014-09-19 18:34:46 +01:00
parent 4344675098
commit ce5eea72d2

View File

@ -15,7 +15,6 @@
*/ */
package com.google.android.exoplayer.text; package com.google.android.exoplayer.text;
import com.google.android.exoplayer.C;
import com.google.android.exoplayer.ExoPlaybackException; import com.google.android.exoplayer.ExoPlaybackException;
import com.google.android.exoplayer.MediaFormatHolder; import com.google.android.exoplayer.MediaFormatHolder;
import com.google.android.exoplayer.SampleHolder; import com.google.android.exoplayer.SampleHolder;
@ -178,7 +177,7 @@ public class TextTrackRenderer extends TrackRenderer implements Callback {
resetSampleHolder = true; resetSampleHolder = true;
InputStream subtitleInputStream = InputStream subtitleInputStream =
new ByteArrayInputStream(sampleHolder.data.array(), 0, sampleHolder.size); new ByteArrayInputStream(sampleHolder.data.array(), 0, sampleHolder.size);
subtitle = subtitleParser.parse(subtitleInputStream, C.UTF8_NAME, sampleHolder.timeUs); subtitle = subtitleParser.parse(subtitleInputStream, null, sampleHolder.timeUs);
syncNextEventIndex(timeUs); syncNextEventIndex(timeUs);
textRendererNeedsUpdate = true; textRendererNeedsUpdate = true;
} else if (result == SampleSource.END_OF_STREAM) { } else if (result == SampleSource.END_OF_STREAM) {