From 1d61c48266b94986bcd045c37ea33f5e6d890581 Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Tue, 21 Nov 2023 10:10:02 -0800
Subject: [PATCH] Rollback of
 https://github.com/androidx/media/commit/136054864993f9df53e6e0e375b7e52fa5648a47

PiperOrigin-RevId: 584358604
---
 RELEASENOTES.md                                               | 2 --
 .../androidx/media3/decoder/ffmpeg/FfmpegAudioRenderer.java   | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 05efedd002..32ade8267d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -93,8 +93,6 @@
         ([#710](https://github.com/androidx/media/pull/710)).
     *   MIDI: Fix issue where seeking forward skips the Program Change events
         ([#704](https://github.com/androidx/media/issues/704).
-    *   Handle unsupported format `xHE-AAC` in `FfmpegAudioRenderer`
-        ([#803](https://github.com/androidx/media/issues/803)).
 *   Leanback extension:
 *   Cast Extension:
     *   Sanitize creation of a `Timeline` to not crash the app when loading
diff --git a/libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/FfmpegAudioRenderer.java b/libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/FfmpegAudioRenderer.java
index 1ff6802c0c..421d3adac0 100644
--- a/libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/FfmpegAudioRenderer.java
+++ b/libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/FfmpegAudioRenderer.java
@@ -97,9 +97,7 @@ public final class FfmpegAudioRenderer extends DecoderAudioRenderer<FfmpegAudioD
       return C.FORMAT_UNSUPPORTED_TYPE;
     } else if (!FfmpegLibrary.supportsFormat(mimeType)
         || (!sinkSupportsFormat(format, C.ENCODING_PCM_16BIT)
-            && !sinkSupportsFormat(format, C.ENCODING_PCM_FLOAT))
-        || (mimeType.equals(MimeTypes.AUDIO_AAC)
-            && MimeTypes.getEncoding(mimeType, format.codecs) == C.ENCODING_AAC_XHE)) {
+            && !sinkSupportsFormat(format, C.ENCODING_PCM_FLOAT))) {
       return C.FORMAT_UNSUPPORTED_SUBTYPE;
     } else if (format.cryptoType != C.CRYPTO_TYPE_NONE) {
       return C.FORMAT_UNSUPPORTED_DRM;