--- a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/C.java
+++ b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/C.java
@@ -107,17 +107,17 @@ public final class C {
    * @see MediaCodec#CRYPTO_MODE_AES_CTR
    */
   @SuppressWarnings("InlinedApi")
   public static final int CRYPTO_MODE_AES_CTR = MediaCodec.CRYPTO_MODE_AES_CTR;
   /**
    * @see MediaCodec#CRYPTO_MODE_AES_CBC
    */
   @SuppressWarnings("InlinedApi")
-  public static final int CRYPTO_MODE_AES_CBC = MediaCodec.CRYPTO_MODE_AES_CBC;
+  public static final int CRYPTO_MODE_AES_CBC = 0x2;
 
   /**
    * Represents an unset {@link android.media.AudioTrack} session identifier. Equal to
    * {@link AudioManager#AUDIO_SESSION_ID_GENERATE}.
    */
   @SuppressWarnings("InlinedApi")
   public static final int AUDIO_SESSION_ID_UNSET = AudioManager.AUDIO_SESSION_ID_GENERATE;
 
@@ -560,66 +560,66 @@ public final class C {
    */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({Format.NO_VALUE, COLOR_SPACE_BT709, COLOR_SPACE_BT601, COLOR_SPACE_BT2020})
   public @interface ColorSpace {}
   /**
    * @see MediaFormat#COLOR_STANDARD_BT709
    */
   @SuppressWarnings("InlinedApi")
-  public static final int COLOR_SPACE_BT709 = MediaFormat.COLOR_STANDARD_BT709;
+  public static final int COLOR_SPACE_BT709 = 0x01;
   /**
    * @see MediaFormat#COLOR_STANDARD_BT601_PAL
    */
   @SuppressWarnings("InlinedApi")
-  public static final int COLOR_SPACE_BT601 = MediaFormat.COLOR_STANDARD_BT601_PAL;
+  public static final int COLOR_SPACE_BT601 = 0x02;
   /**
    * @see MediaFormat#COLOR_STANDARD_BT2020
    */
   @SuppressWarnings("InlinedApi")
-  public static final int COLOR_SPACE_BT2020 = MediaFormat.COLOR_STANDARD_BT2020;
+  public static final int COLOR_SPACE_BT2020 = 0x06;
 
   /**
    * Video color transfer characteristics.
    */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({Format.NO_VALUE, COLOR_TRANSFER_SDR, COLOR_TRANSFER_ST2084, COLOR_TRANSFER_HLG})
   public @interface ColorTransfer {}
   /**
    * @see MediaFormat#COLOR_TRANSFER_SDR_VIDEO
    */
   @SuppressWarnings("InlinedApi")
-  public static final int COLOR_TRANSFER_SDR = MediaFormat.COLOR_TRANSFER_SDR_VIDEO;
+  public static final int COLOR_TRANSFER_SDR = 0x03;
   /**
    * @see MediaFormat#COLOR_TRANSFER_ST2084
    */
   @SuppressWarnings("InlinedApi")
-  public static final int COLOR_TRANSFER_ST2084 = MediaFormat.COLOR_TRANSFER_ST2084;
+  public static final int COLOR_TRANSFER_ST2084 = 0x06;
   /**
    * @see MediaFormat#COLOR_TRANSFER_HLG
    */
   @SuppressWarnings("InlinedApi")
-  public static final int COLOR_TRANSFER_HLG = MediaFormat.COLOR_TRANSFER_HLG;
+  public static final int COLOR_TRANSFER_HLG = 0x07;
 
   /**
    * Video color range.
    */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({Format.NO_VALUE, COLOR_RANGE_LIMITED, COLOR_RANGE_FULL})
   public @interface ColorRange {}
   /**
    * @see MediaFormat#COLOR_RANGE_LIMITED
    */
   @SuppressWarnings("InlinedApi")
-  public static final int COLOR_RANGE_LIMITED = MediaFormat.COLOR_RANGE_LIMITED;
+  public static final int COLOR_RANGE_LIMITED = 0x02;
   /**
    * @see MediaFormat#COLOR_RANGE_FULL
    */
   @SuppressWarnings("InlinedApi")
-  public static final int COLOR_RANGE_FULL = MediaFormat.COLOR_RANGE_FULL;
+  public static final int COLOR_RANGE_FULL = 0x01;
 
   /**
    * Priority for media playback.
    *
    * <p>Larger values indicate higher priorities.
    */
   public static final int PRIORITY_PLAYBACK = 0;
 

--- a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/Format.java
+++ b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/Format.java
@@ -591,20 +591,20 @@ public final class Format implements Par
     return true;
   }
 
   @TargetApi(24)
   private static void maybeSetColorInfoV24(MediaFormat format, ColorInfo colorInfo) {
     if (colorInfo == null) {
       return;
     }
-    maybeSetIntegerV16(format, MediaFormat.KEY_COLOR_TRANSFER, colorInfo.colorTransfer);
-    maybeSetIntegerV16(format, MediaFormat.KEY_COLOR_STANDARD, colorInfo.colorSpace);
-    maybeSetIntegerV16(format, MediaFormat.KEY_COLOR_RANGE, colorInfo.colorRange);
-    maybeSetByteBufferV16(format, MediaFormat.KEY_HDR_STATIC_INFO, colorInfo.hdrStaticInfo);
+    maybeSetIntegerV16(format, "color-transfer", colorInfo.colorTransfer);
+    maybeSetIntegerV16(format, "color-standard", colorInfo.colorSpace);
+    maybeSetIntegerV16(format, "color-range", colorInfo.colorRange);
+    maybeSetByteBufferV16(format, "hdr-static-info", colorInfo.hdrStaticInfo);
   }
 
   @TargetApi(16)
   private static void maybeSetStringV16(MediaFormat format, String key, String value) {
     if (value != null) {
       format.setString(key, value);
     }
   }

--- a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
+++ b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
@@ -125,23 +125,25 @@ public final class CryptoInfo {
       patternHolder.set(patternBlocksToEncrypt, patternBlocksToSkip);
     }
   }
 
   @TargetApi(24)
   private static final class PatternHolderV24 {
 
     private final android.media.MediaCodec.CryptoInfo frameworkCryptoInfo;
-    private final android.media.MediaCodec.CryptoInfo.Pattern pattern;
+
+    // Reference to the two tickets (Bug 1259098, Bug 1365543)
+    // private final android.media.MediaCodec.CryptoInfo.Pattern pattern;
 
     private PatternHolderV24(android.media.MediaCodec.CryptoInfo frameworkCryptoInfo) {
       this.frameworkCryptoInfo = frameworkCryptoInfo;
-      pattern = new android.media.MediaCodec.CryptoInfo.Pattern(0, 0);
+      // pattern = new android.media.MediaCodec.CryptoInfo.Pattern(0, 0);
     }
 
     private void set(int blocksToEncrypt, int blocksToSkip) {
-      pattern.set(blocksToEncrypt, blocksToSkip);
-      frameworkCryptoInfo.setPattern(pattern);
+      // pattern.set(blocksToEncrypt, blocksToSkip);
+      // frameworkCryptoInfo.setPattern(pattern);
     }
 
   }
 
 }