From ab66dfa7c221bad2cffcb6bf7dc1be0caf6c1aa9 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Thu, 10 Sep 2015 18:27:03 +0100 Subject: [PATCH] Parsing embedded TTML styling. --- .../assets/ttml/chain_multiple_styles.xml | 28 ++ .../ttml/inherit_and_override_style.xml | 30 ++ .../assets/ttml/inherit_global_and_parent.xml | 35 ++ .../assets/ttml/inherit_multiple_styles.xml | 45 +++ .../androidTest/assets/ttml/inherit_style.xml | 22 ++ .../assets/ttml/inline_style_attributes.xml | 25 ++ .../assets/ttml/instance_creation.xml | 24 ++ .../assets/ttml/no_underline_linethrough.xml | 21 ++ .../ttml/non_inheritable_properties.xml | 19 + .../exoplayer/text/ttml/TtmlParserTest.java | 353 ++++++++++++++++++ .../exoplayer/text/ttml/TtmlStyleTest.java | 155 ++++++++ .../MediaPresentationDescriptionParser.java | 98 +++-- .../android/exoplayer/text/ttml/TtmlNode.java | 84 ++++- .../exoplayer/text/ttml/TtmlParser.java | 171 ++++++++- .../exoplayer/text/ttml/TtmlStyle.java | 224 +++++++++++ .../exoplayer/text/ttml/TtmlSubtitle.java | 5 + .../android/exoplayer/util/ParserUtil.java | 50 +++ 17 files changed, 1320 insertions(+), 69 deletions(-) create mode 100644 library/src/androidTest/assets/ttml/chain_multiple_styles.xml create mode 100644 library/src/androidTest/assets/ttml/inherit_and_override_style.xml create mode 100644 library/src/androidTest/assets/ttml/inherit_global_and_parent.xml create mode 100644 library/src/androidTest/assets/ttml/inherit_multiple_styles.xml create mode 100644 library/src/androidTest/assets/ttml/inherit_style.xml create mode 100644 library/src/androidTest/assets/ttml/inline_style_attributes.xml create mode 100644 library/src/androidTest/assets/ttml/instance_creation.xml create mode 100644 library/src/androidTest/assets/ttml/no_underline_linethrough.xml create mode 100644 library/src/androidTest/assets/ttml/non_inheritable_properties.xml create mode 100644 library/src/androidTest/java/com/google/android/exoplayer/text/ttml/TtmlParserTest.java create mode 100644 library/src/androidTest/java/com/google/android/exoplayer/text/ttml/TtmlStyleTest.java create mode 100644 library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlStyle.java create mode 100644 library/src/main/java/com/google/android/exoplayer/util/ParserUtil.java diff --git a/library/src/androidTest/assets/ttml/chain_multiple_styles.xml b/library/src/androidTest/assets/ttml/chain_multiple_styles.xml new file mode 100644 index 0000000000..d4de3c8ef9 --- /dev/null +++ b/library/src/androidTest/assets/ttml/chain_multiple_styles.xml @@ -0,0 +1,28 @@ + + + +