Allow empty values in ICY metadata

Issue: #5876 PiperOrigin-RevId: 248119726
google · May 15, 2019 · 3ce0d89 · 3ce0d89
1 parent cea3071
commit 3ce0d89
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -4,7 +4,7 @@
 
 * Fix NPE when using HLS chunkless preparation
   ([#5868](https://github.com/google/ExoPlayer/issues/5868)).
-* Fix handling of line terminators in SHOUTcast ICY metadata
+* Fix handling of empty values and line terminators in SHOUTcast ICY metadata
   ([#5876](https://github.com/google/ExoPlayer/issues/5876)).
 * Offline: Add option to remove all downloads.
 * Add a workaround for a decoder failure on ZTE Axon7 mini devices when playing

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java
@@ -31,7 +31,7 @@ public final class IcyDecoder implements MetadataDecoder {
 
   private static final String TAG = "IcyDecoder";
 
-  private static final Pattern METADATA_ELEMENT = Pattern.compile("(.+?)='(.+?)';", Pattern.DOTALL);
+  private static final Pattern METADATA_ELEMENT = Pattern.compile("(.+?)='(.*?)';", Pattern.DOTALL);
   private static final String STREAM_KEY_NAME = "streamtitle";
   private static final String STREAM_KEY_URL = "streamurl";
 

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
@@ -48,6 +48,17 @@ public void decode_titleOnly() {
     assertThat(streamInfo.url).isNull();
   }
 
+  @Test
+  public void decode_emptyTitle() {
+    IcyDecoder decoder = new IcyDecoder();
+    Metadata metadata = decoder.decode("StreamTitle='';StreamURL='test_url';");
+
+    assertThat(metadata.length()).isEqualTo(1);
+    IcyInfo streamInfo = (IcyInfo) metadata.get(0);
+    assertThat(streamInfo.title).isEmpty();
+    assertThat(streamInfo.url).isEqualTo("test_url");
+  }
+
   @Test
   public void decode_semiColonInTitle() {
     IcyDecoder decoder = new IcyDecoder();