Populate ICY headers into MediaMetadata

Populate ICY headers into MediaMetadata so that they can propagate to the app via AnalyticsListener#onMediaMetadataChanged(). This change copies IcyHeaders.name into MediaMetadata.description and IcyHeaders.genre into MediaMetadata.genre. Note: MediaItem.metadata maintain their precedence and overwrite any ICY headers parsed. Issue: #9677 PiperOrigin-RevId: 410495676
google · Nov 18, 2021 · 16e31a8 · 16e31a8
1 parent 8320fe8
commit 16e31a8
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 2 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,5 +1,11 @@
 # Release notes
 
+### dev-v2 (not yet released)
+
+*   HLS:
+    *   Correctly populate `Format.label` for audio only HLS streams
+        ([#9608](https://github.com/google/ExoPlayer/issues/9608)).
+
 ### 2.16.1 (2021-11-16)
 
 *   Core Library:
@@ -14,6 +20,11 @@
         `buildVideoRenderers()` or `buildAudioRenderers()` can access the codec
         adapter factory and pass it to `MediaCodecRenderer` instances they
         create.
+*   Metadata:
+    *   Propagate ICY header fields `name` and `genre` to
+        `MediaMetadata.station` and `MediaMetadata.genre` respectively so that
+        they reach the app via `Player.Listener.onMediaMetadataChanged()`
+        ((#9677)[https://github.com/google/ExoPlayer/issues/9677]).
 *   Extractors:
     *   WAV: Add support for RF64 streams
         ([#9543](https://github.com/google/ExoPlayer/issues/9543).

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/MediaMetadata.java b/library/common/src/main/java/com/google/android/exoplayer2/MediaMetadata.java
@@ -75,6 +75,7 @@ public static final class Builder {
     @Nullable private Integer totalDiscCount;
     @Nullable private CharSequence genre;
     @Nullable private CharSequence compilation;
+    @Nullable private CharSequence station;
     @Nullable private Bundle extras;
 
     public Builder() {}
@@ -110,6 +111,7 @@ private Builder(MediaMetadata mediaMetadata) {
       this.totalDiscCount = mediaMetadata.totalDiscCount;
       this.genre = mediaMetadata.genre;
       this.compilation = mediaMetadata.compilation;
+      this.station = mediaMetadata.station;
       this.extras = mediaMetadata.extras;
     }
 
@@ -346,6 +348,12 @@ public Builder setCompilation(@Nullable CharSequence compilation) {
       return this;
     }
 
+    /** Sets the name of the station streaming the media. */
+    public Builder setStation(@Nullable CharSequence station) {
+      this.station = station;
+      return this;
+    }
+
     /** Sets the extras {@link Bundle}. */
     public Builder setExtras(@Nullable Bundle extras) {
       this.extras = extras;
@@ -485,6 +493,9 @@ public Builder populate(@Nullable MediaMetadata mediaMetadata) {
       if (mediaMetadata.compilation != null) {
         setCompilation(mediaMetadata.compilation);
       }
+      if (mediaMetadata.station != null) {
+        setStation(mediaMetadata.station);
+      }
       if (mediaMetadata.extras != null) {
         setExtras(mediaMetadata.extras);
       }
@@ -679,6 +690,8 @@ public MediaMetadata build() {
   @Nullable public final CharSequence genre;
   /** Optional compilation. */
   @Nullable public final CharSequence compilation;
+  /** Optional name of the station streaming the media. */
+  @Nullable public final CharSequence station;
 
   /**
    * Optional extras {@link Bundle}.
@@ -720,6 +733,7 @@ private MediaMetadata(Builder builder) {
     this.totalDiscCount = builder.totalDiscCount;
     this.genre = builder.genre;
     this.compilation = builder.compilation;
+    this.station = builder.station;
     this.extras = builder.extras;
   }
 
@@ -766,7 +780,8 @@ public boolean equals(@Nullable Object obj) {
         && Util.areEqual(discNumber, that.discNumber)
         && Util.areEqual(totalDiscCount, that.totalDiscCount)
         && Util.areEqual(genre, that.genre)
-        && Util.areEqual(compilation, that.compilation);
+        && Util.areEqual(compilation, that.compilation)
+        && Util.areEqual(station, that.station);
   }
 
   @Override
@@ -801,7 +816,8 @@ public int hashCode() {
         discNumber,
         totalDiscCount,
         genre,
-        compilation);
+        compilation,
+        station);
   }
 
   // Bundleable implementation.
@@ -839,6 +855,7 @@ public int hashCode() {
     FIELD_TOTAL_DISC_COUNT,
     FIELD_GENRE,
     FIELD_COMPILATION,
+    FIELD_STATION,
     FIELD_EXTRAS
   })
   private @interface FieldNumber {}
@@ -873,6 +890,7 @@ public int hashCode() {
   private static final int FIELD_GENRE = 27;
   private static final int FIELD_COMPILATION = 28;
   private static final int FIELD_ARTWORK_DATA_TYPE = 29;
+  private static final int FIELD_STATION = 30;
   private static final int FIELD_EXTRAS = 1000;
 
   @Override
@@ -893,6 +911,7 @@ public Bundle toBundle() {
     bundle.putCharSequence(keyForField(FIELD_CONDUCTOR), conductor);
     bundle.putCharSequence(keyForField(FIELD_GENRE), genre);
     bundle.putCharSequence(keyForField(FIELD_COMPILATION), compilation);
+    bundle.putCharSequence(keyForField(FIELD_STATION), station);
 
     if (userRating != null) {
       bundle.putBundle(keyForField(FIELD_USER_RATING), userRating.toBundle());
@@ -970,6 +989,7 @@ private static MediaMetadata fromBundle(Bundle bundle) {
         .setConductor(bundle.getCharSequence(keyForField(FIELD_CONDUCTOR)))
         .setGenre(bundle.getCharSequence(keyForField(FIELD_GENRE)))
         .setCompilation(bundle.getCharSequence(keyForField(FIELD_COMPILATION)))
+        .setStation(bundle.getCharSequence(keyForField(FIELD_STATION)))
         .setExtras(bundle.getBundle(keyForField(FIELD_EXTRAS)));
 
     if (bundle.containsKey(keyForField(FIELD_USER_RATING))) {

diff --git a/library/common/src/test/java/com/google/android/exoplayer2/MediaMetadataTest.java b/library/common/src/test/java/com/google/android/exoplayer2/MediaMetadataTest.java
@@ -64,6 +64,7 @@ public void builder_minimal_correctDefaults() {
     assertThat(mediaMetadata.totalDiscCount).isNull();
     assertThat(mediaMetadata.genre).isNull();
     assertThat(mediaMetadata.compilation).isNull();
+    assertThat(mediaMetadata.station).isNull();
     assertThat(mediaMetadata.extras).isNull();
   }
 
@@ -149,6 +150,7 @@ private static MediaMetadata getFullyPopulatedMediaMetadata() {
         .setTotalDiscCount(3)
         .setGenre("Pop")
         .setCompilation("Amazing songs.")
+        .setStation("radio station")
         .setExtras(extras)
         .build();
   }

diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java
@@ -20,6 +20,7 @@
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.MediaMetadata;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Log;
@@ -169,6 +170,16 @@ public IcyHeaders(
     metadataInterval = in.readInt();
   }
 
+  @Override
+  public void populateMediaMetadata(MediaMetadata.Builder builder) {
+    if (name != null) {
+      builder.setStation(name);
+    }
+    if (genre != null) {
+      builder.setGenre(genre);
+    }
+  }
+
   @Override
   public boolean equals(@Nullable Object obj) {
     if (this == obj) {

diff --git a/...ry/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java b/...ry/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
@@ -19,6 +19,7 @@
 
 import android.os.Parcel;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.MediaMetadata;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -45,4 +46,23 @@ public void parcelEquals() {
     // Assert equals.
     assertThat(fromParcelIcyHeaders).isEqualTo(icyHeaders);
   }
+
+  @Test
+  public void populateMediaMetadata() {
+    IcyHeaders headers =
+        new IcyHeaders(
+            /* bitrate= */ 1234,
+            /* genre= */ "pop",
+            /* name= */ "radio station",
+            /* url= */ "url",
+            /* isPublic= */ true,
+            /* metadataInterval= */ 5678);
+    MediaMetadata.Builder builder = new MediaMetadata.Builder();
+
+    headers.populateMediaMetadata(builder);
+    MediaMetadata mediaMetadata = builder.build();
+
+    assertThat(mediaMetadata.station.toString()).isEqualTo("radio station");
+    assertThat(mediaMetadata.genre.toString()).isEqualTo("pop");
+  }
 }