From 5b2e85434406b3bf80d2b5530ab683d2041360c7 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 6 Jul 2021 13:14:41 +0100
Subject: [PATCH] Add missing call and rename getErrorCodeForMediaDrmErrorCode

PiperOrigin-RevId: 383251000
---
 .../common/src/main/java/com/google/android/exoplayer2/C.java | 2 +-
 .../com/google/android/exoplayer2/ExoPlayerImplInternal.java  | 4 +++-
 .../android/exoplayer2/mediacodec/MediaCodecRenderer.java     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/C.java b/library/common/src/main/java/com/google/android/exoplayer2/C.java
index f67d18172e..1203b059cc 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/C.java
@@ -1116,7 +1116,7 @@ public final class C {
   private static final int ERROR_PROVISIONING_RETRY = 28;
 
   @PlaybackException.ErrorCode
-  public static int getErrorCodeCorrespondingToPlatformDrmErrorCode(int mediaDrmErrorCode) {
+  public static int getErrorCodeForMediaDrmErrorCode(int mediaDrmErrorCode) {
     switch (mediaDrmErrorCode) {
       case ERROR_PROVISIONING_CONFIG:
       case ERROR_PROVISIONING_PARSE:
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 4090736a8c..37ea0d6c0c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -3120,10 +3120,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
     }
 
     @DoNotInline
+    @ErrorCode
     public static int mediaDrmStateExceptionToErrorCode(Throwable throwable) {
       @Nullable
       String diagnosticsInfo = ((MediaDrm.MediaDrmStateException) throwable).getDiagnosticInfo();
-      return Util.getErrorCodeFromPlatformDiagnosticsInfo(diagnosticsInfo);
+      int drmErrorCode = Util.getErrorCodeFromPlatformDiagnosticsInfo(diagnosticsInfo);
+      return C.getErrorCodeForMediaDrmErrorCode(drmErrorCode);
     }
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
index 51e5fa5720..38b8cfaa14 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
@@ -1302,7 +1302,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
         }
       } catch (CryptoException e) {
         throw createRendererException(
-            e, inputFormat, C.getErrorCodeCorrespondingToPlatformDrmErrorCode(e.getErrorCode()));
+            e, inputFormat, C.getErrorCodeForMediaDrmErrorCode(e.getErrorCode()));
       }
       return false;
     }
@@ -1373,7 +1373,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
       }
     } catch (CryptoException e) {
       throw createRendererException(
-          e, inputFormat, C.getErrorCodeCorrespondingToPlatformDrmErrorCode(e.getErrorCode()));
+          e, inputFormat, C.getErrorCodeForMediaDrmErrorCode(e.getErrorCode()));
     }
 
     resetInputBuffer();