Modify EventMessageDecoder to return null if decoding fails (currently throws exceptions)

This matches the documentation on MetadataDecoder.decode:
"@return The decoded metadata object, or null if the metadata could not be decoded."

PiperOrigin-RevId: 263767144

library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java

@@ -15,6 +15,7 @@
  */
  */
 package com.google.android.exoplayer2.metadata.emsg;
 package com.google.android.exoplayer2.metadata.emsg;
 
 
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataDecoder;
 import com.google.android.exoplayer2.metadata.MetadataDecoder;
 import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
 import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
@@ -28,14 +29,22 @@ public final class EventMessageDecoder implements MetadataDecoder {
 
 
   @SuppressWarnings("ByteBufferBackingArray")
   @SuppressWarnings("ByteBufferBackingArray")
   @Override
   @Override
+  @Nullable
   public Metadata decode(MetadataInputBuffer inputBuffer) {
   public Metadata decode(MetadataInputBuffer inputBuffer) {
     ByteBuffer buffer = inputBuffer.data;
     ByteBuffer buffer = inputBuffer.data;
     byte[] data = buffer.array();
     byte[] data = buffer.array();
     int size = buffer.limit();
     int size = buffer.limit();
-    return new Metadata(decode(new ParsableByteArray(data, size)));
+    EventMessage decodedEventMessage = decode(new ParsableByteArray(data, size));
+    if (decodedEventMessage == null) {
+      return null;
+    } else {
+      return new Metadata(decodedEventMessage);
+    }
   }
   }
 
 
+  @Nullable
   public EventMessage decode(ParsableByteArray emsgData) {
   public EventMessage decode(ParsableByteArray emsgData) {
+    try {
       String schemeIdUri = Assertions.checkNotNull(emsgData.readNullTerminatedString());
       String schemeIdUri = Assertions.checkNotNull(emsgData.readNullTerminatedString());
       String value = Assertions.checkNotNull(emsgData.readNullTerminatedString());
       String value = Assertions.checkNotNull(emsgData.readNullTerminatedString());
       long durationMs = emsgData.readUnsignedInt();
       long durationMs = emsgData.readUnsignedInt();
@@ -43,6 +52,8 @@ public final class EventMessageDecoder implements MetadataDecoder {
       byte[] messageData =
       byte[] messageData =
           Arrays.copyOfRange(emsgData.data, emsgData.getPosition(), emsgData.limit());
           Arrays.copyOfRange(emsgData.data, emsgData.getPosition(), emsgData.limit());
       return new EventMessage(schemeIdUri, value, durationMs, id, messageData);
       return new EventMessage(schemeIdUri, value, durationMs, id, messageData);
+    } catch (RuntimeException e) {
+      return null;
+    }
   }
   }
-
 }
 }

library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java

@@ -55,7 +55,7 @@ public class MetadataRendererTest {
             /* id= */ 0,
             /* id= */ 0,
             "Test data".getBytes(UTF_8));
             "Test data".getBytes(UTF_8));
 
 
-    List<Metadata> metadata = runRenderer(eventMessageEncoder.encode(emsg));
+    List<Metadata> metadata = runRenderer(EMSG_FORMAT, eventMessageEncoder.encode(emsg));
 
 
     assertThat(metadata).hasSize(1);
     assertThat(metadata).hasSize(1);
     assertThat(metadata.get(0).length()).isEqualTo(1);
     assertThat(metadata.get(0).length()).isEqualTo(1);
@@ -63,6 +63,13 @@ public class MetadataRendererTest {
   }
   }
 
 
   @Test
   @Test
+  public void decodeMetadata_skipsMalformed() throws Exception {
+    List<Metadata> metadata = runRenderer(EMSG_FORMAT, "not valid emsg bytes".getBytes(UTF_8));
+
+    assertThat(metadata).isEmpty();
+  }
+
+  @Test
   public void decodeMetadata_handlesWrappedMetadata() throws Exception {
   public void decodeMetadata_handlesWrappedMetadata() throws Exception {
     EventMessage emsg =
     EventMessage emsg =
         new EventMessage(
         new EventMessage(
@@ -72,7 +79,7 @@ public class MetadataRendererTest {
             /* id= */ 0,
             /* id= */ 0,
             encodeTxxxId3Frame("Test description", "Test value"));
             encodeTxxxId3Frame("Test description", "Test value"));
 
 
-    List<Metadata> metadata = runRenderer(eventMessageEncoder.encode(emsg));
+    List<Metadata> metadata = runRenderer(EMSG_FORMAT, eventMessageEncoder.encode(emsg));
 
 
     assertThat(metadata).hasSize(1);
     assertThat(metadata).hasSize(1);
     assertThat(metadata.get(0).length()).isEqualTo(1);
     assertThat(metadata.get(0).length()).isEqualTo(1);
@@ -91,17 +98,18 @@ public class MetadataRendererTest {
             /* id= */ 0,
             /* id= */ 0,
             "Not a real ID3 tag".getBytes(ISO_8859_1));
             "Not a real ID3 tag".getBytes(ISO_8859_1));
 
 
-    List<Metadata> metadata = runRenderer(eventMessageEncoder.encode(emsg));
+    List<Metadata> metadata = runRenderer(EMSG_FORMAT, eventMessageEncoder.encode(emsg));
 
 
     assertThat(metadata).isEmpty();
     assertThat(metadata).isEmpty();
   }
   }
 
 
-  private static List<Metadata> runRenderer(byte[] input) throws ExoPlaybackException {
+  private static List<Metadata> runRenderer(Format format, byte[] input)
+      throws ExoPlaybackException {
     List<Metadata> metadata = new ArrayList<>();
     List<Metadata> metadata = new ArrayList<>();
     MetadataRenderer renderer = new MetadataRenderer(metadata::add, /* outputLooper= */ null);
     MetadataRenderer renderer = new MetadataRenderer(metadata::add, /* outputLooper= */ null);
     renderer.replaceStream(
     renderer.replaceStream(
-        new Format[] {EMSG_FORMAT},
-        new FakeSampleStream(EMSG_FORMAT, /* eventDispatcher= */ null, input),
+        new Format[] {format},
+        new FakeSampleStream(format, /* eventDispatcher= */ null, input),
         /* offsetUs= */ 0L);
         /* offsetUs= */ 0L);
     renderer.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0); // Read the format
     renderer.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0); // Read the format
     renderer.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0); // Read the data
     renderer.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0); // Read the data

library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java

@@ -360,6 +360,9 @@ public final class PlayerEmsgHandler implements Handler.Callback {
         }
         }
         long eventTimeUs = inputBuffer.timeUs;
         long eventTimeUs = inputBuffer.timeUs;
         Metadata metadata = decoder.decode(inputBuffer);
         Metadata metadata = decoder.decode(inputBuffer);
+        if (metadata == null) {
+          continue;
+        }
         EventMessage eventMessage = (EventMessage) metadata.get(0);
         EventMessage eventMessage = (EventMessage) metadata.get(0);
         if (isPlayerEmsgEvent(eventMessage.schemeIdUri, eventMessage.value)) {
         if (isPlayerEmsgEvent(eventMessage.schemeIdUri, eventMessage.value)) {
           parsePlayerEmsgEvent(eventTimeUs, eventMessage);
           parsePlayerEmsgEvent(eventTimeUs, eventMessage);