From cea3071b333618161d09931ee4dcab3d14fa3125 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Tue, 14 May 2019 12:33:19 +0100
Subject: [PATCH] Fix rendering DVB subtitle on API 28.

Issue: #5862
PiperOrigin-RevId: 248112524
---
 RELEASENOTES.md                                       |  2 ++
 .../google/android/exoplayer2/text/dvb/DvbParser.java | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6a49f911d7b..55349ad42e5 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -9,6 +9,8 @@
 * Offline: Add option to remove all downloads.
 * Add a workaround for a decoder failure on ZTE Axon7 mini devices when playing
   48kHz audio ([#5821](https://github.com/google/ExoPlayer/issues/5821)).
+* Fix DVB subtitles for SDK 28
+  ([#5862](https://github.com/google/ExoPlayer/issues/5862)).
 
 ### 2.10.0 ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java b/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java
index eb956f06db1..3f2fef454fa 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java
@@ -21,7 +21,6 @@
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
-import android.graphics.Region;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.util.Log;
@@ -150,6 +149,8 @@ public List<Cue> decode(byte[] data, int limit) {
     List<Cue> cues = new ArrayList<>();
     SparseArray<PageRegion> pageRegions = subtitleService.pageComposition.regions;
     for (int i = 0; i < pageRegions.size(); i++) {
+      // Save clean clipping state.
+      canvas.save();
       PageRegion pageRegion = pageRegions.valueAt(i);
       int regionId = pageRegions.keyAt(i);
       RegionComposition regionComposition = subtitleService.regions.get(regionId);
@@ -163,9 +164,7 @@ public List<Cue> decode(byte[] data, int limit) {
           displayDefinition.horizontalPositionMaximum);
       int clipBottom = Math.min(baseVerticalAddress + regionComposition.height,
           displayDefinition.verticalPositionMaximum);
-      canvas.clipRect(baseHorizontalAddress, baseVerticalAddress, clipRight, clipBottom,
-          Region.Op.REPLACE);
-
+      canvas.clipRect(baseHorizontalAddress, baseVerticalAddress, clipRight, clipBottom);
       ClutDefinition clutDefinition = subtitleService.cluts.get(regionComposition.clutId);
       if (clutDefinition == null) {
         clutDefinition = subtitleService.ancillaryCluts.get(regionComposition.clutId);
@@ -214,9 +213,11 @@ public List<Cue> decode(byte[] data, int limit) {
           (float) regionComposition.height / displayDefinition.height));
 
       canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
+      // Restore clean clipping state.
+      canvas.restore();
     }
 
-    return cues;
+    return Collections.unmodifiableList(cues);
   }
 
   // Static parsing.