Verify metadata in extractor tests

PiperOrigin-RevId: 283960017

Verify metadata in extractor tests
PiperOrigin-RevId: 283960017
cbdf45aa · andrewlewis · Oliver Woodman · f3ba7432 · cbdf45aa · cbdf45aa
Commit cbdf45aa authored Dec 05, 2019 by andrewlewis Committed by Oliver Woodman Dec 06, 2019
Showing with 317 additions and 8 deletions
extensions/flac/src/androidTest/assets/bear.flac.0.dump
extensions/flac/src/androidTest/assets/bear.flac.1.dump
extensions/flac/src/androidTest/assets/bear.flac.2.dump
extensions/flac/src/androidTest/assets/bear.flac.3.dump
extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump
extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump
extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump
extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump
library/core/src/test/assets/amr/sample_nb.amr.0.dump
library/core/src/test/assets/amr/sample_nb_cbr.amr.0.dump
library/core/src/test/assets/amr/sample_nb_cbr.amr.1.dump
library/core/src/test/assets/amr/sample_nb_cbr.amr.2.dump
library/core/src/test/assets/amr/sample_nb_cbr.amr.3.dump
library/core/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
library/core/src/test/assets/amr/sample_wb.amr.0.dump
library/core/src/test/assets/amr/sample_wb_cbr.amr.0.dump
library/core/src/test/assets/amr/sample_wb_cbr.amr.1.dump
library/core/src/test/assets/amr/sample_wb_cbr.amr.2.dump
library/core/src/test/assets/amr/sample_wb_cbr.amr.3.dump
library/core/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
--- a/extensions/flac/src/androidTest/assets/bear.flac.0.dump
+++ b/extensions/flac/src/androidTest/assets/bear.flac.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
  total output bytes = 526272
  sample count = 33

--- a/extensions/flac/src/androidTest/assets/bear.flac.1.dump
+++ b/extensions/flac/src/androidTest/assets/bear.flac.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
  total output bytes = 362432
  sample count = 23

--- a/extensions/flac/src/androidTest/assets/bear.flac.2.dump
+++ b/extensions/flac/src/androidTest/assets/bear.flac.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
  total output bytes = 182208
  sample count = 12

--- a/extensions/flac/src/androidTest/assets/bear.flac.3.dump
+++ b/extensions/flac/src/androidTest/assets/bear.flac.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
  total output bytes = 18368
  sample count = 2

--- a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump
+++ b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
  total output bytes = 526272
  sample count = 33

--- a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump
+++ b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
  total output bytes = 362432
  sample count = 23

--- a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump
+++ b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
  total output bytes = 182208
  sample count = 12

--- a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump
+++ b/extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
  total output bytes = 18368
  sample count = 2

--- a/library/core/src/test/assets/amr/sample_nb.amr.0.dump
+++ b/library/core/src/test/assets/amr/sample_nb.amr.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 2834
  sample count = 218

--- a/library/core/src/test/assets/amr/sample_nb_cbr.amr.0.dump
+++ b/library/core/src/test/assets/amr/sample_nb_cbr.amr.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 2834
  sample count = 218

--- a/library/core/src/test/assets/amr/sample_nb_cbr.amr.1.dump
+++ b/library/core/src/test/assets/amr/sample_nb_cbr.amr.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 1898
  sample count = 146

--- a/library/core/src/test/assets/amr/sample_nb_cbr.amr.2.dump
+++ b/library/core/src/test/assets/amr/sample_nb_cbr.amr.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 949
  sample count = 73

--- a/library/core/src/test/assets/amr/sample_nb_cbr.amr.3.dump
+++ b/library/core/src/test/assets/amr/sample_nb_cbr.amr.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 13
  sample count = 1

--- a/library/core/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
+++ b/library/core/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 2834
  sample count = 218

--- a/library/core/src/test/assets/amr/sample_wb.amr.0.dump
+++ b/library/core/src/test/assets/amr/sample_wb.amr.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 4056
  sample count = 169

--- a/library/core/src/test/assets/amr/sample_wb_cbr.amr.0.dump
+++ b/library/core/src/test/assets/amr/sample_wb_cbr.amr.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 4056
  sample count = 169

--- a/library/core/src/test/assets/amr/sample_wb_cbr.amr.1.dump
+++ b/library/core/src/test/assets/amr/sample_wb_cbr.amr.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 2712
  sample count = 113

--- a/library/core/src/test/assets/amr/sample_wb_cbr.amr.2.dump
+++ b/library/core/src/test/assets/amr/sample_wb_cbr.amr.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 1368
  sample count = 57

--- a/library/core/src/test/assets/amr/sample_wb_cbr.amr.3.dump
+++ b/library/core/src/test/assets/amr/sample_wb_cbr.amr.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 24
  sample count = 1

--- a/library/core/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
+++ b/library/core/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 4056
  sample count = 169

--- a/library/core/src/test/assets/flac/bear.flac.0.dump
+++ b/library/core/src/test/assets/flac/bear.flac.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 164431

--- a/library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac.0.dump
+++ b/library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 9218FDB7
  total output bytes = 164431

--- a/library/core/src/test/assets/flac/bear_no_num_samples.flac.0.dump
+++ b/library/core/src/test/assets/flac/bear_no_num_samples.flac.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 49FA2C21
  total output bytes = 164431

--- a/library/core/src/test/assets/flac/bear_one_metadata_block.flac.0.dump
+++ b/library/core/src/test/assets/flac/bear_one_metadata_block.flac.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 164431

--- a/library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac.0.dump
+++ b/library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 7249A1B8
  total output bytes = 144086

--- a/library/core/src/test/assets/flac/bear_with_id3.flac
+++ b/library/core/src/test/assets/flac/bear_with_id3.flac
--- a/library/core/src/test/assets/flac/bear_with_id3_disabled.flac.0.dump
+++ b/library/core/src/test/assets/flac/bear_with_id3_disabled.flac.0.dump
+seekMap:
+  isSeekable = false
+  duration = 2741000
+  getPosition(0) = [[timeUs=0, position=0]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = 1536000
+    id = null
+    containerMimeType = null
+    sampleMimeType = audio/flac
+    maxInputSize = 5776
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    metadata = entries=[]
+    initializationData:
+      data = length 42, hash 83F6895
+  total output bytes = 164431
+  sample count = 33
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 5030, hash D2B60530
+  sample 1:
+    time = 85333
+    flags = 1
+    data = length 5066, hash 4C932A54
+  sample 2:
+    time = 170666
+    flags = 1
+    data = length 5112, hash 7E5A7B61
+  sample 3:
+    time = 256000
+    flags = 1
+    data = length 5044, hash 7EF93F13
+  sample 4:
+    time = 341333
+    flags = 1
+    data = length 4943, hash DE7E27F8
+  sample 5:
+    time = 426666
+    flags = 1
+    data = length 5121, hash 6D0D0B40
+  sample 6:
+    time = 512000
+    flags = 1
+    data = length 5068, hash 9924644F
+  sample 7:
+    time = 597333
+    flags = 1
+    data = length 5143, hash 6C34F0CE
+  sample 8:
+    time = 682666
+    flags = 1
+    data = length 5109, hash E3B7BEFB
+  sample 9:
+    time = 768000
+    flags = 1
+    data = length 5129, hash 44111D9B
+  sample 10:
+    time = 853333
+    flags = 1
+    data = length 5031, hash 9D55EA53
+  sample 11:
+    time = 938666
+    flags = 1
+    data = length 5119, hash E1CB9BA6
+  sample 12:
+    time = 1024000
+    flags = 1
+    data = length 5360, hash 17265C5D
+  sample 13:
+    time = 1109333
+    flags = 1
+    data = length 5340, hash A90FDDF1
+  sample 14:
+    time = 1194666
+    flags = 1
+    data = length 5162, hash 31F65AD5
+  sample 15:
+    time = 1280000
+    flags = 1
+    data = length 5168, hash F2394F2D
+  sample 16:
+    time = 1365333
+    flags = 1
+    data = length 5776, hash 58437AB3
+  sample 17:
+    time = 1450666
+    flags = 1
+    data = length 5394, hash EBAB20A8
+  sample 18:
+    time = 1536000
+    flags = 1
+    data = length 5168, hash BF37C7A5
+  sample 19:
+    time = 1621333
+    flags = 1
+    data = length 5324, hash 59546B7B
+  sample 20:
+    time = 1706666
+    flags = 1
+    data = length 5172, hash 6036EF0B
+  sample 21:
+    time = 1792000
+    flags = 1
+    data = length 5102, hash 5A131071
+  sample 22:
+    time = 1877333
+    flags = 1
+    data = length 5111, hash 3D9EBB3B
+  sample 23:
+    time = 1962666
+    flags = 1
+    data = length 5113, hash 61101D4F
+  sample 24:
+    time = 2048000
+    flags = 1
+    data = length 5229, hash D2E55742
+  sample 25:
+    time = 2133333
+    flags = 1
+    data = length 5162, hash 7F2E97FA
+  sample 26:
+    time = 2218666
+    flags = 1
+    data = length 5255, hash D92A782
+  sample 27:
+    time = 2304000
+    flags = 1
+    data = length 5196, hash 98FE5138
+  sample 28:
+    time = 2389333
+    flags = 1
+    data = length 5214, hash 3D35C38C
+  sample 29:
+    time = 2474666
+    flags = 1
+    data = length 5211, hash 7E25420F
+  sample 30:
+    time = 2560000
+    flags = 1
+    data = length 5230, hash 2AD96FBC
+  sample 31:
+    time = 2645333
+    flags = 1
+    data = length 3384, hash 938BCDD9
+  sample 32:
+    time = 2730666
+    flags = 1
+    data = length 445, hash A388E3D6
+tracksEnded = true
--- a/library/core/src/test/assets/flac/bear_with_id3_enabled.flac
+++ b/library/core/src/test/assets/flac/bear_with_id3_enabled.flac
--- a/library/core/src/test/assets/flac/bear_with_id3.flac.0.dump
+++ b/library/core/src/test/assets/flac/bear_with_id3.flac.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[TXXX: description=ID: value=105519843, TIT2: description=null: value=那么爱你为什么, TPE1: description=null: value=阿强, TALB: description=null: value=华丽的外衣, TXXX: description=ID: value=105519843, APIC: mimeType=image/jpeg, description=]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 164431

--- a/library/core/src/test/assets/flac/bear_with_picture.flac.0.dump
+++ b/library/core/src/test/assets/flac/bear_with_picture.flac.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[Picture: mimeType=image/png, description=]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 164431

--- a/library/core/src/test/assets/flac/bear_with_vorbis_comments.flac.0.dump
+++ b/library/core/src/test/assets/flac/bear_with_vorbis_comments.flac.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[VC: TITLE=test title, VC: ARTIST=test artist]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 164431

--- a/library/core/src/test/assets/flv/sample.flv.0.dump
+++ b/library/core/src/test/assets/flv/sample.flv.0.dump
@@ -24,6 +24,7 @@ track 8:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 9529
@@ -229,6 +230,7 @@ track 9:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B

--- a/library/core/src/test/assets/mkv/sample.mkv.0.dump
+++ b/library/core/src/test/assets/mkv/sample.mkv.0.dump
@@ -24,6 +24,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 2:
    selectionFlags = 1
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 12120
  sample count = 29

--- a/library/core/src/test/assets/mkv/sample.mkv.1.dump
+++ b/library/core/src/test/assets/mkv/sample.mkv.1.dump
@@ -24,6 +24,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
@@ -138,6 +139,7 @@ track 2:
    selectionFlags = 1
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 8778
  sample count = 21

--- a/library/core/src/test/assets/mkv/sample.mkv.2.dump
+++ b/library/core/src/test/assets/mkv/sample.mkv.2.dump
@@ -24,6 +24,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
@@ -94,6 +95,7 @@ track 2:
    selectionFlags = 1
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 4180
  sample count = 10

--- a/library/core/src/test/assets/mkv/sample.mkv.3.dump
+++ b/library/core/src/test/assets/mkv/sample.mkv.3.dump
@@ -24,6 +24,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 30, hash F6F3D010
      data = length 10, hash 7A0D0F2B
@@ -50,6 +51,7 @@ track 2:
    selectionFlags = 1
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 1254
  sample count = 3

--- a/library/core/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump
+++ b/library/core/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump
@@ -24,6 +24,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = 1305012705
+    metadata = null
    initializationData:
  total output bytes = 39
  sample count = 1

--- a/library/core/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump
+++ b/library/core/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump
@@ -24,6 +24,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = 1305012705
+    metadata = null
    initializationData:
  total output bytes = 24
  sample count = 1

--- a/library/core/src/test/assets/mp3/bear.mp3.0.dump
+++ b/library/core/src/test/assets/mp3/bear.mp3.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[TSSE: description=null: value=Lavf54.20.4]
    initializationData:
  total output bytes = 44544
  sample count = 116

--- a/library/core/src/test/assets/mp3/bear.mp3.1.dump
+++ b/library/core/src/test/assets/mp3/bear.mp3.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[TSSE: description=null: value=Lavf54.20.4]
    initializationData:
  total output bytes = 29568
  sample count = 77

--- a/library/core/src/test/assets/mp3/bear.mp3.2.dump
+++ b/library/core/src/test/assets/mp3/bear.mp3.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[TSSE: description=null: value=Lavf54.20.4]
    initializationData:
  total output bytes = 14592
  sample count = 38

--- a/library/core/src/test/assets/mp3/bear.mp3.3.dump
+++ b/library/core/src/test/assets/mp3/bear.mp3.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[TSSE: description=null: value=Lavf54.20.4]
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/mp3/play-trimmed.mp3.0.dump
+++ b/library/core/src/test/assets/mp3/play-trimmed.mp3.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 418
  sample count = 1

--- a/library/core/src/test/assets/mp3/play-trimmed.mp3.1.dump
+++ b/library/core/src/test/assets/mp3/play-trimmed.mp3.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 418
  sample count = 1

--- a/library/core/src/test/assets/mp3/play-trimmed.mp3.2.dump
+++ b/library/core/src/test/assets/mp3/play-trimmed.mp3.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 418
  sample count = 1

--- a/library/core/src/test/assets/mp3/play-trimmed.mp3.3.dump
+++ b/library/core/src/test/assets/mp3/play-trimmed.mp3.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 418
  sample count = 1

--- a/library/core/src/test/assets/mp3/play-trimmed.mp3.unklen.dump
+++ b/library/core/src/test/assets/mp3/play-trimmed.mp3.unklen.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 418
  sample count = 1

--- a/library/core/src/test/assets/mp4/sample.mp4.0.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 1:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 9529

--- a/library/core/src/test/assets/mp4/sample.mp4.1.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 1:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 7464

--- a/library/core/src/test/assets/mp4/sample.mp4.2.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 1:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 4019

--- a/library/core/src/test/assets/mp4/sample.mp4.3.dump
+++ b/library/core/src/test/assets/mp4/sample.mp4.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 1:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = entries=[TSSE: description=null: value=Lavf56.1.0]
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 470

--- a/library/core/src/test/assets/mp4/sample_fragmented.mp4.0.dump
+++ b/library/core/src/test/assets/mp4/sample_fragmented.mp4.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 1:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
  total output bytes = 18257

--- a/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
+++ b/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 1:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
  total output bytes = 18257

--- a/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
+++ b/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 1:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
  total output bytes = 13359

--- a/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
+++ b/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 1:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
  total output bytes = 6804

--- a/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
+++ b/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 1:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
  total output bytes = 10

--- a/library/core/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
+++ b/library/core/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 29, hash 4746B5D9
      data = length 10, hash 7A0D0F2B
@@ -170,6 +171,7 @@ track 1:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 5, hash 2B7623A
  total output bytes = 18257
@@ -379,6 +381,7 @@ track 3:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ogg/bear.opus.0.dump
+++ b/library/core/src/test/assets/ogg/bear.opus.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 19, hash BFE794DB
      data = length 8, hash CA22068C

--- a/library/core/src/test/assets/ogg/bear.opus.1.dump
+++ b/library/core/src/test/assets/ogg/bear.opus.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 19, hash BFE794DB
      data = length 8, hash CA22068C

--- a/library/core/src/test/assets/ogg/bear.opus.2.dump
+++ b/library/core/src/test/assets/ogg/bear.opus.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 19, hash BFE794DB
      data = length 8, hash CA22068C

--- a/library/core/src/test/assets/ogg/bear.opus.3.dump
+++ b/library/core/src/test/assets/ogg/bear.opus.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 19, hash BFE794DB
      data = length 8, hash CA22068C

--- a/library/core/src/test/assets/ogg/bear.opus.unklen.dump
+++ b/library/core/src/test/assets/ogg/bear.opus.unklen.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 19, hash BFE794DB
      data = length 8, hash CA22068C

--- a/library/core/src/test/assets/ogg/bear_flac.ogg.0.dump
+++ b/library/core/src/test/assets/ogg/bear_flac.ogg.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 164431

--- a/library/core/src/test/assets/ogg/bear_flac.ogg.1.dump
+++ b/library/core/src/test/assets/ogg/bear_flac.ogg.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 113666

--- a/library/core/src/test/assets/ogg/bear_flac.ogg.2.dump
+++ b/library/core/src/test/assets/ogg/bear_flac.ogg.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 55652

--- a/library/core/src/test/assets/ogg/bear_flac.ogg.3.dump
+++ b/library/core/src/test/assets/ogg/bear_flac.ogg.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 445

--- a/library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump
+++ b/library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 164431

--- a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
+++ b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 164431

--- a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
+++ b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 113666

--- a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
+++ b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 55652

--- a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
+++ b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 445

--- a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
+++ b/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = entries=[]
    initializationData:
      data = length 42, hash 83F6895
  total output bytes = 164431

--- a/library/core/src/test/assets/ogg/bear_vorbis.ogg.0.dump
+++ b/library/core/src/test/assets/ogg/bear_vorbis.ogg.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 30, hash 9A8FF207
      data = length 3832, hash 8A406249

--- a/library/core/src/test/assets/ogg/bear_vorbis.ogg.1.dump
+++ b/library/core/src/test/assets/ogg/bear_vorbis.ogg.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 30, hash 9A8FF207
      data = length 3832, hash 8A406249

--- a/library/core/src/test/assets/ogg/bear_vorbis.ogg.2.dump
+++ b/library/core/src/test/assets/ogg/bear_vorbis.ogg.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 30, hash 9A8FF207
      data = length 3832, hash 8A406249

--- a/library/core/src/test/assets/ogg/bear_vorbis.ogg.3.dump
+++ b/library/core/src/test/assets/ogg/bear_vorbis.ogg.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 30, hash 9A8FF207
      data = length 3832, hash 8A406249

--- a/library/core/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump
+++ b/library/core/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 30, hash 9A8FF207
      data = length 3832, hash 8A406249

--- a/library/core/src/test/assets/rawcc/sample.rawcc.0.dump
+++ b/library/core/src/test/assets/rawcc/sample.rawcc.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 978
  sample count = 150

--- a/library/core/src/test/assets/ts/sample.ac3.0.dump
+++ b/library/core/src/test/assets/ts/sample.ac3.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 13281
  sample count = 8

--- a/library/core/src/test/assets/ts/sample.ac4.0.dump
+++ b/library/core/src/test/assets/ts/sample.ac4.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 7594
  sample count = 19

--- a/library/core/src/test/assets/ts/sample.adts.0.dump
+++ b/library/core/src/test/assets/ts/sample.adts.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 30797
@@ -625,6 +626,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample.eac3.0.dump
+++ b/library/core/src/test/assets/ts/sample.eac3.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 216000
  sample count = 54

--- a/library/core/src/test/assets/ts/sample.ps.0.dump
+++ b/library/core/src/test/assets/ts/sample.ps.0.dump
@@ -24,6 +24,7 @@ track 192:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 1671
  sample count = 4
@@ -64,6 +65,7 @@ track 224:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 22, hash 743CC6F8
  total output bytes = 44056

--- a/library/core/src/test/assets/ts/sample.ps.1.dump
+++ b/library/core/src/test/assets/ts/sample.ps.1.dump
@@ -24,6 +24,7 @@ track 192:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0
@@ -48,6 +49,7 @@ track 224:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 22, hash 743CC6F8
  total output bytes = 33949

--- a/library/core/src/test/assets/ts/sample.ps.2.dump
+++ b/library/core/src/test/assets/ts/sample.ps.2.dump
@@ -24,6 +24,7 @@ track 192:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0
@@ -48,6 +49,7 @@ track 224:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 22, hash 743CC6F8
  total output bytes = 19791

--- a/library/core/src/test/assets/ts/sample.ps.3.dump
+++ b/library/core/src/test/assets/ts/sample.ps.3.dump
@@ -24,6 +24,7 @@ track 192:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0
@@ -48,6 +49,7 @@ track 224:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 22, hash 743CC6F8
  total output bytes = 1585

--- a/library/core/src/test/assets/ts/sample.ps.unklen.dump
+++ b/library/core/src/test/assets/ts/sample.ps.unklen.dump
@@ -24,6 +24,7 @@ track 192:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 1671
  sample count = 4
@@ -64,6 +65,7 @@ track 224:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 22, hash 743CC6F8
  total output bytes = 44056

--- a/library/core/src/test/assets/ts/sample.ts.0.dump
+++ b/library/core/src/test/assets/ts/sample.ts.0.dump
@@ -24,6 +24,7 @@ track 256:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 22, hash CE183139
  total output bytes = 45026
@@ -57,6 +58,7 @@ track 257:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 5015
  sample count = 4
@@ -97,6 +99,7 @@ track 8448:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample.ts.1.dump
+++ b/library/core/src/test/assets/ts/sample.ts.1.dump
@@ -24,6 +24,7 @@ track 256:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 22, hash CE183139
  total output bytes = 45026
@@ -57,6 +58,7 @@ track 257:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 5015
  sample count = 4
@@ -97,6 +99,7 @@ track 8448:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample.ts.2.dump
+++ b/library/core/src/test/assets/ts/sample.ts.2.dump
@@ -24,6 +24,7 @@ track 256:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 22, hash CE183139
  total output bytes = 45026
@@ -57,6 +58,7 @@ track 257:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 5015
  sample count = 4
@@ -97,6 +99,7 @@ track 8448:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample.ts.3.dump
+++ b/library/core/src/test/assets/ts/sample.ts.3.dump
@@ -24,6 +24,7 @@ track 256:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 22, hash CE183139
  total output bytes = 0
@@ -49,6 +50,7 @@ track 257:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 2508
  sample count = 2
@@ -81,6 +83,7 @@ track 8448:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample.ts.unklen.dump
+++ b/library/core/src/test/assets/ts/sample.ts.unklen.dump
@@ -24,6 +24,7 @@ track 256:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 22, hash CE183139
  total output bytes = 45026
@@ -57,6 +58,7 @@ track 257:
    selectionFlags = 0
    language = und
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 5015
  sample count = 4
@@ -97,6 +99,7 @@ track 8448:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample_cbs.adts.0.dump
+++ b/library/core/src/test/assets/ts/sample_cbs.adts.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 30797
@@ -625,6 +626,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample_cbs.adts.1.dump
+++ b/library/core/src/test/assets/ts/sample_cbs.adts.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 20533
@@ -425,6 +426,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample_cbs.adts.2.dump
+++ b/library/core/src/test/assets/ts/sample_cbs.adts.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 10161
@@ -245,6 +246,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample_cbs.adts.3.dump
+++ b/library/core/src/test/assets/ts/sample_cbs.adts.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 174
@@ -53,6 +54,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample_cbs.adts.unklen.dump
+++ b/library/core/src/test/assets/ts/sample_cbs.adts.unklen.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 30797
@@ -625,6 +626,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
+++ b/library/core/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 30787
@@ -621,6 +622,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
+++ b/library/core/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 20523
@@ -421,6 +422,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
+++ b/library/core/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 10151
@@ -241,6 +242,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
+++ b/library/core/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 164
@@ -49,6 +50,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
+++ b/library/core/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
      data = length 2, hash 5F7
  total output bytes = 30787
@@ -621,6 +622,7 @@ track 1:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 0
  sample count = 0

--- a/library/core/src/test/assets/wav/sample.wav.0.dump
+++ b/library/core/src/test/assets/wav/sample.wav.0.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 88200
  sample count = 3

--- a/library/core/src/test/assets/wav/sample.wav.1.dump
+++ b/library/core/src/test/assets/wav/sample.wav.1.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 58802
  sample count = 2

--- a/library/core/src/test/assets/wav/sample.wav.2.dump
+++ b/library/core/src/test/assets/wav/sample.wav.2.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 29402
  sample count = 1

--- a/library/core/src/test/assets/wav/sample.wav.3.dump
+++ b/library/core/src/test/assets/wav/sample.wav.3.dump
@@ -24,6 +24,7 @@ track 0:
    selectionFlags = 0
    language = null
    drmInitData = -
+    metadata = null
    initializationData:
  total output bytes = 2
  sample count = 1

--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java
@@ -31,17 +31,16 @@ public class FlacExtractorTest {
  @Test
  public void testSampleWithId3HeaderAndId3Enabled() throws Exception {
-    ExtractorAsserts.assertBehavior(FlacExtractor::new, "flac/bear_with_id3.flac");
+    ExtractorAsserts.assertBehavior(FlacExtractor::new, "flac/bear_with_id3_enabled.flac");
  }
  @Test
  public void testSampleWithId3HeaderAndId3Disabled() throws Exception {
-    // The same file is used for testing the extractor with and without ID3 enabled as the test does
+    // bear_with_id3_disabled.flac is identical to bear_with_id3_enabled.flac, but the dump file is
-    // not check the metadata outputted. It only checks that the file is parsed correctly in both
+    // different due to setting FLAG_DISABLE_ID3_METADATA.
-    // cases.
    ExtractorAsserts.assertBehavior(
        () -> new FlacExtractor(FlacExtractor.FLAG_DISABLE_ID3_METADATA),
-        "flac/bear_with_id3.flac");
+        "flac/bear_with_id3_disabled.flac");
  }
  @Test

--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java
@@ -152,7 +152,6 @@ public final class ExtractorAsserts {
    assertOutput(factory.create(), file, data, context, false, false, false, false);
  }
-  // TODO: Assert format metadata [Internal ref: b/144771011].
  /**
   * Asserts that {@code extractor} consumes {@code sampleFile} successfully and its output equals
   * to a prerecorded output dump file with the name {@code sampleFile} + "{@value

--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
@@ -156,7 +156,8 @@ public final class FakeTrackOutput implements TrackOutput, Dumper.Dumpable {
  @Override
  public void dump(Dumper dumper) {
-    dumper.startBlock("format")
+    dumper
+        .startBlock("format")
        .add("bitrate", format.bitrate)
        .add("id", format.id)
        .add("containerMimeType", format.containerMimeType)
@@ -175,7 +176,8 @@ public final class FakeTrackOutput implements TrackOutput, Dumper.Dumpable {
        .add("subsampleOffsetUs", format.subsampleOffsetUs)
        .add("selectionFlags", format.selectionFlags)
        .add("language", format.language)
-        .add("drmInitData", format.drmInitData != null ? format.drmInitData.hashCode() : "-");
+        .add("drmInitData", format.drmInitData != null ? format.drmInitData.hashCode() : "-")
+        .add("metadata", format.metadata);
    dumper.startBlock("initializationData");
    for (int i = 0; i < format.initializationData.size(); i++) {