From 17d8e3728fa4fa42898ac0c81c971a9d69bb143e Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Mon, 19 Aug 2019 12:03:55 +0100
Subject: [PATCH] Add support for the AOM scheme_id for ID3-in-EMSG

https://developer.apple.com/documentation/http_live_streaming/about_the_common_media_application_format_with_http_live_streaming

PiperOrigin-RevId: 264126140
---
 .../metadata/emsg/EventMessage.java           | 20 +++++++++++++------
 .../metadata/MetadataRendererTest.java        |  4 ++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
index 6e0b0b40f2..7e3862ca31 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
@@ -27,13 +27,20 @@ import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 
-/**
- * An Event Message (emsg) as defined in ISO 23009-1.
- */
+/** An Event Message (emsg) as defined in ISO 23009-1. */
 public final class EventMessage implements Metadata.Entry {
 
-  @VisibleForTesting
-  public static final String ID3_SCHEME_ID = "https://developer.apple.com/streaming/emsg-id3";
+  /**
+   * emsg scheme_id_uri from the <a href="https://aomediacodec.github.io/av1-id3/#semantics">CMAF
+   * spec</a>.
+   */
+  @VisibleForTesting public static final String ID3_SCHEME_ID_AOM = "https://aomedia.org/emsg/ID3";
+
+  /**
+   * The Apple-hosted scheme_id equivalent to {@code ID3_SCHEME_ID_AOM} - used before AOM adoption.
+   */
+  private static final String ID3_SCHEME_ID_APPLE =
+      "https://developer.apple.com/streaming/emsg-id3";
 
   /**
    * scheme_id_uri from section 7.3.2 of <a
@@ -103,7 +110,8 @@ public final class EventMessage implements Metadata.Entry {
   @Nullable
   public Format getWrappedMetadataFormat() {
     switch (schemeIdUri) {
-      case ID3_SCHEME_ID:
+      case ID3_SCHEME_ID_AOM:
+      case ID3_SCHEME_ID_APPLE:
         return ID3_FORMAT;
       case SCTE35_SCHEME_ID:
         return SCTE35_FORMAT;
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java
index af6489f726..de18d370ec 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java
@@ -96,7 +96,7 @@ public class MetadataRendererTest {
   public void decodeMetadata_handlesId3WrappedInEmsg() throws Exception {
     EventMessage emsg =
         new EventMessage(
-            EventMessage.ID3_SCHEME_ID,
+            EventMessage.ID3_SCHEME_ID_AOM,
             /* value= */ "",
             /* durationMs= */ 1,
             /* id= */ 0,
@@ -133,7 +133,7 @@ public class MetadataRendererTest {
   public void decodeMetadata_skipsMalformedWrappedMetadata() throws Exception {
     EventMessage emsg =
         new EventMessage(
-            EventMessage.ID3_SCHEME_ID,
+            EventMessage.ID3_SCHEME_ID_AOM,
             /* value= */ "",
             /* durationMs= */ 1,
             /* id= */ 0,