diff --git a/testdata/src/test/assets/flv/sample.flv.0.dump b/testdata/src/test/assets/flv/sample.flv.0.dump index 3857558bd0..8bf765bae3 100644 --- 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: diff --git a/testdata/src/test/assets/flv/sample.flv.unklen.dump b/testdata/src/test/assets/flv/sample.flv.unklen.dump index 3857558bd0..8bf765bae3 100644 --- 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: diff --git a/testdata/src/test/assets/mp4/sample.mp4.0.dump b/testdata/src/test/assets/mp4/sample.mp4.0.dump index a18b11fa10..c1d6530965 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample.mp4.1.dump b/testdata/src/test/assets/mp4/sample.mp4.1.dump index cad8241b30..0cba489724 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample.mp4.2.dump b/testdata/src/test/assets/mp4/sample.mp4.2.dump index 78f9bd1ab3..453c1677bf 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample.mp4.3.dump b/testdata/src/test/assets/mp4/sample.mp4.3.dump index 728ac2cce3..0fe653ac2c 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample.mp4.unklen.dump b/testdata/src/test/assets/mp4/sample.mp4.unklen.dump index a18b11fa10..c1d6530965 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump b/testdata/src/test/assets/mp4/sample_fragmented.mp4.0.dump index 61717f6802..a736207757 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample_fragmented.mp4.unklen.dump b/testdata/src/test/assets/mp4/sample_fragmented.mp4.unklen.dump index 61717f6802..a736207757 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump index 6ba5aaa28f..c879cde628 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump index bdf6565021..b264cf1b56 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump index de97e39ea7..4b10cca688 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump index 07c0c80e3d..4477d48371 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unklen.dump b/testdata/src/test/assets/mp4/sample_fragmented_seekable.mp4.unklen.dump index 6ba5aaa28f..c879cde628 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump b/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump index 44bd278db3..95fe467746 100644 --- 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 diff --git a/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unklen.dump b/testdata/src/test/assets/mp4/sample_fragmented_sei.mp4.unklen.dump index 44bd278db3..95fe467746 100644 --- 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 diff --git 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 index 7ce55febd3..287d52240f 100644 --- 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 diff --git 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 index be355cbc73..5c559c7a15 100644 --- 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 diff --git 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 index 6f5b440e65..34b0c2099f 100644 --- 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 diff --git 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 index 19da479c68..c1dc5e9a3f 100644 --- 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 diff --git 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 index 7ce55febd3..287d52240f 100644 --- 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 diff --git a/testdata/src/test/assets/rawcc/sample.rawcc.0.dump b/testdata/src/test/assets/rawcc/sample.rawcc.0.dump index 97256dd403..32c591be32 100644 --- 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 diff --git a/testdata/src/test/assets/rawcc/sample.rawcc.unklen.dump b/testdata/src/test/assets/rawcc/sample.rawcc.unklen.dump index 97256dd403..32c591be32 100644 --- 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 diff --git a/testdata/src/test/assets/ts/sample.adts.0.dump b/testdata/src/test/assets/ts/sample.adts.0.dump index c898993ba2..ddfea3e99b 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample.adts.unklen.dump b/testdata/src/test/assets/ts/sample.adts.unklen.dump index c898993ba2..ddfea3e99b 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample_cbs.adts.0.dump b/testdata/src/test/assets/ts/sample_cbs.adts.0.dump index 7fcc220cd6..e3aaa10d42 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample_cbs.adts.1.dump b/testdata/src/test/assets/ts/sample_cbs.adts.1.dump index 53ec7e1f42..ab3d2feefd 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample_cbs.adts.2.dump b/testdata/src/test/assets/ts/sample_cbs.adts.2.dump index 3baf8e17a1..2330cdc3ce 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample_cbs.adts.3.dump b/testdata/src/test/assets/ts/sample_cbs.adts.3.dump index 888184fbe1..ae07524dad 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample_cbs.adts.unklen.dump b/testdata/src/test/assets/ts/sample_cbs.adts.unklen.dump index c898993ba2..ddfea3e99b 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.0.dump index fd07b50b10..b94049c6be 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.1.dump index 1bc6c78464..79805d78f7 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.2.dump index 6c2fd4b3f0..7c6278eca1 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.3.dump index d8b2d60664..518bcf4a3b 100644 --- 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: diff --git a/testdata/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump b/testdata/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump index 4bfd86d929..0af445910d 100644 --- 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: diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java index ead0bcb82c..d94afbd2e3 100644 --- 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);