Add codecs string to extractor dumps

PiperOrigin-RevId: 297806457

Add codecs string to extractor dumps
PiperOrigin-RevId: 297806457
64feb97d · andrewlewis · Oliver Woodman · db97d0c3 · 64feb97d · 64feb97d
Commit 64feb97d authored Feb 28, 2020 by andrewlewis Committed by Oliver Woodman Feb 28, 2020
Showing with 36 additions and 0 deletions
testdata/src/test/assets/flv/sample.flv.0.dump
testdata/src/test/assets/flv/sample.flv.unklen.dump
testdata/src/test/assets/mp4/sample.mp4.0.dump
testdata/src/test/assets/mp4/sample.mp4.1.dump
testdata/src/test/assets/mp4/sample.mp4.2.dump
testdata/src/test/assets/mp4/sample.mp4.3.dump
testdata/src/test/assets/mp4/sample.mp4.unklen.dump
testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump
testdata/src/test/assets/mp4/sample_fragmented.mp4.unklen.dump
testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unklen.dump
testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unklen.dump
testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump
testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump
testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump
testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump
--- a/testdata/src/test/assets/flv/sample.flv.0.dump
+++ b/testdata/src/test/assets/flv/sample.flv.0.dump
@@ -8,6 +8,7 @@ track 8:
  sample count = 45
  format 0:
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/flv/sample.flv.unklen.dump
+++ b/testdata/src/test/assets/flv/sample.flv.unklen.dump
@@ -8,6 +8,7 @@ track 8:
  sample count = 45
  format 0:
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/mp4/sample.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.0.dump
@@ -145,6 +145,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    maxInputSize = 294
    channelCount = 1
    sampleRate = 44100

--- a/testdata/src/test/assets/mp4/sample.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.1.dump
@@ -145,6 +145,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    maxInputSize = 294
    channelCount = 1
    sampleRate = 44100

--- a/testdata/src/test/assets/mp4/sample.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.2.dump
@@ -145,6 +145,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    maxInputSize = 294
    channelCount = 1
    sampleRate = 44100

--- a/testdata/src/test/assets/mp4/sample.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.3.dump
@@ -145,6 +145,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    maxInputSize = 294
    channelCount = 1
    sampleRate = 44100

--- a/testdata/src/test/assets/mp4/sample.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample.mp4.unklen.dump
@@ -145,6 +145,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    maxInputSize = 294
    channelCount = 1
    sampleRate = 44100

--- a/testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump
@@ -140,6 +140,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    language = und

--- a/testdata/src/test/assets/mp4/sample_fragmented.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented.mp4.unklen.dump
@@ -140,6 +140,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    language = und

--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
@@ -143,6 +143,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    language = und

--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
@@ -143,6 +143,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    language = und

--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
@@ -143,6 +143,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    language = und

--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
@@ -143,6 +143,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    language = und

--- a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unklen.dump
@@ -143,6 +143,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    language = und

--- a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
@@ -140,6 +140,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    language = und

--- a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unklen.dump
@@ -140,6 +140,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    language = und

--- a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump
+++ b/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump
@@ -145,6 +145,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    maxInputSize = 294
    channelCount = 1
    sampleRate = 44100

--- a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump
+++ b/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump
@@ -145,6 +145,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    maxInputSize = 294
    channelCount = 1
    sampleRate = 44100

--- a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump
+++ b/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump
@@ -145,6 +145,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    maxInputSize = 294
    channelCount = 1
    sampleRate = 44100

--- a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump
+++ b/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump
@@ -145,6 +145,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    maxInputSize = 294
    channelCount = 1
    sampleRate = 44100

--- a/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.unklen.dump
+++ b/testdata/src/test/assets/mp4/sample_mdat_too_long.mp4.unklen.dump
@@ -145,6 +145,7 @@ track 1:
  format 0:
    id = 2
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    maxInputSize = 294
    channelCount = 1
    sampleRate = 44100

--- a/testdata/src/test/assets/rawcc/sample.rawcc.0.dump
+++ b/testdata/src/test/assets/rawcc/sample.rawcc.0.dump
@@ -8,6 +8,7 @@ track 0:
  sample count = 150
  format 0:
    sampleMimeType = application/cea-608
+    codecs = cea608
  sample 0:
    time = 37657512133
    flags = 1

--- a/testdata/src/test/assets/rawcc/sample.rawcc.unklen.dump
+++ b/testdata/src/test/assets/rawcc/sample.rawcc.unklen.dump
@@ -8,6 +8,7 @@ track 0:
  sample count = 150
  format 0:
    sampleMimeType = application/cea-608
+    codecs = cea608
  sample 0:
    time = 37657512133
    flags = 1

--- a/testdata/src/test/assets/ts/sample.adts.0.dump
+++ b/testdata/src/test/assets/ts/sample.adts.0.dump
@@ -9,6 +9,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample.adts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample.adts.unklen.dump
@@ -9,6 +9,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample_cbs.adts.0.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.0.dump
@@ -12,6 +12,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample_cbs.adts.1.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.1.dump
@@ -12,6 +12,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample_cbs.adts.2.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.2.dump
@@ -12,6 +12,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample_cbs.adts.3.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.3.dump
@@ -12,6 +12,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample_cbs.adts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample_cbs.adts.unklen.dump
@@ -9,6 +9,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
@@ -12,6 +12,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
@@ -12,6 +12,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
@@ -12,6 +12,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
@@ -12,6 +12,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
+++ b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
@@ -9,6 +9,7 @@ track 0:
  format 0:
    id = 0
    sampleMimeType = audio/mp4a-latm
+    codecs = mp4a.40.2
    channelCount = 1
    sampleRate = 44100
    initializationData:

--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
@@ -274,6 +274,7 @@ public final class FakeTrackOutput implements TrackOutput, Dumper.Dumpable {
      addIfNonDefault(dumper, "id", format -> format.id);
      addIfNonDefault(dumper, "containerMimeType", format -> format.containerMimeType);
      addIfNonDefault(dumper, "sampleMimeType", format -> format.sampleMimeType);
+      addIfNonDefault(dumper, "codecs", format -> format.codecs);
      addIfNonDefault(dumper, "maxInputSize", format -> format.maxInputSize);
      addIfNonDefault(dumper, "width", format -> format.width);
      addIfNonDefault(dumper, "height", format -> format.height);