From 1bb0703f2b61f0093d80c65211cd51ba30fd6f03 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Thu, 1 Aug 2019 12:15:59 +0100
Subject: [PATCH] return lg specific mime type as codec supported type for
 OMX.lge.alac.decoder

ISSUE: #5938
PiperOrigin-RevId: 261097045
---
 .../exoplayer2/mediacodec/MediaCodecUtil.java | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
index e8fead61ae7..46bc448a4a8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
@@ -370,6 +370,13 @@ private static String getCodecSupportedType(
       boolean secureDecodersExplicit,
       String requestedMimeType) {
     if (isCodecUsableDecoder(info, name, secureDecodersExplicit, requestedMimeType)) {
+      String[] supportedTypes = info.getSupportedTypes();
+      for (String supportedType : supportedTypes) {
+        if (supportedType.equalsIgnoreCase(requestedMimeType)) {
+          return supportedType;
+        }
+      }
+
       if (requestedMimeType.equals(MimeTypes.VIDEO_DOLBY_VISION)) {
         // Handle decoders that declare support for DV via MIME types that aren't
         // video/dolby-vision.
@@ -379,13 +386,12 @@ private static String getCodecSupportedType(
             || "OMX.realtek.video.decoder.tunneled".equals(name)) {
           return "video/dv_hevc";
         }
-      }
-
-      String[] supportedTypes = info.getSupportedTypes();
-      for (String supportedType : supportedTypes) {
-        if (supportedType.equalsIgnoreCase(requestedMimeType)) {
-          return supportedType;
-        }
+      } else if (requestedMimeType.equals(MimeTypes.AUDIO_ALAC)
+          && "OMX.lge.alac.decoder".equals(name)) {
+        return "audio/x-lg-alac";
+      } else if (requestedMimeType.equals(MimeTypes.AUDIO_FLAC)
+          && "OMX.lge.flac.decoder".equals(name)) {
+        return "audio/x-lg-flac";
       }
     }
     return null;