From 15583f7c644c0c58928a47ec3246f085f319a649 Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Wed, 30 Oct 2024 08:44:25 -0700
Subject: [PATCH] Set track duration in `AmrExtractor`, `Mp3Extractor` and
 `OggExtractor`

PiperOrigin-RevId: 691433024
---
 .../java/androidx/media3/extractor/amr/AmrExtractor.java   | 6 ++++--
 .../java/androidx/media3/extractor/mp3/Mp3Extractor.java   | 7 +++++++
 .../java/androidx/media3/extractor/ogg/StreamReader.java   | 1 +
 .../amr/sample_nb_cbr_seeking_always_enabled.amr.0.dump    | 1 +
 .../amr/sample_nb_cbr_seeking_always_enabled.amr.1.dump    | 1 +
 .../amr/sample_nb_cbr_seeking_always_enabled.amr.2.dump    | 1 +
 .../amr/sample_nb_cbr_seeking_always_enabled.amr.3.dump    | 1 +
 .../amr/sample_nb_cbr_seeking_enabled.amr.0.dump           | 1 +
 .../amr/sample_nb_cbr_seeking_enabled.amr.1.dump           | 1 +
 .../amr/sample_nb_cbr_seeking_enabled.amr.2.dump           | 1 +
 .../amr/sample_nb_cbr_seeking_enabled.amr.3.dump           | 1 +
 .../amr/sample_nb_with_silence_frames.amr.0.dump           | 1 +
 .../amr/sample_nb_with_silence_frames.amr.1.dump           | 1 +
 .../amr/sample_nb_with_silence_frames.amr.2.dump           | 1 +
 .../amr/sample_nb_with_silence_frames.amr.3.dump           | 1 +
 .../sample_nb_with_silence_frames.amr.unknown_length.dump  | 1 +
 .../amr/sample_wb_cbr_seeking_always_enabled.amr.0.dump    | 1 +
 .../amr/sample_wb_cbr_seeking_always_enabled.amr.1.dump    | 1 +
 .../amr/sample_wb_cbr_seeking_always_enabled.amr.2.dump    | 1 +
 .../amr/sample_wb_cbr_seeking_always_enabled.amr.3.dump    | 1 +
 .../amr/sample_wb_cbr_seeking_enabled.amr.0.dump           | 1 +
 .../amr/sample_wb_cbr_seeking_enabled.amr.1.dump           | 1 +
 .../amr/sample_wb_cbr_seeking_enabled.amr.2.dump           | 1 +
 .../amr/sample_wb_cbr_seeking_enabled.amr.3.dump           | 1 +
 .../amr/sample_wb_with_silence_frames.amr.0.dump           | 1 +
 .../amr/sample_wb_with_silence_frames.amr.1.dump           | 1 +
 .../amr/sample_wb_with_silence_frames.amr.2.dump           | 1 +
 .../amr/sample_wb_with_silence_frames.amr.3.dump           | 1 +
 .../sample_wb_with_silence_frames.amr.unknown_length.dump  | 1 +
 .../mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.0.dump | 1 +
 .../mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.1.dump | 1 +
 .../mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.2.dump | 1 +
 .../mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.3.dump | 1 +
 .../bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump  | 1 +
 .../bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump  | 1 +
 .../bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump  | 1 +
 .../bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump  | 1 +
 .../mp3/bear-cbr_cbr-seeking-always-enabled.0.dump         | 1 +
 .../mp3/bear-cbr_cbr-seeking-always-enabled.1.dump         | 1 +
 .../mp3/bear-cbr_cbr-seeking-always-enabled.2.dump         | 1 +
 .../mp3/bear-cbr_cbr-seeking-always-enabled.3.dump         | 1 +
 .../assets/extractordumps/mp3/bear-id3-disabled.0.dump     | 1 +
 .../assets/extractordumps/mp3/bear-id3-disabled.1.dump     | 1 +
 .../assets/extractordumps/mp3/bear-id3-disabled.2.dump     | 1 +
 .../assets/extractordumps/mp3/bear-id3-disabled.3.dump     | 1 +
 .../mp3/bear-id3-disabled.unknown_length.dump              | 1 +
 .../test/assets/extractordumps/mp3/bear-id3-enabled.0.dump | 1 +
 .../test/assets/extractordumps/mp3/bear-id3-enabled.1.dump | 1 +
 .../test/assets/extractordumps/mp3/bear-id3-enabled.2.dump | 1 +
 .../test/assets/extractordumps/mp3/bear-id3-enabled.3.dump | 1 +
 .../mp3/bear-id3-enabled.unknown_length.dump               | 1 +
 .../extractordumps/mp3/bear-id3-numeric-genre.mp3.0.dump   | 1 +
 .../extractordumps/mp3/bear-id3-numeric-genre.mp3.1.dump   | 1 +
 .../extractordumps/mp3/bear-id3-numeric-genre.mp3.2.dump   | 1 +
 .../extractordumps/mp3/bear-id3-numeric-genre.mp3.3.dump   | 1 +
 .../mp3/bear-id3-numeric-genre.mp3.unknown_length.dump     | 1 +
 .../extractordumps/mp3/bear-vbr-no-seek-table.mp3.0.dump   | 1 +
 .../extractordumps/mp3/bear-vbr-no-seek-table.mp3.1.dump   | 1 +
 .../extractordumps/mp3/bear-vbr-no-seek-table.mp3.2.dump   | 1 +
 .../extractordumps/mp3/bear-vbr-no-seek-table.mp3.3.dump   | 1 +
 .../mp3/bear-vbr-no-seek-table.mp3.unknown_length.dump     | 1 +
 .../extractordumps/mp3/bear-vbr-xing-header.mp3.0.dump     | 1 +
 .../extractordumps/mp3/bear-vbr-xing-header.mp3.1.dump     | 1 +
 .../extractordumps/mp3/bear-vbr-xing-header.mp3.2.dump     | 1 +
 .../extractordumps/mp3/bear-vbr-xing-header.mp3.3.dump     | 1 +
 .../mp3/bear-vbr-xing-header.mp3.unknown_length.dump       | 1 +
 .../test/assets/extractordumps/mp3/play-trimmed.mp3.0.dump | 1 +
 .../test/assets/extractordumps/mp3/play-trimmed.mp3.1.dump | 1 +
 .../test/assets/extractordumps/mp3/play-trimmed.mp3.2.dump | 1 +
 .../test/assets/extractordumps/mp3/play-trimmed.mp3.3.dump | 1 +
 .../mp3/test-cbr-info-header-pcut-frame.mp3.0.dump         | 1 +
 .../mp3/test-cbr-info-header-pcut-frame.mp3.1.dump         | 1 +
 .../mp3/test-cbr-info-header-pcut-frame.mp3.2.dump         | 1 +
 .../mp3/test-cbr-info-header-pcut-frame.mp3.3.dump         | 1 +
 ...test-cbr-info-header-pcut-frame.mp3.unknown_length.dump | 1 +
 .../extractordumps/mp3/test-cbr-info-header.mp3.0.dump     | 1 +
 .../extractordumps/mp3/test-cbr-info-header.mp3.1.dump     | 1 +
 .../extractordumps/mp3/test-cbr-info-header.mp3.2.dump     | 1 +
 .../extractordumps/mp3/test-cbr-info-header.mp3.3.dump     | 1 +
 .../mp3/test-cbr-info-header.mp3.unknown_length.dump       | 1 +
 .../src/test/assets/extractordumps/ogg/bear.opus.0.dump    | 1 +
 .../src/test/assets/extractordumps/ogg/bear.opus.1.dump    | 1 +
 .../src/test/assets/extractordumps/ogg/bear.opus.2.dump    | 1 +
 .../src/test/assets/extractordumps/ogg/bear.opus.3.dump    | 1 +
 .../extractordumps/ogg/bear_duplicate_header.opus.0.dump   | 1 +
 .../extractordumps/ogg/bear_duplicate_header.opus.1.dump   | 1 +
 .../extractordumps/ogg/bear_duplicate_header.opus.2.dump   | 1 +
 .../extractordumps/ogg/bear_duplicate_header.opus.3.dump   | 1 +
 .../test/assets/extractordumps/ogg/bear_flac.ogg.0.dump    | 1 +
 .../test/assets/extractordumps/ogg/bear_flac.ogg.1.dump    | 1 +
 .../test/assets/extractordumps/ogg/bear_flac.ogg.2.dump    | 1 +
 .../test/assets/extractordumps/ogg/bear_flac.ogg.3.dump    | 1 +
 .../extractordumps/ogg/bear_flac.ogg.unknown_length.dump   | 1 +
 .../extractordumps/ogg/bear_flac_noseektable.ogg.0.dump    | 1 +
 .../extractordumps/ogg/bear_flac_noseektable.ogg.1.dump    | 1 +
 .../extractordumps/ogg/bear_flac_noseektable.ogg.2.dump    | 1 +
 .../extractordumps/ogg/bear_flac_noseektable.ogg.3.dump    | 1 +
 .../test/assets/extractordumps/ogg/bear_vorbis.ogg.0.dump  | 1 +
 .../test/assets/extractordumps/ogg/bear_vorbis.ogg.1.dump  | 1 +
 .../test/assets/extractordumps/ogg/bear_vorbis.ogg.2.dump  | 1 +
 .../test/assets/extractordumps/ogg/bear_vorbis.ogg.3.dump  | 1 +
 .../assets/extractordumps/ogg/bear_vorbis_gap.ogg.0.dump   | 1 +
 .../assets/extractordumps/ogg/bear_vorbis_gap.ogg.1.dump   | 1 +
 .../assets/extractordumps/ogg/bear_vorbis_gap.ogg.2.dump   | 1 +
 .../assets/extractordumps/ogg/bear_vorbis_gap.ogg.3.dump   | 1 +
 .../ogg/bear_vorbis_with_large_metadata.ogg.0.dump         | 1 +
 .../ogg/bear_vorbis_with_large_metadata.ogg.1.dump         | 1 +
 .../ogg/bear_vorbis_with_large_metadata.ogg.2.dump         | 1 +
 .../ogg/bear_vorbis_with_large_metadata.ogg.3.dump         | 1 +
 109 files changed, 118 insertions(+), 2 deletions(-)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/amr/AmrExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/amr/AmrExtractor.java
index 57a28cda7e..6f5d17fa06 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/amr/AmrExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/amr/AmrExtractor.java
@@ -245,6 +245,7 @@ public final class AmrExtractor implements Extractor {
       long durationUs = timeOffsetUs + currentSampleTimeUs;
       ((IndexSeekMap) seekMap).setDurationUs(durationUs);
       extractorOutput.seekMap(seekMap);
+      realTrackOutput.durationUs(durationUs);
     }
     return sampleReadResult;
   }
@@ -327,7 +328,7 @@ public final class AmrExtractor implements Extractor {
       int sampleRate = isWideBand ? SAMPLE_RATE_WB : SAMPLE_RATE_NB;
       // Theoretical maximum frame size for a AMR frame.
       int maxInputSize = isWideBand ? frameSizeBytesByTypeWb[8] : frameSizeBytesByTypeNb[7];
-      currentTrackOutput.format(
+      realTrackOutput.format(
           new Format.Builder()
               .setSampleMimeType(mimeType)
               .setMaxInputSize(maxInputSize)
@@ -433,7 +434,7 @@ public final class AmrExtractor implements Extractor {
     return !isWideBand && (frameType < 12 || frameType > 14);
   }
 
-  @RequiresNonNull("extractorOutput")
+  @RequiresNonNull({"extractorOutput", "realTrackOutput"})
   private void maybeOutputSeekMap(long inputLength, int sampleReadResult) {
     if (seekMap != null) {
       return;
@@ -453,6 +454,7 @@ public final class AmrExtractor implements Extractor {
       seekMap =
           getConstantBitrateSeekMap(
               inputLength, (flags & FLAG_ENABLE_CONSTANT_BITRATE_SEEKING_ALWAYS) != 0);
+      realTrackOutput.durationUs(seekMap.getDurationUs());
     }
 
     if (seekMap != null) {
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/Mp3Extractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/Mp3Extractor.java
index 0ae9c614d3..b445f2b86e 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/Mp3Extractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp3/Mp3Extractor.java
@@ -260,6 +260,7 @@ public final class Mp3Extractor implements Extractor {
       if (seeker.getDurationUs() != durationUs) {
         ((IndexSeeker) seeker).setDurationUs(durationUs);
         extractorOutput.seekMap(seeker);
+        realTrackOutput.durationUs(seeker.getDurationUs());
       }
     }
     return readResult;
@@ -465,6 +466,7 @@ public final class Mp3Extractor implements Extractor {
     }
   }
 
+  @RequiresNonNull("realTrackOutput")
   private Seeker computeSeeker(ExtractorInput input) throws IOException {
     // Read past any seek frame and set the seeker based on metadata or a seek frame. Metadata
     // takes priority as it can provide greater precision.
@@ -504,6 +506,10 @@ public final class Mp3Extractor implements Extractor {
               input, (flags & FLAG_ENABLE_CONSTANT_BITRATE_SEEKING_ALWAYS) != 0);
     }
 
+    if (resultSeeker != null) {
+      realTrackOutput.durationUs(resultSeeker.getDurationUs());
+    }
+
     return resultSeeker;
   }
 
@@ -653,6 +659,7 @@ public final class Mp3Extractor implements Extractor {
       seeker =
           ((ConstantBitrateSeeker) seeker).copyWithNewDataEndPosition(endPositionOfLastSampleRead);
       checkNotNull(extractorOutput).seekMap(seeker);
+      checkNotNull(realTrackOutput).durationUs(seeker.getDurationUs());
     }
   }
 
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ogg/StreamReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ogg/StreamReader.java
index 6add005122..78c2bd8c7d 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/ogg/StreamReader.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ogg/StreamReader.java
@@ -208,6 +208,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
     if (!seekMapSet) {
       SeekMap seekMap = checkStateNotNull(oggSeeker.createSeekMap());
       extractorOutput.seekMap(seekMap);
+      trackOutput.durationUs(seekMap.getDurationUs());
       seekMapSet = true;
     }
 
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.0.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.0.dump
index 2ed249d16b..7f370dcb03 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2834
   sample count = 218
+  track duration = 4360000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.1.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.1.dump
index e12b429169..1f044cc537 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 1898
   sample count = 146
+  track duration = 4360000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.2.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.2.dump
index b4d0d0d226..d7cb1ce928 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 949
   sample count = 73
+  track duration = 4360000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.3.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.3.dump
index bb9c247b6b..bce4f49710 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13
   sample count = 1
+  track duration = 4360000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.0.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.0.dump
index 2ed249d16b..7f370dcb03 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2834
   sample count = 218
+  track duration = 4360000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.1.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.1.dump
index e12b429169..1f044cc537 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 1898
   sample count = 146
+  track duration = 4360000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.2.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.2.dump
index b4d0d0d226..d7cb1ce928 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 949
   sample count = 73
+  track duration = 4360000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.3.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.3.dump
index bb9c247b6b..bce4f49710 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 13
   sample count = 1
+  track duration = 4360000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.0.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.0.dump
index fe82cb2e7e..6cc8f5252f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2836
   sample count = 220
+  track duration = 4400000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.1.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.1.dump
index aa2d2fd913..a7c4f2ebeb 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 1924
   sample count = 148
+  track duration = 4400000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.2.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.2.dump
index e0209f9a78..97b32f3982 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 975
   sample count = 75
+  track duration = 4400000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.3.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.3.dump
index 2832c3c090..4f025c2e08 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 4400000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.unknown_length.dump
index fe82cb2e7e..6cc8f5252f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2836
   sample count = 220
+  track duration = 4400000
   format 0:
     sampleMimeType = audio/3gpp
     maxInputSize = 32
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.0.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.0.dump
index de452ce2a3..16edac211a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4056
   sample count = 169
+  track duration = 3380000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.1.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.1.dump
index 1fc2a1c806..506251fdf0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2712
   sample count = 113
+  track duration = 3380000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.2.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.2.dump
index 4f41388bbd..bcfb985981 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 1368
   sample count = 57
+  track duration = 3380000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.3.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.3.dump
index 6dfb7623a8..a1ff2d810f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 24
   sample count = 1
+  track duration = 3380000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.0.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.0.dump
index de452ce2a3..16edac211a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4056
   sample count = 169
+  track duration = 3380000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.1.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.1.dump
index 1fc2a1c806..506251fdf0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2712
   sample count = 113
+  track duration = 3380000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.2.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.2.dump
index 4f41388bbd..bcfb985981 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 1368
   sample count = 57
+  track duration = 3380000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.3.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.3.dump
index 6dfb7623a8..a1ff2d810f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 24
   sample count = 1
+  track duration = 3380000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.0.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.0.dump
index 694fd92a3c..4cc71cbab8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4057
   sample count = 170
+  track duration = 3400000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.1.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.1.dump
index 70b19f8e6a..80db732274 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2760
   sample count = 115
+  track duration = 3400000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.2.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.2.dump
index 4108303d2c..23eabd19ee 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 1392
   sample count = 58
+  track duration = 3400000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.3.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.3.dump
index e241f5a9c0..04fda8697b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 3400000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.unknown_length.dump
index 694fd92a3c..4cc71cbab8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 4057
   sample count = 170
+  track duration = 3400000
   format 0:
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.0.dump
index b8b7af77d0..c3ca8e549e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 45139
   sample count = 108
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.1.dump
index 02a784b9e7..1fc8973648 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 30093
   sample count = 72
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.2.dump
index 297c862c80..033e62640b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 15046
   sample count = 36
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.3.dump
index bf484c7ee3..6740563d28 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-no-seek-table-trailing-garbage.mp3.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump
index b8b7af77d0..c3ca8e549e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 45139
   sample count = 108
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump
index 02a784b9e7..1fc8973648 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 30093
   sample count = 72
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump
index 297c862c80..033e62640b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 15046
   sample count = 36
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump
index bf484c7ee3..6740563d28 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr-variable-frame-size-no-seek-table.mp3.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.0.dump
index b8b7af77d0..c3ca8e549e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 45139
   sample count = 108
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.1.dump
index 02a784b9e7..1fc8973648 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 30093
   sample count = 72
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.2.dump
index 297c862c80..033e62640b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 15046
   sample count = 36
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.3.dump
index bf484c7ee3..6740563d28 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-cbr_cbr-seeking-always-enabled.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 2821187
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
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
index 985efca1fd..4b51186fbd 100644
--- 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
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
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
index bcddef2022..e83c215e23 100644
--- 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
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 25344
   sample count = 80
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
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
index 6d544246f8..f528c4f873 100644
--- 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
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 12624
   sample count = 42
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
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
index cfe9c502c2..5ad2819433 100644
--- 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
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
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
index 985efca1fd..4b51186fbd 100644
--- 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
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
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
index 49fd53f7ba..43992ed876 100644
--- 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
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
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
index d95554971c..f8d1363914 100644
--- 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
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 25344
   sample count = 80
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
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
index 114c947758..780a6168e4 100644
--- 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
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 12624
   sample count = 42
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
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
index e00b9cb0e2..c78bdc01cf 100644
--- 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
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
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
index 49fd53f7ba..43992ed876 100644
--- 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
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.0.dump
index 42691428c3..5e7f28c76e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.1.dump
index 034f281ac2..ce253347fa 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 25344
   sample count = 80
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.2.dump
index d925b68495..c3c373066b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 12624
   sample count = 42
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.3.dump
index 89386c95fa..9c9a0000a7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.unknown_length.dump
index 42691428c3..5e7f28c76e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-id3-numeric-genre.mp3.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.0.dump
index 90edd282b2..0727a2581f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.1.dump
index 8a06d2bba7..def89b6378 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 25920
   sample count = 82
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.2.dump
index 32a412e8ca..bae2a70956 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 12624
   sample count = 42
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.3.dump
index 41e499b4a8..02d6f382e5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 216
   sample count = 2
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.unknown_length.dump
index 90edd282b2..0727a2581f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-no-seek-table.mp3.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
+  track duration = 2808000
   format 0:
     sampleMimeType = audio/mpeg
     maxInputSize = 4096
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.0.dump
index 1dd1aed0a8..18267ba3dc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
+  track duration = 2807979
   format 0:
     averageBitrate = 64000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.1.dump
index 420919c0b0..9bff8760f7 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 24384
   sample count = 77
+  track duration = 2807979
   format 0:
     averageBitrate = 64000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.2.dump
index 64fe870c86..ede55a226f 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 11328
   sample count = 38
+  track duration = 2807979
   format 0:
     averageBitrate = 64000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.3.dump
index 55ffb9d9d0..ce78dea3a0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 2807979
   format 0:
     averageBitrate = 64000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.unknown_length.dump
index 1dd1aed0a8..18267ba3dc 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/bear-vbr-xing-header.mp3.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 38160
   sample count = 117
+  track duration = 2807979
   format 0:
     averageBitrate = 64000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.0.dump
index cc3c05e915..e2b2e9b1e6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 418
   sample count = 1
+  track duration = 26125
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.1.dump
index cc3c05e915..e2b2e9b1e6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 418
   sample count = 1
+  track duration = 26125
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.2.dump
index cc3c05e915..e2b2e9b1e6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 418
   sample count = 1
+  track duration = 26125
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.3.dump
index cc3c05e915..e2b2e9b1e6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/play-trimmed.mp3.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 418
   sample count = 1
+  track duration = 26125
   format 0:
     averageBitrate = 128000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.0.dump
index f46ed23025..cc64dc5f83 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8463
   sample count = 41
+  track duration = 1070994
   format 0:
     averageBitrate = 63216
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.1.dump
index 26d542cbdf..c7de7a644d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 5643
   sample count = 27
+  track duration = 1070994
   format 0:
     averageBitrate = 63216
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.2.dump
index 24662f77df..211b998750 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2717
   sample count = 13
+  track duration = 1070994
   format 0:
     averageBitrate = 63216
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.3.dump
index e961e045a8..46441e55e0 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 1070994
   format 0:
     averageBitrate = 63216
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.unknown_length.dump
index f46ed23025..cc64dc5f83 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header-pcut-frame.mp3.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8463
   sample count = 41
+  track duration = 1070994
   format 0:
     averageBitrate = 63216
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.0.dump
index 09bea5d141..a879ad852d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8359
   sample count = 40
+  track duration = 1044875
   format 0:
     averageBitrate = 64000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.1.dump
index a74c470bb3..c861a8f45d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 5434
   sample count = 26
+  track duration = 1044875
   format 0:
     averageBitrate = 64000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.2.dump
index 0f738921cd..8a66ecb591 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 2717
   sample count = 13
+  track duration = 1044875
   format 0:
     averageBitrate = 64000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.3.dump
index d9fe0f8ac1..2d299cee45 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 209
   sample count = 1
+  track duration = 1044875
   format 0:
     averageBitrate = 64000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.unknown_length.dump
index 09bea5d141..a879ad852d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mp3/test-cbr-info-header.mp3.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8359
   sample count = 40
+  track duration = 1044875
   format 0:
     averageBitrate = 64000
     sampleMimeType = audio/mpeg
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.0.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.0.dump
index 5f450b0019..c18d2714c6 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 25541
   sample count = 275
+  track duration = 2747500
   format 0:
     sampleMimeType = audio/opus
     channelCount = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.1.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.1.dump
index 815de4ff88..cff80d1e9b 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 17031
   sample count = 184
+  track duration = 2747500
   format 0:
     sampleMimeType = audio/opus
     channelCount = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.2.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.2.dump
index 740e02452b..6edb175570 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8698
   sample count = 92
+  track duration = 2747500
   format 0:
     sampleMimeType = audio/opus
     channelCount = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.3.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.3.dump
index 01f612dd27..2dd5ff4e93 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear.opus.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 126
   sample count = 1
+  track duration = 2747500
   format 0:
     sampleMimeType = audio/opus
     channelCount = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.0.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.0.dump
index e7bbf1e621..60c1a63641 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 25541
   sample count = 275
+  track duration = 2747500
   format 0:
     sampleMimeType = audio/opus
     channelCount = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.1.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.1.dump
index aa9c322191..65fc476053 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 17031
   sample count = 184
+  track duration = 2747500
   format 0:
     sampleMimeType = audio/opus
     channelCount = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.2.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.2.dump
index 20d822107a..03883ff7d5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8698
   sample count = 92
+  track duration = 2747500
   format 0:
     sampleMimeType = audio/opus
     channelCount = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.3.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.3.dump
index 80c9d3b6ce..d8848b82e4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_duplicate_header.opus.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 126
   sample count = 1
+  track duration = 2747500
   format 0:
     sampleMimeType = audio/opus
     channelCount = 2
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump
index 7c59b0fda1..f4663de58e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 164431
   sample count = 33
+  track duration = 2741000
   format 0:
     sampleMimeType = audio/flac
     maxInputSize = 5776
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump
index 89a41b8d70..38c25f53b4 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 113666
   sample count = 23
+  track duration = 2741000
   format 0:
     sampleMimeType = audio/flac
     maxInputSize = 5776
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump
index b2dc3916c5..26a98cb29e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 55652
   sample count = 12
+  track duration = 2741000
   format 0:
     sampleMimeType = audio/flac
     maxInputSize = 5776
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump
index 0e4a330e60..14f5a8cb48 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 445
   sample count = 1
+  track duration = 2741000
   format 0:
     sampleMimeType = audio/flac
     maxInputSize = 5776
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump
index 7c59b0fda1..f4663de58e 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac.ogg.unknown_length.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 164431
   sample count = 33
+  track duration = 2741000
   format 0:
     sampleMimeType = audio/flac
     maxInputSize = 5776
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump
index b8badab368..d6fb2e0710 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 164431
   sample count = 33
+  track duration = 2741000
   format 0:
     sampleMimeType = audio/flac
     maxInputSize = 5776
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump
index d5ec4be867..efb08632ee 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 113666
   sample count = 23
+  track duration = 2741000
   format 0:
     sampleMimeType = audio/flac
     maxInputSize = 5776
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump
index 73ee968169..83118c19a8 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 55652
   sample count = 12
+  track duration = 2741000
   format 0:
     sampleMimeType = audio/flac
     maxInputSize = 5776
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump
index 59e3d3b35d..c37b151096 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_flac_noseektable.ogg.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 445
   sample count = 1
+  track duration = 2741000
   format 0:
     sampleMimeType = audio/flac
     maxInputSize = 5776
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.0.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.0.dump
index 7c00eb044d..ce6ee88bbd 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 26873
   sample count = 180
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.1.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.1.dump
index 2faeecb70e..e7d33450f9 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 17598
   sample count = 109
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.2.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.2.dump
index 3536830154..ee8bf2c35c 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8658
   sample count = 49
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.3.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.3.dump
index 1975852f49..b3138c6610 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis.ogg.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.0.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.0.dump
index bf05a1a039..41797e73dd 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 26873
   sample count = 180
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.1.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.1.dump
index 1946984309..cfe9e46182 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 17598
   sample count = 109
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.2.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.2.dump
index b936c3621a..3d4fb22728 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8658
   sample count = 49
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.3.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.3.dump
index 91fc8a7b09..c1e2a66292 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_gap.ogg.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.0.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.0.dump
index b92508b27a..8fdaab6b8a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.0.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 26873
   sample count = 180
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.1.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.1.dump
index bdc0ca45dd..8df49d85a1 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.1.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 17598
   sample count = 109
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.2.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.2.dump
index 9add7b53e6..83d624576a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.2.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 8658
   sample count = 49
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis
diff --git a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.3.dump b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.3.dump
index 45da0276a8..3496300fd5 100644
--- a/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/ogg/bear_vorbis_with_large_metadata.ogg.3.dump
@@ -9,6 +9,7 @@ numberOfTracks = 1
 track 0:
   total output bytes = 0
   sample count = 0
+  track duration = 2741000
   format 0:
     averageBitrate = 112000
     sampleMimeType = audio/vorbis