From 8017118ef1fa5d688447c2744baaedd0d235fd75 Mon Sep 17 00:00:00 2001
From: Matthias Tamegger <matthias.tamegger@bitmovin.com>
Date: Tue, 17 Mar 2020 12:33:16 +0100
Subject: [PATCH] Extend FrameworkMediaDrm to support PSSHv1 on Amazon FireTV
 Gen1/Gen2/Stick Gen1/Stick Gen2

---
 .../google/android/exoplayer2/drm/FrameworkMediaDrm.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
index 2f5e258e86..5be22bb7f7 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
@@ -358,13 +358,15 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     }
 
     // Prior to L the Widevine CDM required data to be extracted from the PSSH atom. Some Amazon
-    // devices also required data to be extracted from the PSSH atom for PlayReady.
+    // devices also required data to be extracted from the PSSH atom for PlayReady and Widevine
+    // with PSSHv1 boxes.
     if ((Util.SDK_INT < 21 && C.WIDEVINE_UUID.equals(uuid))
-        || (C.PLAYREADY_UUID.equals(uuid)
+        || ((C.PLAYREADY_UUID.equals(uuid) || C.WIDEVINE_UUID.equals(uuid))
             && "Amazon".equals(Util.MANUFACTURER)
             && ("AFTB".equals(Util.MODEL) // Fire TV Gen 1
                 || "AFTS".equals(Util.MODEL) // Fire TV Gen 2
-                || "AFTM".equals(Util.MODEL)))) { // Fire TV Stick Gen 1
+                || "AFTM".equals(Util.MODEL) // Fire TV Stick Gen 1
+                || "AFTT".equals(Util.MODEL)))) { // Fire TV Stick Gen 2
       byte[] psshData = PsshAtomUtil.parseSchemeSpecificData(initData, uuid);
       if (psshData != null) {
         // Extraction succeeded, so return the extracted data.