From f935f59eaac1f537f45970dd6601c3dba3273c1c Mon Sep 17 00:00:00 2001
From: Ian Baker <ibaker@google.com>
Date: Wed, 3 Jan 2024 15:54:09 +0000
Subject: [PATCH] Improve logging by including full stack trace, and add
 release note

---
 RELEASENOTES.md                                      |  3 +++
 .../media3/extractor/metadata/id3/Id3Decoder.java    | 12 +++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5b32e1bb58..4b754f3037 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -97,6 +97,9 @@
     *   Fix bug where `MediaMetadata` was only populated from Vorbis comments
         with upper-case keys
         ([#876](https://github.com/androidx/media/issues/876)).
+    *   Catch `OutOfMemoryError` when parsing very large ID3 frames, meaning
+        playback can continue without the tag info instead of playback failing
+        completely.
 *   DRM:
     *   Extend workaround for spurious ClearKey `https://default.url` license
         URL to API 33+ (previously the workaround only applied on API 33
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/id3/Id3Decoder.java b/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/id3/Id3Decoder.java
index 6c07ef5223..2b7bf3c823 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/id3/Id3Decoder.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/id3/Id3Decoder.java
@@ -372,8 +372,8 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
       frameSize = removeUnsynchronization(id3Data, frameSize);
     }
 
-    String error = "";
     Id3Frame frame = null;
+    Throwable error = null;
     try {
       if (frameId0 == 'T'
           && frameId1 == 'X'
@@ -431,10 +431,8 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
         String id = getFrameId(majorVersion, frameId0, frameId1, frameId2, frameId3);
         frame = decodeBinaryFrame(id3Data, frameSize, id);
       }
-    } catch (Exception e) {
-      error = ",error=" + e.getMessage();
-    } catch (OutOfMemoryError e) {
-      error = ",error=" + e.getMessage();
+    } catch (OutOfMemoryError | Exception e) {
+      error = e;
     } finally {
       id3Data.setPosition(nextFramePosition);
     }
@@ -444,8 +442,8 @@ public final class Id3Decoder extends SimpleMetadataDecoder {
           "Failed to decode frame: id="
               + getFrameId(majorVersion, frameId0, frameId1, frameId2, frameId3)
               + ", frameSize="
-              + frameSize
-              + error);
+              + frameSize,
+          error);
     }
     return frame;
   }