Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev

2013-09-24 18:37:12 +00:00
parent e1cb9accf2 283fe37aa2
commit 566d6b6534
1 changed files with 3 additions and 0 deletions
--- a/media/java/android/media/WebVttRenderer.java
+++ b/media/java/android/media/WebVttRenderer.java
@@ -690,6 +690,9 @@ class WebVttParser {
    final private Phase mParseStart = new Phase() { // 5-9
        @Override
        public void parse(String line) {
+            if (line.startsWith("\ufeff")) {
+                line = line.substring(1);
+            }
            if (!line.equals("WEBVTT") &&
                    !line.startsWith("WEBVTT ") &&
                    !line.startsWith("WEBVTT\t")) {