loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9207 from dlafayet:ruby-position

Browse Source 
PiperOrigin-RevId: 386836747
This commit is contained in:
bachinger 2021-07-27 12:19:29 +01:00
commit f9162c07c2
4 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELEASENOTES.md
View File

@ -106,6 +106,9 @@
* Extractors: * Extractors:
* Add support for DTS-UHD in MP4 * Add support for DTS-UHD in MP4
([#9163](https://github.com/google/ExoPlayer/issues/9163). ([#9163](https://github.com/google/ExoPlayer/issues/9163).
* Text:
* TTML: Inherit the `rubyPosition` value from a containing `<span
ruby="container">` element.
* Ad playback: * Ad playback:
* Support changing ad break positions in the player logic * Support changing ad break positions in the player logic
([#5067](https://github.com/google/ExoPlayer/issues/5067). ([#5067](https://github.com/google/ExoPlayer/issues/5067).
@ -128,7 +131,6 @@
`ControlDispatcher` parameter has also been deprecated in all `ControlDispatcher` parameter has also been deprecated in all
`MediaSessionConnector` listener methods. `MediaSessionConnector` listener methods.
### 2.14.2 (2021-07-20) ### 2.14.2 (2021-07-20)
* Core Library: * Core Library:

18
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java
View File

@ -178,12 +178,22 @@ import java.util.Map;
break; break;
} }
// TODO: Get rubyPosition from `textNode` when TTML inheritance is implemented. @Nullable
TtmlStyle textStyle = resolveStyle(textNode.style, textNode.getStyleIds(), globalStyles);
// Use position from ruby text node if defined.
@TextAnnotation.Position @TextAnnotation.Position
int rubyPosition = int rubyPosition =
containerNode.style != null textStyle != null ? textStyle.getRubyPosition() : TextAnnotation.POSITION_UNKNOWN;
? containerNode.style.getRubyPosition()
: TextAnnotation.POSITION_UNKNOWN; if (rubyPosition == TextAnnotation.POSITION_UNKNOWN) {
// If ruby position is not defined, use position info from container node.
@Nullable
TtmlStyle containerStyle =
resolveStyle(containerNode.style, containerNode.getStyleIds(), globalStyles);
rubyPosition = containerStyle != null ? containerStyle.getRubyPosition() : rubyPosition;
}
builder.setSpan( builder.setSpan(
new RubySpan(rubyText, rubyPosition), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); new RubySpan(rubyText, rubyPosition), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
break; break;

12
library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
View File

@ -710,6 +710,18 @@ public final class TtmlDecoderTest {
Spanned sixthCue = getOnlyCueTextAtTimeUs(subtitle, 60_000_000); Spanned sixthCue = getOnlyCueTextAtTimeUs(subtitle, 60_000_000);
assertThat(sixthCue.toString()).isEqualTo("Cue with annotated text."); assertThat(sixthCue.toString()).isEqualTo("Cue with annotated text.");
assertThat(sixthCue).hasNoRubySpanBetween(0, sixthCue.length()); assertThat(sixthCue).hasNoRubySpanBetween(0, sixthCue.length());
Spanned seventhCue = getOnlyCueTextAtTimeUs(subtitle, 70_000_000);
assertThat(seventhCue.toString()).isEqualTo("Cue with annotated text.");
assertThat(seventhCue)
.hasRubySpanBetween("Cue with ".length(), "Cue with annotated".length())
.withTextAndPosition("rubies", TextAnnotation.POSITION_BEFORE);
Spanned eighthCue = getOnlyCueTextAtTimeUs(subtitle, 80_000_000);
assertThat(eighthCue.toString()).isEqualTo("Cue with annotated text.");
assertThat(eighthCue)
.hasRubySpanBetween("Cue with ".length(), "Cue with annotated".length())
.withTextAndPosition("rubies", TextAnnotation.POSITION_AFTER);
} }
@Test @Test

24
testdata/src/test/assets/media/ttml/rubies.xml vendored
View File

@ -7,6 +7,8 @@
<style id="cont" tts:ruby="container" /> <style id="cont" tts:ruby="container" />
<style id="base" tts:ruby="base" /> <style id="base" tts:ruby="base" />
<style id="text" tts:ruby="text" /> <style id="text" tts:ruby="text" />
<style id="cont-with-pos-before" tts:ruby="container" tts:rubyPosition="before" />
<style id="text-with-pos-after" tts:ruby="text" tts:rubyPosition="after" />
</styling> </styling>
</head> </head>
<body> <body>
@ -76,5 +78,27 @@
text. text.
</p> </p>
</div> </div>
<div>
<!-- ruby info in style block and ruby position in contpos -->
<p begin="70s" end="78s">
Cue with
<span style="cont-with-pos-before">
<span style="base">annotated</span>
<span style="text">rubies</span>
text.
</span>
</p>
</div>
<div>
<!-- ruby info and position in style block for base and text -->
<p begin="80s" end="88s">
Cue with
<span style="cont-with-pos-before">
<span style="base">annotated</span>
<span style="text-with-pos-after">rubies</span>
text.
</span>
</p>
</div>
</body> </body>
</tt> </tt>