From ab57c8010f5d5c846aa64b6dc03eb9f3f0fe8006 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 30 Apr 2020 17:54:35 +0100 Subject: [PATCH] Add bottomPaddingFraction support to SubtitleWebView PiperOrigin-RevId: 309245320 --- .../google/android/exoplayer2/ui/SubtitleWebView.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleWebView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleWebView.java index 8f55c29c84..d6f79368bf 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleWebView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleWebView.java @@ -172,6 +172,7 @@ import java.util.List; float linePercent; int lineTranslatePercent; + @Cue.AnchorType int lineAnchor; if (cue.line != Cue.DIMEN_UNSET) { switch (cue.lineType) { case Cue.LINE_TYPE_NUMBER: @@ -189,14 +190,17 @@ import java.util.List; linePercent = cue.line * 100; lineTranslatePercent = 0; } + lineAnchor = cue.lineAnchor; } else { - linePercent = 100; + linePercent = (1.0f - bottomPaddingFraction) * 100; lineTranslatePercent = 0; + // If Cue.line == DIMEN_UNSET then ignore Cue.lineAnchor and assume ANCHOR_TYPE_END. + lineAnchor = Cue.ANCHOR_TYPE_END; } int lineAnchorTranslatePercent = cue.verticalType == Cue.VERTICAL_TYPE_RL - ? -anchorTypeToTranslatePercent(cue.lineAnchor) - : anchorTypeToTranslatePercent(cue.lineAnchor); + ? -anchorTypeToTranslatePercent(lineAnchor) + : anchorTypeToTranslatePercent(lineAnchor); String size = cue.size != Cue.DIMEN_UNSET