sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-06-29 05:39:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1583 - Modify in event time generation of TtmlNode

Browse source 
Look for "div" tags when generating the set of times.
This commit is contained in:
Arnold Szabo 2018-11-08 22:22:23 +02:00
parent eafca5402a
commit c7f763a369
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
View file

@ -479,7 +479,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
long startTime = C.TIME_UNSET;
long endTime = C.TIME_UNSET;
String regionId = TtmlNode.ANONYMOUS_REGION_ID;
String imageId = "";
String imageId = null;
String[] styleIds = null;
int attributeCount = parser.getAttributeCount();
TtmlStyle style = parseStyleAttributes(parser, null);
@ -511,7 +511,11 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
}
break;
case ATTR_IMAGE:
imageId = value.substring(1);
// Parse URI reference only if refers to an element in the same document (it must start with '#')
// Resolving URIs from external sources is not supported
if (value.startsWith("#")) {
imageId = value.substring(1);
}
break;
default:
// Do nothing.

20
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
View file

@ -159,7 +159,8 @@ import java.util.TreeSet;
private void getEventTimes(TreeSet<Long> out, boolean descendsPNode) {
boolean isPNode = TAG_P.equals(tag);
if (descendsPNode || isPNode) {
boolean isDivNode = TAG_DIV.equals(tag);
if (descendsPNode || isPNode || (isDivNode && imageId != null)) {
if (startTimeUs != C.TIME_UNSET) {
out.add(startTimeUs);
}
@ -180,7 +181,7 @@ import java.util.TreeSet;
}
public List<Cue> getCues(long timeUs, Map<String, TtmlStyle> globalStyles,
Map<String, TtmlRegion> regionMap, Map<String, String> imageMap) {
Map<String, TtmlRegion> regionMap, Map<String, String> imageMap) {
TreeMap<String, SpannableStringBuilder> regionOutputs = new TreeMap<>();
List<Pair<String, String>> regionImageList = new ArrayList<>();
@ -204,7 +205,7 @@ import java.util.TreeSet;
Cue.TYPE_UNSET,
region.line,
region.lineAnchor,
region.width,
region.width == Cue.DIMEN_UNSET ? 0.5f : region.width,
Cue.DIMEN_UNSET
)
);
@ -229,12 +230,17 @@ import java.util.TreeSet;
return cues;
}
private void traverseForImage(long timeUs, String inheritedRegion, List<Pair<String, String>> regionImageList) {
// TODO isActive needed?
private void traverseForImage(
long timeUs,
String inheritedRegion,
List<Pair<String, String>> regionImageList) {
String resolvedRegionId = ANONYMOUS_REGION_ID.equals(regionId) ? inheritedRegion : regionId;
if (TAG_DIV.equals(tag) && imageId != null) {
regionImageList.add(new Pair<>(resolvedRegionId, imageId));
if (isActive(timeUs)) {
if (TAG_DIV.equals(tag) && imageId != null) {
regionImageList.add(new Pair<>(resolvedRegionId, imageId));
}
}
for (int i = 0; i < getChildCount(); ++i) {