From 618c2cf9526acb3eee3aebbba8ecb38e4bb0e4c8 Mon Sep 17 00:00:00 2001
From: Ian Baker <ibaker@google.com>
Date: Fri, 3 Jan 2025 15:15:14 +0000
Subject: [PATCH] Add a release note and format with google-java-format

---
 RELEASENOTES.md                                            | 2 ++
 .../androidx/media3/extractor/text/ttml/TtmlParser.java    | 7 +++++--
 .../media3/extractor/text/ttml/TtmlParserTest.java         | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c49ef4aa8b..c9b3bb1a32 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -24,6 +24,8 @@
         `DefaultAudioSink` to stall.
 *   Video:
 *   Text:
+    *   TTML: Add support for referencing `tts:origin` and `tts:extent` via
+        `style` ([#2953](https://github.com/google/ExoPlayer/issues/2953)).
 *   Metadata:
 *   Image:
 *   DataSource:
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/ttml/TtmlParser.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/ttml/TtmlParser.java
index 2cf87fc094..760a992b43 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/text/ttml/TtmlParser.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/text/ttml/TtmlParser.java
@@ -315,7 +315,8 @@ public final class TtmlParser implements SubtitleParser {
           globalStyles.put(styleId, style);
         }
       } else if (XmlPullParserUtil.isStartTag(xmlParser, TtmlNode.TAG_REGION)) {
-        @Nullable TtmlRegion ttmlRegion = parseRegionAttributes(xmlParser, cellRows, ttsExtent, globalStyles);
+        @Nullable
+        TtmlRegion ttmlRegion = parseRegionAttributes(xmlParser, cellRows, ttsExtent, globalStyles);
         if (ttmlRegion != null) {
           globalRegions.put(ttmlRegion.id, ttmlRegion);
         }
@@ -350,7 +351,9 @@ public final class TtmlParser implements SubtitleParser {
    */
   @Nullable
   private static TtmlRegion parseRegionAttributes(
-      XmlPullParser xmlParser, int cellRows, @Nullable TtsExtent ttsExtent,
+      XmlPullParser xmlParser,
+      int cellRows,
+      @Nullable TtsExtent ttsExtent,
       Map<String, TtmlStyle> globalStyles) {
     @Nullable String regionId = XmlPullParserUtil.getAttributeValue(xmlParser, TtmlNode.ATTR_ID);
     if (regionId == null) {
diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/text/ttml/TtmlParserTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/text/ttml/TtmlParserTest.java
index 821ce20e9b..3445a6de97 100644
--- a/libraries/extractor/src/test/java/androidx/media3/extractor/text/ttml/TtmlParserTest.java
+++ b/libraries/extractor/src/test/java/androidx/media3/extractor/text/ttml/TtmlParserTest.java
@@ -74,7 +74,8 @@ public final class TtmlParserTest {
   private static final String RUBIES_FILE = "media/ttml/rubies.xml";
   private static final String TEXT_EMPHASIS_FILE = "media/ttml/text_emphasis.xml";
   private static final String SHEAR_FILE = "media/ttml/shear.xml";
-  private static final String REGION_ATTRS_FROM_STYLE_FILE = "media/ttml/inherit_region_attributes_from_style.xml";
+  private static final String REGION_ATTRS_FROM_STYLE_FILE =
+      "media/ttml/inherit_region_attributes_from_style.xml";
 
   @Test
   public void simple_allCues() throws Exception {