Add ID3 TCON genre to MP3 test samples

This change adds a 'free-form' text genre to the existing `bear-id3.mp3` sample, and adds a new sample with a 'numeric' genre ([9 is Metal](https://mutagen-specs.readthedocs.io/en/latest/id3/id3v2.4.0-frames.html#appendix-a-genre-list-from-id3v1)). The samples were modified with: ```shell $ id3edit --set-genre "Gorpcore" bear-id3.mp3 $ id3edit --set-genre "9" bear-id3-numeric-genre.mp3 ``` Reading the numeric genre with `exiftool` shows the mapping back to 'Metal': ``` $ exiftool bear-id3-numeric-genre.mp3 | grep Genre Genre : Metal ``` The playback dumps don't contain the genre because it's not yet propagated to `MediaMetadata.genre`. That is done in a follow-up change. Issue: #1305 PiperOrigin-RevId: 629043506
androidx · Apr 29, 2024 · b0e4817 · b0e4817
1 parent d292f80
commit b0e4817
Show file tree

Hide file tree

Showing 20 changed files with 2,768 additions and 45 deletions.
diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java
@@ -42,6 +42,7 @@ public static ImmutableList<String> mediaSamples() {
         "bear-cbr-constant-frame-size-no-seek-table.mp3",
         "bear-cbr-variable-frame-size-no-seek-table.mp3",
         "bear-id3.mp3",
+        "bear-id3-numeric-genre.mp3",
         "bear-vbr-no-seek-table.mp3",
         "bear-vbr-xing-header.mp3",
         "play-trimmed.mp3",

diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/mp3/Mp3ExtractorTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/mp3/Mp3ExtractorTest.java
@@ -101,4 +101,10 @@ public void mp3SampleWithId3Disabled() throws Exception {
             .build(),
         simulationConfig);
   }
+
+  @Test
+  public void mp3SampleWithId3NumericGenre() throws Exception {
+    ExtractorAsserts.assertBehavior(
+        Mp3Extractor::new, "media/mp3/bear-id3-numeric-genre.mp3", simulationConfig);
+  }
 }
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-disabled.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-disabled.0.dump
@@ -1,10 +1,10 @@
 seekMap:
   isSeekable = true
   duration = 2808000
-  getPosition(0) = [[timeUs=0, position=39740]]
-  getPosition(1) = [[timeUs=0, position=39740]]
-  getPosition(1404000) = [[timeUs=1404000, position=58820]]
-  getPosition(2808000) = [[timeUs=2808000, position=77900]]
+  getPosition(0) = [[timeUs=0, position=39743]]
+  getPosition(1) = [[timeUs=0, position=39743]]
+  getPosition(1404000) = [[timeUs=1404000, position=58823]]
+  getPosition(2808000) = [[timeUs=2808000, position=77903]]
 numberOfTracks = 1
 track 0:
   total output bytes = 38160

diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-disabled.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-disabled.1.dump
@@ -1,10 +1,10 @@
 seekMap:
   isSeekable = true
   duration = 2808000
-  getPosition(0) = [[timeUs=0, position=39740]]
-  getPosition(1) = [[timeUs=0, position=39740]]
-  getPosition(1404000) = [[timeUs=1404000, position=58820]]
-  getPosition(2808000) = [[timeUs=2808000, position=77900]]
+  getPosition(0) = [[timeUs=0, position=39743]]
+  getPosition(1) = [[timeUs=0, position=39743]]
+  getPosition(1404000) = [[timeUs=1404000, position=58823]]
+  getPosition(2808000) = [[timeUs=2808000, position=77903]]
 numberOfTracks = 1
 track 0:
   total output bytes = 25344

diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-disabled.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-disabled.2.dump
@@ -1,10 +1,10 @@
 seekMap:
   isSeekable = true
   duration = 2808000
-  getPosition(0) = [[timeUs=0, position=39740]]
-  getPosition(1) = [[timeUs=0, position=39740]]
-  getPosition(1404000) = [[timeUs=1404000, position=58820]]
-  getPosition(2808000) = [[timeUs=2808000, position=77900]]
+  getPosition(0) = [[timeUs=0, position=39743]]
+  getPosition(1) = [[timeUs=0, position=39743]]
+  getPosition(1404000) = [[timeUs=1404000, position=58823]]
+  getPosition(2808000) = [[timeUs=2808000, position=77903]]
 numberOfTracks = 1
 track 0:
   total output bytes = 12624

diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-disabled.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-disabled.3.dump
@@ -1,10 +1,10 @@
 seekMap:
   isSeekable = true
   duration = 2808000
-  getPosition(0) = [[timeUs=0, position=39740]]
-  getPosition(1) = [[timeUs=0, position=39740]]
-  getPosition(1404000) = [[timeUs=1404000, position=58820]]
-  getPosition(2808000) = [[timeUs=2808000, position=77900]]
+  getPosition(0) = [[timeUs=0, position=39743]]
+  getPosition(1) = [[timeUs=0, position=39743]]
+  getPosition(1404000) = [[timeUs=1404000, position=58823]]
+  getPosition(2808000) = [[timeUs=2808000, position=77903]]
 numberOfTracks = 1
 track 0:
   total output bytes = 0

diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-disabled.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-disabled.unknown_length.dump
@@ -1,10 +1,10 @@
 seekMap:
   isSeekable = true
   duration = 2808000
-  getPosition(0) = [[timeUs=0, position=39740]]
-  getPosition(1) = [[timeUs=0, position=39740]]
-  getPosition(1404000) = [[timeUs=1404000, position=58820]]
-  getPosition(2808000) = [[timeUs=2808000, position=77900]]
+  getPosition(0) = [[timeUs=0, position=39743]]
+  getPosition(1) = [[timeUs=0, position=39743]]
+  getPosition(1404000) = [[timeUs=1404000, position=58823]]
+  getPosition(2808000) = [[timeUs=2808000, position=77903]]
 numberOfTracks = 1
 track 0:
   total output bytes = 38160

diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-enabled.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-enabled.0.dump
@@ -1,10 +1,10 @@
 seekMap:
   isSeekable = true
   duration = 2808000
-  getPosition(0) = [[timeUs=0, position=39740]]
-  getPosition(1) = [[timeUs=0, position=39740]]
-  getPosition(1404000) = [[timeUs=1404000, position=58820]]
-  getPosition(2808000) = [[timeUs=2808000, position=77900]]
+  getPosition(0) = [[timeUs=0, position=39743]]
+  getPosition(1) = [[timeUs=0, position=39743]]
+  getPosition(1404000) = [[timeUs=1404000, position=58823]]
+  getPosition(2808000) = [[timeUs=2808000, position=77903]]
 numberOfTracks = 1
 track 0:
   total output bytes = 38160
@@ -16,7 +16,7 @@ track 0:
     sampleRate = 48000
     encoderDelay = 576
     encoderPadding = 576
-    metadata = entries=[TIT2: description=null: values=[Test title], TPE1: description=null: values=[Test Artist], TALB: description=null: values=[Test Album], TXXX: description=Test description: values=[Test user info], COMM: language=eng, description=Test description, text=Test comment, WXXX: url=Test URL, TSSE: description=null: values=[Lavf58.29.100], MLLT, PRIV: owner=test@gmail.com, UNKN, GEOB: mimeType=test/mime, filename=Testfilename.txt, description=Test description, CHAP, CHAP, CTOC, APIC: mimeType=image/jpeg, description=Test description]
+    metadata = entries=[TIT2: description=null: values=[Test title], TPE1: description=null: values=[Test Artist], TALB: description=null: values=[Test Album], TXXX: description=Test description: values=[Test user info], COMM: language=eng, description=Test description, text=Test comment, WXXX: url=Test URL, TSSE: description=null: values=[Lavf58.29.100], MLLT, PRIV: owner=test@gmail.com, UNKN, GEOB: mimeType=test/mime, filename=Testfilename.txt, description=Test description, CHAP, CHAP, CTOC, APIC: mimeType=image/jpeg, description=Test description, TCON: description=null: values=[Gorpcore]]
   sample 0:
     time = 0
     flags = 1

diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-enabled.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-enabled.1.dump
@@ -1,10 +1,10 @@
 seekMap:
   isSeekable = true
   duration = 2808000
-  getPosition(0) = [[timeUs=0, position=39740]]
-  getPosition(1) = [[timeUs=0, position=39740]]
-  getPosition(1404000) = [[timeUs=1404000, position=58820]]
-  getPosition(2808000) = [[timeUs=2808000, position=77900]]
+  getPosition(0) = [[timeUs=0, position=39743]]
+  getPosition(1) = [[timeUs=0, position=39743]]
+  getPosition(1404000) = [[timeUs=1404000, position=58823]]
+  getPosition(2808000) = [[timeUs=2808000, position=77903]]
 numberOfTracks = 1
 track 0:
   total output bytes = 25344
@@ -16,7 +16,7 @@ track 0:
     sampleRate = 48000
     encoderDelay = 576
     encoderPadding = 576
-    metadata = entries=[TIT2: description=null: values=[Test title], TPE1: description=null: values=[Test Artist], TALB: description=null: values=[Test Album], TXXX: description=Test description: values=[Test user info], COMM: language=eng, description=Test description, text=Test comment, WXXX: url=Test URL, TSSE: description=null: values=[Lavf58.29.100], MLLT, PRIV: owner=test@gmail.com, UNKN, GEOB: mimeType=test/mime, filename=Testfilename.txt, description=Test description, CHAP, CHAP, CTOC, APIC: mimeType=image/jpeg, description=Test description]
+    metadata = entries=[TIT2: description=null: values=[Test title], TPE1: description=null: values=[Test Artist], TALB: description=null: values=[Test Album], TXXX: description=Test description: values=[Test user info], COMM: language=eng, description=Test description, text=Test comment, WXXX: url=Test URL, TSSE: description=null: values=[Lavf58.29.100], MLLT, PRIV: owner=test@gmail.com, UNKN, GEOB: mimeType=test/mime, filename=Testfilename.txt, description=Test description, CHAP, CHAP, CTOC, APIC: mimeType=image/jpeg, description=Test description, TCON: description=null: values=[Gorpcore]]
   sample 0:
     time = 943000
     flags = 1

diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-enabled.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-enabled.2.dump
@@ -1,10 +1,10 @@
 seekMap:
   isSeekable = true
   duration = 2808000
-  getPosition(0) = [[timeUs=0, position=39740]]
-  getPosition(1) = [[timeUs=0, position=39740]]
-  getPosition(1404000) = [[timeUs=1404000, position=58820]]
-  getPosition(2808000) = [[timeUs=2808000, position=77900]]
+  getPosition(0) = [[timeUs=0, position=39743]]
+  getPosition(1) = [[timeUs=0, position=39743]]
+  getPosition(1404000) = [[timeUs=1404000, position=58823]]
+  getPosition(2808000) = [[timeUs=2808000, position=77903]]
 numberOfTracks = 1
 track 0:
   total output bytes = 12624
@@ -16,7 +16,7 @@ track 0:
     sampleRate = 48000
     encoderDelay = 576
     encoderPadding = 576
-    metadata = entries=[TIT2: description=null: values=[Test title], TPE1: description=null: values=[Test Artist], TALB: description=null: values=[Test Album], TXXX: description=Test description: values=[Test user info], COMM: language=eng, description=Test description, text=Test comment, WXXX: url=Test URL, TSSE: description=null: values=[Lavf58.29.100], MLLT, PRIV: owner=test@gmail.com, UNKN, GEOB: mimeType=test/mime, filename=Testfilename.txt, description=Test description, CHAP, CHAP, CTOC, APIC: mimeType=image/jpeg, description=Test description]
+    metadata = entries=[TIT2: description=null: values=[Test title], TPE1: description=null: values=[Test Artist], TALB: description=null: values=[Test Album], TXXX: description=Test description: values=[Test user info], COMM: language=eng, description=Test description, text=Test comment, WXXX: url=Test URL, TSSE: description=null: values=[Lavf58.29.100], MLLT, PRIV: owner=test@gmail.com, UNKN, GEOB: mimeType=test/mime, filename=Testfilename.txt, description=Test description, CHAP, CHAP, CTOC, APIC: mimeType=image/jpeg, description=Test description, TCON: description=null: values=[Gorpcore]]
   sample 0:
     time = 1879000
     flags = 1

diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-enabled.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-enabled.3.dump
@@ -1,10 +1,10 @@
 seekMap:
   isSeekable = true
   duration = 2808000
-  getPosition(0) = [[timeUs=0, position=39740]]
-  getPosition(1) = [[timeUs=0, position=39740]]
-  getPosition(1404000) = [[timeUs=1404000, position=58820]]
-  getPosition(2808000) = [[timeUs=2808000, position=77900]]
+  getPosition(0) = [[timeUs=0, position=39743]]
+  getPosition(1) = [[timeUs=0, position=39743]]
+  getPosition(1404000) = [[timeUs=1404000, position=58823]]
+  getPosition(2808000) = [[timeUs=2808000, position=77903]]
 numberOfTracks = 1
 track 0:
   total output bytes = 0
@@ -16,5 +16,5 @@ track 0:
     sampleRate = 48000
     encoderDelay = 576
     encoderPadding = 576
-    metadata = entries=[TIT2: description=null: values=[Test title], TPE1: description=null: values=[Test Artist], TALB: description=null: values=[Test Album], TXXX: description=Test description: values=[Test user info], COMM: language=eng, description=Test description, text=Test comment, WXXX: url=Test URL, TSSE: description=null: values=[Lavf58.29.100], MLLT, PRIV: owner=test@gmail.com, UNKN, GEOB: mimeType=test/mime, filename=Testfilename.txt, description=Test description, CHAP, CHAP, CTOC, APIC: mimeType=image/jpeg, description=Test description]
+    metadata = entries=[TIT2: description=null: values=[Test title], TPE1: description=null: values=[Test Artist], TALB: description=null: values=[Test Album], TXXX: description=Test description: values=[Test user info], COMM: language=eng, description=Test description, text=Test comment, WXXX: url=Test URL, TSSE: description=null: values=[Lavf58.29.100], MLLT, PRIV: owner=test@gmail.com, UNKN, GEOB: mimeType=test/mime, filename=Testfilename.txt, description=Test description, CHAP, CHAP, CTOC, APIC: mimeType=image/jpeg, description=Test description, TCON: description=null: values=[Gorpcore]]
 tracksEnded = true
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-enabled.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-enabled.unknown_length.dump
@@ -1,10 +1,10 @@
 seekMap:
   isSeekable = true
   duration = 2808000
-  getPosition(0) = [[timeUs=0, position=39740]]
-  getPosition(1) = [[timeUs=0, position=39740]]
-  getPosition(1404000) = [[timeUs=1404000, position=58820]]
-  getPosition(2808000) = [[timeUs=2808000, position=77900]]
+  getPosition(0) = [[timeUs=0, position=39743]]
+  getPosition(1) = [[timeUs=0, position=39743]]
+  getPosition(1404000) = [[timeUs=1404000, position=58823]]
+  getPosition(2808000) = [[timeUs=2808000, position=77903]]
 numberOfTracks = 1
 track 0:
   total output bytes = 38160
@@ -16,7 +16,7 @@ track 0:
     sampleRate = 48000
     encoderDelay = 576
     encoderPadding = 576
-    metadata = entries=[TIT2: description=null: values=[Test title], TPE1: description=null: values=[Test Artist], TALB: description=null: values=[Test Album], TXXX: description=Test description: values=[Test user info], COMM: language=eng, description=Test description, text=Test comment, WXXX: url=Test URL, TSSE: description=null: values=[Lavf58.29.100], MLLT, PRIV: owner=test@gmail.com, UNKN, GEOB: mimeType=test/mime, filename=Testfilename.txt, description=Test description, CHAP, CHAP, CTOC, APIC: mimeType=image/jpeg, description=Test description]
+    metadata = entries=[TIT2: description=null: values=[Test title], TPE1: description=null: values=[Test Artist], TALB: description=null: values=[Test Album], TXXX: description=Test description: values=[Test user info], COMM: language=eng, description=Test description, text=Test comment, WXXX: url=Test URL, TSSE: description=null: values=[Lavf58.29.100], MLLT, PRIV: owner=test@gmail.com, UNKN, GEOB: mimeType=test/mime, filename=Testfilename.txt, description=Test description, CHAP, CHAP, CTOC, APIC: mimeType=image/jpeg, description=Test description, TCON: description=null: values=[Gorpcore]]
   sample 0:
     time = 0
     flags = 1