Format with google-java-format and add release note

androidx · May 15, 2024 · 5c3f3d9 · 5c3f3d9
1 parent dad747a
commit 5c3f3d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -67,6 +67,8 @@
 *   Text:
     *   Fix issue where subtitles starting before a seek position are skipped.
         This issue was only introduced in Media3 1.4.0-alpha01.
+    *   PGS: Fix run-length decoding to resolve `0` as a color index, instead of
+        a literal color value.
 *   Metadata:
     *   Fix mapping of MP4 to ID3 sort tags. Previously the 'album sort'
         (`soal`), 'artist sort' (`soar`) and 'album artist sort' (`soaa`) MP4

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/pgs/PgsParser.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/pgs/PgsParser.java
@@ -248,7 +248,8 @@ public Cue build() {
                 (switchBits & 0x40) == 0
                     ? (switchBits & 0x3F)
                     : (((switchBits & 0x3F) << 8) | bitmapData.readUnsignedByte());
-            int color = (switchBits & 0x80) == 0 ? colors[0] : colors[bitmapData.readUnsignedByte()];
+            int color =
+                (switchBits & 0x80) == 0 ? colors[0] : colors[bitmapData.readUnsignedByte()];
             Arrays.fill(
                 argbBitmapData, argbBitmapDataIndex, argbBitmapDataIndex + runLength, color);
             argbBitmapDataIndex += runLength;